Fix the nonstandard coding.

Fix the ArrayList usage, Remove the redundancy newly object.

Change-Id: I0311297d4e1387f89196eab978ed58a86f54cddb
Issue-ID: AAI-500
Signed-off-by: Lizi <li.zi30@zte.com.cn>

13 files changed, 26 insertions, 13 deletions

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java
index 89cbd95..ac9de8a 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionDetailTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -89,7 +90,7 @@ public class CloudRegionDetailTest {
   @Test
   public void getterAndSetter4esrSystemInfoList(){
       final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-      ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
+      List<EsrSystemInfo> esrSystemInfo = new ArrayList<>();
       EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
       esrSystemInfoObj.setEsrSystemInfoId("123");
       esrSystemInfo.add(esrSystemInfoObj );
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java
index 4786fc1..4a3a432 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/CloudRegionListTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -26,7 +27,7 @@ public class CloudRegionListTest {
   @Test
   public void getterAndSetter4cloudRegion() {
     CloudRegionList cloudRegionList = new CloudRegionList();
-    ArrayList<CloudRegion> cloudRegions = new ArrayList<CloudRegion>();
+    List<CloudRegion> cloudRegions = new ArrayList<>();
     CloudRegion cloudRegion = new CloudRegion();
     cloudRegion.setCloudOwner("owner");
     cloudRegion.setCloudRegionId("regionId");
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsDetailTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsDetailTest.java
index eb1f619..7cdbde3 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsDetailTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsDetailTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -42,7 +43,7 @@ public class EsrEmsDetailTest {
   @Test
   public void getterAndSetter4esrSystemInfoList(){
     final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-    ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> esrSystemInfo = new ArrayList<>();
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     esrSystemInfoObj.setEsrSystemInfoId("123");
     esrSystemInfo.add(esrSystemInfoObj );
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsListTest.java
index 3da7aaa..333a900 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsListTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrEmsListTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -25,7 +26,7 @@ public class EsrEmsListTest {
   @Test
   public void getterAndSetter4EsrEmsList() {
     EsrEmsList esrEmsList = new EsrEmsList();
-    ArrayList<EsrEms> esrEmses = new ArrayList<EsrEms>();
+    List<EsrEms> esrEmses = new ArrayList<>();
     EsrEms esrEms = new EsrEms();
     esrEms.setEmsId("123");
     esrEmses.add(esrEms);
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrSystemInfoListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrSystemInfoListTest.java
index 98337a0..6beb4b4 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrSystemInfoListTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrSystemInfoListTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -25,7 +26,7 @@ public class EsrSystemInfoListTest {
   @Test
   public void getterAndSetter4cloudRegion() {
     EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-    ArrayList<EsrSystemInfo> esrSystemInfos = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> esrSystemInfos = new ArrayList<>();
     EsrSystemInfo esrSystemInfo = new EsrSystemInfo();
     esrSystemInfo.setEsrSystemInfoId("123");
     esrSystemInfos.add(esrSystemInfo);
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncDetailTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncDetailTest.java
index e83a6f9..7985d55 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncDetailTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncDetailTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -57,7 +58,7 @@ public class EsrThirdpartySdncDetailTest {
   @Test
   public void getterAndSetter4esrSystemInfoList(){
     final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-    ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> esrSystemInfo = new ArrayList<>();
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     esrSystemInfoObj.setEsrSystemInfoId("123");
     esrSystemInfo.add(esrSystemInfoObj );
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncListTest.java
index 2a531b4..fcf5db4 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncListTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdncListTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -25,7 +26,7 @@ public class EsrThirdpartySdncListTest {
   @Test
   public void getterAndSetter4EsrThirdpartySdncList() {
     EsrThirdpartySdncList esrThirdpartySdncList = new EsrThirdpartySdncList();
-    ArrayList<EsrThirdpartySdnc> esrThirdpartySdncs = new ArrayList<EsrThirdpartySdnc>();
+    List<EsrThirdpartySdnc> esrThirdpartySdncs = new ArrayList<>();
     EsrThirdpartySdnc esrThirdpartySdnc = new EsrThirdpartySdnc();
     esrThirdpartySdnc.setThirdpartySdncId("123");
     esrThirdpartySdncs.add(esrThirdpartySdnc);
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmDetailTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmDetailTest.java
index 4dc4f0e..17991aa 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmDetailTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmDetailTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -57,7 +58,7 @@ public class EsrVnfmDetailTest {
   @Test
   public void getterAndSetter4esrSystemInfoList(){
     final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-    ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> esrSystemInfo = new ArrayList<>();
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     esrSystemInfoObj.setEsrSystemInfoId("123");
     esrSystemInfo.add(esrSystemInfoObj );
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmListTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmListTest.java
index f5d5228..943307b 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmListTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/aai/EsrVnfmListTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.aai;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -25,7 +26,7 @@ public class EsrVnfmListTest {
   @Test
   public void getterAndSetter4EsrVnfmList() {
     EsrVnfmList esrVnfmList = new EsrVnfmList();
-    ArrayList<EsrVnfm> esrVnfms = new ArrayList<EsrVnfm>();
+    List<EsrVnfm> esrVnfms = new ArrayList<>();
     EsrVnfm esrVnfm = new EsrVnfm();
     esrVnfm.setVnfmId("fadasf");
     esrVnfms.add(esrVnfm);
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/entity/rest/VimRegisterInfoTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/entity/rest/VimRegisterInfoTest.java
index 04db4a3..4f4c989 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/entity/rest/VimRegisterInfoTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/entity/rest/VimRegisterInfoTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.entity.rest;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 
@@ -96,7 +97,7 @@ public class VimRegisterInfoTest {
   
   @Test
   public void getterAndSetter4vimAuthInfos(){
-      final ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
+      final List<VimAuthInfo> vimAuthInfos = new ArrayList<>();
       VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
       vimRegisterInfo.setVimAuthInfos(vimAuthInfos);
       assertEquals(vimRegisterInfo.getVimAuthInfos(), vimAuthInfos);
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
index 1bd8a62..7e71571 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.util;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 import org.onap.aai.esr.entity.aai.EsrSystemInfo;
@@ -88,7 +89,7 @@ public class ExtsysUtilTest {
   
   @Test
   public void getEsrSystemInfoListFromAuthInfoListTest() {
-    ArrayList<EsrSystemInfo> esrSystemInfos = new ArrayList<EsrSystemInfo>();
+    List<EsrSystemInfo> esrSystemInfos = new ArrayList<>();
     EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
     EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
     ExtsysUtil extsysUtil = new ExtsysUtil();
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java
index 647c952..202368f 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.util;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Test;
 import org.onap.aai.esr.entity.aai.CloudRegionDetail;
@@ -33,7 +34,7 @@ public class VimManagerUtilTest {
     VimManagerUtil vimManagerUtil = new VimManagerUtil();
     CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
     VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
-    ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
+    List<VimAuthInfo> vimAuthInfos = new ArrayList<>();
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     vimAuthInfo.setAuthUrl("http://10.11.22.33:5000/v3");
     vimAuthInfo.setCloudDomain("default");
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
index 00dc1f7..735e169 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
@@ -18,6 +18,7 @@ package org.onap.aai.esr.wrapper;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.ws.rs.core.Response;
 
@@ -88,7 +89,7 @@ public class VnfmManagerWrapperTest {
   public void test_queryVnfmList() {
     ExternalSystemProxy.isTest = true;
     ExtsysUtil extsysUtil = new ExtsysUtil();
-    ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
+    List<VnfmRegisterInfo> vnfmList = new ArrayList<>();
     VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
     vnfmRegisterInfo.setVimId("987654");
     vnfmRegisterInfo.setVersion("v1");