X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FThirdpartySdncManagerUtil.java;h=a2d1e1abf846cf23035edd8c80069bf5956238d3;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=a9075e31b35fa44d9fcaa5e17b1487ec364c9299;hpb=0fc3e68fe98646d2e814b0e7597ffae7f731b586;p=aai%2Fesr-server.git diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtil.java index a9075e3..a2d1e1a 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtil.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtil.java @@ -20,13 +20,13 @@ import java.util.ArrayList; import org.onap.aai.esr.common.SystemType; import org.onap.aai.esr.entity.aai.EsrSystemInfo; import org.onap.aai.esr.entity.aai.EsrSystemInfoList; -import org.onap.aai.esr.entity.aai.EsrThirdpartySdnc; +import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail; import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo; public class ThirdpartySdncManagerUtil { - public EsrThirdpartySdnc sdncRegisterInfo2EsrSdnc(ThirdpartySdncRegisterInfo sdncRegisterInfo) { - EsrThirdpartySdnc esrThirdpartySdnc = new EsrThirdpartySdnc(); + public EsrThirdpartySdncDetail sdncRegisterInfo2EsrSdnc(ThirdpartySdncRegisterInfo sdncRegisterInfo) { + EsrThirdpartySdncDetail esrThirdpartySdnc = new EsrThirdpartySdncDetail(); sdncRegisterInfo.setThirdpartySdncId(ExtsysUtil.generateId()); esrThirdpartySdnc.setThirdpartySdncId(sdncRegisterInfo.getThirdpartySdncId()); esrThirdpartySdnc.setLocation(sdncRegisterInfo.getLocation()); @@ -39,7 +39,8 @@ public class ThirdpartySdncManagerUtil { EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList(); ArrayList esrSystemInfo = new ArrayList(); EsrSystemInfo authInfo = new EsrSystemInfo(); - authInfo.setResouceVersion(sdncRegisterInfo.getVersion()); + authInfo.setEsrSystemInfoId(ExtsysUtil.generateId()); + authInfo.setVersion(sdncRegisterInfo.getVersion()); authInfo.setSystemName(sdncRegisterInfo.getName()); authInfo.setServiceUrl(sdncRegisterInfo.getUrl()); authInfo.setVendor(sdncRegisterInfo.getVendor()); @@ -53,7 +54,7 @@ public class ThirdpartySdncManagerUtil { return esrSystemInfoList; } - public ThirdpartySdncRegisterInfo esrSdnc2SdncRegisterInfo(EsrThirdpartySdnc esrSdnc) { + public ThirdpartySdncRegisterInfo esrSdnc2SdncRegisterInfo(EsrThirdpartySdncDetail esrSdnc) { ThirdpartySdncRegisterInfo registerSdncInfo = new ThirdpartySdncRegisterInfo(); EsrSystemInfo esrSystemInfo = esrSdnc.getEsrSystemInfoList().getEsrSystemInfo().get(0); registerSdncInfo.setThirdpartySdncId(esrSdnc.getThirdpartySdncId());