Replace explicit type with dimond everywhere 57/32757/1
authorMunir Ahmad <munir.ahmad@bell.ca>
Sat, 24 Feb 2018 17:20:27 +0000 (12:20 -0500)
committerMunir Ahmad <munir.ahmad@bell.ca>
Sat, 24 Feb 2018 17:20:27 +0000 (12:20 -0500)
Change-Id: I2443c6d0f7dae2bf153da46b77bc95bba1c495c1
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
37 files changed:
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/ObjectFactory.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/AbstractCallbackService.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowMessageResource.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResource.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowResourceApplication.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Body.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/Input.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/RequestHealthDiagnostic.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/ResultInfo.java
bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/sdno/beans/SDNO.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CompleteMsoProcessTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupNameTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ConfirmVolumeGroupTenantTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/CreateAAIVfModuleVolumeGroupTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DecomposeServiceTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/DeleteAAIVfModuleTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteServiceTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericDeleteVnfTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetServiceTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericGetVnfTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/GenericPutVnfTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/HomingTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ManualHandlingTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/PrepareUpdateAAIVfModuleTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/RainyDayHandlerTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/ReceiveWorkflowMessageTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/SDNCAdapterV1Test.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIGenericVnfTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/UpdateAAIVfModuleTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/VnfAdapterRestV1Test.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowAsyncResourceTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowTest.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResource.java
bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/MockResourceApplication.java

