Uplift swagger to 3.0.0 (#307)

Author: jainadc9

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.eiffel-community</groupId>
         <artifactId>eiffel-remrem-parent</artifactId>
-        <version>2.0.14</version>
+        <version>2.0.15</version>
     </parent>
     <properties>
         <eiffel-remrem-publish.version>2.1.7</eiffel-remrem-publish.version>

publish-cli/pom.xml

@@ -64,22 +64,6 @@
             <version>${springboot.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.ulisesbocchio</groupId>
             <artifactId>jasypt-spring-boot-starter</artifactId>

publish-common/pom.xml

@@ -64,12 +64,8 @@
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${springfox-boot-starter.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

publish-service/pom.xml

@@ -72,18 +72,8 @@
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${springfox-boot-starter.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/config/SwaggerConfig.java

@@ -46,8 +46,14 @@
 import springfox.documentation.swagger.web.UiConfiguration.Constants;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+import springfox.documentation.swagger.web.DocExpansion;
+import springfox.documentation.swagger.web.ModelRendering;
+import springfox.documentation.swagger.web.OperationsSorter;
+import springfox.documentation.swagger.web.TagsSorter;
+import springfox.documentation.swagger.web.UiConfiguration;
+import springfox.documentation.swagger.web.UiConfigurationBuilder;
+
 @Configuration
-@EnableSwagger2
 public class SwaggerConfig {
 
         @Bean
@@ -63,8 +69,23 @@ public Docket api() {
 
         @Bean
         public UiConfiguration uiConfig() {
-        	return new UiConfiguration(null, "list", "alpha", "schema", Constants.DEFAULT_SUBMIT_METHODS, false, true,
-    				null);
+
+            return UiConfigurationBuilder.builder()
+                .deepLinking(true)
+                .displayOperationId(false)
+                .defaultModelsExpandDepth(-1)
+                .defaultModelExpandDepth(1)
+                .defaultModelRendering(ModelRendering.EXAMPLE)
+                .displayRequestDuration(false)
+                .docExpansion(DocExpansion.NONE)
+                .filter(false)
+                .maxDisplayedTags(null)
+                .operationsSorter(OperationsSorter.ALPHA)
+                .showExtensions(false)
+                .tagsSorter(TagsSorter.ALPHA)
+                .supportedSubmitMethods(UiConfiguration.Constants.DEFAULT_SUBMIT_METHODS)
+                .validatorUrl(null)
+                .build();
         }
 
         @Bean

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/controller/RemremHomeController.java

@@ -28,6 +28,6 @@ public class RemremHomeController {
 
         @RequestMapping(value = "/", method = RequestMethod.GET)
         public String home() {
-                return "redirect:/swagger-ui.html";
+                return "redirect:/swagger-ui/index.html";
         }
 }