Restentpoints with same name get mix up. Fixes #2876

Author: bnasslahsen

Diff for: springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -661,8 +661,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
 			}
 
 			PathItem pathItemObject = buildPathItem(requestMethod, operation, operationPath, paths);
-			if (!StringUtils.contains(operationPath, "**"))
-				paths.addPathItem(operationPath, pathItemObject);
+			paths.addPathItem(operationPath, pathItemObject);
 		}
 	}
 

Diff for: springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocHints.java

@@ -113,6 +113,7 @@ public class SpringDocHints implements RuntimeHintsRegistrar {
 			io.swagger.v3.oas.models.media.Schema.class,
 			io.swagger.v3.oas.models.media.Content.class,
 			io.swagger.v3.oas.models.media.ArraySchema.class,
+			io.swagger.v3.oas.models.media.JsonSchema.class,
 			io.swagger.v3.oas.models.responses.ApiResponse.class,
 			io.swagger.v3.oas.models.responses.ApiResponses.class,
 			io.swagger.v3.oas.models.ExternalDocumentation.class,
@@ -122,6 +123,7 @@ public class SpringDocHints implements RuntimeHintsRegistrar {
 			io.swagger.v3.oas.models.Operation.class,
 			io.swagger.v3.oas.models.headers.Header.class,
 			ModelConverter.class,
+			io.swagger.v3.core.converter.ModelConverterContextImpl.class,
 			ModelConverters.class,
 			SpecFilter.class,
 			MediaType.class,
@@ -166,6 +168,7 @@ public class SpringDocHints implements RuntimeHintsRegistrar {
 			MediaTypeMixin.class,
 			//oas 3.1
 			Schema31Mixin.class,
+			Schema31Mixin.TypeSerializer.class,
 			Components31Mixin.class,
 			OpenAPI31Mixin.class,
 			Discriminator31Mixin.class,

Diff for: springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java

@@ -167,6 +167,11 @@ protected void getPaths(Map<String, Object> restControllers, Locale locale, Open
 			Optional<ActuatorProvider> actuatorProviderOptional = springDocProviders.getActuatorProvider();
 			if (actuatorProviderOptional.isPresent() && springDocConfigProperties.isShowActuator()) {
 				Map<RequestMappingInfo, HandlerMethod> actuatorMap = actuatorProviderOptional.get().getMethods();
+				List<RequestMappingInfo> globMatchActuators = actuatorMap.keySet().stream()
+					.filter(requestMappingInfo -> requestMappingInfo.getPatternValues().stream()
+						.anyMatch(patternValues -> patternValues.contains("**")))
+					.toList();
+				globMatchActuators.forEach(actuatorMap::remove);
 				this.openAPIService.addTag(new HashSet<>(actuatorMap.values()), getTag());
 				map.putAll(actuatorMap);
 			}

Diff for: springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/OpenApiConfig.java

@@ -1,4 +1,30 @@
-package test.org.springdoc.api.v31.app240;
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  *
+ *  *  *  *  *
+ *  *  *  *  *  * Copyright 2019-2025 the original author or authors.
+ *  *  *  *  *  *
+ *  *  *  *  *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  *  *  *  * you may not use this file except in compliance with the License.
+ *  *  *  *  *  * You may obtain a copy of the License at
+ *  *  *  *  *  *
+ *  *  *  *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *  *  *  *
+ *  *  *  *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  *  *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  *  *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  *  *  *  * See the License for the specific language governing permissions and
+ *  *  *  *  *  * limitations under the License.
+ *  *  *  *  *
+ *  *  *  *
+ *  *  *
+ *  *
+ *  
+ */
+
+package test.org.springdoc.api.v31.app241;
 
 import java.util.HashSet;
 import java.util.Optional;

Diff for: springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/DemoRestController.java renamed to springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/DemoRestController.java

@@ -0,0 +1,59 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  *
+ *  *  *  *  *
+ *  *  *  *  *  * Copyright 2019-2025 the original author or authors.
+ *  *  *  *  *  *
+ *  *  *  *  *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  *  *  *  * you may not use this file except in compliance with the License.
+ *  *  *  *  *  * You may obtain a copy of the License at
+ *  *  *  *  *  *
+ *  *  *  *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *  *  *  *
+ *  *  *  *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  *  *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  *  *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  *  *  *  * See the License for the specific language governing permissions and
+ *  *  *  *  *  * limitations under the License.
+ *  *  *  *  *
+ *  *  *  *
+ *  *  *
+ *  *
+ *  
+ */
+
+package test.org.springdoc.api.v31.app241;
+
+import org.springdoc.core.customizers.OpenApiCustomizer;
+import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpRequest;
+
+@Configuration
+public class OpenApiConfig {
+
+  @Bean
+  public OpenApiCustomizer openApiCustomiser() {
+    return openApi -> {
+
+    };
+  }
+
+  @Bean
+  ServerBaseUrlCustomizer serverBaseUrlCustomizer() {
+    return new ServerBaseUrlCustomizer() {
+
+      @Override
+      public String customize(final String serverBaseUrl,
+          final HttpRequest request) {
+        // TODO Auto-generated method stub
+        return null;
+      }
+      
+    };
+  }
+}

Diff for: springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/OpenApiConfig.java

@@ -24,16 +24,16 @@
  *  
  */
 
-package test.org.springdoc.api.v31.app240;
+package test.org.springdoc.api.v31.app241;
 
 import test.org.springdoc.api.v31.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.test.context.TestPropertySource;
 
 @TestPropertySource(properties = "springdoc.api-docs.resolve-schema-properties=true" )
-public class SpringDocApp240Test extends AbstractSpringDocTest {
+public class SpringDocApp241Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication
 	static class SpringDocTestApp {}
-}
+}

Diff for: springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/SpringDocApp240Test.java renamed to springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/SpringDocApp241Test.java

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "openapi": "3.1.0",
   "info": {
     "title": "OpenAPI definition",
@@ -149,3 +150,41 @@
   },
   "components": {}
 }
+=======
+	"openapi": "3.1.0",
+	"info": {
+		"title": "OpenAPI definition",
+		"version": "v0"
+	},
+	"servers": [
+		{
+			"url": "http://localhost",
+			"description": "Generated server url"
+		}
+	],
+	"paths": {
+		"/**": {
+			"post": {
+				"tags": [
+					"wildcard-controller"
+				],
+				"summary": "My Wildcard Operation",
+				"operationId": "getItem",
+				"responses": {
+					"200": {
+						"description": "OK",
+						"content": {
+							"*/*": {
+								"schema": {
+									"type": "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	"components": {}
+}
+>>>>>>> origin/main