Remove wrapping of primitive values in objects

Change-Id: I67b1229c7c8d0d82b94857f64a6547d9f57d16b8
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

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..b2caa99 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
@@ -104,10 +104,10 @@ 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));
             sep = ",\n";

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
index c2b8328..fbfe226 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/xml/XmlTool.java
@@ -64,10 +64,10 @@ public final class XmlTool {
        private static final Map<String, Integer> ENTITIES = new HashMap<>();
        private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.BPEL);
        static {
-               ENTITIES.put("amp", new Integer(38));
-               ENTITIES.put("quot", new Integer(34));
-               ENTITIES.put("lt", new Integer(60));
-               ENTITIES.put("gt", new Integer(62));
+               ENTITIES.put("amp", 38);
+               ENTITIES.put("quot", 34);
+               ENTITIES.put("lt", 60);
+               ENTITIES.put("gt", 62);
        }
 
        /**

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
index 27c3c2b..ad76a15 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
@@ -741,7 +741,7 @@ public class MsoRequest {
             if ((status == Status.FAILED) || (status == Status.COMPLETE)) {
                 aq.setStatusMessage (this.errorMessage);
                 aq.setResponseBody (this.responseBody);
-                aq.setProgress(new Long(100));
+                aq.setProgress(100L);
 
                 Timestamp endTimeStamp = new Timestamp (System.currentTimeMillis());
                 aq.setEndTime (endTimeStamp);