fix:fix swagger not working bug. (#1225)
Haotian Zhang
10 months ago
committed by
GitHub
parent
dd56d3cbf1
commit
38792c12a1
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed
|
||||
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
||||
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springdoc.api;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
import io.swagger.v3.oas.models.OpenAPI;
|
||||
|
||||
/**
|
||||
* Util for {@link AbstractOpenApiResource}.
|
||||
*
|
||||
* @author Haotian Zhang
|
||||
*/
|
||||
public final class AbstractOpenApiResourceUtil {
|
||||
|
||||
private AbstractOpenApiResourceUtil() {
|
||||
}
|
||||
|
||||
public static OpenAPI getOpenApi(AbstractOpenApiResource openApiResource) {
|
||||
return openApiResource.getOpenApi(Locale.getDefault());
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed
|
||||
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
||||
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springdoc.webflux.api;
|
||||
|
||||
import org.springdoc.api.AbstractOpenApiResource;
|
||||
|
||||
/**
|
||||
* Util for {@link MultipleOpenApiResource}.
|
||||
*
|
||||
* @author Haotian Zhang
|
||||
*/
|
||||
public final class OpenApiWebFluxUtil {
|
||||
|
||||
private OpenApiWebFluxUtil() {
|
||||
}
|
||||
|
||||
public static AbstractOpenApiResource getOpenApiResourceOrThrow(
|
||||
org.springdoc.webflux.api.MultipleOpenApiResource multipleOpenApiWebFluxResource, String groupName) {
|
||||
return multipleOpenApiWebFluxResource.getOpenApiResourceOrThrow(groupName);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed
|
||||
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
||||
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springdoc.webmvc.api;
|
||||
|
||||
import org.springdoc.api.AbstractOpenApiResource;
|
||||
|
||||
/**
|
||||
* Util for {@link MultipleOpenApiResource}.
|
||||
*
|
||||
* @author Haotian Zhang
|
||||
*/
|
||||
public final class OpenApiWebMvcUtil {
|
||||
private OpenApiWebMvcUtil() {
|
||||
}
|
||||
|
||||
public static AbstractOpenApiResource getOpenApiResourceOrThrow(
|
||||
org.springdoc.webmvc.api.MultipleOpenApiResource multipleOpenApiWebMvcResource, String groupName) {
|
||||
return multipleOpenApiWebMvcResource.getOpenApiResourceOrThrow(groupName);
|
||||
}
|
||||
}
|
||||
@ -1,90 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2015 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
package springfox.documentation.spring.web;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
|
||||
|
||||
import static springfox.documentation.spring.web.paths.Paths.maybeChompLeadingSlash;
|
||||
import static springfox.documentation.spring.web.paths.Paths.maybeChompTrailingSlash;
|
||||
|
||||
/**
|
||||
* Modified to be compatible with spring-boot-actuator.
|
||||
*/
|
||||
public class WebMvcPatternsRequestConditionWrapper
|
||||
implements springfox.documentation.spring.wrapper.PatternsRequestCondition<PatternsRequestCondition> {
|
||||
private final String contextPath;
|
||||
private final PatternsRequestCondition condition;
|
||||
|
||||
public WebMvcPatternsRequestConditionWrapper(
|
||||
String contextPath,
|
||||
PatternsRequestCondition condition) {
|
||||
|
||||
this.contextPath = contextPath;
|
||||
this.condition = condition;
|
||||
}
|
||||
|
||||
@Override
|
||||
public springfox.documentation.spring.wrapper.PatternsRequestCondition combine(
|
||||
springfox.documentation.spring.wrapper.PatternsRequestCondition<PatternsRequestCondition> other) {
|
||||
if (other instanceof WebMvcPatternsRequestConditionWrapper && !this.equals(other)) {
|
||||
return new WebMvcPatternsRequestConditionWrapper(
|
||||
contextPath,
|
||||
condition.combine(((WebMvcPatternsRequestConditionWrapper) other).condition));
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getPatterns() {
|
||||
// polaris add start
|
||||
if (this.condition == null) {
|
||||
return new HashSet<>();
|
||||
}
|
||||
// polaris add end
|
||||
return this.condition.getPatterns().stream()
|
||||
.map(p -> String.format("%s/%s", maybeChompTrailingSlash(contextPath), maybeChompLeadingSlash(p)))
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (o instanceof WebMvcPatternsRequestConditionWrapper) {
|
||||
return this.condition.equals(((WebMvcPatternsRequestConditionWrapper) o).condition);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return this.condition.hashCode();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.condition.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,175 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2016-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*
|
||||
*/
|
||||
package springfox.documentation.spring.web;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.StringJoiner;
|
||||
|
||||
import com.fasterxml.classmate.ResolvedType;
|
||||
import springfox.documentation.RequestHandler;
|
||||
import springfox.documentation.RequestHandlerKey;
|
||||
import springfox.documentation.service.ResolvedMethodParameter;
|
||||
import springfox.documentation.spring.web.readers.operation.HandlerMethodResolver;
|
||||
import springfox.documentation.spring.wrapper.NameValueExpression;
|
||||
import springfox.documentation.spring.wrapper.PatternsRequestCondition;
|
||||
|
||||
import org.springframework.core.annotation.AnnotationUtils;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
|
||||
|
||||
import static java.util.Optional.ofNullable;
|
||||
|
||||
/**
|
||||
* Modified to be compatible with spring-boot-actuator.
|
||||
*/
|
||||
public class WebMvcRequestHandler implements RequestHandler {
|
||||
private final String contextPath;
|
||||
private final HandlerMethodResolver methodResolver;
|
||||
private final RequestMappingInfo requestMapping;
|
||||
private final HandlerMethod handlerMethod;
|
||||
|
||||
public WebMvcRequestHandler(
|
||||
String contextPath,
|
||||
HandlerMethodResolver methodResolver,
|
||||
RequestMappingInfo requestMapping,
|
||||
HandlerMethod handlerMethod) {
|
||||
this.contextPath = contextPath;
|
||||
this.methodResolver = methodResolver;
|
||||
this.requestMapping = requestMapping;
|
||||
this.handlerMethod = handlerMethod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerMethod getHandlerMethod() {
|
||||
return handlerMethod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RequestHandler combine(RequestHandler other) {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?> declaringClass() {
|
||||
return handlerMethod.getBeanType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAnnotatedWith(Class<? extends Annotation> annotation) {
|
||||
return null != AnnotationUtils.findAnnotation(handlerMethod.getMethod(), annotation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PatternsRequestCondition getPatternsCondition() {
|
||||
return new WebMvcPatternsRequestConditionWrapper(
|
||||
contextPath,
|
||||
requestMapping.getPatternsCondition());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String groupName() {
|
||||
return ControllerNamingUtils.controllerNameAsGroup(handlerMethod);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return handlerMethod.getMethod().getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<RequestMethod> supportedMethods() {
|
||||
return requestMapping.getMethodsCondition().getMethods();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<MediaType> produces() {
|
||||
return requestMapping.getProducesCondition().getProducibleMediaTypes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<MediaType> consumes() {
|
||||
return requestMapping.getConsumesCondition().getConsumableMediaTypes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<NameValueExpression<String>> headers() {
|
||||
return WebMvcNameValueExpressionWrapper.from(requestMapping.getHeadersCondition().getExpressions());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<NameValueExpression<String>> params() {
|
||||
return WebMvcNameValueExpressionWrapper.from(requestMapping.getParamsCondition().getExpressions());
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends Annotation> Optional<T> findAnnotation(Class<T> annotation) {
|
||||
return ofNullable(AnnotationUtils.findAnnotation(handlerMethod.getMethod(), annotation));
|
||||
}
|
||||
|
||||
@Override
|
||||
public RequestHandlerKey key() {
|
||||
// polaris add start
|
||||
Set<String> patterns = new HashSet<>();
|
||||
if (requestMapping.getPatternsCondition() != null && requestMapping.getPatternsCondition()
|
||||
.getPatterns() != null) {
|
||||
patterns = requestMapping.getPatternsCondition().getPatterns();
|
||||
}
|
||||
// polaris add end
|
||||
return new RequestHandlerKey(
|
||||
patterns,
|
||||
requestMapping.getMethodsCondition().getMethods(),
|
||||
requestMapping.getConsumesCondition().getConsumableMediaTypes(),
|
||||
requestMapping.getProducesCondition().getProducibleMediaTypes());
|
||||
}
|
||||
|
||||
@Override
|
||||
public springfox.documentation.spring.wrapper.RequestMappingInfo<?> getRequestMapping() {
|
||||
return new WebMvcRequestMappingInfoWrapper(requestMapping);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ResolvedMethodParameter> getParameters() {
|
||||
return methodResolver.methodParameters(handlerMethod);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResolvedType getReturnType() {
|
||||
return methodResolver.methodReturnType(handlerMethod);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends Annotation> Optional<T> findControllerAnnotation(Class<T> annotation) {
|
||||
return ofNullable(AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), annotation));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new StringJoiner(", ", WebMvcRequestHandler.class.getSimpleName() + "{", "}")
|
||||
.add("requestMapping=" + requestMapping)
|
||||
.add("handlerMethod=" + handlerMethod)
|
||||
.add("key=" + key())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue