Combine hierarchy if statements

Issue-ID: CLI-100

Change-Id: I744ffefb28bf292b98a7e1465fb58e55b7bf1aeb
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
index 23263c1..618c321 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
+++ b/framework/src/main/java/org/onap/cli/fw/input/OnapCommandParameter.java
@@ -301,13 +301,10 @@ public class OnapCommandParameter {
                 throw new OnapCommandInvalidParameterValue(this.getName());
             }
         } else if (OnapCommandParameterType.BOOL.equals(parameterType)) {
-            if (!(value instanceof Boolean)) {
-                if (value instanceof String) {
-                    value = Boolean.valueOf((String)value);
-                } else {
-                    throw new OnapCommandInvalidParameterValue(this.getName());
-                }
-
+            if (value instanceof String) {
+                value = Boolean.valueOf((String)value);
+            } else if (!(value instanceof Boolean)) {
+                throw new OnapCommandInvalidParameterValue(this.getName());
             }
         }
         this.value = value;