Merge "Reorder modifiers"

[so.git] / adapters / mso-catalog-db-adapter / src / main / java / org / openecomp / mso / adapters / catalogdb / catalogrest / QueryAllottedResourceCustomization.java

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
index 9a82ed2..b249b58 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -20,7 +20,6 @@
 package org.openecomp.mso.adapters.catalogdb.catalogrest;
 
 import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
-import org.jboss.resteasy.annotations.providers.NoJackson;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
@@ -29,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 
 @XmlRootElement(name = "serviceAllottedResources")
-@NoJackson
 public class QueryAllottedResourceCustomization extends CatalogQuery {
        private List<AllottedResourceCustomization> allottedResourceCustomization;
        private final String template =
@@ -43,15 +41,17 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
                        "\t\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
                        "\t\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
                "\t\t},\n"+
-                               "\t\t\"toscaNodeType\"              : <TOSCA_NODE_TYPE>,\n"+
-                               "\t\t\"allottedResourceType\"              : <ALLOTTED_RESOURCE_TYPE>,\n"+
-                               "\t\t\"allottedResourceRole\"              : <ALLOTTED_RESOURCE_ROLE>,\n"+
-                               "\t\t\"providingServiceModelInvariantUuid\"              : <PROVIDING_SERVICE_MODEL_INVARIANT_UUID>,\n"+
-                               "\t\t\"nfFunction\"              : <NF_FUNCTION>,\n"+
-                               "\t\t\"nfType\"              : <NF_TYPE>,\n"+
-                               "\t\t\"nfRole\"              : <NF_ROLE>,\n"+
-                               "\t\t\"nfNamingCode\"              : <NF_NAMING_CODE>\n"+
-               "\t}";
+               "\t\t\"toscaNodeType\"                      : <TOSCA_NODE_TYPE>,\n"+ 
+               "\t\t\"allottedResourceType\"               : <ALLOTTED_RESOURCE_TYPE>,\n"+ 
+               "\t\t\"allottedResourceRole\"               : <ALLOTTED_RESOURCE_ROLE>,\n"+ 
+               "\t\t\"providingServiceModelName\"          : <PROVIDING_SERVICE_MODEL_NAME>,\n"+ 
+               "\t\t\"providingServiceModelInvariantUuid\" : <PROVIDING_SERVICE_MODEL_INVARIANT_UUID>,\n"+ 
+               "\t\t\"providingServiceModelUuid\"          : <PROVIDING_SERVICE_MODEL_UUID>,\n"+ 
+               "\t\t\"nfFunction\"                         : <NF_FUNCTION>,\n"+ 
+               "\t\t\"nfType\"                             : <NF_TYPE>,\n"+ 
+               "\t\t\"nfRole\"                             : <NF_ROLE>,\n"+ 
+               "\t\t\"nfNamingCode\"                       : <NF_NAMING_CODE>\n"+ 
+           "\t}";                      
 //             "\t}}";
 
        public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<>(); }
@@ -62,30 +62,30 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuilder buf = new StringBuilder();
+               StringBuilder sb = new StringBuilder();
 
                boolean first = true;
                int i = 1;
                for (AllottedResourceCustomization o : allottedResourceCustomization) {
-                       buf.append(i+"\t");
-                       if (!first) buf.append("\n"); first = false;
-                       buf.append(o);
+                       sb.append(i).append("\t");
+                       if (!first) sb.append("\n"); first = false;
+                       sb.append(o);
                }
-               return buf.toString();
+               return sb.toString();
     }
 
        @Override
        public String JSON2(boolean isArray, boolean isEmbed) {
-               StringBuilder buf = new StringBuilder();
-               if (!isEmbed && isArray) buf.append("{ ");
-               if (isArray) buf.append("\"serviceAllottedResources\": [");
+               StringBuilder sb = new StringBuilder();
+               if (!isEmbed && isArray) sb.append("{ ");
+               if (isArray) sb.append("\"serviceAllottedResources\": [");
                Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
                if (this.allottedResourceCustomization != null) {
                for (AllottedResourceCustomization o : allottedResourceCustomization) {
-                       if (first) buf.append("\n"); first = false;
+                       if (first) sb.append("\n"); first = false;
 
                                boolean arNull = o.getAllottedResource() == null ? true : false;
        
@@ -103,15 +103,17 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
                            put(valueMap, "NF_FUNCTION",     o.getNfFunction());
                            put(valueMap, "NF_NAMING_CODE",     o.getNfNamingCode());
                            put(valueMap, "PROVIDING_SERVICE_MODEL_INVARIANT_UUID",     o.getProvidingServiceModelInvariantUuid());
+                           put(valueMap, "PROVIDING_SERVICE_MODEL_UUID",     o.getProvidingServiceModelUuid());
+                           put(valueMap, "PROVIDING_SERVICE_MODEL_NAME",     o.getProvidingServiceModelName());
 
-            buf.append(sep+ this.setTemplate(template, valueMap));
+            sb.append(sep).append(this.setTemplate(template, valueMap));
             sep = ",\n";
                }
                }
-               if (!first) buf.append("\n");
-               if (isArray) buf.append("]");
-               if (!isEmbed && isArray) buf.append("}");
-               return buf.toString();
+               if (!first) sb.append("\n");
+               if (isArray) sb.append("]");
+               if (!isEmbed && isArray) sb.append("}");
+               return sb.toString();
        }
 
 }