Skip to content

Commit 5889678

Browse files
bnasslahsenbnasslahsen
committed
code review
1 parent 34f6710 commit 5889678

File tree

24 files changed

+87
-64
lines changed

24 files changed

+87
-64
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import org.springdoc.core.GenericParameterService;
8080
import org.springdoc.core.GenericResponseService;
8181
import org.springdoc.core.MethodAttributes;
82-
import org.springdoc.core.filters.OpenApiMethodFilter;
8382
import org.springdoc.core.OpenAPIService;
8483
import org.springdoc.core.OperationService;
8584
import org.springdoc.core.SpringDocConfigProperties;
@@ -89,6 +88,7 @@
8988
import org.springdoc.core.customizers.OpenApiCustomiser;
9089
import org.springdoc.core.customizers.OpenApiLocaleCustomizer;
9190
import org.springdoc.core.customizers.OperationCustomizer;
91+
import org.springdoc.core.filters.OpenApiMethodFilter;
9292
import org.springdoc.core.fn.AbstractRouterFunctionVisitor;
9393
import org.springdoc.core.fn.RouterFunctionData;
9494
import org.springdoc.core.fn.RouterOperation;

‎springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ public void buildGenericResponse(Components components, Map<String, Object> find
185185
// for each one build ApiResponse and add it to existing responses
186186
for (Method method : methods) {
187187
if (!operationService.isHidden(method)) {
188-
RequestMapping reqMappringMethod = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
188+
RequestMapping reqMappingMethod = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
189189
String[] methodProduces = { springDocConfigProperties.getDefaultProducesMediaType() };
190-
if (reqMappringMethod != null)
191-
methodProduces = reqMappringMethod.produces();
190+
if (reqMappingMethod != null)
191+
methodProduces = reqMappingMethod.produces();
192192
Map<String, ApiResponse> controllerAdviceInfoApiResponseMap = controllerAdviceInfo.getApiResponseMap();
193193
MethodParameter methodParameter = new MethodParameter(method, -1);
194194
ApiResponses apiResponsesOp = new ApiResponses();
@@ -565,15 +565,13 @@ public String evaluateResponseStatus(Method method, Class<?> beanType, boolean i
565565
*/
566566
private boolean isVoid(Type returnType) {
567567
boolean result = false;
568-
if (Void.TYPE.equals(returnType))
568+
if (Void.TYPE.equals(returnType) || Void.class.equals(returnType))
569569
result = true;
570570
else if (returnType instanceof ParameterizedType) {
571571
Type[] types = ((ParameterizedType) returnType).getActualTypeArguments();
572572
if (types != null && isResponseTypeWrapper(ResolvableType.forType(returnType).getRawClass()))
573-
return isVoid(types[0]);
573+
result = isVoid(types[0]);
574574
}
575-
if (Void.class.equals(returnType))
576-
result = true;
577575
return result;
578576
}
579577

@@ -585,7 +583,7 @@ else if (returnType instanceof ParameterizedType) {
585583
*/
586584
private Map<String, ApiResponse> getGenericMapResponse(Class<?> beanType) {
587585
return controllerAdviceInfos.stream()
588-
.filter(controllerAdviceInfo -> new ControllerAdviceBean(controllerAdviceInfo.getControllerAdvice()).isApplicableToBeanType(beanType))
586+
.filter(controllerAdviceInfo -> new ControllerAdviceBean(controllerAdviceInfo.getControllerAdvice()).isApplicableToBeanType(beanType))
589587
.map(ControllerAdviceInfo::getApiResponseMap)
590588
.collect(LinkedHashMap::new, Map::putAll, Map::putAll);
591589
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public class SpringDocConfiguration {
131131
* @return the local variable table parameter name discoverer
132132
*/
133133
@Bean
134+
@Lazy(false)
134135
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer() {
135136
return new LocalVariableTableParameterNameDiscoverer();
136137
}
@@ -220,6 +221,7 @@ PolymorphicModelConverter polymorphicModelConverter() {
220221
*/
221222
@Bean
222223
@ConditionalOnMissingBean
224+
@Lazy(false)
223225
OpenAPIService openAPIBuilder(Optional<OpenAPI> openAPI,
224226
SecurityService securityParser,
225227
SpringDocConfigProperties springDocConfigProperties,PropertyResolverUtils propertyResolverUtils,
@@ -251,6 +253,7 @@ ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> m
251253
*/
252254
@Bean
253255
@ConditionalOnMissingBean
256+
@Lazy(false)
254257
OperationService operationBuilder(GenericParameterService parameterBuilder, RequestBodyService requestBodyService,
255258
SecurityService securityParser, PropertyResolverUtils propertyResolverUtils, Optional<JavadocProvider> javadocProvider) {
256259
return new OperationService(parameterBuilder, requestBodyService,
@@ -266,6 +269,7 @@ OperationService operationBuilder(GenericParameterService parameterBuilder, Requ
266269
* @return the property resolver utils
267270
*/
268271
@Bean
272+
@Lazy(false)
269273
PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory, MessageSource messageSource, SpringDocConfigProperties springDocConfigProperties) {
270274
return new PropertyResolverUtils(factory, messageSource, springDocConfigProperties);
271275
}
@@ -278,6 +282,7 @@ PropertyResolverUtils propertyResolverUtils(ConfigurableBeanFactory factory, Mes
278282
*/
279283
@Bean
280284
@ConditionalOnMissingBean
285+
@Lazy(false)
281286
RequestBodyService requestBodyBuilder(GenericParameterService parameterBuilder) {
282287
return new RequestBodyService(parameterBuilder);
283288
}
@@ -290,6 +295,7 @@ RequestBodyService requestBodyBuilder(GenericParameterService parameterBuilder)
290295
*/
291296
@Bean
292297
@ConditionalOnMissingBean
298+
@Lazy(false)
293299
SecurityService securityParser(PropertyResolverUtils propertyResolverUtils) {
294300
return new SecurityService(propertyResolverUtils);
295301
}
@@ -315,6 +321,7 @@ ReturnTypeParser genericReturnTypeParser() {
315321
*/
316322
@Bean
317323
@ConditionalOnMissingBean
324+
@Lazy(false)
318325
GenericParameterService parameterBuilder(PropertyResolverUtils propertyResolverUtils,
319326
Optional<DelegatingMethodParameterCustomizer> optionalDelegatingMethodParameterCustomizer,
320327
Optional<WebConversionServiceProvider> optionalWebConversionServiceProvider) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
import org.mockito.junit.jupiter.MockitoExtension;
4444
import org.springdoc.core.AbstractRequestService;
4545
import org.springdoc.core.GenericResponseService;
46-
import org.springdoc.core.filters.OpenApiMethodFilter;
4746
import org.springdoc.core.OpenAPIService;
4847
import org.springdoc.core.OperationService;
4948
import org.springdoc.core.SpringDocConfigProperties;
5049
import org.springdoc.core.SpringDocProviders;
5150
import org.springdoc.core.customizers.OpenApiCustomiser;
5251
import org.springdoc.core.customizers.OperationCustomizer;
52+
import org.springdoc.core.filters.OpenApiMethodFilter;
5353
import org.springdoc.core.fn.RouterOperation;
5454

5555
import org.springframework.beans.factory.ObjectFactory;

‎springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ static class SpringRepositoryRestResourceProviderConfiguration {
149149
*/
150150
@Bean
151151
@ConditionalOnMissingBean
152+
@Lazy(false)
152153
SpringRepositoryRestResourceProvider springRepositoryRestResourceProvider(ResourceMappings mappings,
153154
Repositories repositories, Associations associations, ApplicationContext applicationContext,
154155
DataRestRouterOperationService dataRestRouterOperationService, PersistentEntities persistentEntities,
@@ -168,6 +169,7 @@ SpringRepositoryRestResourceProvider springRepositoryRestResourceProvider(Resour
168169
*/
169170
@Bean
170171
@ConditionalOnMissingBean
172+
@Lazy(false)
171173
DataRestRouterOperationService dataRestRouterOperationBuilder(DataRestOperationService dataRestOperationService,
172174
SpringDocConfigProperties springDocConfigProperties, RepositoryRestConfiguration repositoryRestConfiguration, DataRestHalProvider dataRestHalProvider) {
173175
return new DataRestRouterOperationService(dataRestOperationService, springDocConfigProperties, repositoryRestConfiguration, dataRestHalProvider);
@@ -184,6 +186,7 @@ DataRestRouterOperationService dataRestRouterOperationBuilder(DataRestOperationS
184186
*/
185187
@Bean
186188
@ConditionalOnMissingBean
189+
@Lazy(false)
187190
DataRestOperationService dataRestOperationBuilder(DataRestRequestService dataRestRequestService, DataRestTagsService tagsBuilder,
188191
DataRestResponseService dataRestResponseService, OperationService operationService) {
189192
return new DataRestOperationService(dataRestRequestService, tagsBuilder, dataRestResponseService, operationService);
@@ -201,6 +204,7 @@ DataRestOperationService dataRestOperationBuilder(DataRestRequestService dataRes
201204
*/
202205
@Bean
203206
@ConditionalOnMissingBean
207+
@Lazy(false)
204208
DataRestRequestService dataRestRequestBuilder(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder,
205209
RequestBodyService requestBodyService, AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) {
206210
return new DataRestRequestService(localSpringDocParameterNameDiscoverer, parameterBuilder,
@@ -216,6 +220,7 @@ DataRestRequestService dataRestRequestBuilder(LocalVariableTableParameterNameDis
216220
*/
217221
@Bean
218222
@ConditionalOnMissingBean
223+
@Lazy(false)
219224
DataRestResponseService dataRestResponseBuilder(GenericResponseService genericResponseService, SpringDocDataRestUtils springDocDataRestUtils) {
220225
return new DataRestResponseService(genericResponseService, springDocDataRestUtils);
221226
}
@@ -228,6 +233,7 @@ DataRestResponseService dataRestResponseBuilder(GenericResponseService genericRe
228233
*/
229234
@Bean
230235
@ConditionalOnMissingBean
236+
@Lazy(false)
231237
DataRestTagsService dataRestTagsBuilder(OpenAPIService openAPIService) {
232238
return new DataRestTagsService(openAPIService);
233239
}
@@ -241,6 +247,7 @@ DataRestTagsService dataRestTagsBuilder(OpenAPIService openAPIService) {
241247
*/
242248
@Bean
243249
@ConditionalOnMissingBean
250+
@Lazy(false)
244251
SpringDocDataRestUtils springDocDataRestUtils(LinkRelationProvider linkRelationProvider, RepositoryRestConfiguration repositoryRestConfiguration) {
245252
return new SpringDocDataRestUtils(linkRelationProvider, repositoryRestConfiguration);
246253
}

‎springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringRepositoryRestResourceProvider.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.commons.lang3.reflect.MethodUtils;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
39-
import org.springdoc.api.AbstractOpenApiResource;
4039
import org.springdoc.core.fn.RouterOperation;
4140
import org.springdoc.core.providers.RepositoryRestResourceProvider;
4241
import org.springdoc.data.rest.core.ControllerType;
@@ -230,15 +229,13 @@ public List<RouterOperation> getRouterOperations(OpenAPI openAPI, Locale locale)
230229
Map<RequestMappingInfo, HandlerMethod> handlerMethodMapFiltered = handlerMethodMap.entrySet().stream()
231230
.filter(requestMappingInfoHandlerMethodEntry -> REPOSITORY_ENTITY_CONTROLLER.equals(requestMappingInfoHandlerMethodEntry
232231
.getValue().getBeanType().getName()))
233-
.filter(controller -> !AbstractOpenApiResource.isHiddenRestControllers(controller.getValue().getBeanType()))
234232
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
235233
dataRestRepository.setControllerType(ControllerType.ENTITY);
236234
findControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI);
237235

238236
Map<RequestMappingInfo, HandlerMethod> handlerMethodMapFilteredMethodMap = handlerMethodMap.entrySet().stream()
239237
.filter(requestMappingInfoHandlerMethodEntry -> REPOSITORY_PROPERTY_CONTROLLER.equals(requestMappingInfoHandlerMethodEntry
240238
.getValue().getBeanType().getName()))
241-
.filter(controller -> !AbstractOpenApiResource.isHiddenRestControllers(controller.getValue().getBeanType()))
242239
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
243240

244241
entity.doWithAssociations((SimpleAssociationHandler) association -> {
@@ -259,7 +256,6 @@ else if (handlerMapping instanceof BasePathAwareHandlerMapping) {
259256
Map<RequestMappingInfo, HandlerMethod> handlerMethodMapFiltered = handlerMethodMap.entrySet().stream()
260257
.filter(requestMappingInfoHandlerMethodEntry -> REPOSITORY_SCHEMA_CONTROLLER.equals(requestMappingInfoHandlerMethodEntry
261258
.getValue().getBeanType().getName()))
262-
.filter(controller -> !AbstractOpenApiResource.isHiddenRestControllers(controller.getValue().getBeanType()))
263259
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
264260
dataRestRepository.setControllerType(ControllerType.SCHEMA);
265261
findControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI);
@@ -354,7 +350,6 @@ private void findSearchResourceMappings(OpenAPI openAPI, List<RouterOperation> r
354350
Map<RequestMappingInfo, HandlerMethod> handlerMethodMapFiltered = handlerMethodMap.entrySet().stream()
355351
.filter(requestMappingInfoHandlerMethodEntry -> REPOSITORY_SERACH_CONTROLLER.equals(requestMappingInfoHandlerMethodEntry
356352
.getValue().getBeanType().getName()))
357-
.filter(controller -> !AbstractOpenApiResource.isHiddenRestControllers(controller.getValue().getBeanType()))
358353
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
359354
ResourceMetadata metadata = associations.getMetadataFor(dataRestRepository.getDomainType());
360355
SearchResourceMappings searchResourceMappings = metadata.getSearchResourceMappings();

‎springdoc-openapi-javadoc/src/main/java/org/springdoc/openapi/javadoc/SpringDocJavadocConfiguration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class SpringDocJavadocConfiguration {
4646
*/
4747
@Bean
4848
@ConditionalOnMissingBean
49+
@Lazy(false)
4950
SpringDocJavadocProvider springDocJavadocProvider( ) {
5051
return new SpringDocJavadocProvider();
5152
}

‎springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app94/SpringDocApp94Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import org.apache.commons.lang3.RandomStringUtils;
3030
import org.springdoc.core.AbstractRequestService;
3131
import org.springdoc.core.GenericResponseService;
32-
import org.springdoc.core.filters.OpenApiMethodFilter;
3332
import org.springdoc.core.OpenAPIService;
3433
import org.springdoc.core.OperationService;
3534
import org.springdoc.core.SpringDocConfigProperties;
3635
import org.springdoc.core.SpringDocProviders;
3736
import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
3837
import org.springdoc.core.customizers.OpenApiCustomiser;
3938
import org.springdoc.core.customizers.OperationCustomizer;
39+
import org.springdoc.core.filters.OpenApiMethodFilter;
4040
import org.springdoc.webmvc.api.OpenApiWebMvcResource;
4141
import test.org.springdoc.api.AbstractSpringDocTest;
4242
import test.org.springdoc.api.app91.Greeting;

‎springdoc-openapi-kotlin/pom.xml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,7 @@
3434
<groupId>org.springdoc</groupId>
3535
<artifactId>springdoc-openapi-webflux-core</artifactId>
3636
<version>${project.version}</version>
37-
<scope>provided</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.springdoc</groupId>
41-
<artifactId>springdoc-openapi-webflux-ui</artifactId>
42-
<version>${project.version}</version>
43-
<scope>provided</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.springframework</groupId>
47-
<artifactId>spring-webflux</artifactId>
48-
<version>${spring.version}</version>
49-
<scope>provided</scope>
37+
<scope>test</scope>
5038
</dependency>
5139
</dependencies>
5240

‎springdoc-openapi-security/src/main/java/org/springdoc/security/SpringDocSecurityConfiguration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class SpringSecurityOAuth2ProviderConfiguration {
9393
*/
9494
@Bean
9595
@ConditionalOnMissingBean
96+
@Lazy(false)
9697
SpringSecurityOAuth2Provider springSecurityOAuth2Provider(FrameworkEndpointHandlerMapping oauth2EndpointHandlerMapping) {
9798
return new SpringSecurityOAuth2Provider(oauth2EndpointHandlerMapping);
9899
}

0 commit comments

Comments
 (0)