summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-02-22 06:26:57 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-22 06:26:57 +0000
commit6000217dfd1af031823e21c11f3fdd4a631fac01 (patch)
tree065852543305617a2dcceb95a1c08d5efad4d9f1
parent3dabdbcfe266364fb0e33ca8b44b5cdad057ae6f (diff)
parent7b5f2495f09ee0634d5ecf29aced1b9b177fa4e6 (diff)
Merge "Boolean constructor call"
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java2
-rw-r--r--adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java6
-rw-r--r--common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertiesFactoryTest.java2
3 files changed, 5 insertions, 5 deletions
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 d7be686309..20535e93c8 100644
--- 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 309aa0641a..cb6ba1b3f6 100644
--- 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 54b01a5410..7b559dfbcb 100644
--- 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));
}