From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Thu, 26 Apr 2018 10:01:17 +0000 (+0530)
Subject: Combine hierarchy if statements
X-Git-Tag: v2.0.2~88
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3fc42e430b3f1cf95e48aa8f744edb9d823fff86;p=cli.git

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 23263c12..618c321c 100644
--- 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;