Update http query part
[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / init / EnvVariablesInitialization.java
index 7e75621..1fb7138 100644 (file)
@@ -21,7 +21,6 @@ import java.io.IOException;
 import org.apache.http.client.ClientProtocolException;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.msb.sdk.discovery.common.RouteException;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.util.CommonUtil;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
@@ -59,20 +58,20 @@ public class EnvVariablesInitialization implements ApplicationRunner {
                }
                
                try {
-                       handLcmMsbServiceInfo();
+                       handleLcmMsbServiceInfo();
                } catch (Exception e) {
-                       logger.error("handLcmMsbServiceInfo error", e);
+                       logger.error("handleLcmMsbServiceInfo error", e);
                }
                
                try {
-                       handCatalogMsbServiceInfo();
+                       handleCatalogMsbServiceInfo();
                } catch (Exception e) {
-                       logger.error("handCatalogMsbServiceInfo error", e);
+                       logger.error("handleCatalogMsbServiceInfo error", e);
                }
                
        }
 
-       private void handleAaiMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+       private void handleAaiMsbServiceInfo() throws ClientProtocolException, IOException {
                String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb());
                adaptorEnv.setAaiUrlInMsb(urlInMsb);
                adaptorEnv.setAaiApiUriFront(generateApiUriFront(urlInMsb));
@@ -87,13 +86,13 @@ public class EnvVariablesInitialization implements ApplicationRunner {
                return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort();
        }
        
-       private void handLcmMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+       private void handleLcmMsbServiceInfo() throws ClientProtocolException, IOException {
                String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
                adaptorEnv.setLcmUrlInMsb(urlInMsb);
                adaptorEnv.setLcmApiUriFront(generateApiUriFront(urlInMsb));
        }
        
-       private void handCatalogMsbServiceInfo() throws RouteException, ClientProtocolException, IOException {
+       private void handleCatalogMsbServiceInfo() throws ClientProtocolException, IOException {
                String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
                adaptorEnv.setCatalogUrlInMsb(urlInMsb);
                adaptorEnv.setCatalogApiUriFront(generateApiUriFront(urlInMsb));