Merge "Remove the literal boolean values."

4 files changed, 6 insertions, 6 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
index e550394931..c1acc319f7 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -104,7 +104,7 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 
                 first = false;
 
-                boolean arNull = o.getAllottedResource() == null ? true : false;
+                boolean arNull = o.getAllottedResource() == null;
 
                 put(valueMap, "MODEL_NAME", arNull ? null : o.getAllottedResource().getModelName());
                 put(valueMap, "MODEL_UUID", arNull ? null : o.getAllottedResource().getModelUUID());
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceNetworks.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
index 96ea797631..5573b23a8d 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
@@ -104,7 +104,7 @@ public class QueryServiceNetworks extends CatalogQuery {
             if (first)
                 sb.append("\n");
             first = false;
-            boolean nrNull = o.getNetworkResource() == null ? true : false;
+            boolean nrNull = o.getNetworkResource() == null;
             put(valueMap, "MODEL_NAME", nrNull ? null : o.getNetworkResource().getModelName());
             put(valueMap, "MODEL_UUID", nrNull ? null : o.getNetworkResource().getModelUUID());
             put(valueMap, "MODEL_INVARIANT_ID", nrNull ? null : o.getNetworkResource().getModelInvariantUUID());
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceVnfs.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
index b1bdeda445..f786f25361 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
@@ -101,7 +101,7 @@ public class QueryServiceVnfs extends CatalogQuery {
                 sb.append("\n");
             first = false;
 
-            boolean vrNull = o.getVnfResources() == null ? true : false;
+            boolean vrNull = o.getVnfResources() == null;
 
             put(valueMap, "MODEL_NAME", vrNull ? null : o.getVnfResources().getModelName());
             put(valueMap, "MODEL_UUID", vrNull ? null : o.getVnfResources().getModelUUID());
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVfModule.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVfModule.java
index 1dec9cecae..1604e99a72 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVfModule.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryVfModule.java
@@ -97,7 +97,7 @@ public class QueryVfModule extends CatalogQuery {
                 sb.append("\n");
             first = false;
 
-            boolean vfNull = o.getVfModule() == null ? true : false;
+            boolean vfNull = o.getVfModule() == null;
             boolean hasVolumeGroup = false;
             HeatEnvironment envt = o.getVolumeHeatEnv();
             if (envt != null) {
@@ -109,10 +109,10 @@ public class QueryVfModule extends CatalogQuery {
             put(valueMap, "MODEL_INVARIANT_ID", vfNull ? null : o.getVfModule().getModelInvariantUUID());
             put(valueMap, "MODEL_VERSION", vfNull ? null : o.getVfModule().getModelVersion());
             put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUUID());
-            put(valueMap, "IS_BASE", vfNull ? false : o.getVfModule().getIsBase() ? true : false);
+            put(valueMap, "IS_BASE", !vfNull && (o.getVfModule().getIsBase()));
             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", hasVolumeGroup);
 
             sb.append(sep).append(this.setTemplate(TEMPLATE, valueMap));
             sep = ",\n";