From: rama-huawei Date: Mon, 25 Sep 2017 12:11:23 +0000 (+0530) Subject: Replaced with Diamond symbol X-Git-Tag: v1.1.0~275^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=29fe4a75b506afefe525ffe5a3e4a6e57344f56c;p=so.git Replaced with Diamond symbol Issue-Id:SO-118 Change-Id: I6a1542d53c9021e315331a1643519c25500df20a Signed-off-by: rama-huawei --- 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 vfModuleParams = new HashMap(); + private Map 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 vfModuleOutputs = new HashMap(); + private Map 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 volumeGroupParams = new HashMap(); + private Map 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 volumeGroupOutputs = new HashMap(); + private Map 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 stackId = new Holder(); - Holder> outputs = new Holder>(); - Holder vnfRollback = new Holder(); + Holder stackId = new Holder<>(); + Holder> outputs = new Holder<>(); + Holder 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 stackId = new Holder (); - Holder> outputs = new Holder> (); - Holder vnfRollback = new Holder (); + Holder stackId = new Holder<> (); + Holder> outputs = new Holder<> (); + Holder 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 vnfExists = new Holder(); - Holder vfModuleId = new Holder(); - Holder status = new Holder(); - Holder> outputs = new Holder>(); + Holder vnfExists = new Holder<>(); + Holder vfModuleId = new Holder<>(); + Holder status = new Holder<>(); + Holder> 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 testMap() { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("mickey", "7"); m.put("clyde", "10"); m.put("wayne", "99");