code review

Author: bnasslahsen

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

@@ -295,6 +295,7 @@ public static void addHiddenRestControllers(String... classes) {
 	 */
 	protected synchronized OpenAPI getOpenApi(Locale locale) {
 		OpenAPI openApi;
+		locale = locale == null ? Locale.getDefault() : locale;
 		if (openAPIService.getCachedOpenAPI(locale) == null || springDocConfigProperties.isCacheDisabled()) {
 			Instant start = Instant.now();
 			openAPIService.build(locale);
@@ -1110,6 +1111,7 @@ else if (existingOperation != null) {
 	 * Init open api builder.
 	 */
 	protected void initOpenAPIBuilder(Locale locale) {
+		locale = locale == null ? Locale.getDefault() : locale;
 		if (openAPIService.getCachedOpenAPI(locale) != null && springDocConfigProperties.isCacheDisabled()) {
 			openAPIService = openAPIBuilderObjectFactory.getObject();
 		}

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

@@ -127,10 +127,7 @@ public class OpenAPIService {
 	private OpenAPI openAPI;
 
 	/**
-	 * The Cached open api.
-	 */
-	/**
-	 * The Mappings map.
+	 * The Cached open api map.
 	 */
 	private final Map<String, OpenAPI> cachedOpenAPI = new HashMap<>();
 
@@ -306,8 +303,8 @@ public Operation buildTags(HandlerMethod handlerMethod, Operation operation, Ope
 		Set<io.swagger.v3.oas.models.tags.Tag> tags = new HashSet<>();
 		Set<String> tagsStr = new HashSet<>();
 
-		buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr,locale);
-		buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr,locale);
+		buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr, locale);
+		buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr, locale);
 
 		if (!CollectionUtils.isEmpty(tagsStr))
 			tagsStr = tagsStr.stream()
@@ -732,11 +729,7 @@ public Map<String, Object> getControllerAdviceMap() {
 	 * @return the cached open api
 	 */
 	public OpenAPI getCachedOpenAPI(Locale locale) {
-		Locale cachedLocale = (locale == null ? Locale.getDefault() : locale);
-		if (cachedOpenAPI != null && cachedOpenAPI.containsKey(cachedLocale.getLanguage())) {
-			return cachedOpenAPI.get(cachedLocale.getLanguage());
-		}
-		return null;
+		return cachedOpenAPI.get(locale.getLanguage());
 	}
 
 	/**
@@ -746,10 +739,7 @@ public OpenAPI getCachedOpenAPI(Locale locale) {
 	 * @param cachedOpenAPI the cached open api
 	 */
 	public void setCachedOpenAPI(OpenAPI cachedOpenAPI, Locale locale) {
-		Locale cachedLocale = (locale == null ? Locale.getDefault() : locale);
-		if (this.cachedOpenAPI != null) {
-			this.cachedOpenAPI.put(cachedLocale.getLanguage(), cachedOpenAPI);
-		}
+		this.cachedOpenAPI.put(locale.getLanguage(), cachedOpenAPI);
 	}
 
 	/**

springdoc-openapi-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java

@@ -20,6 +20,7 @@
 
 package org.springdoc.api;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -52,6 +53,7 @@
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import static java.util.Arrays.asList;
@@ -100,6 +102,7 @@ class AbstractOpenApiResourceTest {
 	public void setUp() {
 		openAPI = new OpenAPI();
 		openAPI.setPaths(new Paths().addPathItem(PATH, new PathItem()));
+		ReflectionTestUtils.setField(openAPIService, "cachedOpenAPI", new HashMap<>());
 
 		when(openAPIService.getCalculatedOpenAPI()).thenReturn(openAPI);
 		when(openAPIService.getContext()).thenReturn(context);

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app161/SpringDocApp161Test.java

@@ -1,5 +1,8 @@
 package test.org.springdoc.api.app161;
 
+import java.util.Locale;
+
+import org.junit.jupiter.api.Test;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,5 +12,10 @@ public class SpringDocApp161Test extends AbstractSpringDocTest {
 	@SpringBootApplication
 	static class SpringDocTestApp {}
 
+	@Test
+	public void testApp() throws Exception {
+		Locale.setDefault(Locale.US);
+		super.testApp();
+	}
 
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app171/SpringDocApp171Test.java

@@ -18,22 +18,22 @@
 
 package test.org.springdoc.api.app171;
 
-import static org.hamcrest.Matchers.is;
-import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import java.util.Locale;
 
 import org.junit.jupiter.api.Test;
 import org.springdoc.core.Constants;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MvcResult;
 
-import test.org.springdoc.api.AbstractSpringDocTest;
+import static org.hamcrest.Matchers.is;
+import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @TestPropertySource(properties = Constants.SPRINGDOC_CACHE_DISABLED + "=false")
 public class SpringDocApp171Test extends AbstractSpringDocTest {
@@ -45,6 +45,7 @@ static class SpringDocTestApp {
 	@Test
 	@Override
 	public void testApp() throws Exception {
+		Locale.setDefault(Locale.US);
 		testApp(Locale.US);
 		testApp(Locale.FRANCE);
 	}