Boolean constructor call

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

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index d7be686..20535e9 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -1548,7 +1548,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                }
                        } else if ("boolean".equalsIgnoreCase(type)) {
                                String booleanString = inputs.get(key);
-                               Boolean aBool = new Boolean(booleanString);
+                               Boolean aBool = Boolean.valueOf(booleanString);
                                if (alias)
                                        newInputs.put(realName, aBool);
                                else

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 309aa06..cb6ba1b 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 : new Boolean(o.getVfModule().isBase()? true: false));
-                   put(valueMap, "VF_MODULE_LABEL",          o.getLabel());
+                       put(valueMap, "IS_BASE", vfNull ? false : Boolean.valueOf(o.getVfModule().isBase() ? true : false));
+                       put(valueMap, "VF_MODULE_LABEL",          o.getLabel());
                    put(valueMap, "INITIAL_COUNT",            o.getInitialCount());
-                   put(valueMap, "HAS_VOLUME_GROUP",           new Boolean(hasVolumeGroup));
+                   put(valueMap, "HAS_VOLUME_GROUP", Boolean.valueOf(hasVolumeGroup));
 
             buf.append(sep+ this.setTemplate(template, valueMap));
             sep = ",\n";

diff --git a/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertiesFactoryTest.java b/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertiesFactoryTest.java
index 54b01a5..7b559df 100644 (file)
--- a/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertiesFactoryTest.java
+++ b/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertiesFactoryTest.java
@@ -153,7 +153,7 @@ public class MsoPropertiesFactoryTest {
                
                assertFalse(msoPropChanged.equals(null));
                assertFalse(msoPropChanged.equals(msoPropCache));
-               assertFalse(msoPropChanged.equals(new Boolean(true)));
+               assertFalse(msoPropChanged.equals(Boolean.TRUE));
                
                assertTrue(msoPropChanged.equals(msoPropChanged));
        }