|
2 | 2 |
|
3 | 3 | import java.lang.reflect.Field;
|
4 | 4 |
|
| 5 | +import io.swagger.v3.core.util.AnnotationsUtils; |
5 | 6 | import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
6 | 7 | import io.swagger.v3.oas.models.OpenAPI;
|
7 | 8 | import io.swagger.v3.oas.models.Operation;
|
|
22 | 23 | import org.apache.commons.lang3.reflect.FieldUtils;
|
23 | 24 | import org.slf4j.Logger;
|
24 | 25 | import org.slf4j.LoggerFactory;
|
25 |
| -import org.springdoc.core.SpringDocAnnotationsUtils; |
26 | 26 | import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
|
27 | 27 | import org.springdoc.security.oauth2.SpringDocOAuth2AuthorizationServerMetadata;
|
28 | 28 | import org.springdoc.security.oauth2.SpringDocOAuth2Token;
|
@@ -125,7 +125,7 @@ private void getOAuth2TokenIntrospectionEndpointFilter(OpenAPI openAPI, Security
|
125 | 125 | new SpringDocSecurityOAuth2EndpointUtils(OAuth2TokenIntrospectionEndpointFilter.class).findEndpoint(securityFilterChain);
|
126 | 126 | if (oAuth2EndpointFilter != null) {
|
127 | 127 | ApiResponses apiResponses = new ApiResponses();
|
128 |
| - buildApiResponsesOnSuccess(apiResponses, SpringDocAnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2TokenIntrospection.class, openAPI.getComponents(), null)); |
| 128 | + buildApiResponsesOnSuccess(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2TokenIntrospection.class, openAPI.getComponents(), null)); |
129 | 129 | buildApiResponsesOnInternalServerError(apiResponses);
|
130 | 130 | buildApiResponsesOnBadRequest(apiResponses, openAPI);
|
131 | 131 |
|
@@ -153,7 +153,7 @@ private void getOAuth2AuthorizationServerMetadataEndpoint(OpenAPI openAPI, Secur
|
153 | 153 | new SpringDocSecurityOAuth2EndpointUtils(OAuth2AuthorizationServerMetadataEndpointFilter.class).findEndpoint(securityFilterChain);
|
154 | 154 | if (oAuth2EndpointFilter != null) {
|
155 | 155 | ApiResponses apiResponses = new ApiResponses();
|
156 |
| - buildApiResponsesOnSuccess(apiResponses, SpringDocAnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2AuthorizationServerMetadata.class, openAPI.getComponents(), null)); |
| 156 | + buildApiResponsesOnSuccess(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2AuthorizationServerMetadata.class, openAPI.getComponents(), null)); |
157 | 157 | buildApiResponsesOnInternalServerError(apiResponses);
|
158 | 158 | Operation operation = buildOperation(apiResponses);
|
159 | 159 | buildPath(oAuth2EndpointFilter, "requestMatcher", openAPI, operation, HttpMethod.GET);
|
@@ -199,7 +199,7 @@ private void getOAuth2TokenEndpoint(OpenAPI openAPI, SecurityFilterChain securit
|
199 | 199 |
|
200 | 200 | if (oAuth2EndpointFilter != null) {
|
201 | 201 | ApiResponses apiResponses = new ApiResponses();
|
202 |
| - buildApiResponsesOnSuccess(apiResponses, SpringDocAnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2Token.class, openAPI.getComponents(), null)); |
| 202 | + buildApiResponsesOnSuccess(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOAuth2Token.class, openAPI.getComponents(), null)); |
203 | 203 | buildApiResponsesOnInternalServerError(apiResponses);
|
204 | 204 | buildApiResponsesOnBadRequest(apiResponses, openAPI);
|
205 | 205 | buildOAuth2Error(openAPI, apiResponses, HttpStatus.UNAUTHORIZED);
|
@@ -317,7 +317,7 @@ private ApiResponses buildApiResponsesOnBadRequest(ApiResponses apiResponses, Op
|
317 | 317 | * @param httpStatus the http status
|
318 | 318 | */
|
319 | 319 | private static void buildOAuth2Error(OpenAPI openAPI, ApiResponses apiResponses, HttpStatus httpStatus) {
|
320 |
| - Schema oAuth2ErrorSchema = SpringDocAnnotationsUtils.resolveSchemaFromType(OAuth2Error.class, openAPI.getComponents(), null); |
| 320 | + Schema oAuth2ErrorSchema = AnnotationsUtils.resolveSchemaFromType(OAuth2Error.class, openAPI.getComponents(), null); |
321 | 321 | apiResponses.addApiResponse(String.valueOf(httpStatus.value()), new ApiResponse().description(httpStatus.getReasonPhrase()).content(new Content().addMediaType(
|
322 | 322 | APPLICATION_JSON_VALUE,
|
323 | 323 | new MediaType().schema(oAuth2ErrorSchema))));
|
|
0 commit comments