Missing paths after upgrading from Spring Docs 1.5.13 to 1.6.0. Fixes #1381

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java

@@ -400,6 +400,8 @@ static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedO
 		 */
 		@Bean
 		@Lazy(false)
+		@ConditionalOnMissingBean
+		@ConditionalOnManagementPort(ManagementPortType.SAME)
 		OperationCustomizer actuatorCustomizer() {
 			return new ActuatorOperationCustomizer();
 		}
@@ -412,6 +414,8 @@ OperationCustomizer actuatorCustomizer() {
 		 */
 		@Bean
 		@Lazy(false)
+		@ConditionalOnMissingBean
+		@ConditionalOnManagementPort(ManagementPortType.SAME)
 		OpenApiCustomiser actuatorOpenApiCustomiser(WebEndpointProperties webEndpointProperties) {
 			return new ActuatorOpenApiCustomizer(webEndpointProperties);
 		}

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringdocActuatorBeanFactoryConfigurer.java

@@ -69,11 +69,17 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 			WebEndpointProperties webEndpointProperties = result.get();
 
 			List<GroupedOpenApi> newGroups = new ArrayList<>();
+
+			ActuatorOpenApiCustomizer actuatorOpenApiCustomiser = new ActuatorOpenApiCustomizer(webEndpointProperties);
+			beanFactory.registerSingleton("actuatorOpenApiCustomiser", actuatorOpenApiCustomiser);
+			ActuatorOperationCustomizer actuatorCustomizer =	new ActuatorOperationCustomizer();
+			beanFactory.registerSingleton("actuatorCustomizer", actuatorCustomizer);
+
 			GroupedOpenApi actuatorGroup = GroupedOpenApi.builder().group(ACTUATOR_DEFAULT_GROUP)
 					.pathsToMatch(webEndpointProperties.getBasePath() + ALL_PATTERN)
 					.pathsToExclude(webEndpointProperties.getBasePath() + HEALTH_PATTERN)
-					.addOperationCustomizer(new ActuatorOperationCustomizer())
-					.addOpenApiCustomiser(new ActuatorOpenApiCustomizer(webEndpointProperties))
+					.addOperationCustomizer(actuatorCustomizer)
+					.addOpenApiCustomiser(actuatorOpenApiCustomiser)
 					.build();
 			// Add the actuator group
 			newGroups.add(actuatorGroup);

springdoc-openapi-common/src/main/java/org/springdoc/core/customizers/ActuatorOpenApiCustomizer.java

@@ -5,7 +5,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.swagger.v3.core.filter.SpecFilter;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.media.StringSchema;
@@ -15,11 +14,13 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
 import org.springframework.util.CollectionUtils;
 
+import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
+
 /**
  * The type Actuator open api customiser.
  * @author bnasslahsen
  */
-public class ActuatorOpenApiCustomizer extends SpecFilter implements OpenApiCustomiser {
+public class ActuatorOpenApiCustomizer implements OpenApiCustomiser {
 
 	/**
 	 * The Path pathern.
@@ -34,9 +35,9 @@ public ActuatorOpenApiCustomizer(WebEndpointProperties webEndpointProperties) {
 
 	@Override
 	public void customise(OpenAPI openApi) {
-		if (!CollectionUtils.isEmpty(openApi.getPaths())) {
-			openApi.getPaths().entrySet().removeIf(path -> !path.getKey().startsWith(webEndpointProperties.getBasePath()));
+		if (!CollectionUtils.isEmpty(openApi.getPaths()))
 			openApi.getPaths().entrySet().stream()
+					.filter(stringPathItemEntry -> stringPathItemEntry.getKey().startsWith(webEndpointProperties.getBasePath() + DEFAULT_PATH_SEPARATOR))
 					.forEach(stringPathItemEntry -> {
 						String path = stringPathItemEntry.getKey();
 						Matcher matcher = pathPathern.matcher(path);
@@ -53,10 +54,5 @@ public void customise(OpenAPI openApi) {
 							});
 						}
 					});
-		}
-		if (!CollectionUtils.isEmpty(openApi.getTags()))
-			openApi.getTags().removeIf(tag -> openApi.getPaths().entrySet().stream().anyMatch(pathItemEntry -> pathItemEntry.getValue().
-					readOperations().stream().noneMatch(operation -> operation.getTags().contains(tag.getName()))));
-		super.removeBrokenReferenceDefinitions(openApi);
 	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocApp68Test.java

@@ -83,7 +83,7 @@ public void testActuator() throws Exception {
 	public void testActuatorDescription() throws Exception {
 		mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
 				.andExpect(jsonPath("$.openapi", is("3.0.1")))
-				.andExpect(jsonPath("$.tags", hasSize(1)))
+				.andExpect(jsonPath("$.tags", hasSize(4)))
 				.andExpect(jsonPath("$.tags[?(@.name == '" + Constants.SPRINGDOC_ACTUATOR_TAG + "')].name", contains(Constants.SPRINGDOC_ACTUATOR_TAG)))
 				.andExpect(jsonPath("$.tags[?(@.name == '" + Constants.SPRINGDOC_ACTUATOR_TAG + "')].description", contains(Constants.SPRINGDOC_ACTUATOR_DESCRIPTION)))
 				.andExpect(jsonPath("$.tags[?(@.name == '" + Constants.SPRINGDOC_ACTUATOR_TAG + "')].externalDocs.description", contains(Constants.SPRINGDOC_ACTUATOR_DOC_DESCRIPTION)))

springdoc-openapi-webmvc-core/src/test/resources/results/app172.json

@@ -10,6 +10,37 @@
       "description": "Generated server url"
     }
   ],
-  "paths": {},
+  "paths": {
+    "/customer/{id}": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "getTenantById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   "components": {}
 }