Merge "Replaced with Diamond symbol"

5 files changed, 15 insertions, 15 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
index 854cda9cea..43ac1f1f3c 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
@@ -72,7 +72,7 @@ public class CreateVfModuleRequest extends VfRequestCommon {
 	private Boolean failIfExists;
 	private Boolean backout;
 
-	private Map<String,String> vfModuleParams = new HashMap<String, String>();
+	private Map<String,String> vfModuleParams = new HashMap<>();
 	private MsoRequest msoRequest = new MsoRequest();
 
 	public String getCloudSiteId() {
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java
index 7fd72ee20e..84b8caa096 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java
@@ -36,7 +36,7 @@ public class CreateVfModuleResponse extends VfResponseCommon {
 	private String vfModuleId;
 	private String vfModuleStackId;
 	private Boolean vfModuleCreated;
-	private Map<String,String> vfModuleOutputs = new HashMap<String, String>();
+	private Map<String,String> vfModuleOutputs = new HashMap<>();
 	private VfModuleRollback rollback = new VfModuleRollback();
 
 	public CreateVfModuleResponse() {
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
index 5d7451148e..e66271c24a 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
@@ -43,7 +43,7 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
 	private String vnfVersion;
 	private String vfModuleType;
 	private String modelCustomizationUuid;
-	private Map<String,String> volumeGroupParams = new HashMap<String, String>();
+	private Map<String,String> volumeGroupParams = new HashMap<>();
 	private Boolean failIfExists;
 	private Boolean suppressBackout;
 	private MsoRequest msoRequest = new MsoRequest();
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java
index 5201bcef81..cc2f6da29e 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java
@@ -36,7 +36,7 @@ public class CreateVolumeGroupResponse extends VfResponseCommon {
 	private String volumeGroupId;
 	private String volumeGroupStackId;
 	private Boolean volumeGroupCreated;
-	private Map<String,String> volumeGroupOutputs = new HashMap<String, String>();
+	private Map<String,String> volumeGroupOutputs = new HashMap<>();
 	private VolumeGroupRollback volumeGroupRollback = new VolumeGroupRollback();
 
 	public CreateVolumeGroupResponse() {
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
index d2f1c86fda..87b48fc68a 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VolumeAdapterRest.java
@@ -136,9 +136,9 @@ public class VolumeAdapterRest {
 			LOGGER.debug ("CreateVFModule VolumesTask start");
 			try {
 				// Synchronous Web Service Outputs
-				Holder<String> stackId = new Holder<String>();
-				Holder<Map<String, String>> outputs = new Holder<Map<String, String>>();
-				Holder<VnfRollback> vnfRollback = new Holder<VnfRollback>();
+				Holder<String> stackId = new Holder<>();
+				Holder<Map<String, String>> outputs = new Holder<>();
+				Holder<VnfRollback> vnfRollback = new Holder<>();
 				String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType();
 				LOGGER.debug("in createVfModuleVolumes - completeVnfVfModuleType=" + completeVnfVfModuleType);
 
@@ -462,9 +462,9 @@ public class VolumeAdapterRest {
 			LOGGER.debug("UpdateVNFVolumesTask start");
 			try {
 				@SuppressWarnings("unused")
-				Holder<String> stackId = new Holder<String> ();
-				Holder<Map<String, String>> outputs = new Holder<Map <String, String>> ();
-				Holder<VnfRollback> vnfRollback = new Holder<VnfRollback> ();
+				Holder<String> stackId = new Holder<> ();
+				Holder<Map<String, String>> outputs = new Holder<> ();
+				Holder<VnfRollback> vnfRollback = new Holder<> ();
 				String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType();
 				LOGGER.debug("in updateVfModuleVolume - completeVnfVfModuleType=" + completeVnfVfModuleType);
 
@@ -535,10 +535,10 @@ public class VolumeAdapterRest {
     	try {
         	int respStatus = HttpStatus.SC_OK;
         	QueryVolumeGroupResponse qryResp = new QueryVolumeGroupResponse(aaiVolumeGroupId, volumeGroupStackId, null, null);
-        	Holder<Boolean> vnfExists = new Holder<Boolean>();
-        	Holder<String> vfModuleId = new Holder<String>();
-        	Holder<VnfStatus> status = new Holder<VnfStatus>();
-        	Holder<Map<String, String>> outputs = new Holder<Map<String, String>>();
+        	Holder<Boolean> vnfExists = new Holder<>();
+        	Holder<String> vfModuleId = new Holder<>();
+        	Holder<VnfStatus> status = new Holder<>();
+        	Holder<Map<String, String>> outputs = new Holder<>();
 			if (cloudSiteId != null && cloudSiteId.equals(TESTING_KEYWORD)) {
 				if (tenantId != null && tenantId.equals(TESTING_KEYWORD)) {
 					throw new VnfException("testing.");
@@ -575,7 +575,7 @@ public class VolumeAdapterRest {
 		}
 	}
     public static Map<String, String> testMap() {
-		Map<String, String> m = new HashMap<String, String>();
+		Map<String, String> m = new HashMap<>();
 		m.put("mickey", "7");
 		m.put("clyde", "10");
 		m.put("wayne", "99");