Merge branch 'mschout-spring-boot-3.5-support'

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.5</version>
+		<version>3.5.0</version>
 	</parent>
 
 	<licenses>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityConfiguration.java

@@ -66,7 +66,10 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.web.util.pattern.PathPattern;
 
 import static org.springdoc.core.utils.Constants.SPRINGDOC_SHOW_LOGIN_ENDPOINT;
 import static org.springdoc.core.utils.Constants.SPRINGDOC_SHOW_OAUTH2_ENDPOINTS;
@@ -155,8 +158,25 @@ OpenApiCustomizer springSecurityLoginEndpointCustomizer(ApplicationContext appli
 						operation.addTagsItem("login-endpoint");
 						PathItem pathItem = new PathItem().post(operation);
 						try {
-							AntPathRequestMatcher requestMatcher = (AntPathRequestMatcher)FieldUtils.readField(usernamePasswordAuthenticationFilter, "requiresAuthenticationRequestMatcher", true);
-							String loginPath = requestMatcher.getPattern();
+							RequestMatcher requestMatcher = (RequestMatcher) FieldUtils.readField(
+									usernamePasswordAuthenticationFilter,
+									"requiresAuthenticationRequestMatcher",
+									true
+							);
+
+							String loginPath = null;
+
+							if (requestMatcher instanceof AntPathRequestMatcher) {
+								loginPath = ((AntPathRequestMatcher) requestMatcher).getPattern();
+							} else if (requestMatcher instanceof PathPatternRequestMatcher) {
+								PathPattern pathPattern = (PathPattern) FieldUtils.readField(
+										requestMatcher,
+										"pattern",
+										true
+								);
+								loginPath = pathPattern.getPatternString();
+							}
+							
 							openAPI.getPaths().addPathItem(loginPath, pathItem);
 						}
 						catch (IllegalAccessException |

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/HateoasHalProvider.java

@@ -26,12 +26,15 @@
 
 package org.springdoc.core.providers;
 
+import java.util.List;
 import java.util.Optional;
 
 import jakarta.annotation.PostConstruct;
 
 import org.springframework.boot.autoconfigure.hateoas.HateoasProperties;
 import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.lang.NonNull;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * The type Hateoas hal provider.
@@ -79,8 +82,26 @@ protected void init() {
 	 */
 	public boolean isHalEnabled() {
 		return hateoasPropertiesOptional
-				.map(HateoasProperties::getUseHalAsDefaultJsonMediaType)
+				.map(HateoasHalProvider::isHalEnabled)
 				.orElse(true);
 	}
 
+	private static boolean isHalEnabled(@NonNull HateoasProperties hateoasProperties) {
+		// In spring-boot 3.5, the method name was changed from getUseHalAsDefaultJsonMediaType to isUseHalAsDefaultJsonMediaType
+		var possibleMethodNames = List.of("isUseHalAsDefaultJsonMediaType", "getUseHalAsDefaultJsonMediaType");
+
+		for (var methodName : possibleMethodNames) {
+			var method = ReflectionUtils.findMethod(HateoasProperties.class, methodName);
+			if (method != null) {
+				var result = ReflectionUtils.invokeMethod(method, hateoasProperties);
+				if (result instanceof Boolean halEnabled) {
+					return halEnabled;
+				}
+
+				throw new IllegalStateException("Method " + methodName + " did not return a boolean value");
+			}
+		}
+
+		throw new IllegalStateException("No suitable method found to determine if HAL is enabled");
+	}
 }

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app22.json

@@ -143,6 +143,11 @@
                   "$ref": "#/components/schemas/Person"
                 }
               },
+              "application/vnd.hal+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Person"
+                }
+              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/Person"
@@ -227,12 +232,6 @@
           }
         }
       },
-      "Links": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/components/schemas/Link"
-        }
-      },
       "RepresentationModelObject": {
         "type": "object",
         "properties": {
@@ -337,6 +336,12 @@
             "type": "boolean"
           }
         }
+      },
+      "Links": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Link"
+        }
       }
     }
   }

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app22.json

@@ -25,9 +25,9 @@
             "description": "Zero-based page index (0..N)",
             "required": false,
             "schema": {
-              "minimum": 0,
               "type": "integer",
-              "default": 0
+              "default": 0,
+              "minimum": 0
             }
           },
           {
@@ -36,9 +36,9 @@
             "description": "The size of the page to be returned",
             "required": false,
             "schema": {
-              "minimum": 1,
               "type": "integer",
-              "default": 20
+              "default": 20,
+              "minimum": 1
             }
           },
           {
@@ -143,6 +143,11 @@
                   "$ref": "#/components/schemas/Person"
                 }
               },
+              "application/vnd.hal+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Person"
+                }
+              },
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/Person"
@@ -227,12 +232,6 @@
           }
         }
       },
-      "Links": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/components/schemas/Link"
-        }
-      },
       "RepresentationModelObject": {
         "type": "object",
         "properties": {
@@ -337,6 +336,12 @@
             "type": "boolean"
           }
         }
+      },
+      "Links": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/Link"
+        }
       }
     }
   }