Network Discovery Swagger fix

Issue-ID: LOG-927

Change-Id: Ice25909e2aa0dc2bc566b585c1d3e4a577c3a73c
Signed-off-by: Norm Traxler <normant@amdocs.com>

48 files changed, 12 insertions, 16 deletions

diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
index c9b995f..5a643b0 100644
--- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
+++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
@@ -19,19 +19,11 @@
 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) {
diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
index e073e34..5dcddbb 100644
--- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
+++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
@@ -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);
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css b/pomba/network-discovery/src/main/resources/static/swagger/css/print.css
index 32bf0c8..32bf0c8 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/print.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css b/pomba/network-discovery/src/main/resources/static/swagger/css/reset.css
index b2b0789..b2b0789 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/reset.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css b/pomba/network-discovery/src/main/resources/static/swagger/css/screen.css
index 90a93a2..90a93a2 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/screen.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css b/pomba/network-discovery/src/main/resources/static/swagger/css/style.css
index fc21a31..fc21a31 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/style.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css b/pomba/network-discovery/src/main/resources/static/swagger/css/typography.css
index 3235edd..3235edd 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/typography.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf
index 036c4d1..036c4d1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf
+++ b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf
index e517a0c..e517a0c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf
+++ b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif
index 8843e8c..8843e8c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif
index 477bf13..477bf13 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png b/pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png
index ed9d2ff..ed9d2ff 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png
index 66b1a5b..66b1a5b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png
index 32f319f..32f319f 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico
index 8b60bcf..8b60bcf 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png b/pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png
index 5496a65..5496a65 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png b/pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png
index f9f9cd4..f9f9cd4 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif
index 0639388..0639388 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png b/pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png
index dca4f14..dca4f14 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html b/pomba/network-discovery/src/main/resources/static/swagger/index.html
index c79f30d..0921554 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html
+++ b/pomba/network-discovery/src/main/resources/static/swagger/index.html
@@ -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";
       }
 
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/en.js
index 9183136..9183136 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/en.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/es.js
index 13fa015..13fa015 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/es.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js
index 388dff1..388dff1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js
index 609c20d..609c20d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/it.js
index 8529c2a..8529c2a 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/it.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js
index 3207bfc..3207bfc 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js
index ce41e91..ce41e91 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js
index f2e7c13..f2e7c13 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js
index 592744e..592744e 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js
index 16426a9..16426a9 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js
index 591f6d4..591f6d4 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js
index 570319b..570319b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js
index a3f544b..a3f544b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js
index 53cf921..53cf921 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js
index 928386d..928386d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js
index 571c740..571c740 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js
index 066d72c..066d72c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js
index bcbf248..bcbf248 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js
index ba32cff..ba32cff 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js
index 2adb0d6..2adb0d6 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js
index c3d07ad..c3d07ad 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js
index 343397f..343397f 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js
index 05870d1..05870d1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js
index c2a678d..c2a678d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js
index 2bb6be1..2bb6be1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html b/pomba/network-discovery/src/main/resources/static/swagger/o2c.html
index 88e8bf1..88e8bf1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html
+++ b/pomba/network-discovery/src/main/resources/static/swagger/o2c.html
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js
index 7e0cc6d..7e0cc6d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js
index 2c56818..2c56818 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js