OperationCustomizer is not working with Spring Data REST. springdoc#2062

Author: bnasslahsen

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

@@ -76,6 +76,7 @@
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.annotations.RouterOperations;
 import org.springdoc.core.customizers.DataRestRouterOperationCustomizer;
+import org.springdoc.core.customizers.OpenApiLocaleCustomizer;
 import org.springdoc.core.customizers.OperationCustomizer;
 import org.springdoc.core.customizers.RouterOperationCustomizer;
 import org.springdoc.core.customizers.SpringDocCustomizers;
@@ -193,8 +194,12 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 	 */
 	protected OpenAPIService openAPIService;
 
+	/**
+	 * The Spring doc customizers.
+	 */
 	protected final SpringDocCustomizers springDocCustomizers;
 
+
 	/**
 	 * Instantiates a new Abstract open api resource.
 	 *
@@ -353,7 +358,7 @@ protected synchronized OpenAPI getOpenApi(Locale locale) {
 				LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage());
 			}
 
-			springDocCustomizers.getOpenApiLocaleCustomizers().values().forEach(openApiLocaleCustomizer -> openApiLocaleCustomizer.customise(openAPI, finalLocale));
+			openAPIService.getContext().getBeansOfType(OpenApiLocaleCustomizer.class).values().forEach(openApiLocaleCustomizer -> openApiLocaleCustomizer.customise(openAPI, finalLocale));
 			springDocCustomizers.getOpenApiCustomizers().ifPresent(apiCustomizers -> apiCustomizers.forEach(openApiCustomizer -> openApiCustomizer.customise(openAPI)));
 			if (!CollectionUtils.isEmpty(openAPI.getServers()) && !openAPI.getServers().equals(serversCopy))
 				openAPIService.setServersPresent(true);

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

@@ -23,7 +23,6 @@
  */
 package org.springdoc.core.customizers;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -40,6 +39,8 @@
 import static org.springdoc.core.utils.Constants.LINKS_SCHEMA_CUSTOMISER;
 
 /**
+ * The type Spring doc customizers.
+ *
  * @author bnasslahsen
  */
 public class SpringDocCustomizers implements ApplicationContextAware, InitializingBean {
@@ -65,7 +66,9 @@ public class SpringDocCustomizers implements ApplicationContextAware, Initializi
 	 */
 	private final Optional<List<DataRestRouterOperationCustomizer>> dataRestRouterOperationCustomizers;
 
-
+	/**
+	 * The Context.
+	 */
 	private ApplicationContext context;
 
 	/**
@@ -113,28 +116,47 @@ public SpringDocCustomizers(Optional<List<OpenApiCustomizer>> openApiCustomizers
 		this.dataRestRouterOperationCustomizers = Optional.empty();
 	}
 
+	/**
+	 * Gets open api customizers.
+	 *
+	 * @return the open api customizers
+	 */
 	public Optional<List<OpenApiCustomizer>> getOpenApiCustomizers() {
 		return openApiCustomizers;
 	}
 
-	public Map<String, OpenApiLocaleCustomizer> getOpenApiLocaleCustomizers() {
-		if (context != null)
-			return context.getBeansOfType(OpenApiLocaleCustomizer.class);
-		return new HashMap<>();
-	}
-
+	/**
+	 * Gets operation customizers.
+	 *
+	 * @return the operation customizers
+	 */
 	public Optional<List<OperationCustomizer>> getOperationCustomizers() {
 		return operationCustomizers;
 	}
 
+	/**
+	 * Gets router operation customizers.
+	 *
+	 * @return the router operation customizers
+	 */
 	public Optional<List<RouterOperationCustomizer>> getRouterOperationCustomizers() {
 		return routerOperationCustomizers;
 	}
 
+	/**
+	 * Gets data rest router operation customizers.
+	 *
+	 * @return the data rest router operation customizers
+	 */
 	public Optional<List<DataRestRouterOperationCustomizer>> getDataRestRouterOperationCustomizers() {
 		return dataRestRouterOperationCustomizers;
 	}
 
+	/**
+	 * Gets method filters.
+	 *
+	 * @return the method filters
+	 */
 	public Optional<List<OpenApiMethodFilter>> getMethodFilters() {
 		return methodFilters;
 	}

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

@@ -59,6 +59,7 @@
 import org.springdoc.core.service.OperationService;
 
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.context.ApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -106,6 +107,9 @@ class AbstractOpenApiResourceTest {
 	@Mock
 	private SpringDocProviders springDocProviders;
 
+	@Mock
+	private ApplicationContext context;
+
 	private OpenAPI openAPI;
 
 	private AbstractOpenApiResource resource;
@@ -118,6 +122,8 @@ public void setUp() {
 		ReflectionTestUtils.setField(openAPIService, "serverBaseUrlCustomizers", Optional.empty());
 
 		when(openAPIService.build(any())).thenReturn(openAPI);
+		when(openAPIService.getContext()).thenReturn(context);
+
 		when(openAPIBuilderObjectFactory.getObject()).thenReturn(openAPIService);
 		when(springDocProviders.jsonMapper()).thenReturn(Json.mapper());
 	}