X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FEmsManagerUtil.java;h=404b118caea46f034fd7dd6502657f7d310b904b;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hp=238683d99d10dcf2b2566098ffa9971a575962a3;hpb=349a9fccf2b65af964bac4c3ac65b919998293ef;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
index 238683d..404b118 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
@@ -16,6 +16,7 @@
 package org.onap.aai.esr.util;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.onap.aai.esr.common.SystemType;
 import org.onap.aai.esr.entity.aai.EsrSystemInfo;
@@ -29,21 +30,17 @@ public class EmsManagerUtil {
   
   public EsrEmsDetail emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
     EsrEmsDetail esrEms = new EsrEmsDetail();
-    esrEms.setEmsId(ExtsysUtil.generateId());
-    ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
-    authInfos = getAuthInfosFromRegisterData(emsRegisterInfo);
+    esrEms.setEmsId(extsysUtil.generateId());
+     List<EsrSystemInfo> authInfos = getAuthInfosFromRegisterData(emsRegisterInfo);
     esrEms.setEsrSystemInfoList(extsysUtil.getEsrSystemInfoListFromAuthInfoList(authInfos));
     return esrEms;
   }
 
-  private ArrayList<EsrSystemInfo> getAuthInfosFromRegisterData(EmsRegisterInfo emsRegisterInfo) {
-    ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
-    EsrSystemInfo resouceAuthInfo = new EsrSystemInfo();
-    EsrSystemInfo performanceAuthInfo = new EsrSystemInfo();
-    EsrSystemInfo alarmAuthInfo = new EsrSystemInfo();
-    resouceAuthInfo = getAuthInfoFromFtpAddr(emsRegisterInfo, SystemType.EMS_RESOUCE.toString());
-    performanceAuthInfo = getAuthInfoFromFtpAddr(emsRegisterInfo, SystemType.EMS_PERFORMANCE.toString());
-    alarmAuthInfo = getAuthInfoFromAlarmAddr(emsRegisterInfo);
+  private List<EsrSystemInfo> getAuthInfosFromRegisterData(EmsRegisterInfo emsRegisterInfo) {
+    List<EsrSystemInfo> authInfos = new ArrayList<>();
+    EsrSystemInfo resouceAuthInfo = getAuthInfoFromFtpAddr(emsRegisterInfo, SystemType.EMS_RESOUCE.toString());
+    EsrSystemInfo performanceAuthInfo = getAuthInfoFromFtpAddr(emsRegisterInfo, SystemType.EMS_PERFORMANCE.toString());
+    EsrSystemInfo alarmAuthInfo = getAuthInfoFromAlarmAddr(emsRegisterInfo);
     authInfos.add(resouceAuthInfo);
     authInfos.add(performanceAuthInfo);
     authInfos.add(alarmAuthInfo);
@@ -65,7 +62,7 @@ public class EmsManagerUtil {
     authInfo.setPassword(ftpAddr.getPassword());
     authInfo.setRemotePath(ftpAddr.getRemotepath());
     authInfo.setPassive(ftpAddr.getPassive());
-    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+    authInfo.setEsrSystemInfoId(extsysUtil.generateId());
     authInfo.setSystemType(systemType);
     authInfo.setSystemName(emsRegisterInfo.getName());
     authInfo.setVendor(emsRegisterInfo.getVendor());
@@ -75,9 +72,8 @@ public class EmsManagerUtil {
   
   private EsrSystemInfo getAuthInfoFromAlarmAddr(EmsRegisterInfo emsRegisterInfo) {
     EsrSystemInfo authInfo = new EsrSystemInfo();
-    AlarmAddr alarmAddr = new AlarmAddr();
-    alarmAddr = emsRegisterInfo.getAlarmAddr();
-    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+    AlarmAddr alarmAddr = emsRegisterInfo.getAlarmAddr();
+    authInfo.setEsrSystemInfoId(extsysUtil.generateId());
     authInfo.setIpAddress(alarmAddr.getIp());
     authInfo.setPort(alarmAddr.getPort());
     authInfo.setUserName(alarmAddr.getUser());
@@ -91,9 +87,8 @@ public class EmsManagerUtil {
   
   public EmsRegisterInfo EsrEms2EmsRegisterInfo(EsrEmsDetail esrEms) {
     EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
-    ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
     EsrSystemInfo authInfo = new EsrSystemInfo();
-    esrSystemInfo = esrEms.getEsrSystemInfoList().getEsrSystemInfo();
+    List<EsrSystemInfo> esrSystemInfo = esrEms.getEsrSystemInfoList().getEsrSystemInfo();
     emsRegisterInfo.setEmsId(esrEms.getEmsId());
     
     for(int i=0; i<esrSystemInfo.size(); i++) {