Merge pull request #33 from SpringForAll/1.5.1

#18 Application类上增加EnableSwagger2Doc导致rabbitMQ异常

Author: 程序猿DD-翟永超

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.spring4all</groupId>
     <artifactId>spring-boot-starter-swagger</artifactId>
-    <version>1.5.0.RELEASE</version>
+    <version>1.5.1.RELEASE</version>
 
     <name>spring-boot-starter-swagger</name>
     <url>https://github.com/SpringForAll/spring-boot-starter-swagger</url>

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

@@ -50,6 +50,7 @@ public SwaggerProperties swaggerProperties() {
     @ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true)
     public List<Docket> createRestApi(SwaggerProperties swaggerProperties) {
         ConfigurableBeanFactory configurableBeanFactory = (ConfigurableBeanFactory) beanFactory;
+        List<Docket> docketList = new LinkedList<>();
 
         // 没有分组
         if (swaggerProperties.getDocket().size() == 0) {
@@ -81,7 +82,6 @@ public List<Docket> createRestApi(SwaggerProperties swaggerProperties) {
                 excludePath.add(PathSelectors.ant(path));
             }
 
-
             Docket docket = new Docket(DocumentationType.SWAGGER_2)
                     .host(swaggerProperties.getHost())
                     .apiInfo(apiInfo)
@@ -98,11 +98,11 @@ public List<Docket> createRestApi(SwaggerProperties swaggerProperties) {
                     .build();
 
             configurableBeanFactory.registerSingleton("defaultDocket", docket);
-            return null;
+            docketList.add(docket);
+            return docketList;
         }
 
         // 分组创建
-        List<Docket> docketList = new LinkedList<>();
         for (String groupName : swaggerProperties.getDocket().keySet()) {
             SwaggerProperties.DocketInfo docketInfo = swaggerProperties.getDocket().get(groupName);