Modify service register part

Change-Id: Ie14599005868e60669a8a949dc5c8f23afa80a40
Issue-ID: VFC-53
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>

2 files changed, 13 insertions, 8 deletions

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
index dc2b8c0c..a7cab38a 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
@@ -28,10 +28,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 @ComponentScan
 public class VfcadaptorApplication {
 
-	private VfcadaptorApplication() {
-		
-	}
-	
 	public final static void main(String[] args) {
 		SpringApplication.run(VfcadaptorApplication.class, args);
 	}
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
index 675229f1..5d488854 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 
 @Component
@@ -46,16 +47,19 @@ public class MsbMgmrImpl implements IMsbMgmr {
 	public void register() {
 		try {
 			String vfcAdaptorInfoJsonStr = readVfcAdaptorInfoFromJsonFile();
-			MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+//			MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+			
+			JSON json = com.alibaba.fastjson.JSON.parseObject(vfcAdaptorInfoJsonStr);
+			MicroServiceInfo msinfo = com.alibaba.fastjson.JSON.toJavaObject(json , MicroServiceInfo.class);
 			
 			MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
 			MicroServiceFullInfo microServiceInfo = msbClient.registerMicroServiceInfo(msinfo);
 			logger.info("Registered service response info is " + microServiceInfo.toString());
 			
-		} catch (IOException e) {
-			logger.error("Failed to read vfcadaptor info! ", e);
 		} catch (RouteException e) {
-			logger.error("Failed to register nokia vnfm driver! ", e);
+			logger.error("RouteException Failed to register nokia vnfm driver! ", e);
+		} catch (IOException e) {
+			logger.error("IOException Failed to register nokia vnfm driver! ", e);
 		}
 			
 	}
@@ -105,5 +109,10 @@ public class MsbMgmrImpl implements IMsbMgmr {
 	public void setAdaptorEnv(AdaptorEnv env) {
 		this.adaptorEnv = env;
 	}
+	
+	public static final void main(String[] args) {
+		MsbMgmrImpl impl = new MsbMgmrImpl();
+		impl.register();
+	}
 
 }