Merge "Reorder modifiers"

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

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
index cb6ba1b..9215c38 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
@@ -19,18 +19,16 @@
  */
 package org.openecomp.mso.adapters.catalogdb.catalogrest;
 
-import org.openecomp.mso.db.catalog.beans.VfModule;
-import org.openecomp.mso.db.catalog.beans.VfModuleCustomization;
-import org.jboss.resteasy.annotations.providers.NoJackson;
-
-import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.openecomp.mso.db.catalog.beans.VfModuleCustomization;
+
 @XmlRootElement(name = "vfModules")
-@NoJackson
 public class QueryVfModule extends CatalogQuery {
        private List<VfModuleCustomization> vfModules;
        private final String template =
@@ -69,28 +67,29 @@ public class QueryVfModule extends CatalogQuery {
 
        @Override
        public String toString () {
-               StringBuilder buf = new StringBuilder();
+               StringBuilder sb = new StringBuilder();
 
                boolean first = true;
                int i = 1;
                for (VfModuleCustomization o : vfModules) {
-                       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 x) {
-               StringBuilder buf = new StringBuilder();
-               if (isArray) buf.append("\"vfModules\": [");
+       public String JSON2(boolean isArray, boolean isEmbed) {
+               StringBuilder sb = new StringBuilder();
+               if (!isEmbed && isArray) sb.append("{ ");
+               if (isArray) sb.append("\"vfModules\": [");
                Map<String, String> valueMap = new HashMap<>();
                String sep = "";
                boolean first = true;
 
                for (VfModuleCustomization o : vfModules) {
-                       if (first) buf.append("\n"); first = false;
+                       if (first) sb.append("\n"); first = false;
 
                        boolean vfNull = o.getVfModule() == null ? true : false;
                        boolean hasVolumeGroup = false;
@@ -104,16 +103,17 @@ public class QueryVfModule extends CatalogQuery {
                    put(valueMap, "MODEL_INVARIANT_ID",       vfNull ? null : o.getVfModule().getModelInvariantUuid());
                    put(valueMap, "MODEL_VERSION",            vfNull ? null : o.getVfModule().getVersion());
                    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
-                       put(valueMap, "IS_BASE", vfNull ? false : Boolean.valueOf(o.getVfModule().isBase() ? true : false));
+                       put(valueMap, "IS_BASE", vfNull ? false : o.getVfModule().isBase() ? true : false);
                        put(valueMap, "VF_MODULE_LABEL",          o.getLabel());
                    put(valueMap, "INITIAL_COUNT",            o.getInitialCount());
-                   put(valueMap, "HAS_VOLUME_GROUP", Boolean.valueOf(hasVolumeGroup));
+                   put(valueMap, "HAS_VOLUME_GROUP", hasVolumeGroup);
 
-            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("]");
-               return buf.toString();
+               if (!first) sb.append("\n");
+               if (isArray) sb.append("]");
+               if (!isEmbed && isArray) sb.append("}");
+               return sb.toString();
        }
 }