From 500519857b2a3fe08cf812fdae78d81944f5e0c4 Mon Sep 17 00:00:00 2001 From: lizi00164331 Date: Fri, 22 Sep 2017 14:26:13 +0800 Subject: [PATCH] Change method objectToString to un-static. Change-Id: Id30fe2aefb5621724a547a11a327ed4c04bbd8d5 Issue-ID: AAI-365 Signed-off-by: lizi00164331 --- esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java | 6 ++++-- .../main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java | 5 +++-- esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java | 6 ++++-- esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java | 4 +++- esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java | 2 +- .../src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java | 5 +++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java index 63622e1..861cd5a 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java @@ -46,6 +46,8 @@ public class EmsManager { private static final Logger LOGGER = LoggerFactory.getLogger(EmsManager.class); + private static ExtsysUtil extsysUtil = new ExtsysUtil(); + /** * query all ems. */ @@ -122,7 +124,7 @@ public class EmsManager { @Timed public Response updateEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems, @ApiParam(value = "ems id", required = true) @PathParam("emsId") String emsId) { - LOGGER.info("start update ems .id:" + emsId + " info:" + ExtsysUtil.objectToString(ems)); + LOGGER.info("start update ems .id:" + emsId + " info:" + extsysUtil.objectToString(ems)); return EmsManagerWrapper.getInstance().updateEms(ems, emsId); } @@ -142,7 +144,7 @@ public class EmsManager { response = String.class)}) @Timed public Response registerEms(@ApiParam(value = "ems", required = true) EmsRegisterInfo ems) { - LOGGER.info("start add ems" + " info:" + ExtsysUtil.objectToString(ems)); + LOGGER.info("start add ems" + " info:" + extsysUtil.objectToString(ems)); return EmsManagerWrapper.getInstance().registerEms(ems); } } diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java index 8c5f5f7..0d0f935 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java @@ -46,6 +46,7 @@ public class ThirdpatySdncManager { private static final Logger LOGGER = LoggerFactory.getLogger(ThirdpatySdncManager.class); + private static ExtsysUtil extsysUtil = new ExtsysUtil(); /** *query all thirdParty sdnc. */ @@ -122,7 +123,7 @@ public class ThirdpatySdncManager { @Timed public Response updateThirdpartySdnc(@ApiParam(value = "thirdpartySdnc", required = true) ThirdpartySdncRegisterInfo thirdPartySdnc, @ApiParam(value = "sdnc id", required = true) @PathParam("thirdPartySdncId") String thirdPartySdncId) { - LOGGER.info("start update sdnc .id:" + thirdPartySdncId + " info:" + ExtsysUtil.objectToString(thirdPartySdnc)); + LOGGER.info("start update sdnc .id:" + thirdPartySdncId + " info:" + extsysUtil.objectToString(thirdPartySdnc)); return ThirdpatySdncWrapper.getInstance().updateThirdpartySdnc(thirdPartySdnc, thirdPartySdncId); } @@ -142,7 +143,7 @@ public class ThirdpatySdncManager { response = String.class)}) @Timed public Response registerThirdpatySdnc(@ApiParam(value = "thirdPartySdnc", required = true) ThirdpartySdncRegisterInfo thirdPartySdnc) { - LOGGER.info("start register sdnc" + " info:" + ExtsysUtil.objectToString(thirdPartySdnc)); + LOGGER.info("start register sdnc" + " info:" + extsysUtil.objectToString(thirdPartySdnc)); return ThirdpatySdncWrapper.getInstance().registerThirdpartySdnc(thirdPartySdnc); } } diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java index 67fcca0..75fc10b 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java @@ -44,6 +44,8 @@ public class VimManager { private static final Logger LOGGER = LoggerFactory.getLogger(VimManager.class); + private static ExtsysUtil extsysUtil = new ExtsysUtil(); + /** * query all VIM. */ @@ -118,7 +120,7 @@ public class VimManager { response = String.class)}) @Timed public Response updatevims(@PathParam("cloudOwner") String cloudOwner, @PathParam("cloudRegionId") String cloudRegionId, VimRegisterInfo vim) { - LOGGER.info("start update vim info:" + ExtsysUtil.objectToString(vim)); + LOGGER.info("start update vim info:" + extsysUtil.objectToString(vim)); return VimManagerWrapper.getInstance().updateVim(cloudOwner, cloudRegionId, vim); } @@ -138,7 +140,7 @@ public class VimManager { response = String.class)}) @Timed public Response registerVims(VimRegisterInfo vim) { - LOGGER.info("start add vim" + " info:" + ExtsysUtil.objectToString(vim)); + LOGGER.info("start add vim" + " info:" + extsysUtil.objectToString(vim)); return VimManagerWrapper.getInstance().registerVim(vim); } } diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java index e088fda..4a76a90 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java @@ -45,6 +45,8 @@ public class VnfmManager { private static final Logger LOGGER = LoggerFactory.getLogger(VnfmManager.class); + private static ExtsysUtil extsysUtil = new ExtsysUtil(); + /** * query all vnfm. */ @@ -121,7 +123,7 @@ public class VnfmManager { @Timed public Response updateVnfm(@ApiParam(value = "vnfm", required = true) VnfmRegisterInfo vnfm, @ApiParam(value = "vnfm id", required = true) @PathParam("vnfmId") String vnfmId) { - LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + ExtsysUtil.objectToString(vnfm)); + LOGGER.info("start update vnfm .id:" + vnfmId + " info:" + extsysUtil.objectToString(vnfm)); return VnfmManagerWrapper.getInstance().updateVnfm(vnfm, vnfmId); } diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java index 8e1d323..2e1649f 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java @@ -35,7 +35,7 @@ public class ExtsysUtil { /** * change object to str. */ - public static String objectToString(Object obj) { + public String objectToString(Object obj) { Gson gson = new Gson(); if (obj != null) { return gson.toJson(obj); diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java index 75eaaca..47fa95c 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java @@ -40,6 +40,7 @@ public class VimManagerWrapper { private static VimManagerWrapper vimManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class); private static VimManagerUtil vimManagerUtil = new VimManagerUtil(); + private static ExtsysUtil extsysUtil = new ExtsysUtil(); /** * get VimManagerWrapper instance. @@ -56,7 +57,7 @@ public class VimManagerWrapper { public Response registerVim(VimRegisterInfo vimRegisterInfo) { LOG.info( - "Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo)); + "Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); CloudRegionDetail cloudRegion = new CloudRegionDetail(); VimRegisterResponse result = new VimRegisterResponse(); cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); @@ -83,7 +84,7 @@ public class VimManagerWrapper { } public Response updateVim(String cloudOwner, String cloudRegionId,VimRegisterInfo vimRegisterInfo) { - LOG.info("Start update VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo)); + LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); VimRegisterResponse result = new VimRegisterResponse(); -- 2.16.6