Network Discovery Swagger fix 80/75780/1
authorNorm Traxler <normant@amdocs.com>
Tue, 15 Jan 2019 00:59:28 +0000 (00:59 +0000)
committerNorm Traxler <normant@amdocs.com>
Tue, 15 Jan 2019 01:01:14 +0000 (01:01 +0000)
Issue-ID: LOG-927

Change-Id: Ice25909e2aa0dc2bc566b585c1d3e4a577c3a73c
Signed-off-by: Norm Traxler <normant@amdocs.com>
50 files changed:
pomba/network-discovery/config/application.properties
pomba/network-discovery/pom.xml
pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
pomba/network-discovery/src/main/resources/static/swagger/css/print.css [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/css/reset.css [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/css/screen.css [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/css/style.css [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/css/typography.css [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/index.html [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html with 98% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/en.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/es.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/it.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/o2c.html [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js with 100% similarity]
pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js [moved from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js with 100% similarity]

index 9de4fde..1032d42 100644 (file)
@@ -1,22 +1,5 @@
 
 spring.jersey.type=filter
-spring.mvc.urls=swagger,docs,prometheus,auditevents,info,heapdump,autoconfig,beans,loggers,dump,env,trace,health,configprops,mappings,metrics,webjars
-
-
-server.contextPath=/network-discovery
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-
-#This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma
-#tomcat.connector.attributes=allowTrace-true
-#The max number of active threads in this pool
-server.tomcat.max-threads=200
-#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
-#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
-server.tomcat.max-idle-time=60000
-
-#Servlet context parameters
-server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
 
 #Enable HTTPS
 server.port=8443
index a428a59..2ea5b48 100644 (file)
@@ -31,11 +31,17 @@ limitations under the License.
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>
+        
         <!--docker -->
         <docker.tag>${project.version}-${timestamp}</docker.tag>
         <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+        
+        <jolt.version>0.1.0</jolt.version>
+        
     </properties>
 
+
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -54,25 +60,26 @@ limitations under the License.
         <dependency>
             <groupId>com.bazaarvoice.jolt</groupId>
             <artifactId>jolt-core</artifactId>
-            <version>0.1.0</version>
+            <version>${jolt.version}</version>
         </dependency>
         <dependency>
             <groupId>com.bazaarvoice.jolt</groupId>
             <artifactId>json-utils</artifactId>
-            <version>0.1.0</version>
+            <version>${jolt.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
         </dependency>
-           
-         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
+
+        <!-- Springboot dependencies -->
+        <dependency>
+                   <groupId>org.eclipse.jetty</groupId>
+                   <artifactId>jetty-webapp</artifactId>
         </dependency>
 
-           <dependency>
+        <dependency>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-jersey</artifactId>
                    <exclusions>
@@ -82,6 +89,12 @@ limitations under the License.
                        </exclusion>
                    </exclusions>
         </dependency>
+        <!-- Required for swagger UI -->
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+               </dependency>
         
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -142,13 +155,14 @@ limitations under the License.
                 <executions>
                     <execution>
                         <goals>
+                             <!-- required to package the jar correctly for springboot-->
                             <goal>repackage</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
-
+  
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -158,6 +172,7 @@ limitations under the License.
                 </includes>
             </resource>
         </resources>
+          
     </build>
 
     <profiles>
index c9b995f..5a643b0 100644 (file)
 package org.onap.sdnc.apps.pomba.networkdiscovery;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"org.onap.sdnc.apps.pomba.networkdiscovery"})
-@EnableAsync
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 public class Application extends SpringBootServletInitializer {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
index e073e34..5dcddbb 100644 (file)
@@ -31,6 +31,7 @@ import org.glassfish.jersey.servlet.ServletProperties;
 import org.onap.sdnc.apps.pomba.networkdiscovery.service.rs.RestService;
 import org.onap.sdnc.apps.pomba.networkdiscovery.service.rs.RestServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
@@ -39,13 +40,16 @@ import io.swagger.jaxrs.listing.ApiListingResource;
 import io.swagger.jaxrs.listing.SwaggerSerializers;
 
 @Component
-@ApplicationPath("/")
+@ApplicationPath("/network-discovery")
 public class JerseyConfiguration extends ResourceConfig {
-    
+
     public static final String SERVICE_NAME = "network-discovery";
 
+    @Value("${spring.jersey.application-path:/network-discovery}")
+    private String apiPath;   
+
     private static final Logger log = Logger.getLogger(JerseyConfiguration.class.getName());
-    
+
     @Autowired
     public JerseyConfiguration() {
         register(RestServiceImpl.class);
@@ -61,7 +65,7 @@ public class JerseyConfiguration extends ResourceConfig {
     @PostConstruct
     public void init() {
         // Register components where DI is needed
-        this.configureSwagger();
+        configureSwagger();
     }
 
     private void configureSwagger() {
@@ -70,10 +74,10 @@ public class JerseyConfiguration extends ResourceConfig {
         this.register(SwaggerSerializers.class);
 
         BeanConfig config = new BeanConfig();
-        config.setTitle("Network Discovery Swagger");
+        config.setTitle("Network Discovery API");
         config.setVersion("v1");
-        config.setSchemes(new String[] { "https", "http" });
-        config.setBasePath("/" + SERVICE_NAME);
+        config.setSchemes(new String[] { "https", "http" });        
+        config.setBasePath(apiPath);
         config.setResourcePackage(RestService.class.getPackage().getName());
         config.setPrettyPrint(true);
         config.setScan(true);
@@ -36,7 +36,7 @@
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
       } else {
-          url = "../swagger.json";
+          url = "/network-discovery/swagger.json";
         //url = "http://petstore.swagger.io/v2/swagger.json";
       }