Merge pull request #22 from spinnaker/upgrade-to-springfox-swagger2

Upgrade to Swagger2 (as part of springfox)

kork-swagger/kork-swagger.gradle

@@ -1,6 +1,5 @@
 dependencies {
   compile spinnaker.dependency('bootAutoConfigure')
-
-  compile "com.mangofactory:swagger-springmvc:0.9.5"
-  compile "com.mangofactory:swagger-models:0.9.5"
+  compile "io.springfox:springfox-swagger2:2.2.2"
+  compile "io.springfox:springfox-swagger-ui:2.2.2"
 }

kork-swagger/src/main/java/com/netflix/spinnaker/config/SwaggerConfig.java

@@ -16,19 +16,24 @@
 
 package com.netflix.spinnaker.config;
 
-import com.mangofactory.swagger.configuration.SpringSwaggerConfig;
-import com.mangofactory.swagger.models.dto.ApiInfo;
-import com.mangofactory.swagger.plugin.EnableSwagger;
-import com.mangofactory.swagger.plugin.SwaggerSpringMvcPlugin;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import com.google.common.base.Predicate;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
-@EnableSwagger
+import static com.google.common.base.Predicates.or;
+
+@EnableSwagger2
 @Configuration
 @ConditionalOnProperty("swagger.enabled")
 @ConfigurationProperties(prefix = "swagger")
@@ -38,24 +43,28 @@ public class SwaggerConfig {
   private String contact;
   private List<String> patterns;
 
-  @Autowired
-  SpringSwaggerConfig springSwaggerConfig;
-
   @Bean
-  public SwaggerSpringMvcPlugin swaggerPlugin() {
-    SwaggerSpringMvcPlugin plugin = new SwaggerSpringMvcPlugin(this.springSwaggerConfig).apiInfo(apiInfo());
-    if (patterns != null && !patterns.isEmpty()) {
-      plugin = plugin.includePatterns(patterns.toArray(new String[patterns.size()]));
-    }
+  public Docket gateApi() {
+    return new Docket(DocumentationType.SWAGGER_2)
+      .select()
+      .apis(RequestHandlerSelectors.any())
+      .paths(paths())
+      .build()
+      .apiInfo(apiInfo());
+  }
 
-    return plugin;
+  private Predicate<String> paths() {
+    return or(
+      patterns.stream().map(PathSelectors::regex).collect(Collectors.toList())
+    );
   }
 
   private ApiInfo apiInfo() {
     return new ApiInfo(
       title,
       description,
       null,
+      null,
       contact,
       null,
       null