Merge branch 'master' of https://github.com/springdoc/springdoc-openapi into 1354_unit_test_170

Author: ianwallen

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

@@ -45,6 +45,7 @@
 
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -321,8 +322,17 @@ protected synchronized OpenAPI getOpenApi(Locale locale) {
 
 			// run the optional customisers
 			List<Server> servers = openApi.getServers();
+			List<Server> serversCopy = null;
+			try {
+				serversCopy = Json.mapper()
+						.readValue(Json.mapper().writeValueAsString(servers), new TypeReference<List<Server>>() {});
+			}
+			catch (JsonProcessingException e) {
+				LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage());
+			}
+
 			openApiCustomisers.ifPresent(apiCustomisers -> apiCustomisers.forEach(openApiCustomiser -> openApiCustomiser.customise(openApi)));
-			if ((!CollectionUtils.isEmpty(openApi.getServers()) && !Objects.equals(servers, openApi.getServers())))
+			if (!CollectionUtils.isEmpty(openApi.getServers()) && !openApi.getServers().equals(serversCopy))
 				openAPIService.setServersPresent(true);
 
 			openAPIService.setCachedOpenAPI(openApi, locale);

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

@@ -211,12 +211,12 @@ public class OpenAPIService {
 	 */
 	public static String splitCamelCase(String str) {
 		return str.replaceAll(
-				String.format(
-						"%s|%s|%s",
-						"(?<=[A-Z])(?=[A-Z][a-z])",
-						"(?<=[^A-Z])(?=[A-Z])",
-						"(?<=[A-Za-z])(?=[^A-Za-z])"),
-				"-")
+						String.format(
+								"%s|%s|%s",
+								"(?<=[A-Z])(?=[A-Z][a-z])",
+								"(?<=[^A-Z])(?=[A-Z])",
+								"(?<=[A-Za-z])(?=[^A-Za-z])"),
+						"-")
 				.toLowerCase(Locale.ROOT);
 	}
 
@@ -375,7 +375,10 @@ private void addTags(List<Tag> sourceTags, Set<io.swagger.v3.oas.models.tags.Tag
 		Optional<Set<io.swagger.v3.oas.models.tags.Tag>> optionalTagSet = AnnotationsUtils
 				.getTags(sourceTags.toArray(new Tag[0]), false);
 		optionalTagSet.ifPresent(tagsSet -> {
-			tagsSet.forEach(tag -> tag.name(propertyResolverUtils.resolve(tag.getName(), locale)));
+			tagsSet.forEach(tag -> {
+				tag.name(propertyResolverUtils.resolve(tag.getName(), locale));
+				tag.description(propertyResolverUtils.resolve(tag.getDescription(), locale));
+			});
 			tags.addAll(tagsSet);
 		});
 	}
@@ -718,7 +721,7 @@ public void addMappings(Map<String, Object> mappings) {
 	public Map<String, Object> getControllerAdviceMap() {
 		Map<String, Object> controllerAdviceMap = context.getBeansWithAnnotation(ControllerAdvice.class);
 		return Stream.of(controllerAdviceMap).flatMap(mapEl -> mapEl.entrySet().stream()).filter(
-				controller -> (AnnotationUtils.findAnnotation(controller.getValue().getClass(), Hidden.class) == null))
+						controller -> (AnnotationUtils.findAnnotation(controller.getValue().getClass(), Hidden.class) == null))
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1, LinkedHashMap::new));
 	}
 

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app170/HelloController.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.app170;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+	@GetMapping("hello")
+	public String hello() {
+		return "Hello";
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app170/SpringDocApp170Test.java

@@ -0,0 +1,26 @@
+package test.org.springdoc.api.app170;
+
+import org.junit.jupiter.api.Test;
+import org.springdoc.core.customizers.OpenApiCustomiser;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+
+public class SpringDocApp170Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {
+		@Bean
+		public OpenApiCustomiser openApiCustomiser() {
+			return openApi -> openApi.getServers().forEach(s -> s.url("URL"));
+		}
+	}
+
+	@Test
+	public void testApp1() throws Exception {
+		this.testApp();
+	}
+
+}

springdoc-openapi-webmvc-core/src/test/resources/messages.properties

@@ -2,4 +2,5 @@ greeting=Hello! Welcome to our website!
 lang.change=Change the language
 lang.eng=English
 lang.fr=French
-mySample=toto
+mySample=toto
+test=This is a test message

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

@@ -12,11 +12,11 @@
   ],
   "tags": [
     {
-      "name": "Change the language"
+      "name": "Hello! Welcome to our website!",
+      "description": "This is a test message"
     },
     {
-      "name": "Hello! Welcome to our website!",
-      "description": "test"
+      "name": "Change the language"
     }
   ],
   "paths": {

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

@@ -16,7 +16,7 @@
         "tags": [
           "hello-controller"
         ],
-        "summary": "test",
+        "summary": "This is a test message",
         "operationId": "test",
         "requestBody": {
           "content": {

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

@@ -0,0 +1,36 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "URL",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/hello": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "hello",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}