aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'mso-catalog-db/src/main')
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java6
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java2
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java10
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java6
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java14
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java12
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java9
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java10
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java3
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java8
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java6
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java20
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java4
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java8
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java8
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java6
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java6
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java60
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java22
24 files changed, 123 insertions, 117 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index 8e7202d46d..534b5a38c9 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -3464,7 +3464,7 @@ public class CatalogDatabase implements Closeable {
StringBuilder sb = new StringBuilder("Parameters: ");
for (HeatTemplateParam param : paramSet) {
param.setHeatTemplateArtifactUuid(heat.getArtifactUuid());
- sb.append(param.getParamName() + ", ");
+ sb.append(param.getParamName()).append(", ");
}
LOGGER.debug(sb.toString());
heat.setParameters (paramSet);
@@ -4934,7 +4934,7 @@ public class CatalogDatabase implements Closeable {
StringBuilder sb = new StringBuilder();
if (variables != null) {
for(Map.Entry<String, String> entry : variables.entrySet()){
- sb.append(entry.getKey() + "=" + entry.getValue() + "\n");
+ sb.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
query.setParameter(entry.getKey(), entry.getValue());
}
}
@@ -4985,7 +4985,7 @@ public class CatalogDatabase implements Closeable {
StringBuilder sb = new StringBuilder();
if (variables != null) {
for(Map.Entry<String, String> entry : variables.entrySet()){
- sb.append(entry.getKey() + "=" + entry.getValue()+ "\n");
+ sb.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
query.setParameter(entry.getKey(), entry.getValue());
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
index dd628bb863..fcd9211ec6 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
@@ -88,7 +88,7 @@ public class HeatEnvironment extends MavenLikeVersioning implements Serializable
@Override
public String toString () {
StringBuilder sb = new StringBuilder();
- sb.append ("Artifact UUID=" + this.artifactUuid);
+ sb.append("Artifact UUID=").append(this.artifactUuid);
sb.append (", name=");
sb.append (name);
sb.append (", version=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
index b90578d369..ec429c896e 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
@@ -103,23 +103,23 @@ public class HeatFiles extends MavenLikeVersioning implements Serializable {
@Override
public String toString () {
StringBuilder sb = new StringBuilder();
- sb.append ("artifactUuid=" + this.artifactUuid);
+ sb.append("artifactUuid=").append(this.artifactUuid);
if (this.description == null) {
sb.append(", description=null");
} else {
- sb.append(", description=" + this.description);
+ sb.append(", description=").append(this.description);
}
if (this.fileName == null) {
sb.append(", fileName=null");
} else {
- sb.append(",fileName=" + this.fileName);
+ sb.append(",fileName=").append(this.fileName);
}
if (this.fileBody == null) {
sb.append(", fileBody=null");
} else {
- sb.append(",fileBody=" + this.fileBody);
+ sb.append(",fileBody=").append(this.fileBody);
}
- sb.append(", artifactChecksum=" + this.artifactChecksum);
+ sb.append(", artifactChecksum=").append(this.artifactChecksum);
if (created != null) {
sb.append (",created=");
sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
index eec0f410c6..df067445f6 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
@@ -61,12 +61,12 @@ public class HeatNestedTemplate implements Serializable {
@Override
public String toString () {
StringBuilder sb = new StringBuilder ();
- sb.append ("ParentTemplateId=" + this.parentTemplateId);
- sb.append (", ChildTemplateId=" + this.childTemplateId);
+ sb.append("ParentTemplateId=").append(this.parentTemplateId);
+ sb.append(", ChildTemplateId=").append(this.childTemplateId);
if (this.providerResourceFile == null) {
sb.append (", providerResourceFile=null");
} else {
- sb.append (",providerResourceFile=" + this.providerResourceFile);
+ sb.append(",providerResourceFile=").append(this.providerResourceFile);
}
return sb.toString ();
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
index 2c79d7d48c..54acf12ca8 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
@@ -48,8 +48,8 @@ public class HeatTemplateArtifactUuidModelUuid implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("heatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid);
- sb.append(" modelUuid=" + this.modelUuid);
+ sb.append("heatTemplateArtifactUuid=").append(this.heatTemplateArtifactUuid);
+ sb.append(" modelUuid=").append(this.modelUuid);
return sb.toString();
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
index 77beeb71df..96e6c616bf 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
@@ -185,13 +185,13 @@ public class Model extends MavenLikeVersioning implements Serializable {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Model: ");
- sb.append("modelCustomizationId=" + modelCustomizationId);
- sb.append(",modelCustomizationName=" + modelCustomizationName);
- sb.append(",modelInvariantId=" + modelInvariantId);
- sb.append(",modelName=" + modelName);
- sb.append(",modelType=" + modelType);
- sb.append(",modelVersion=" + modelVersion);
- sb.append(",modelVersionId=" + modelVersionId);
+ sb.append("modelCustomizationId=").append(modelCustomizationId);
+ sb.append(",modelCustomizationName=").append(modelCustomizationName);
+ sb.append(",modelInvariantId=").append(modelInvariantId);
+ sb.append(",modelName=").append(modelName);
+ sb.append(",modelType=").append(modelType);
+ sb.append(",modelVersion=").append(modelVersion);
+ sb.append(",modelVersionId=").append(modelVersionId);
if (created != null) {
sb.append (",created=");
sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
index fddea4791b..7f8c3dbacb 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
@@ -169,12 +169,12 @@ public class ModelRecipe extends MavenLikeVersioning implements Serializable {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("ModelRecipe: ");
- sb.append("modelId=" + modelId.toString());
- sb.append(",action=" + action);
- sb.append(",schemaVersion=" + schemaVersion);
- sb.append(",orchestrationUri=" + orchestrationUri);
- sb.append(",modelParamXSD=" + modelParamXSD);
- sb.append(",recipeTimeout=" + recipeTimeout.toString());
+ sb.append("modelId=").append(modelId.toString());
+ sb.append(",action=").append(action);
+ sb.append(",schemaVersion=").append(schemaVersion);
+ sb.append(",orchestrationUri=").append(orchestrationUri);
+ sb.append(",modelParamXSD=").append(modelParamXSD);
+ sb.append(",recipeTimeout=").append(recipeTimeout.toString());
if (created != null) {
sb.append (",created=");
sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
index 9ef1fb6fd3..f25a99ca2d 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
@@ -47,8 +47,8 @@ public class NetworkRecipe extends Recipe implements Serializable {
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append (",modelName=" + modelName);
- sb.append (",networkParamXSD=" + networkParamXSD);
+ sb.append(",modelName=").append(modelName);
+ sb.append(",networkParamXSD=").append(networkParamXSD);
return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
index 668f666fcd..a425c1e96a 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
@@ -103,8 +103,8 @@ public class Recipe extends MavenLikeVersioning implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("RECIPE: " + action);
- sb.append(",uri=" + orchestrationUri);
+ sb.append("RECIPE: ").append(action);
+ sb.append(",uri=").append(orchestrationUri);
if (created != null) {
sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
index beb021ac11..f518678b44 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
@@ -150,14 +150,17 @@ public class Service extends MavenLikeVersioning implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("SERVICE: name=" + modelName + ",modelVersion=" + modelVersion + ",description=" + description+",modelInvariantUUID="+modelInvariantUUID+",toscaCsarArtifactUUID="+toscaCsarArtifactUUID+",serviceType="+serviceType+",serviceRole="+serviceRole);
+ sb.append("SERVICE: name=").append(modelName).append(",modelVersion=").append(modelVersion)
+ .append(",description=").append(description).append(",modelInvariantUUID=").append(modelInvariantUUID)
+ .append(",toscaCsarArtifactUUID=").append(toscaCsarArtifactUUID).append(",serviceType=").append(serviceType)
+ .append(",serviceRole=").append(serviceRole);
for (String recipeAction : recipes.keySet()) {
ServiceRecipe recipe = recipes.get(recipeAction);
- sb.append ("\n" + recipe.toString());
+ sb.append("\n").append(recipe.toString());
}
for(ServiceToResourceCustomization serviceResourceCustomization : serviceResourceCustomizations) {
- sb.append("\n" + serviceResourceCustomization.toString());
+ sb.append("\n").append(serviceResourceCustomization.toString());
}
if (created != null) {
sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
index d4d0507f20..645626d125 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
@@ -129,7 +129,7 @@ public class ServiceMacroHolder implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append("ServicePlus: ");
if (this.service != null) {
- sb.append("service: " + this.service.toString());
+ sb.append("service: ").append(this.service.toString());
} else {
sb.append("service: null");
}
@@ -137,7 +137,7 @@ public class ServiceMacroHolder implements Serializable {
int i=0;
sb.append("VnfResources: ");
for (VnfResourceCustomization vrc : this.vnfResourceCustomizations) {
- sb.append(", vnfResourceCustomization[" + i++ + "]:" + vrc.toString());
+ sb.append(", vnfResourceCustomization[").append(i++).append("]:").append(vrc.toString());
}
} else {
sb.append("none");
@@ -146,7 +146,7 @@ public class ServiceMacroHolder implements Serializable {
int i=0;
sb.append("VnfResources: ");
for (VnfResource vr : this.vnfResources) {
- sb.append(", vnfResource[" + i++ + "]:" + vr.toString());
+ sb.append(", vnfResource[").append(i++).append("]:").append(vr.toString());
}
} else {
sb.append("none");
@@ -155,14 +155,14 @@ public class ServiceMacroHolder implements Serializable {
int i=0;
sb.append("NetworkResourceCustomizations:");
for (NetworkResourceCustomization nrc : this.networkResourceCustomizations) {
- sb.append("NRC[" + i++ + "]: " + nrc.toString());
+ sb.append("NRC[").append(i++).append("]: ").append(nrc.toString());
}
}
if (this.allottedResourceCustomizations != null && this.allottedResourceCustomizations.size() > 0) {
int i=0;
sb.append("AllottedResourceCustomizations:");
for (AllottedResourceCustomization arc : this.allottedResourceCustomizations) {
- sb.append("ARC[" + i++ + "]: " + arc.toString());
+ sb.append("ARC[").append(i++).append("]: ").append(arc.toString());
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
index 3a3cc0aa69..303570a8d0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
@@ -139,8 +139,8 @@ public class ServiceRecipe extends MavenLikeVersioning implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("RECIPE: " + action);
- sb.append(",uri=" + orchestrationUri);
+ sb.append("RECIPE: ").append(action);
+ sb.append(",uri=").append(orchestrationUri);
if (created != null) {
sb.append (",created=");
sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
index f076e13e26..a380a58c6b 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
@@ -85,8 +85,8 @@ public class ServiceToNetworks implements Serializable {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("ServiceToNetworks mapping: ");
- sb.append("serviceModelUuid=" + this.serviceModelUuid);
- sb.append(",networkModelCustomizationUuid=" + networkModelCustomizationUuid);
+ sb.append("serviceModelUuid=").append(this.serviceModelUuid);
+ sb.append(",networkModelCustomizationUuid=").append(networkModelCustomizationUuid);
return sb.toString();
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
index fcd20ef963..6d74ab38aa 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
@@ -99,7 +99,8 @@ public class ServiceToResourceCustomization implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("ServiceToResourceCustomization: modelType=" + modelType + ",serviceModelUUID=" + serviceModelUUID+",resourceModelCustomizationUUID="+resourceModelCustomizationUUID);
+ sb.append("ServiceToResourceCustomization: modelType=").append(modelType).append(",serviceModelUUID=")
+ .append(serviceModelUUID).append(",resourceModelCustomizationUUID=").append(resourceModelCustomizationUUID);
if (created != null) {
sb.append (",created=");
sb.append (DateFormat.getInstance().format(created));
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
index 20801c105e..783fc2df30 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
@@ -66,10 +66,10 @@ public class TempNetworkHeatTemplateLookup implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("NetworkResourceModelName=" + this.networkResourceModelName);
- sb.append("HeatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid);
- sb.append("aicVersionMin=" + this.aicVersionMin);
- sb.append("aicVersionMax=" + this.aicVersionMax);
+ sb.append("NetworkResourceModelName=").append(this.networkResourceModelName);
+ sb.append("HeatTemplateArtifactUuid=").append(this.heatTemplateArtifactUuid);
+ sb.append("aicVersionMin=").append(this.aicVersionMin);
+ sb.append("aicVersionMax=").append(this.aicVersionMax);
return sb.toString();
}
@Override
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
index 88a358d364..591e648a33 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
@@ -100,9 +100,11 @@ public class ToscaCsar extends MavenLikeVersioning implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("TOSCACSAR: artifactUUID=" + artifactUUID + ",name=" + name + ",version=" + version + ",description=" + description+",artifactChecksum="+artifactChecksum+",url="+url);
+ sb.append("TOSCACSAR: artifactUUID=").append(artifactUUID).append(",name=").append(name).append(",version=")
+ .append(version).append(",description=").append(description).append(",artifactChecksum=")
+ .append(artifactChecksum).append(",url=").append(url);
for (Service service : services) {
- sb.append ("\n" + service.toString());
+ sb.append("\n").append(service.toString());
}
if (created != null) {
sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
index 4404834585..9f2dae5035 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
@@ -112,16 +112,16 @@ public class VfModuleCustomization implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("modelCustomizationUuid=" + this.modelCustomizationUuid);
- sb.append("vfModuleModelUuid=" + this.vfModuleModelUuid);
- sb.append("label=" + this.label);
- sb.append("initalCount=" + this.initialCount);
- sb.append("minInstances=" + this.minInstances);
- sb.append("maxInstances=" + this.maxInstances);
- sb.append("availabilityZoneCount=" + this.availabilityZoneCount);
- sb.append("heatEnvironmentArtifactUuid=" + this.heatEnvironmentArtifactUuid);
- sb.append("volEnvironmentArtifactUuid=" + this.volEnvironmentArtifactUuid);
- sb.append("created=" + this.created);
+ sb.append("modelCustomizationUuid=").append(this.modelCustomizationUuid);
+ sb.append("vfModuleModelUuid=").append(this.vfModuleModelUuid);
+ sb.append("label=").append(this.label);
+ sb.append("initalCount=").append(this.initialCount);
+ sb.append("minInstances=").append(this.minInstances);
+ sb.append("maxInstances=").append(this.maxInstances);
+ sb.append("availabilityZoneCount=").append(this.availabilityZoneCount);
+ sb.append("heatEnvironmentArtifactUuid=").append(this.heatEnvironmentArtifactUuid);
+ sb.append("volEnvironmentArtifactUuid=").append(this.volEnvironmentArtifactUuid);
+ sb.append("created=").append(this.created);
return sb.toString();
}
@Override
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
index 63395c215c..476283e6b0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
@@ -50,8 +50,8 @@ public class VfModuleToHeatFiles implements Serializable {
@Override
public String toString () {
StringBuilder sb = new StringBuilder ();
- sb.append ("vfModuleModelUuid=" + this.vfModuleModelUuid);
- sb.append (", heatFilesArtifactUuid=" + this.heatFilesArtifactUuid);
+ sb.append("vfModuleModelUuid=").append(this.vfModuleModelUuid);
+ sb.append(", heatFilesArtifactUuid=").append(this.heatFilesArtifactUuid);
return sb.toString ();
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
index 8db4902cd8..e1795e1b04 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
@@ -78,10 +78,10 @@ public class VnfComponent implements Serializable {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("VnfComponent: ");
- sb.append("vnfId=" + vnfId);
- sb.append(",componentType=" + componentType);
- sb.append(",heatTemplateId=" + heatTemplateId);
- sb.append(",heatEnvironmentId=" + heatEnvironmentId);
+ sb.append("vnfId=").append(vnfId);
+ sb.append(",componentType=").append(componentType);
+ sb.append(",heatTemplateId=").append(heatTemplateId);
+ sb.append(",heatEnvironmentId=").append(heatEnvironmentId);
if (created != null) {
sb.append (",created=");
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
index 42d6b82f0f..8867170ba7 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
@@ -66,10 +66,10 @@ public class VnfComponentsRecipe extends Recipe implements Serializable {
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append (",vnfComponentParamXSD=" + vnfComponentParamXSD);
- sb.append (",serviceType=" + getServiceType ());
- sb.append (",vnfComponentType=" + getVnfComponentType ());
- sb.append (",vfModuleId=" + getVfModuleModelUUId());
+ sb.append(",vnfComponentParamXSD=").append(vnfComponentParamXSD);
+ sb.append(",serviceType=").append(getServiceType());
+ sb.append(",vnfComponentType=").append(getVnfComponentType());
+ sb.append(",vfModuleId=").append(getVfModuleModelUUId());
return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
index 29e4b8909c..49865e8e9d 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
@@ -58,9 +58,9 @@ public class VnfRecipe extends Recipe implements Serializable {
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append (",vnfParamXSD=" + vnfParamXSD);
- sb.append (",serviceType=" + getServiceType ());
- sb.append (",vfModuleId=" + getVfModuleId ());
+ sb.append(",vnfParamXSD=").append(vnfParamXSD);
+ sb.append(",serviceType=").append(getServiceType());
+ sb.append(",vfModuleId=").append(getVfModuleId());
return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
index 9cd9f1ca78..7b2364d194 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
@@ -56,9 +56,9 @@ public class VnfResCustomToVfModuleCustom implements Serializable {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("vnfResourceCustModelCustomizationUuid=" + this.vnfResourceCustModelCustomizationUuid);
- sb.append("vfModuleCustModelCustomizationUuid=" + this.vfModuleCustModelCustomizationUuid);
- sb.append("created=" + this.created);
+ sb.append("vnfResourceCustModelCustomizationUuid=").append(this.vnfResourceCustModelCustomizationUuid);
+ sb.append("vfModuleCustModelCustomizationUuid=").append(this.vfModuleCustModelCustomizationUuid);
+ sb.append("created=").append(this.created);
return sb.toString();
}
@Override
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
index 37040d6a4e..f0b990acae 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
@@ -240,45 +240,45 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
@Override
public String toString () {
- StringBuilder buf = new StringBuilder();
-
- buf.append("VNF=");
- buf.append(",modelVersion=");
- buf.append(modelVersion);
- buf.append(",mode=");
- buf.append(orchestrationMode);
- buf.append(",heatTemplateArtifactUUId=");
- buf.append(heatTemplateArtifactUUId);
- buf.append(",envtId=");
- buf.append(",asdcUuid=");
- buf.append(",aicVersionMin=");
- buf.append(this.aicVersionMin);
- buf.append(",aicVersionMax=");
- buf.append(this.aicVersionMax);
- buf.append(",modelInvariantUuid=");
- buf.append(this.modelInvariantUuid);
- buf.append(",modelVersion=");
- buf.append(",modelCustomizationName=");
- buf.append(",modelName=");
- buf.append(this.modelName);
- buf.append(",serviceModelInvariantUUID=");
- buf.append(",modelCustomizationUuid=");
- buf.append(",toscaNodeType=");
- buf.append(toscaNodeType);
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("VNF=");
+ sb.append(",modelVersion=");
+ sb.append(modelVersion);
+ sb.append(",mode=");
+ sb.append(orchestrationMode);
+ sb.append(",heatTemplateArtifactUUId=");
+ sb.append(heatTemplateArtifactUUId);
+ sb.append(",envtId=");
+ sb.append(",asdcUuid=");
+ sb.append(",aicVersionMin=");
+ sb.append(this.aicVersionMin);
+ sb.append(",aicVersionMax=");
+ sb.append(this.aicVersionMax);
+ sb.append(",modelInvariantUuid=");
+ sb.append(this.modelInvariantUuid);
+ sb.append(",modelVersion=");
+ sb.append(",modelCustomizationName=");
+ sb.append(",modelName=");
+ sb.append(this.modelName);
+ sb.append(",serviceModelInvariantUUID=");
+ sb.append(",modelCustomizationUuid=");
+ sb.append(",toscaNodeType=");
+ sb.append(toscaNodeType);
if (created != null) {
- buf.append(",created=");
- buf.append(DateFormat.getInstance().format(created));
+ sb.append(",created=");
+ sb.append(DateFormat.getInstance().format(created));
}
for(VnfResourceCustomization vrc : vnfResourceCustomizations) {
- buf.append("/n" + vrc.toString());
+ sb.append("/n").append(vrc.toString());
}
for(VfModule vfm : vfModules) {
- buf.append("/n" + vfm.toString());
+ sb.append("/n").append(vfm.toString());
}
- return buf.toString();
+ return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
index 8d580fd9a0..151c9e594e 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
@@ -180,18 +180,18 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
@Override
public String toString() {
StringBuilder sb = new StringBuilder("VnfResourceCustomization: ");
- sb.append("ModelCustUuid=" + this.modelCustomizationUuid );
- sb.append(", ModelInstanceName=" + this.modelInstanceName);
- sb.append(", vnfResourceModelUuid=" + this.vnfResourceModelUUID);
- sb.append(", creationTimestamp=" + this.created);
- sb.append(", minInstances=" + this.minInstances);
- sb.append(", maxInstances=" + this.maxInstances);
- sb.append(", availabilityZoneMaxCount=" + this.availabilityZoneMaxCount);
+ sb.append("ModelCustUuid=").append(this.modelCustomizationUuid);
+ sb.append(", ModelInstanceName=").append(this.modelInstanceName);
+ sb.append(", vnfResourceModelUuid=").append(this.vnfResourceModelUUID);
+ sb.append(", creationTimestamp=").append(this.created);
+ sb.append(", minInstances=").append(this.minInstances);
+ sb.append(", maxInstances=").append(this.maxInstances);
+ sb.append(", availabilityZoneMaxCount=").append(this.availabilityZoneMaxCount);
// sb.append(", vnfResource:\n" + this.vnfResource == null ? "null" : this.vnfResource.toString());
- sb.append(", nfFunction=" + this.nfFunction);
- sb.append(", nfType=" + this.nfType);
- sb.append(", nfRole=" + this.nfRole);
- sb.append(", nfNamingCode=" + this.nfNamingCode);
+ sb.append(", nfFunction=").append(this.nfFunction);
+ sb.append(", nfType=").append(this.nfType);
+ sb.append(", nfRole=").append(this.nfRole);
+ sb.append(", nfNamingCode=").append(this.nfNamingCode);
return sb.toString();
}