index 952e3e2..c22fd28 100644 (file)
@@ -166,7 +166,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "rollbackVnfNotification")
     public JAXBElement<RollbackVnfNotification> createRollbackVnfNotification(RollbackVnfNotification value) {
-        return new JAXBElement<RollbackVnfNotification>(_RollbackVnfNotification_QNAME, RollbackVnfNotification.class, null, value);
+        return new JAXBElement<>(_RollbackVnfNotification_QNAME, RollbackVnfNotification.class, null, value);
     }
 
     /**
@@ -175,7 +175,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "deleteVnfNotification")
     public JAXBElement<DeleteVnfNotification> createDeleteVnfNotification(DeleteVnfNotification value) {
-        return new JAXBElement<DeleteVnfNotification>(_DeleteVnfNotification_QNAME, DeleteVnfNotification.class, null, value);
+        return new JAXBElement<>(_DeleteVnfNotification_QNAME, DeleteVnfNotification.class, null, value);
     }
 
     /**
@@ -184,7 +184,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "createVnfNotification")
     public JAXBElement<CreateVnfNotification> createCreateVnfNotification(CreateVnfNotification value) {
-        return new JAXBElement<CreateVnfNotification>(_CreateVnfNotification_QNAME, CreateVnfNotification.class, null, value);
+        return new JAXBElement<>(_CreateVnfNotification_QNAME, CreateVnfNotification.class, null, value);
     }
 
     /**
@@ -193,7 +193,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "updateVnfNotification")
     public JAXBElement<UpdateVnfNotification> createUpdateVnfNotification(UpdateVnfNotification value) {
-        return new JAXBElement<UpdateVnfNotification>(_UpdateVnfNotification_QNAME, UpdateVnfNotification.class, null, value);
+        return new JAXBElement<>(_UpdateVnfNotification_QNAME, UpdateVnfNotification.class, null, value);
     }
 
     /**
@@ -202,7 +202,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "http://org.openecomp.mso/vnfNotify", name = "queryVnfNotification")
     public JAXBElement<QueryVnfNotification> createQueryVnfNotification(QueryVnfNotification value) {
-        return new JAXBElement<QueryVnfNotification>(_QueryVnfNotification_QNAME, QueryVnfNotification.class, null, value);
+        return new JAXBElement<>(_QueryVnfNotification_QNAME, QueryVnfNotification.class, null, value);
     }
 
 }
index d65311d..daca9fc 100644 (file)
@@ -70,7 +70,7 @@ public abstract class AbstractCallbackService extends ProcessEngineAwareService
                        + (message == null ? "" : System.lineSeparator()) + message);\r
 \r
                try {\r
-                       Map<String, Object> variables = new HashMap<String, Object>();\r
+                       Map<String, Object> variables = new HashMap<>();\r
 \r
                        if (injectedVariables != null) {\r
                                variables.putAll(injectedVariables);\r
@@ -192,7 +192,7 @@ public abstract class AbstractCallbackService extends ProcessEngineAwareService
 \r
                int count = waitingProcesses.size();\r
 \r
-               List<ExecInfo> execInfoList = new ArrayList<ExecInfo>(count);\r
+               List<ExecInfo> execInfoList = new ArrayList<>(count);\r
                for (Execution execution : waitingProcesses) {\r
                        execInfoList.add(new ExecInfo(execution));\r
                }\r
@@ -364,4 +364,4 @@ public abstract class AbstractCallbackService extends ProcessEngineAwareService
                                + ":" + execution.getId() + "]";\r
                }\r
        }\r
-}
+}\r
index d9aed81..4ba3590 100644 (file)
@@ -90,7 +90,7 @@ public class WorkflowMessageResource extends AbstractCallbackService {
                String correlationValue = correlator;\r
                String contentTypeVariable = messageType + "_CONTENT_TYPE";\r
 \r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
 \r
                if (contentType != null) {\r
                        variables.put(contentTypeVariable, contentType);\r
index 76ff221..dd100a3 100644 (file)
@@ -450,7 +450,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                                        Object responseCodeObject = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");\r
                                        String responseCode = responseCodeObject == null ? null : String.valueOf(responseCodeObject);\r
                                        msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);\r
-                                       responseMap = new HashMap<String, Object>();\r
+                                       responseMap = new HashMap<>();\r
                                        responseMap.put("WorkflowResponse", workflowResponse);\r
                                        responseMap.put("ResponseCode", responseCode);\r
                                        responseMap.put("Status", "Success");\r
@@ -467,7 +467,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                                        if(workflowExceptionObject instanceof WorkflowException) {\r
                                                workflowException = (WorkflowException) workflowExceptionObject;\r
                                                workflowExceptionText = workflowException.toString();\r
-                                               responseMap = new HashMap<String, Object>();\r
+                                               responseMap = new HashMap<>();\r
                                                responseMap.put("WorkflowException", workflowExceptionText);\r
                                                responseMap.put("ResponseCode", workflowException.getErrorCode());\r
                                                responseMap.put("Status", "Fail");\r
@@ -477,7 +477,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                                                Object object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");\r
                                                String responseCode = object == null ? null : String.valueOf(object);\r
                                                workflowExceptionText = (String) workflowExceptionObject;\r
-                                               responseMap = new HashMap<String, Object>();\r
+                                               responseMap = new HashMap<>();\r
                                                responseMap.put("WorkflowException", workflowExceptionText);\r
                                                responseMap.put("ResponseCode", responseCode);\r
                                                responseMap.put("Status", "Fail");\r
@@ -496,7 +496,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                                        object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");\r
                                        String responseCode = object == null ? null : String.valueOf(object);\r
                                        msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);\r
-                                       responseMap = new HashMap<String, Object>();\r
+                                       responseMap = new HashMap<>();\r
                                        responseMap.put("Response", response);\r
                                        responseMap.put("ResponseCode", responseCode);\r
                                        responseMap.put("Status", "Success");\r
@@ -511,7 +511,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                                        object = getVariableFromHistory(historyService, processInstanceId, prefix + "ResponseCode");\r
                                        String responseCode = object == null ? null : String.valueOf(object);\r
                                        msoLogger.debug(LOGMARKER + prefix + "ResponseCode: " + responseCode);\r
-                                       responseMap = new HashMap<String, Object>();\r
+                                       responseMap = new HashMap<>();\r
                                        responseMap.put("Response", errorResponse);\r
                                        responseMap.put("ResponseCode", responseCode);\r
                                        responseMap.put("Status", "Fail");\r
@@ -569,7 +569,7 @@ public class WorkflowResource extends ProcessEngineAwareService {
                try {\r
                        ProcessEngineServices engine = getProcessEngineServices();\r
                        List<HistoricVariableInstance> variables = engine.getHistoryService().createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).list();\r
-                       Map<String,String> variablesMap = new HashMap<String,String>();\r
+                       Map<String,String> variablesMap = new HashMap<>();\r
                        for (HistoricVariableInstance variableInstance: variables) {\r
                                variablesMap.put(variableInstance.getName(), variableInstance.getValue().toString());\r
                        }\r
index 193b8fe..64e5adc 100644 (file)
@@ -28,8 +28,8 @@ import javax.ws.rs.core.Application;
 \r
 @ApplicationPath("/")\r
 public class WorkflowResourceApplication extends Application {\r
-    private Set<Object> singletons = new HashSet<Object>();\r
-    private Set<Class<?>> classes = new HashSet<Class<?>>();\r
+    private Set<Object> singletons = new HashSet<>();\r
+    private Set<Class<?>> classes = new HashSet<>();\r
 \r
     public WorkflowResourceApplication() {\r
     }\r
index cc8ce81..26c74b0 100644 (file)
@@ -41,7 +41,7 @@ public class Body implements Serializable
     @JsonProperty("input")
     private Input input;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 9101706044452851559L;
 
     @JsonProperty("input")
index 7b9bf6f..579f481 100644 (file)
@@ -43,7 +43,7 @@ public class Input implements Serializable
     private RequestHealthDiagnostic RequestHealthDiagnostic;
     
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 7155546785389227528L;
 
     @JsonProperty("request-healthdiagnostic")
index 104dbb7..2cddd03 100644 (file)
@@ -59,7 +59,7 @@ public class RequestHealthDiagnostic implements Serializable
     @JsonProperty("health-diagnostic-code")
     private String healthDiagnosticCode;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = 1166788526178388021L;
 
     @JsonProperty("request-client-name")
index 4d029cb..976f5b9 100644 (file)
@@ -51,7 +51,7 @@ private String requestId;
 @JsonProperty("status")
 private String status;
 @JsonIgnore
-private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+private Map<String, Object> additionalProperties = new HashMap<>();
 
 @JsonProperty("client-name")
 public String getClientName() {
index 4edd54c..8505ec9 100644 (file)
@@ -50,7 +50,7 @@ public class SDNO implements Serializable
     @JsonProperty("body")
     private Body body;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
     private final static long serialVersionUID = -5303297382564282650L;
 
     @JsonProperty("operation")
index eef9ed8..9fcde31 100644 (file)
@@ -121,7 +121,7 @@ public class BPMNUtil {
 \r
        \r
        private static void buildVariable(String key, String value, Map<String,Object> variableValueType) {\r
-               Map<String, Object> host = new HashMap<String, Object>();\r
+               Map<String, Object> host = new HashMap<>();\r
                host.put("value", value);\r
                host.put("type", "String");\r
                variableValueType.put(key, host);\r
@@ -131,7 +131,7 @@ public class BPMNUtil {
                WorkflowResource workflowResource = new WorkflowResource();\r
                VariableMapImpl variableMap = new VariableMapImpl();\r
 \r
-               Map<String, Object> variableValueType = new HashMap<String, Object>();\r
+               Map<String, Object> variableValueType = new HashMap<>();\r
                for (String key : variables.keySet()) {\r
                        buildVariable(key, variables.get(key), variableValueType);\r
                }\r
@@ -203,7 +203,7 @@ public class BPMNUtil {
                WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();\r
                VariableMapImpl variableMap = new VariableMapImpl();\r
 \r
-               Map<String, Object> variableValueType = new HashMap<String, Object>();\r
+               Map<String, Object> variableValueType = new HashMap<>();\r
                for (String key : variables.keySet()) {\r
                        buildVariable(key, variables.get(key), variableValueType);\r
                }\r
index b050a81..9d4dac2 100644 (file)
@@ -42,7 +42,7 @@ public class CompleteMsoProcessTest extends WorkflowTest {
                mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
                \r
                //String changeFeatureActivateRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/ChangeFeatureActivateV1/" + inputRequestFile);\r
-               Map<String, String> variables = new HashMap<String, String>();          \r
+               Map<String, String> variables = new HashMap<>();\r
                variables.put("CompleteMsoProcessRequest",inputRequestFile);\r
                \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CompleteMsoProcess", variables);\r
index 1925c0a..845f060 100644 (file)
@@ -51,7 +51,7 @@ public class ConfirmVolumeGroupNameTest extends WorkflowTest {
                System.out.println("Before starting process");
                
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          
-               Map<String, Object> variables = new HashMap<String, Object>();          
+               Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_1");
                variables.put("ConfirmVolumeGroupName_volumeGroupName", "VOLUME_GROUP_ID_1_NAME");
@@ -83,7 +83,7 @@ public class ConfirmVolumeGroupNameTest extends WorkflowTest {
                System.out.println("Before starting process");
                
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          
-               Map<String, Object> variables = new HashMap<String, Object>();          
+               Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_THAT_DOES_NOT_EXIST");
                variables.put("ConfirmVolumeGroupName_volumeGroupName", "cee6d136-e378-4678-a024-2cd15f0ee0cg");
@@ -116,7 +116,7 @@ public class ConfirmVolumeGroupNameTest extends WorkflowTest {
                System.out.println("Before starting process");
                
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          
-               Map<String, Object> variables = new HashMap<String, Object>();          
+               Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                variables.put("ConfirmVolumeGroupName_volumeGroupId", "VOLUME_GROUP_ID_1");
                variables.put("ConfirmVolumeGroupName_volumeGroupName", "BAD_VOLUME_GROUP_NAME");
index 3856f7b..457128f 100644 (file)
@@ -46,7 +46,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest {
        public void testRemoveLayer3Service_success() throws Exception{
                MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
@@ -66,7 +66,7 @@ public class ConfirmVolumeGroupTenantTest extends WorkflowTest {
        public void testRemoveLayer3Service_idsNotMatch() throws Exception{
                MockGetVolumeGroupById("MDTWNJ21", "a8399879-31b3-4973-be26-0a0cbe776b58", "CRTGVNF_queryAAIResponseVolume_idsNotMatch.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "ConfirmVolumeGroupTenant", variables);
index 045bd6f..b2b7760 100644 (file)
@@ -51,7 +51,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfName", "STMTN5MMSC22");\r
@@ -78,7 +78,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfId", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
@@ -103,7 +103,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfName", "STMTN5MMSC23");\r
@@ -128,7 +128,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfName", "STMTN5MMSC21");\r
@@ -153,7 +153,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfId", "2f6aee38-1e2a-11e6-82d1-ffc7d9ee8aa4");\r
@@ -178,7 +178,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfName", "STMTN5MMSC22");\r
@@ -203,7 +203,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfId", "768073c7-f41f-4822-9323-b75962763d74");\r
@@ -228,7 +228,7 @@ public class CreateAAIVfModuleTest extends WorkflowTest {
                MockAAICreateGenericVnf();\r
                MockAAIVfModulePUT(true);\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");              \r
                variables.put("isVidRequest", "false");\r
                variables.put("vnfId", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
index 5845ec1..5cc2645 100644 (file)
@@ -55,7 +55,7 @@ public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {
                MockPutVfModuleIdNoResponse("skask", "PCRF", "lukewarm");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);\r
@@ -86,7 +86,7 @@ public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {
                MockGetVfModuleId("skask", ".*", "VfModularity/VfModule-supercool.xml", 404);\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);\r
@@ -117,7 +117,7 @@ public class CreateAAIVfModuleVolumeGroupTest extends WorkflowTest {
                MockGetVfModuleId("skask", "lukewarm", "VfModularity/VfModule-lukewarm.xml", 200);\r
 \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("CreateAAIVfModuleVolumeGroupRequest", updateAAIVfModuleRequest);\r
index bda6dd9..7295cd8 100644 (file)
@@ -49,7 +49,7 @@ public class DecomposeServiceTest extends WorkflowTest {
 
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
                invokeSubProcess("DecomposeService", businessKey, variables);
 
@@ -66,7 +66,7 @@ public class DecomposeServiceTest extends WorkflowTest {
 
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariablesSuccess(variables, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
                invokeSubProcess("DecomposeService", businessKey, variables);
 
index bb2fc03..564927a 100644 (file)
@@ -52,7 +52,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest","<vnf-request xmlns=\"http://openecomp.org/mso/infra/vnf-request/v1\"> <request-info> <action>DELETE_VF_MODULE</action> <source>PORTAL</source> </request-info> <vnf-inputs> <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnf-id> <vnf-name>STMTN5MMSC21</vnf-name> <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a73</vf-module-id> <vf-module-name>STMTN5MMSC21-MMSC::module-0-0</vf-module-name> </vnf-inputs> <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/> </vnf-request>");\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -88,7 +88,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -123,7 +123,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -158,7 +158,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -193,7 +193,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -228,7 +228,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -263,7 +263,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest",request);\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
@@ -284,7 +284,7 @@ public class DeleteAAIVfModuleTest extends WorkflowTest {
                MockAAIDeleteGenericVnf();\r
                MockAAIDeleteVfModule();\r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("DeleteAAIVfModuleRequest","<vnf-request xmlns=\"http://openecomp.org/mso/infra/vnf-request/v1\"> <request-info> <action>DELETE_VF_MODULE</action> <source>PORTAL</source> </request-info> <vnf-inputs> <vnf-id>a27ce5a9-29c4-4c22-a017-6615ac73c720</vnf-id> <vnf-name>STMTN5MMSC20</vnf-name> <vf-module-id>973ed047-d251-4fb9-bf1a-65b8949e0a76</vf-module-id> <vf-module-name>STMTN5MMSC20-MMSC::module-2-0</vf-module-name> </vnf-inputs> <vnf-params xmlns:tns=\"http://openecomp.org/mso/infra/vnf-request/v1\"/> </vnf-request>");\r
                runtimeService.startProcessInstanceByKey("DeleteAAIVfModule", variables);\r
index 8281687..257cec9 100644 (file)
@@ -58,7 +58,7 @@ public class FalloutHandlerTest extends WorkflowTest {
                System.out.println("STARTED TEST: " + method);\r
         \r
                //String changeFeatureActivateRequest = FileUtil.readResourceFile("__files/SDN-ETHERNET-INTERNET/ChangeFeatureActivateV1/" + inputRequestFile);\r
-               Map<String, String> variables = new HashMap<String, String>();          \r
+               Map<String, String> variables = new HashMap<>();\r
                variables.put("FalloutHandlerRequest",inputRequestFile);\r
                \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "FalloutHandler", variables);\r
index cced8c1..125a9ad 100644 (file)
@@ -51,7 +51,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
        public void testGenericDeleteService_success_serviceInstance() throws Exception{
                MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
                waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
@@ -70,7 +70,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 
                MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 204);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -94,7 +94,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
                MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceSubscription.xml");
                MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -118,7 +118,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
                MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");
                MockDeleteServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 204);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesSubscription(variables, null, "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -142,7 +142,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 
                MockGetServiceInstance_404("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -164,7 +164,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
        public void testGenericDeleteService_success_subscriptionGetEmpty200() throws Exception{
                MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234", 200);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesSubscription(variables, "", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -189,7 +189,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
                MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "GENDSI_getServiceInstanceResponse.xml");
                MockDeleteServiceInstance_404("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "1234");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "1234");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -210,7 +210,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericDeleteService.bpmn"})
        public void testGenericDeleteService_error_invalidVariables() throws Exception{
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "1234");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
@@ -236,7 +236,7 @@ public class GenericDeleteServiceTest extends WorkflowTest {
 
                MockGetServiceInstance_500("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", "aaiFault.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", null);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteService", variables);
index 473f6c8..add9a32 100644 (file)
@@ -51,7 +51,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_success_genericVnf() throws Exception{
                MockDeleteGenericVnf("testVnfId123", "testReVer123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -66,7 +66,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_success_vce() throws Exception{
                MockDeleteVce("testVnfId123", "testReVer123", 204);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -83,7 +83,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
                MockGetGenericVnfById("/testVnfId123", "GenericFlows/getGenericVnfByNameResponse.xml", 200);
                MockDeleteGenericVnf("testVnfId123", "testReVer123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -99,7 +99,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
                MockDeleteVce("testVnfId123", "testReVer123", 204);
                MockGetVceById("testVnfId123", "GenericFlows/getVceResponse.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "vce", null);
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -114,7 +114,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_success_genericVnf404() throws Exception{
                MockDeleteGenericVnf("testVnfId123", "testReVer123", 404);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -129,7 +129,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_success_vce404() throws Exception{
                MockDeleteVce("testVnfId123", "testReVer123", 404);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "vce", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -144,7 +144,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_success_genericVnfNoResourceVersion404() throws Exception{
                MockGetGenericVnfById_404("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -158,7 +158,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericDeleteVnf.bpmn"})
        public void testGenericDeleteVnf_error_missingVariables() throws Exception{
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -173,7 +173,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_error_genericVnf500() throws Exception{
 
                MockDeleteGenericVnf_500("testVnfId123", "testReVer123");
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
@@ -188,7 +188,7 @@ public class GenericDeleteVnfTest extends WorkflowTest {
        public void testGenericDeleteVnf_error_genericVnf412() throws Exception{
                MockDeleteGenericVnf("testVnfId123", "testReVer123", 412);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "generic-vnf", "testReVer123");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericDeleteVnf", variables);
index 82cceb0..0198395 100644 (file)
@@ -56,7 +56,7 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_success_serviceInstance() throws Exception{\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
                waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());\r
@@ -81,7 +81,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", "GenericFlows/getServiceSubscription.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", null , "1604-MVM-26", "SDN-ETHERNET-INTERNET");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -109,7 +109,7 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByName.xml");\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -139,7 +139,7 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceById("MIS%2F1604%2F0026%2FSW_INTERNET", "GenericFlows/getSIUrlById.xml");\r
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -168,7 +168,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance_404("SDN-ETHERNET-INTERNET", "123456789", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -192,7 +192,7 @@ public class GenericGetServiceTest extends WorkflowTest {
        public void testGenericGetService_success_serviceSubscription404() throws Exception{\r
                MockGetServiceSubscription("1604-MVM-26", "SDN-ETHERNET-INTERNET", 404);\r
                \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", "1604-MVM-26");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -219,7 +219,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceByName_404("1604-MVM-26");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "", "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -246,7 +246,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -273,7 +273,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance("1604-MVM-26", "SDN-ETHERNET-INTERNET", "MIS%252F1604%252F0026%252FSW_INTERNET", " ");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -297,7 +297,7 @@ public class GenericGetServiceTest extends WorkflowTest {
        public void testGenericGetService_success_serviceInstanceByNameEmpty() throws Exception{\r
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "");\r
                \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "", "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -324,7 +324,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById("MIS[%]2F1604[%]2F0026[%]2FSW_INTERNET", "");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -350,7 +350,7 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_error_serviceInstanceInvalidVariables() throws Exception{\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, null, "SDN-ETHERNET-INTERNET", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -375,7 +375,7 @@ public class GenericGetServiceTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericGetService.bpmn"})\r
        public void testGenericGetService_success_serviceSubscriptionInvalidVariables() throws Exception{\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesSubscription(variables, "", "", "SDN-ETHERNET-INTERNET", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -403,7 +403,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockGetServiceInstance_500("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", "1604-MVM-26", "SDN-ETHERNET-INTERNET", "123456789");\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -430,7 +430,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceById_500("MIS%2F1604%2F0026%2FSW_INTERNET");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, "MIS%2F1604%2F0026%2FSW_INTERNET", null, null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -459,7 +459,7 @@ public class GenericGetServiceTest extends WorkflowTest {
 \r
                MockNodeQueryServiceInstanceByName_500("1604-MVM-26");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", null, null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -489,7 +489,7 @@ public class GenericGetServiceTest extends WorkflowTest {
         MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");\r
         MockGetServiceInstance("XyCorporation", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-        Map<String, String> variables = new HashMap<String, String>();\r
+        Map<String, String> variables = new HashMap<>();\r
         setVariablesInstance(variables, null, "1604-MVM-26", "XyCorporation", null);\r
 \r
         WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
@@ -517,7 +517,7 @@ public class GenericGetServiceTest extends WorkflowTest {
                MockNodeQueryServiceInstanceByName("1604-MVM-26", "GenericFlows/getSIUrlByNameMultiCustomer.xml");\r
                MockGetServiceInstance("CorporationNotPresent", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                setVariablesInstance(variables, null, "1604-MVM-26", "CorporationNotPresent", null);\r
 \r
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetService", variables);\r
index 126a5fd..4922263 100644 (file)
@@ -52,7 +52,7 @@ public class GenericGetVnfTest extends WorkflowTest {
        public void testGenericGetVnf_success_genericVnf() throws Exception{
                MockGetGenericVnfByIdWithDepth("testVnfId123", 1, "GenericFlows/getGenericVnfByNameResponse.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
@@ -79,7 +79,7 @@ public class GenericGetVnfTest extends WorkflowTest {
        public void testGenericGetVnf_success_vce() throws Exception{
                MockGetVceById("testVnfId123[?]depth=1", "GenericFlows/getVceResponse.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "testVnfName123", "vce");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
@@ -106,7 +106,7 @@ public class GenericGetVnfTest extends WorkflowTest {
        public void testGenericGetVnf_success_genericVnfByName() throws Exception{
                MockGetGenericVnfByNameWithDepth("testVnfName123", 1, "GenericFlows/getGenericVnfResponse.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "", "testVnfName123", "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
@@ -133,7 +133,7 @@ public class GenericGetVnfTest extends WorkflowTest {
        public void testGenericGetVnf_success_vceByName() throws Exception{
                MockGetGenericVceByNameWithDepth("testVnfName123", 1, "GenericFlows/getVceByNameResponse.xml");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, null, "testVnfName123", "vce");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
@@ -162,7 +162,7 @@ public class GenericGetVnfTest extends WorkflowTest {
 
                MockGetGenericVnfById_500("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", "testVnfName123", "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericGetVnf", variables);
index 149f8ae..0e0a237 100644 (file)
@@ -51,7 +51,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 
                MockPutGenericVnf("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
@@ -71,7 +71,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 
                MockPutVce("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", vcePayload, "vce");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
@@ -91,7 +91,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 
                MockPutGenericVnf("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", genericVnfPayload, "");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
@@ -113,7 +113,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 
                MockPutGenericVnf("testVnfId123");
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", genericVnfPayload, "");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
@@ -133,7 +133,7 @@ public class GenericPutVnfTest extends WorkflowTest {
        @Deployment(resources = {"subprocess/GenericPutVnf.bpmn"})
        public void testGenericPutVnf_error_404() throws Exception{
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
@@ -154,7 +154,7 @@ public class GenericPutVnfTest extends WorkflowTest {
 
                MockPutGenericVnf("/testVnfId123", 400);
 
-               Map<String, String> variables = new HashMap<String, String>();
+               Map<String, String> variables = new HashMap<>();
                setVariables(variables, "testVnfId123", genericVnfPayload, "generic-vnf");
 
                WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "GenericPutVnf", variables);
index e49ef00..4296c74 100644 (file)
@@ -140,7 +140,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -183,7 +183,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables2(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -237,7 +237,7 @@ public class HomingTest extends WorkflowTest {
 //System.out.println("At start of testHoming_success_vnfResourceList");
                MockGetServiceResourcesCatalogData("1cc4e2e4-eb6e-404d-a66f-c8733cedcce8", "5.0", "/BuildingBlocks/catalogResp.json");
                String busKey = UUID.randomUUID().toString();
-               Map<String, Object> vars = new HashMap<String, Object>();
+               Map<String, Object> vars = new HashMap<>();
                setVariablesForServiceDecomposition(vars, "testRequestId123", "ff5256d2-5a33-55df-13ab-12abad84e7ff");
                invokeSubProcess("DecomposeService", busKey, vars);
                
@@ -252,7 +252,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled", "true");
                variables.put("msoRequestId", "testRequestId");
                variables.put("serviceInstanceId", "testServiceInstanceId");
@@ -288,7 +288,7 @@ public class HomingTest extends WorkflowTest {
        public void testHoming_error_inputVariable() throws Exception {
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables3(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -307,7 +307,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO_500();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -326,7 +326,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -347,7 +347,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
@@ -368,7 +368,7 @@ public class HomingTest extends WorkflowTest {
                mockSNIRO();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                setVariables(variables);
 
                invokeSubProcess("Homing", businessKey, variables);
index 6141ee0..a7c2d19 100644 (file)
@@ -67,7 +67,7 @@ public class ManualHandlingTest extends WorkflowTest {
        public void  TestManualHandlingSuccess() {
 
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          
-               Map<String, Object> variables = new HashMap<String, Object>();          
+               Map<String, Object> variables = new HashMap<>();
                variables.put("isDebugLogEnabled","true");
                variables.put("msoRequestId", "testRequestId");
                variables.put("serviceType", "X");
@@ -103,7 +103,7 @@ public class ManualHandlingTest extends WorkflowTest {
                        System.out.println("TASK NAME: " + task.getName());
                        try {
                                System.out.println("Completing the task");
-                               Map<String,Object> completeVariables = new HashMap<String,Object>();
+                               Map<String,Object> completeVariables = new HashMap<>();
                                completeVariables.put("responseValue", "skip");
                                taskService.complete(task.getId(), completeVariables);                  
                        }
index 441cefd..be74770 100644 (file)
@@ -60,7 +60,7 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
                MockPatchVfModuleId("skask", "supercool");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);\r
@@ -94,7 +94,7 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
                MockGetGenericVnfById_404("skask[?]depth=1");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);\r
@@ -129,7 +129,7 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
                MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);\r
@@ -159,7 +159,7 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
                MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");              \r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);\r
@@ -190,7 +190,7 @@ public class PrepareUpdateAAIVfModuleTest extends WorkflowTest {
                MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("PrepareUpdateAAIVfModuleRequest", prepareUpdateAAIVfModuleRequest);\r
index 8a78f32..65575ba 100644 (file)
@@ -57,7 +57,7 @@ public class RainyDayHandlerTest extends WorkflowTest {
        public void  TestRainyDayHandlingSuccess() {\r
 \r
                RuntimeService runtimeService = processEngineRule.getRuntimeService();                          \r
-               Map<String, Object> variables = new HashMap<String, Object>();          \r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("msoRequestId", "testRequestId");\r
                variables.put("serviceType", "X");\r
index 4669192..a806515 100644 (file)
@@ -85,7 +85,7 @@ public class ReceiveWorkflowMessageTest extends WorkflowTest {
                logStart();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", "dffbae0e-5588-4bd6-9749-b0f0adb52312");
                variables.put("isDebugLogEnabled", "true");
                variables.put("RCVWFMSG_timeout", "PT1M");
@@ -115,7 +115,7 @@ public class ReceiveWorkflowMessageTest extends WorkflowTest {
                logStart();
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", "dffbae0e-5588-4bd6-9749-b0f0adb52312");
                variables.put("isDebugLogEnabled", "true");
                variables.put("RCVWFMSG_timeout", "PT0.1S");
index 778eec1..0349b17 100644 (file)
@@ -75,12 +75,12 @@ public class SDNCAdapterV1Test extends WorkflowTest {
 \r
        private WorkflowResponse invokeFlow(String workflowRequest) {\r
 \r
-               Map<String, Object>valueMap = new HashMap<String, Object>();\r
+               Map<String, Object>valueMap = new HashMap<>();\r
                valueMap.put("value", workflowRequest);\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("sdncAdapterWorkflowRequest", valueMap);\r
 \r
-               Map<String, Object> valueMap2 = new HashMap<String, Object>();\r
+               Map<String, Object> valueMap2 = new HashMap<>();\r
                valueMap2.put("value", "true");\r
                variables.put("isDebugLogEnabled", valueMap2);\r
 \r
index 20f6f6d..7c557ff 100644 (file)
@@ -59,7 +59,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
                MockPatchGenericVnf("skask");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);\r
@@ -92,7 +92,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
                MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);\r
@@ -122,7 +122,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
                MockGetGenericVnfById_404("skask[?]depth=1");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);\r
@@ -156,7 +156,7 @@ public class UpdateAAIGenericVnfTest extends WorkflowTest {
                MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask", 404);\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIGenericVnfRequest", updateAAIGenericVnfRequest);\r
index 0e523cb..30d7e6d 100644 (file)
@@ -58,7 +58,7 @@ public class UpdateAAIVfModuleTest extends WorkflowTest {
                MockPatchVfModuleId("skask", "supercool");\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);\r
@@ -89,7 +89,7 @@ public class UpdateAAIVfModuleTest extends WorkflowTest {
                MockGetGenericVnfById("/skask/vf-modules/vf-module/.*", "VfModularity/VfModule-supercool.xml", 404);\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);\r
@@ -122,7 +122,7 @@ public class UpdateAAIVfModuleTest extends WorkflowTest {
                MockAAIVfModuleBadPatch("/aai/v[0-9]+/network/generic-vnfs/generic-vnf/skask/vf-modules/vf-module/supercool", 404);\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
                variables.put("mso-request-id", "999-99-9999");\r
                variables.put("isDebugLogEnabled","true");\r
                variables.put("UpdateAAIVfModuleRequest", updateAAIVfModuleRequest);\r
index 707fe46..fb029fa 100644 (file)
@@ -241,7 +241,7 @@ public class VnfAdapterRestV1Test extends WorkflowTest {
                String request = CREATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", requestId);
                variables.put("isDebugLogEnabled", "true");
                variables.put("vnfAdapterRestV1Request", request);
@@ -272,7 +272,7 @@ public class VnfAdapterRestV1Test extends WorkflowTest {
                String request = UPDATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", requestId);
                variables.put("isDebugLogEnabled", "true");
                variables.put("vnfAdapterRestV1Request", request);
@@ -303,7 +303,7 @@ public class VnfAdapterRestV1Test extends WorkflowTest {
                String request = DELETE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", requestId);
                variables.put("isDebugLogEnabled", "true");
                variables.put("vnfAdapterRestV1Request", request);
@@ -334,7 +334,7 @@ public class VnfAdapterRestV1Test extends WorkflowTest {
                String request = ROLLBACK_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", requestId);
                variables.put("isDebugLogEnabled", "true");
                variables.put("vnfAdapterRestV1Request", request);
@@ -365,7 +365,7 @@ public class VnfAdapterRestV1Test extends WorkflowTest {
                String request = CREATE_VF_MODULE_REQUEST.replace("{{MESSAGE-ID}}", messageId);
 
                String businessKey = UUID.randomUUID().toString();
-               Map<String, Object> variables = new HashMap<String, Object>();
+               Map<String, Object> variables = new HashMap<>();
                variables.put("mso-request-id", requestId);
                variables.put("isDebugLogEnabled", "true");
                variables.put("vnfAdapterRestV1Request", request);
index 426bcee..5f91298 100644 (file)
@@ -42,7 +42,7 @@ public class WorkflowAsyncResourceTest extends WorkflowTest {
                //it can be any request which asynchronously processed by the workflow
                String request = "<aetgt:CreateTenantRequest xmlns:aetgt=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:sdncadapterworkflow=\"http://org.openecomp/mso/workflow/schema/v1\" xmlns:ns5=\"http://org.openecomp/mso/request/types/v1\">  <msoservtypes:service-information xmlns:msoservtypes=\"http://org.openecomp/mso/request/types/v1\">    <msoservtypes:service-type>SDN-ETHERNET-INTERNET</msoservtypes:service-type>    <msoservtypes:service-instance-id>HI/VLXM/950604//SW_INTERNET</msoservtypes:service-instance-id>    <msoservtypes:subscriber-name>SubName01</msoservtypes:subscriber-name> </msoservtypes:service-information> </aetgt:CreateTenantRequest>";
 
-               Map<String,String> variables = new HashMap<String,String>();
+               Map<String,String> variables = new HashMap<>();
                variables.put("testAsyncRequestMsg", request);
                variables.put("mso-request-id", UUID.randomUUID().toString());
                variables.put("mso-service-request-timeout", "5");
@@ -56,17 +56,17 @@ public class WorkflowAsyncResourceTest extends WorkflowTest {
                WorkflowAsyncResource workflowResource = new WorkflowAsyncResource();
                VariableMapImpl variableMap = new VariableMapImpl();
 
-               Map<String, Object> variableValueType = new HashMap<String, Object>();
+               Map<String, Object> variableValueType = new HashMap<>();
 
-               Map<String, Object> requestMsg = new HashMap<String, Object>();
+               Map<String, Object> requestMsg = new HashMap<>();
                requestMsg.put("value", request);
                requestMsg.put("type", "String");
 
-               Map<String, Object> msorequestId = new HashMap<String, Object>();
+               Map<String, Object> msorequestId = new HashMap<>();
                msorequestId.put("type", "String");
                msorequestId.put("value",requestId);
 
-               Map<String, Object> timeout = new HashMap<String, Object>();
+               Map<String, Object> timeout = new HashMap<>();
                timeout.put("type", "String");
                timeout.put("value","5"); 
 
index 54c48bd..b71f708 100644 (file)
@@ -327,7 +327,7 @@ public class WorkflowTest {
                        String businessKey, String request, Map<String, Object> injectedVariables,\r
                        boolean serviceInstantiationModel) {\r
 \r
-               Map<String, Object> variables = new HashMap<String, Object>();\r
+               Map<String, Object> variables = new HashMap<>();\r
 \r
                // These variables may be overridded by injected variables.\r
                variables.put("mso-service-request-timeout", "180");\r
@@ -422,7 +422,7 @@ public class WorkflowTest {
         * @return a VariableMap\r
         */\r
        private VariableMapImpl createVariableMapImpl(Map<String, Object> variables) {\r
-               Map<String, Object> wrappedVariables = new HashMap<String, Object>();\r
+               Map<String, Object> wrappedVariables = new HashMap<>();\r
 \r
                for (String key : variables.keySet()) {\r
                        Object value = variables.get(key);\r
@@ -441,7 +441,7 @@ public class WorkflowTest {
         * @return the wrapped variable\r
         */\r
        private Map<String, Object> wrapVariableValue(Object value) {\r
-               HashMap<String, Object> valueMap = new HashMap<String, Object>();\r
+               HashMap<String, Object> valueMap = new HashMap<>();\r
                valueMap.put("value", value);\r
                return valueMap;\r
        }\r
@@ -1776,7 +1776,7 @@ public class WorkflowTest {
         * An object that contains callback data for a "program".\r
         */\r
        public class CallbackSet {\r
-               private final Map<String, CallbackData> map = new HashMap<String, CallbackData>();\r
+               private final Map<String, CallbackData> map = new HashMap<>();\r
 \r
                /**\r
                 * Add untyped callback data to the set.\r
@@ -1975,8 +1975,8 @@ public class WorkflowTest {
         * A NamespaceContext class based on a Map.\r
         */\r
        private class SimpleNamespaceContext implements NamespaceContext {\r
-               private Map<String, String> prefixMap = new HashMap<String, String>();\r
-               private Map<String, String> uriMap = new HashMap<String, String>();\r
+               private Map<String, String> prefixMap = new HashMap<>();\r
+               private Map<String, String> uriMap = new HashMap<>();\r
 \r
                public synchronized void add(String prefix, String uri) {\r
                        prefixMap.put(prefix, uri);\r
@@ -1990,7 +1990,7 @@ public class WorkflowTest {
 \r
                @Override\r
                public Iterator<String> getPrefixes(String uri) {\r
-                       List<String> list = new ArrayList<String>();\r
+                       List<String> list = new ArrayList<>();\r
                        String prefix = uriMap.get(uri);\r
                        if (prefix != null) {\r
                                list.add(prefix);\r
index fc97e69..74f50ba 100644 (file)
@@ -45,7 +45,7 @@ public class MockResource {
        private boolean started = false;
        private final Integer defaultPort = 28090;
        private WireMockServer wireMockServer = null;
-       private static Map<String,String> mockProperties = new HashMap<String,String>();
+       private static Map<String,String> mockProperties = new HashMap<>();
 
        public static String getMockProperties(String key) {
                return mockProperties.get(key);
index ebbfea5..ba48bff 100644 (file)
@@ -31,8 +31,8 @@ import javax.ws.rs.core.Application;
 @ApplicationPath("/console")
 public class MockResourceApplication extends Application {
 
-       private Set<Object> singletons = new HashSet<Object>();
-       private Set<Class<?>> classes = new HashSet<Class<?>>();
+       private Set<Object> singletons = new HashSet<>();
+       private Set<Class<?>> classes = new HashSet<>();
 
        public MockResourceApplication() {
                singletons.add(new MockResource());