Merge pull request #804 from admintertar/compatible-javax-jakarta

fix 兼容jakarta/javax的ServletRequest
pagehelper · Jan 30, 2024 · 30dd0f3 · 30dd0f3
2 parents 4a2ce68 + 2abe80f
commit 30dd0f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/github/pagehelper/util/ClassUtil.java b/src/main/java/com/github/pagehelper/util/ClassUtil.java
@@ -89,4 +89,15 @@ public static <T> T newInstance(Class<T> cls, Properties properties) {
         }
     }
 
+    public static Class<?> getServletRequestClass() throws ClassNotFoundException {
+        Class<?> requestClass = null;
+        try {
+            requestClass = Class.forName("javax.servlet.ServletRequest");
+        }catch (ClassNotFoundException exception){
+        }
+        if (requestClass != null){
+            return requestClass;
+        }
+        return Class.forName("jakarta.servlet.ServletRequest");
+    }
 }
diff --git a/src/main/java/com/github/pagehelper/util/PageObjectUtil.java b/src/main/java/com/github/pagehelper/util/PageObjectUtil.java
@@ -47,7 +47,7 @@ public abstract class PageObjectUtil {
 
     static {
         try {
-            requestClass = Class.forName("javax.servlet.ServletRequest");
+            requestClass = ClassUtil.getServletRequestClass();
             getParameterMap = requestClass.getMethod("getParameterMap", new Class[]{});
             hasRequest = true;
         } catch (Throwable e) {