Merge pull request #45 from sis-yoshiday/features/spring-data-commons-3.x

support spring-data-commons 3.x

Author: jpenren

pom.xml

@@ -33,23 +33,22 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>17</java.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
+				<version>3.8.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+				<version>3.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -62,7 +61,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -90,21 +89,15 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
-			<version>2.6.0</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<version>3.0.14.RELEASE</version>
+			<version>3.1.1.RELEASE</version>
 		</dependency>
 	</dependencies>
 

src/main/java/org/thymeleaf/dialect/springdata/util/PageUtils.java

@@ -11,14 +11,11 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
@@ -31,6 +28,9 @@
 import org.thymeleaf.standard.expression.IStandardExpression;
 import org.thymeleaf.standard.expression.IStandardExpressionParser;
 import org.thymeleaf.standard.expression.StandardExpressions;
+import org.thymeleaf.web.IWebExchange;
+import org.thymeleaf.web.IWebRequest;
+import org.thymeleaf.web.servlet.IServletWebRequest;
 import org.unbescape.html.HtmlEscape;
 
 @SuppressWarnings("unchecked")
@@ -60,12 +60,12 @@ public static Page<?> findPage(final ITemplateContext context) {
 
         // Search for Page object, and only one instance, as request attribute
         if (context instanceof IWebContext) {
-            HttpServletRequest request = ((IWebContext) context).getRequest();
-            Enumeration<String> attrNames = request.getAttributeNames();
+            IWebExchange webExchange = ((IWebContext) context).getExchange();
+            Set<String> attrNames = webExchange.getAllAttributeNames();
             Page<?> pageOnRequest = null;
-            while (attrNames.hasMoreElements()) {
-                String attrName = (String) attrNames.nextElement();
-                Object attr = request.getAttribute(attrName);
+
+            for (String attrName : attrNames) {
+                Object attr = webExchange.getAttributeValue(attrName);
                 if (isPageInstance(attr)) {
                     if (pageOnRequest != null) {
                         throw new InvalidObjectParameterException("More than one Page object found on request!");
@@ -162,10 +162,11 @@ private static String buildBaseUrl(final ITemplateContext context, Collection<St
             // Creates url from actual request URI and parameters
             final StringBuilder builder = new StringBuilder();
             final IWebContext webContext = (IWebContext) context;
-            final HttpServletRequest request = webContext.getRequest();
+            final IWebExchange webExchange = webContext.getExchange();
+            final IWebRequest request = webExchange.getRequest();
 
             // URL base path from request
-            builder.append(request.getRequestURI());
+            builder.append(getRequestURI(request));
 
             Map<String, String[]> params = request.getParameterMap();
             Set<Entry<String, String[]>> entries = params.entrySet();
@@ -203,6 +204,31 @@ private static String buildBaseUrl(final ITemplateContext context, Collection<St
         return url == null ? EMPTY : url;
     }
 
+    private static String getRequestURI(IWebRequest webRequest) {
+        if (webRequest instanceof IServletWebRequest servletWebRequest) {
+            return servletWebRequest.getRequestURI();
+        } else  {
+            // from org.thymeleaf.web.IWebRequest.getRequestURL
+            String scheme = webRequest.getScheme();
+            String serverName = webRequest.getServerName();
+            Integer serverPort = webRequest.getServerPort();
+            String requestPath = webRequest.getRequestPath();
+            if (scheme != null && serverName != null && serverPort != null) {
+                StringBuilder urlBuilder = new StringBuilder();
+                urlBuilder.append(scheme).append("://").append(serverName);
+                if ((!scheme.equals("http") || serverPort != 80) && (!scheme.equals("https") || serverPort != 443)) {
+                    urlBuilder.append(':').append(serverPort);
+                }
+
+                urlBuilder.append(requestPath);
+
+                return urlBuilder.toString();
+            } else {
+                throw new UnsupportedOperationException("Request scheme, server name or port are null in this environment. Cannot compute request URL");
+            }
+        }
+    }
+
     private static boolean isPageInstance(Object page) {
         return page != null && (page instanceof Page<?>);
     }