Enhance Actuator + CHANGELOG.md update

Author: bnasslahsen

CHANGELOG.md

@@ -4,13 +4,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.0] - 2021-12-12
+### Added
+- #1356, #1360 - Add support for caching based on Locale 
+- #1355 - Add support for @Tag description using i18n 
+- #1376 - Add Support for Spring Native 0.11
+- #1365 - Make MediaType for "loginRequestBody" as "application/json"
+- #1375 - Support @JsonIgnore in @ParameterObject.  
+- #1379 - Enable support for queryConfigEnabled.  Disable reading config params from URL search params by default
+### Changed
+- Upgrade swagger-ui to 4.1.3
+- Upgrade to spring-boot 2.6.1
+- #1373 - Enhance Pageable config
+### Fixed
+- #1353 - Servers from cached OpenAPI are overwritten and customizer is skipped.
+- #1364 - Incorrect configUrl due to null path prefix
+- #1370 - NullPointerException on JavadocPropertyCustomizer.java:81 - Warning level
+
 ## [1.5.13] - 2021-11-30
 ### Added
 - #1317 - Add SpEL support for default values
 - #1324 - springdoc-openapi-javadoc doesn't work with @ParameterObject
 - #1334 - Allow customizing / disabling PolymorphicModelConverter
 - #1328 - Add support for spring-native 0.11-RC1. (remove property springdoc.enable-native-image-support and introduce new springdoc module)
-- #1348 - Treat java.nio.charset.Charset as string type by default.
+- #1348 - Treat java.nio.charset.Charset as string type by default
 ### Changed
 - Upgrade swagger-ui to 4.1.2
 - Upgrade to spring-boot 2.6.0

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

@@ -5,6 +5,7 @@
 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;
@@ -14,13 +15,11 @@
 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 implements OpenApiCustomiser {
+public class ActuatorOpenApiCustomizer extends SpecFilter implements OpenApiCustomiser {
 
 	/**
 	 * The Path pathern.
@@ -35,8 +34,11 @@ public ActuatorOpenApiCustomizer(WebEndpointProperties webEndpointProperties) {
 
 	@Override
 	public void customise(OpenAPI openApi) {
+		openApi.getPaths().entrySet().removeIf(path -> !path.getKey().startsWith(webEndpointProperties.getBasePath()));
+		openApi.getTags().removeIf(tag -> openApi.getPaths().entrySet().stream().anyMatch(pathItemEntry -> pathItemEntry.getValue().
+				readOperations().stream().noneMatch(operation -> operation.getTags().contains(tag.getName()))));
+
 		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,5 +55,7 @@ public void customise(OpenAPI openApi) {
 						});
 					}
 				});
+
+		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(4)))
+				.andExpect(jsonPath("$.tags", hasSize(1)))
 				.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)))