summaryrefslogtreecommitdiffstats
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/ASDCGlobalController.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/BigDecimalVersion.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java16
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java2
-rw-r--r--asdc-controller/src/main/java/org/openecomp/mso/asdc/util/YamlEditor.java33
8 files changed, 29 insertions, 32 deletions
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 c0056e0573..251888e9e2 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
@@ -49,7 +49,7 @@ public class ASDCGlobalController {
List<String> controllerNames = ASDCConfiguration.getAllDefinedControllers();
- StringBuffer controllerListLog = new StringBuffer("List of controllers loaded:");
+ StringBuilder controllerListLog = new StringBuilder("List of controllers loaded:");
for (String controllerName : controllerNames) {
controllers.put(controllerName, new ASDCController(controllerName));
controllerListLog.append(controllerName);
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
index 3c262c6c90..29144a9884 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ASDCElementInfo.java
@@ -109,7 +109,7 @@ public class ASDCElementInfo {
*/
@Override
public final String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
List<String> aggregatedElements = new ArrayList<>();
for (Entry<String, String> entry : this.getElementInfoMap().entrySet()) {
aggregatedElements.add(entry.getKey() + ": " + entry.getValue());
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/BigDecimalVersion.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/BigDecimalVersion.java
index 5547bb1189..c2faf1c0e8 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/BigDecimalVersion.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/BigDecimalVersion.java
@@ -34,7 +34,7 @@ public class BigDecimalVersion {
public static BigDecimal castAndCheckNotificationVersion(String version) {
// Truncate the version if bad type
String[] splitVersion = version.split("\\.");
- StringBuffer newVersion = new StringBuffer();
+ StringBuilder newVersion = new StringBuilder();
if (splitVersion.length > 1) {
newVersion.append(splitVersion[0]);
newVersion.append(".");
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index b998be9a69..f22debce1e 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -636,7 +636,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
return body;
}
- StringBuffer sb = new StringBuffer(body.length());
+ StringBuilder sb = new StringBuilder(body.length());
int currentIndex = 0;
int startIndex = 0;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
index bd20eb0bf1..0ae58dad41 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/VfResourceInstaller.java
@@ -631,7 +631,7 @@ public class VfResourceInstaller implements IVfResourceInstaller {
return body;
}
- StringBuffer sb = new StringBuffer(body.length());
+ StringBuilder sb = new StringBuilder(body.length());
int currentIndex = 0;
int startIndex = 0;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
index 28f5dbdee5..a7ba01354d 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/ASDCNotificationLogging.java
@@ -42,7 +42,7 @@ public class ASDCNotificationLogging {
if (asdcNotification == null) {
return "NULL";
}
- StringBuffer buffer = new StringBuffer("ASDC Notification:");
+ StringBuilder buffer = new StringBuilder("ASDC Notification:");
buffer.append(System.lineSeparator());
buffer.append("DistributionID:");
@@ -96,7 +96,7 @@ public class ASDCNotificationLogging {
}
- StringBuffer buffer = new StringBuffer("CSAR Notification:");
+ StringBuilder buffer = new StringBuilder("CSAR Notification:");
buffer.append(System.lineSeparator());
buffer.append(System.lineSeparator());
@@ -286,7 +286,7 @@ public class ASDCNotificationLogging {
return null;
}
- StringBuffer buffer = new StringBuffer("VfModuleMetaData List:");
+ StringBuilder buffer = new StringBuilder("VfModuleMetaData List:");
buffer.append(System.lineSeparator());
buffer.append("{");
@@ -311,7 +311,7 @@ public class ASDCNotificationLogging {
return "NULL";
}
- StringBuffer buffer = new StringBuffer("VfModuleMetaData:");
+ StringBuilder buffer = new StringBuilder("VfModuleMetaData:");
buffer.append(System.lineSeparator());
buffer.append("VfModuleModelName:");
@@ -395,7 +395,7 @@ public class ASDCNotificationLogging {
return null;
}
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("{");
for (IResourceInstance resourceInstanceElem:asdcNotification.getResources()) {
@@ -418,7 +418,7 @@ public class ASDCNotificationLogging {
return null;
}
- StringBuffer buffer = new StringBuffer("Resource Instance Info:");
+ StringBuilder buffer = new StringBuilder("Resource Instance Info:");
buffer.append(System.lineSeparator());
buffer.append("ResourceInstanceName:");
@@ -473,7 +473,7 @@ public class ASDCNotificationLogging {
return null;
}
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("{");
for (IArtifactInfo artifactInfoElem:artifactsList) {
buffer.append(System.lineSeparator());
@@ -495,7 +495,7 @@ public class ASDCNotificationLogging {
return null;
}
- StringBuffer buffer = new StringBuffer("Service Artifacts Info:");
+ StringBuilder buffer = new StringBuilder("Service Artifacts Info:");
buffer.append(System.lineSeparator());
buffer.append("ArtifactName:");
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 9b38a50daf..126114d2d6 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
@@ -82,7 +82,7 @@ public class NotificationLogging implements InvocationHandler {
return "EMPTY"; // No declared methods in this class !!!
}
- StringBuffer buffer = new StringBuffer("ASDC Notification:");
+ StringBuilder buffer = new StringBuilder("ASDC Notification:");
buffer.append(System.lineSeparator());
for (Method m : declaredMethods) {
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 f94e0a153b..a90fdeb8e6 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
@@ -82,12 +82,10 @@ public class YamlEditor {
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
- Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
- while (it.hasNext ()) {
- Map.Entry <String, Object> pair = it.next ();
+ for (Entry<String, Object> pair : resourceMap.entrySet()) {
@SuppressWarnings("unchecked")
- Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
- typeList.add (resourceEntry.get ("type"));
+ Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+ typeList.add(resourceEntry.get("type"));
}
return typeList;
}
@@ -100,28 +98,27 @@ public class YamlEditor {
Set <HeatTemplateParam> paramSet = new HashSet <HeatTemplateParam> ();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
- Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
- while (it.hasNext ()) {
- HeatTemplateParam param = new HeatTemplateParam ();
- Map.Entry <String, Object> pair = it.next ();
+ for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+ HeatTemplateParam param = new HeatTemplateParam();
+ Entry<String, Object> pair = stringObjectEntry;
@SuppressWarnings("unchecked")
- Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
-
- param.setParamName (pair.getKey ());
+ Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+
+ param.setParamName(pair.getKey());
// System.out.println(pair.getKey()+":"+type);
if (resourceEntry.containsKey("default")) {
- param.setRequired (false);
+ param.setRequired(false);
} else {
- param.setRequired (true);
+ param.setRequired(true);
}
// Now set the type
- String value = resourceEntry.get ("type");
- param.setParamType (value);
-
+ String value = resourceEntry.get("type");
+ param.setParamType(value);
+
param.setHeatTemplateArtifactUuid(artifactUUID);
- paramSet.add (param);
+ paramSet.add(param);
}
return paramSet;