X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2FExtsysApp.java;h=43b29ad846167bd466d3d0c1d73cac1f09273b3f;hb=refs%2Fchanges%2F23%2F11023%2F1;hp=6552d95f368bb80f4637df7ba362d4353e4e8b33;hpb=fa6dd60a45a093205ae55065f6de044c91493e60;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
index 6552d95..43b29ad 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
@@ -15,26 +15,23 @@
  */
 package org.onap.aai.esr;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.dropwizard.Application;
-import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.server.SimpleServerFactory;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import io.swagger.jaxrs.config.BeanConfig;
-import io.swagger.jaxrs.listing.ApiListingResource;
 
-import org.glassfish.jersey.media.multipart.MultiPartFeature;
-import org.onap.aai.esr.common.Config;
 import org.onap.aai.esr.externalservice.msb.MsbHelper;
+import org.onap.aai.esr.resource.EmsManager;
+import org.onap.aai.esr.resource.ThirdpatySdncManager;
+import org.onap.aai.esr.resource.VimManager;
+import org.onap.aai.esr.resource.VnfmManager;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.dropwizard.Application;
+import io.dropwizard.setup.Environment;
+
 public class ExtsysApp extends Application<ExtsysAppConfiguration> {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ExtsysApp.class);
-
+  
   public static void main(String[] args) throws Exception {
     new ExtsysApp().run(args);
   }
@@ -44,58 +41,25 @@ public class ExtsysApp extends Application<ExtsysAppConfiguration> {
     return "ONAP-ESR";
   }
 
-
-  @Override
-  public void initialize(Bootstrap<ExtsysAppConfiguration> bootstrap) {
-    bootstrap.addBundle(new AssetsBundle("/api-doc", "/api-doc", "index.html", "api-doc"));
-  }
-
   @Override
   public void run(ExtsysAppConfiguration configuration, Environment environment) {
-    LOGGER.info("Start to initialize esr.");    
-    environment.jersey().packages("org.onap.aai.esr.resource");
-    environment.jersey().register(MultiPartFeature.class);
-    String MSB_IP=configuration.getMsbIp();
-    int MSB_Port=configuration.getMsbPort();
-    
-    initSwaggerConfig(environment, configuration);
-    Config.setConfigration(configuration);
-    MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
-
-    MsbHelper helper = new MsbHelper(msbClient);
-    try {
-      helper.registerMsb();
-    } catch (Exception e) {
-      LOGGER.error("Register ESR to msb failed", e);
-    }
+    LOGGER.info("Start to initialize esr.");
+    environment.jersey().register(new EmsManager());
+    environment.jersey().register(new ThirdpatySdncManager());
+    environment.jersey().register(new VimManager());
+    environment.jersey().register(new VnfmManager());
     
+//    String MSB_IP="127.0.0.1";
+      String MSB_IP=configuration.getMsbIp();
+      Integer MSB_Port= Integer.valueOf(configuration.getMsbPort());    
+      MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
+      MsbHelper helper = new MsbHelper(msbClient);
+      try {
+        helper.registerMsb();
+      } catch (Exception e) {
+        LOGGER.error("Register esr-server to msb by java-sdk failed", e);
+      }
     LOGGER.info("Initialize extsys finished.");
   }
 
-  /**
-   * initialize swagger configuration.
-   * 
-   * @param environment environment information
-   * @param configuration configuration
-   */
-  private void initSwaggerConfig(Environment environment, ExtsysAppConfiguration configuration) {
-    environment.jersey().register(new ApiListingResource());
-    environment.getObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
-    BeanConfig config = new BeanConfig();
-    config.setTitle("Open-o ExtSys Service rest API");
-    config.setVersion("1.0.0");
-    config.setResourcePackage("org.onap.aai.esr.resource");
-    // set rest api basepath in swagger
-    SimpleServerFactory simpleServerFactory =
-        (SimpleServerFactory) configuration.getServerFactory();
-    String basePath = simpleServerFactory.getApplicationContextPath();
-    String rootPath = simpleServerFactory.getJerseyRootPath();
-    rootPath = rootPath.substring(0, rootPath.indexOf("/*"));
-    basePath = basePath.equals("/") ? rootPath
-        : (new StringBuilder()).append(basePath).append(rootPath).toString();
-    config.setBasePath(basePath);
-    config.setScan(true);
-  }
-
 }