From 2c3be92eccd45ebad09d4fea7245f11a3c14f583 Mon Sep 17 00:00:00 2001 From: Munir Ahmad Date: Fri, 2 Mar 2018 19:47:30 -0500 Subject: Replace explicit type with dimond type Change-Id: I1dedb9ef1ca7b734e3cfc0a3a594d733dbd298d4 Issue-ID: SO-437 Signed-off-by: Munir Ahmad --- .../java/org/openecomp/mso/asdc/client/ASDCConfiguration.java | 2 +- .../org/openecomp/mso/asdc/client/ASDCGlobalController.java | 4 ++-- .../org/openecomp/mso/asdc/installer/VfModuleStructure.java | 6 +++--- .../org/openecomp/mso/asdc/installer/VfResourceStructure.java | 4 ++-- .../java/org/openecomp/mso/asdc/util/NotificationLogging.java | 2 +- .../src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'asdc-controller/src/main/java/org') diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCConfiguration.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCConfiguration.java index 6cfe90b92c..e069989aeb 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCConfiguration.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCConfiguration.java @@ -399,7 +399,7 @@ public class ASDCConfiguration implements IConfiguration { MsoJsonProperties msoProp; try { - List result = new ArrayList (); + List result = new ArrayList<>(); msoProp = new MsoPropertiesFactory ().getMsoJsonProperties (MSO_PROP_ASDC); if (msoProp.getJsonRootNode ().get (PARAMETER_PATTERN) != null) { diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCGlobalController.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCGlobalController.java index 251888e9e2..295dddd53a 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCGlobalController.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCGlobalController.java @@ -41,7 +41,7 @@ import org.openecomp.mso.properties.MsoPropertiesFactory; public class ASDCGlobalController { private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC); - private Map controllers = new HashMap (); + private Map controllers = new HashMap<>(); private MsoJsonProperties msoProp= null; @@ -149,7 +149,7 @@ public class ASDCGlobalController { } public void closeASDC () { - List controllerToRemove = new LinkedList(); + List controllerToRemove = new LinkedList<>(); for (ASDCController controller : controllers.values()) { try { diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java index be86574137..c9bde98da8 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java @@ -47,7 +47,7 @@ public final class VfModuleStructure { vfModuleMetadata = vfmoduleMetadata; parentVfResource = vfParentResource; - artifactsMap = new HashMap>(); + artifactsMap = new HashMap<>(); for (String artifactUUID:this.vfModuleMetadata.getArtifacts()) { if (vfParentResource.getArtifactsMapByUUID().containsKey(artifactUUID)) { @@ -64,7 +64,7 @@ public final class VfModuleStructure { artifactsMap.get(vfModuleArtifact.getArtifactInfo().getArtifactType()).add(vfModuleArtifact); } else { - List nestedList = new LinkedList(); + List nestedList = new LinkedList<>(); nestedList.add(vfModuleArtifact); artifactsMap.put(vfModuleArtifact.getArtifactInfo().getArtifactType(), nestedList); @@ -73,7 +73,7 @@ public final class VfModuleStructure { public List getOrderedArtifactList() { - List artifactsList = new LinkedList (); + List artifactsList = new LinkedList<>(); artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT)); artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT_ENV)); diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java index c2879a4df2..e9e39d7660 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java @@ -101,8 +101,8 @@ public final class VfResourceStructure { resourceInstance=resourceinstance; - vfModulesStructureList = new LinkedList(); - artifactsMapByUUID = new HashMap(); + vfModulesStructureList = new LinkedList<>(); + artifactsMapByUUID = new HashMap<>(); } //@Override diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java index bbf8fe6f8c..c0a1f53283 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java @@ -156,7 +156,7 @@ public class NotificationLogging implements InvocationHandler { INotificationData.class.getClassLoader(), new Class[] { INotificationData.class }, NotificationLogging.getHandler()); - objectMethodsToLog.put(proxy, new ArrayList()); + objectMethodsToLog.put(proxy, new ArrayList<>()); } private static void methodToLog(T methodCall) { diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java index a90fdeb8e6..f6f1af5da6 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java @@ -58,7 +58,7 @@ public class YamlEditor { } public synchronized List getYamlNestedFileResourceTypeList () { - List typeList = new ArrayList (); + List typeList = new ArrayList<>(); @SuppressWarnings("unchecked") Map resourceMap = (Map ) yml.get ("resources"); @@ -78,7 +78,7 @@ public class YamlEditor { } public synchronized List getYamlResourceTypeList () { - List typeList = new ArrayList (); + List typeList = new ArrayList<>(); @SuppressWarnings("unchecked") Map resourceMap = (Map ) yml.get ("resources"); @@ -95,7 +95,7 @@ public class YamlEditor { // Within Heat Template, under parameters catalog, it might indicate the default value of the parameter // If default value exist, the parameter is not mandatory, otherwise its value should be set public synchronized Set getParameterList (String artifactUUID) { - Set paramSet = new HashSet (); + Set paramSet = new HashSet<>(); @SuppressWarnings("unchecked") Map resourceMap = (Map ) yml.get ("parameters"); @@ -130,11 +130,11 @@ public class YamlEditor { @SuppressWarnings("unchecked") Map resourceMap = (Map ) yml.get ("parameters"); if (resourceMap == null) { - resourceMap = new LinkedHashMap (); + resourceMap = new LinkedHashMap<>(); this.yml.put ("parameters", resourceMap); } for (HeatTemplateParam heatParam : heatSet) { - Map paramInfo = new HashMap (); + Map paramInfo = new HashMap<>(); paramInfo.put ("type", heatParam.getParamType ()); resourceMap.put (heatParam.getParamName (), paramInfo); -- cgit 1.2.3-korg