Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8a57f6d

Browse files
code review
1 parent d9b8206 commit 8a57f6d

File tree

5 files changed

+33
-25
lines changed

5 files changed

+33
-25
lines changed

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2Customizer.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
*/
6767
public class SpringDocSecurityOAuth2Customizer implements GlobalOpenApiCustomizer, ApplicationContextAware {
6868

69+
/**
70+
* The constant REQUEST_MATCHER.
71+
*/
72+
private static final String REQUEST_MATCHER = "requestMatcher";
73+
6974
/**
7075
* The constant LOGGER.
7176
*/
@@ -170,7 +175,7 @@ private void getOAuth2AuthorizationServerMetadataEndpoint(OpenAPI openAPI, Secur
170175
buildApiResponsesOnSuccess(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2AuthorizationServerMetadata.class, openAPI.getComponents(), null, openapi31));
171176
buildApiResponsesOnInternalServerError(apiResponses);
172177
Operation operation = buildOperation(apiResponses);
173-
buildPath(oAuth2EndpointFilter, "requestMatcher", openAPI, operation, HttpMethod.GET);
178+
buildPath(oAuth2EndpointFilter, REQUEST_MATCHER, openAPI, operation, HttpMethod.GET);
174179
}
175180
}
176181

@@ -198,7 +203,7 @@ private void getNimbusJwkSetEndpoint(OpenAPI openAPI, SecurityFilterChain securi
198203

199204
Operation operation = buildOperation(apiResponses);
200205
operation.responses(apiResponses);
201-
buildPath(oAuth2EndpointFilter, "requestMatcher", openAPI, operation, HttpMethod.GET);
206+
buildPath(oAuth2EndpointFilter, REQUEST_MATCHER, openAPI, operation, HttpMethod.GET);
202207
}
203208
}
204209

@@ -291,7 +296,7 @@ private void getOidcProviderConfigurationEndpoint(OpenAPI openAPI, SecurityFilte
291296
buildApiResponsesOnSuccess(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOidcProviderConfiguration.class, openAPI.getComponents(), null, openapi31));
292297
buildApiResponsesOnInternalServerError(apiResponses);
293298
Operation operation = buildOperation(apiResponses);
294-
buildPath(oAuth2EndpointFilter, "requestMatcher", openAPI, operation, HttpMethod.GET);
299+
buildPath(oAuth2EndpointFilter, REQUEST_MATCHER, openAPI, operation, HttpMethod.GET);
295300
}
296301
}
297302

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private void setComponentsProperties(OpenAPI openApi) {
179179
for (Schema componentSchema : components.getSchemas().values()) {
180180
// set component description
181181
String schemaPropertyPrefix = MessageFormat.format("components.schemas.{0}", componentSchema.getName());
182-
resolveString(componentSchema::setDescription, schemaPropertyPrefix + ".description");
182+
resolveString(componentSchema::setDescription, schemaPropertyPrefix + DESCRIPTION);
183183
Map<String, Schema> properties = componentSchema.getProperties();
184184

185185
if (CollectionUtils.isEmpty(properties)) {
@@ -190,7 +190,7 @@ private void setComponentsProperties(OpenAPI openApi) {
190190
String propertyNode = MessageFormat.format("components.schemas.{0}.properties.{1}",
191191
componentSchema.getName(), propSchema.getName());
192192

193-
resolveString(propSchema::setDescription, propertyNode + ".description");
193+
resolveString(propSchema::setDescription, propertyNode + DESCRIPTION);
194194
resolveString(propSchema::setExample, propertyNode + ".example");
195195
}
196196
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class Builder {
9797
/**
9898
* The Content schem.
9999
*/
100-
private Schema contentSchem = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
100+
private Schema contentSchema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
101101

102102
/**
103103
* The Property names.
@@ -285,7 +285,7 @@ public DependentSchema[] dependentSchemas() {
285285

286286
@Override
287287
public Schema contentSchema() {
288-
return contentSchem;
288+
return contentSchema;
289289
}
290290

291291
@Override

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,17 +349,18 @@ private List<HandlerMapping> getHandlerMappingList() {
349349
private void findSearchResourceMappings(OpenAPI openAPI, List<RouterOperation> routerOperationList, List<HandlerMapping> handlerMappingList,
350350
DataRestRepository dataRestRepository, ResourceMetadata resourceMetadata) {
351351
for (HandlerMapping handlerMapping : handlerMappingList) {
352-
if (handlerMapping instanceof RepositoryRestHandlerMapping) {
353-
RepositoryRestHandlerMapping repositoryRestHandlerMapping = (RepositoryRestHandlerMapping) handlerMapping;
352+
if (handlerMapping instanceof RepositoryRestHandlerMapping repositoryRestHandlerMapping) {
354353
Map<RequestMappingInfo, HandlerMethod> handlerMethodMap = repositoryRestHandlerMapping.getHandlerMethods();
355354
Map<RequestMappingInfo, HandlerMethod> handlerMethodMapFiltered = handlerMethodMap.entrySet().stream()
356355
.filter(requestMappingInfoHandlerMethodEntry -> REPOSITORY_SERACH_CONTROLLER.equals(requestMappingInfoHandlerMethodEntry
357356
.getValue().getBeanType().getName()))
358357
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
359358
ResourceMetadata metadata = associations.getMetadataFor(dataRestRepository.getDomainType());
360-
SearchResourceMappings searchResourceMappings = metadata.getSearchResourceMappings();
361-
if (searchResourceMappings.isExported()) {
362-
findSearchControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI, searchResourceMappings);
359+
if(metadata!=null && metadata.isExported()) {
360+
SearchResourceMappings searchResourceMappings = metadata.getSearchResourceMappings();
361+
if (searchResourceMappings.isExported()) {
362+
findSearchControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI, searchResourceMappings);
363+
}
363364
}
364365
}
365366
}

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -767,19 +767,21 @@ else if (methodParameter.getParameterAnnotation(org.springframework.web.bind.ann
767767
private boolean checkOperationRequestBody(MethodParameter methodParameter) {
768768
if (AnnotatedElementUtils.findMergedAnnotation(Objects.requireNonNull(methodParameter.getMethod()), io.swagger.v3.oas.annotations.Operation.class) != null) {
769769
io.swagger.v3.oas.annotations.Operation operation = AnnotatedElementUtils.findMergedAnnotation(Objects.requireNonNull(methodParameter.getMethod()), io.swagger.v3.oas.annotations.Operation.class);
770-
io.swagger.v3.oas.annotations.parameters.RequestBody requestBody = operation.requestBody();
771-
if (StringUtils.isNotBlank(requestBody.description()))
772-
return true;
773-
else if (StringUtils.isNotBlank(requestBody.ref()))
774-
return true;
775-
else if (requestBody.required())
776-
return true;
777-
else if (requestBody.useParameterTypeSchema())
778-
return true;
779-
else if (requestBody.content().length > 0)
780-
return true;
781-
else
782-
return requestBody.extensions().length > 0;
770+
if(operation!=null){
771+
io.swagger.v3.oas.annotations.parameters.RequestBody requestBody = operation.requestBody();
772+
if (StringUtils.isNotBlank(requestBody.description()))
773+
return true;
774+
else if (StringUtils.isNotBlank(requestBody.ref()))
775+
return true;
776+
else if (requestBody.required())
777+
return true;
778+
else if (requestBody.useParameterTypeSchema())
779+
return true;
780+
else if (requestBody.content().length > 0)
781+
return true;
782+
else
783+
return requestBody.extensions().length > 0;
784+
}
783785
}
784786
return false;
785787
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /