aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src/test
diff options
context:
space:
mode:
authorMunir Ahmad <munir.ahmad@bell.ca>2018-03-02 19:47:30 -0500
committerSeshu Kumar M <seshu.kumar.m@huawei.com>2018-03-06 14:40:52 +0000
commit2c3be92eccd45ebad09d4fea7245f11a3c14f583 (patch)
treeb18a696ea61d917e332b19157ffcd2b66f6e4cb1 /mso-api-handlers/mso-api-handler-infra/src/test
parent9f4a5beffd747c5e816f97d8c04d99ceee4a32f3 (diff)
Replace explicit type with dimond type
Change-Id: I1dedb9ef1ca7b734e3cfc0a3a594d733dbd298d4 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/test')
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java22
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java2
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java2
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java4
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java2
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java2
6 files changed, 17 insertions, 17 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java
index 6a7fc2c723..c4a1c1fffc 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/MsoRequestTest.java
@@ -76,7 +76,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -101,7 +101,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -121,7 +121,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -141,7 +141,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -161,7 +161,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -181,7 +181,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON1, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -210,7 +210,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON2, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -230,7 +230,7 @@ public class MsoRequestTest {
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
@@ -251,7 +251,7 @@ public class MsoRequestTest {
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
@@ -270,7 +270,7 @@ public class MsoRequestTest {
}
mapper = new ObjectMapper();
- instanceIdMap = new HashMap<String,String>();
+ instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
@@ -291,7 +291,7 @@ public class MsoRequestTest {
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
index 89d4d0c98f..c1da76e885 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
@@ -179,7 +179,7 @@ UriInfo uriInfo = null;
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java
index 4305db3e72..1c3c85653b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java
@@ -49,7 +49,7 @@ public class VfModuleModelNamesHandlerTest {
new MockUp<CatalogDatabase>() {
@Mock
public List <VfModule> getAllVfModules(){
- List <VfModule> list = new ArrayList<VfModule>();
+ List <VfModule> list = new ArrayList<>();
VfModule resource = new VfModule();
list.add(resource);
return list;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
index 205bb8d910..9c9ebaee35 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
@@ -177,7 +177,7 @@ public class VnfRequestHandlerTest {
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
@@ -202,7 +202,7 @@ public class VnfRequestHandlerTest {
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java
index 7eabc1ac2a..1800bb4695 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java
@@ -62,7 +62,7 @@ public class VnfTypesHandlerTest {
new MockUp<CatalogDatabase>() {
@Mock
public List <VnfResource> getAllVnfResources(){
- List <VnfResource> list = new ArrayList<VnfResource>();
+ List <VnfResource> list = new ArrayList<>();
VnfResource resource = new VnfResource();
list.add(resource);
return list;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
index fa6b06b4b2..fa5e094336 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
@@ -151,7 +151,7 @@ public class VolumeRequestHandlerTest {
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");