PR#313 review

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -6,7 +6,6 @@
 import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.responses.ApiResponses;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.*;
@@ -22,8 +21,6 @@
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -298,7 +295,7 @@ protected boolean isPathToMatch(String operationPath) {
         return CollectionUtils.isEmpty(pathsToMatch) || pathsToMatch.stream().anyMatch(pattern -> antPathMatcher.match(pattern, operationPath));
     }
 
-    protected static String decode(String requestURI) {
+    protected String decode(String requestURI) {
         try {
             return URLDecoder.decode(requestURI, StandardCharsets.UTF_8.toString());
         } catch (UnsupportedEncodingException e) {

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/MultipleOpenApiResource.java

@@ -91,4 +91,4 @@ private OpenApiResource getOpenApiResourceOrThrow(String group) {
         }
         return openApiResource;
     }
-}
+}

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -61,7 +61,6 @@ public OpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder req
         this.showActuator = showActuator;
     }
 
-
     @Operation(hidden = true)
     @GetMapping(value = API_DOCS_URL, produces = MediaType.APPLICATION_JSON_VALUE)
     public String openapiJson(HttpServletRequest request, @Value(API_DOCS_URL) String apiDocsUrl)

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

@@ -13,14 +13,15 @@
 import org.springframework.test.web.servlet.MockMvc;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 import static test.org.springdoc.utils.FileUtils.getContent;
 
 @RunWith(SpringRunner.class)
 @ActiveProfiles("test")
-@SpringBootTest
+@SpringBootTest(properties = "springdoc.show-actuator=true")
 @AutoConfigureMockMvc
 public class SpringDocApp68Test {
 
@@ -62,4 +63,10 @@ public void testApp4() throws Exception {
                 .andExpect(jsonPath("$.openapi", is("3.0.1")))
                 .andExpect(content().json(getContent("results/app684.json"), true));
     }
+
+    @Test
+    public void testActuator() throws Exception {
+        mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
+                .andExpect(jsonPath("$.openapi", is("3.0.1"))).andExpect(jsonPath("$.paths./actuator/info.get.operationId", containsString("handle"))).andExpect(jsonPath("$.paths./actuator/health.get.operationId", containsString("handle")));
+    }
 }