aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller
diff options
context:
space:
mode:
Diffstat (limited to 'asdc-controller')
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCConfiguration.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCGlobalController.java4
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfModuleStructure.java6
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/VfResourceStructure.java4
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java4
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java10
-rw-r--r--asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java2
-rw-r--r--asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java2
-rw-r--r--asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java4
-rw-r--r--asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java2
-rw-r--r--asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/VfResourceInstallerTest.java2
11 files changed, 21 insertions, 21 deletions
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 <String> result = new ArrayList <String> ();
+ List <String> 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 <String,ASDCController> controllers = new HashMap <String,ASDCController> ();
+ private Map <String,ASDCController> controllers = new HashMap<>();
private MsoJsonProperties msoProp= null;
@@ -149,7 +149,7 @@ public class ASDCGlobalController {
}
public void closeASDC () {
- List<String> controllerToRemove = new LinkedList<String>();
+ List<String> 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<String, List<VfModuleArtifact>>();
+ 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<VfModuleArtifact> nestedList = new LinkedList<VfModuleArtifact>();
+ List<VfModuleArtifact> nestedList = new LinkedList<>();
nestedList.add(vfModuleArtifact);
artifactsMap.put(vfModuleArtifact.getArtifactInfo().getArtifactType(), nestedList);
@@ -73,7 +73,7 @@ public final class VfModuleStructure {
public List<VfModuleArtifact> getOrderedArtifactList() {
- List <VfModuleArtifact> artifactsList = new LinkedList <VfModuleArtifact>();
+ List <VfModuleArtifact> 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<VfModuleStructure>();
- artifactsMapByUUID = new HashMap<String, VfModuleArtifact>();
+ 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 126114d2d6..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
@@ -107,7 +107,7 @@ public class NotificationLogging implements InvocationHandler {
return buffer.toString();
}
- private static final boolean isGetter(Method method) {
+ private static boolean isGetter(Method method) {
// Must start with a valid (and known) prefix
boolean prefixFound = false;
@@ -156,7 +156,7 @@ public class NotificationLogging implements InvocationHandler {
INotificationData.class.getClassLoader(),
new Class[] { INotificationData.class },
NotificationLogging.getHandler());
- objectMethodsToLog.put(proxy, new ArrayList<Method>());
+ objectMethodsToLog.put(proxy, new ArrayList<>());
}
private static <T> 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 <String> getYamlNestedFileResourceTypeList () {
- List <String> typeList = new ArrayList <String> ();
+ List <String> typeList = new ArrayList<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
@@ -78,7 +78,7 @@ public class YamlEditor {
}
public synchronized List <String> getYamlResourceTypeList () {
- List <String> typeList = new ArrayList <String> ();
+ List <String> typeList = new ArrayList<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) 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 <HeatTemplateParam> getParameterList (String artifactUUID) {
- Set <HeatTemplateParam> paramSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> paramSet = new HashSet<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
@@ -130,11 +130,11 @@ public class YamlEditor {
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
if (resourceMap == null) {
- resourceMap = new LinkedHashMap <String, Object> ();
+ resourceMap = new LinkedHashMap<>();
this.yml.put ("parameters", resourceMap);
}
for (HeatTemplateParam heatParam : heatSet) {
- Map <String, Object> paramInfo = new HashMap <String, Object> ();
+ Map <String, Object> paramInfo = new HashMap<>();
paramInfo.put ("type", heatParam.getParamType ());
resourceMap.put (heatParam.getParamName (), paramInfo);
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java
index 45bd7cff8b..5026b51bd1 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCControllerTest.java
@@ -117,7 +117,7 @@ public class ASDCControllerTest {
Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java
index b752cfbb45..73c5456d29 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCGlobalControllerTest.java
@@ -109,7 +109,7 @@ public class ASDCGlobalControllerTest {
Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
index d7c8315d3a..589968ece4 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/YamlTest.java
@@ -76,7 +76,7 @@ public class YamlTest {
InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTestWithoutParam.yaml"));
YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
- Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> newParamSet = new HashSet<>();
HeatTemplateParam heatParam1 = new HeatTemplateParam();
heatParam1.setHeatTemplateArtifactUuid("1");
@@ -108,7 +108,7 @@ public class YamlTest {
InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
- Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> newParamSet = new HashSet<>();
HeatTemplateParam heatParam1 = new HeatTemplateParam();
heatParam1.setHeatTemplateArtifactUuid("1");
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
index a4563c66ac..9c20a084c3 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/ToscaResourceInstallerTest.java
@@ -143,7 +143,7 @@ public class ToscaResourceInstallerTest {
distributionClient = Mockito.mock(IDistributionClient.class);
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance
diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/VfResourceInstallerTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/VfResourceInstallerTest.java
index c4ada7437e..e2239dc952 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/VfResourceInstallerTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/installer/heat/tests/VfResourceInstallerTest.java
@@ -121,7 +121,7 @@ public class VfResourceInstallerTest {
distributionClient = Mockito.mock(IDistributionClient.class);
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance