1. swagger升级3.0.0

2. 去掉guava
3. 增加TODO点

Author: dyc87112

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.spring4all</groupId>
     <artifactId>swagger-spring-boot-starter</artifactId>
-    <version>1.9.1.RELEASE</version>
+    <version>1.10.0.SNAPSHOT</version>
 
     <name>spring-boot-starter-swagger</name>
     <url>https://github.com/SpringForAll/spring-boot-starter-swagger</url>
@@ -34,7 +34,7 @@
 
     <developers>
         <developer>
-            <name>翟永超-程序猿DD</name>
+            <name>程序猿DD</name>
             <email>dyc87112@qq.com</email>
             <organization>http://didispace.com</organization>
         </developer>
@@ -48,8 +48,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.java>1.8</version.java>
-        <version.swagger>2.9.2</version.swagger>
-        <version.spring-boot>1.5.10.RELEASE</version.spring-boot>
+        <version.swagger>3.0.0</version.swagger>
+        <version.spring-boot>2.3.0.RELEASE</version.spring-boot>
         <version.lombok>1.18.6</version.lombok>
         <version.swagger-models>1.5.24</version.swagger-models>
     </properties>
@@ -70,6 +70,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
@@ -79,13 +84,8 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>${version.swagger}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>swagger-models</artifactId>
-                    <groupId>io.swagger</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>

src/main/java/com/spring4all/swagger/SwaggerAutoConfiguration.java

@@ -1,7 +1,5 @@
 package com.spring4all.swagger;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -25,10 +23,9 @@
 import springfox.documentation.swagger.web.UiConfigurationBuilder;
 
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
  * @author 翟永超
  * Create date：2017/8/7.
@@ -122,6 +119,7 @@ public List<Docket> createRestApi(SwaggerProperties swaggerProperties) {
                 buildGlobalResponseMessage(swaggerProperties, docketForBuilder);
             }
 
+            // TODO Guava去掉了之后，需要换种写法
             Docket docket = docketForBuilder.select()
                     .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage()))
                     .paths(
@@ -195,6 +193,7 @@ public List<Docket> createRestApi(SwaggerProperties swaggerProperties) {
                 buildGlobalResponseMessage(swaggerProperties, docketForBuilder);
             }
 
+            // TODO Guava去掉了之后，需要换种写法
             Docket docket = docketForBuilder.groupName(groupName)
                     .select()
                     .apis(RequestHandlerSelectors.basePackage(docketInfo.getBasePackage()))
@@ -270,9 +269,11 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         this.beanFactory = beanFactory;
     }
 
-
+    // TODO 全局参数的配置功能：过期了，需要重写/
     private List<Parameter> buildGlobalOperationParametersFromSwaggerProperties(
             List<SwaggerProperties.GlobalOperationParameter> globalOperationParameters) {
+
+        // TODO Guava去掉了之后，需要换种写法
         List<Parameter> parameters = newArrayList();
 
         if (Objects.isNull(globalOperationParameters)) {
@@ -291,7 +292,7 @@ private List<Parameter> buildGlobalOperationParametersFromSwaggerProperties(
     }
 
     /**
-     * 局部参数按照name覆盖局部参数
+     * TODO 局部参数按照name覆盖局部参数（过期了，需要重写）
      *
      * @param globalOperationParameters
      * @param docketOperationParameters
@@ -309,6 +310,7 @@ private List<Parameter> assemblyGlobalOperationParameters(
                 .map(SwaggerProperties.GlobalOperationParameter::getName)
                 .collect(Collectors.toSet());
 
+        // TODO Guava去掉了之后，需要换种写法
         List<SwaggerProperties.GlobalOperationParameter> resultOperationParameters = newArrayList();
 
         if (Objects.nonNull(globalOperationParameters)) {
@@ -334,6 +336,7 @@ private void buildGlobalResponseMessage(SwaggerProperties swaggerProperties, Doc
         SwaggerProperties.GlobalResponseMessage globalResponseMessages =
                 swaggerProperties.getGlobalResponseMessage();
 
+        // TODO ResponseMessage过期，需要重写
         /* POST,GET,PUT,PATCH,DELETE,HEAD,OPTIONS,TRACE 响应消息体 **/
         List<ResponseMessage> postResponseMessages = getResponseMessageList(globalResponseMessages.getPost());
         List<ResponseMessage> getResponseMessages = getResponseMessageList(globalResponseMessages.getGet());

src/main/java/com/spring4all/swagger/SwaggerUiWebFluxConfigurer.java

@@ -0,0 +1,27 @@
+package com.spring4all.swagger;
+
+import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.config.ResourceHandlerRegistry;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
+
+/**
+ * WebFlux的支持配置
+ */
+public class SwaggerUiWebFluxConfigurer implements WebFluxConfigurer {
+
+    private final String baseUrl;
+
+    public SwaggerUiWebFluxConfigurer(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        String baseUrl = StringUtils.trimTrailingCharacter(this.baseUrl, '/');
+        registry.
+                addResourceHandler(baseUrl + "/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
+                .resourceChain(false);
+    }
+
+}

src/main/java/com/spring4all/swagger/SwaggerUiWebMvcConfigurer.java

@@ -0,0 +1,34 @@
+package com.spring4all.swagger;
+
+import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Spring MVC的支持配置
+ */
+public class SwaggerUiWebMvcConfigurer implements WebMvcConfigurer {
+
+    private final String baseUrl;
+
+    public SwaggerUiWebMvcConfigurer(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        String baseUrl = StringUtils.trimTrailingCharacter(this.baseUrl, '/');
+        registry.
+                addResourceHandler(baseUrl + "/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
+                .resourceChain(false);
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController(baseUrl + "/swagger-ui/")
+                .setViewName("forward:" + baseUrl + "/swagger-ui/index.html");
+    }
+
+}