diff options
| author |   Kanagaraj Manickam <kanagaraj.manickam@huawei.com> | 2019-08-07 06:49:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-07 06:49:57 +0000 |
| commit | 4b279245d18de79879240e587d78db16dd3f09b6 (patch) | |
| tree | c65a802da32977f39b72041b917e83d4db50c292 | |
| parent | 59a19fc2b4ffc2d6765fbd77696afd61a550929b (diff) | |
| parent | 1aa15b526706ed7f45f197186a3e6ca0da3204c6 (diff) | |
Merge "Fix the boolean check"
| -rw-r--r-- | deployment/zip/src/main/release/conf/open-cli.properties | 2 | ||||
| -rw-r--r-- | framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/deployment/zip/src/main/release/conf/open-cli.properties b/deployment/zip/src/main/release/conf/open-cli.properties index 65d4db7e..eff85b8a 100644 --- a/deployment/zip/src/main/release/conf/open-cli.properties +++ b/deployment/zip/src/main/release/conf/open-cli.properties @@ -34,7 +34,7 @@ cli.schema.base.parameters.sections.mandatory=name,description,type cli.schema.base.results.sections=name,description,scope,type,is_secured, default_value cli.schema.base.results.sections.mandatory=name, description, type, scope -cli.schema.boolean_values=true +cli.schema.boolean_values=true,false cli.schema.command.type=cmd,auth,catalog # moco properties diff --git a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java index 7d2cec92..a1a14745 100644 --- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java +++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java @@ -344,7 +344,7 @@ public class OnapCommandSchemaLoader { case IS_OPTIONAL: if (validate && !OnapCommandUtils.validateBoolean(String.valueOf(parameter.get(key2)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(parameter.get(NAME), - IS_OPTIONAL, parameter.get(key2))); + IS_OPTIONAL, String.valueOf(parameter.get(key2)))); } if (BOOLEAN_TRUE.equalsIgnoreCase(String.valueOf(parameter.get(key2)))) { @@ -358,7 +358,7 @@ public class OnapCommandSchemaLoader { if (validate) { if (!OnapCommandUtils.validateBoolean(String.valueOf(parameter.get(key2)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(parameter.get(NAME), - IS_SECURED, parameter.get(key2))); + IS_SECURED, String.valueOf(parameter.get(key2)))); } } @@ -372,7 +372,7 @@ public class OnapCommandSchemaLoader { case IS_INCLUDE: if (validate && !OnapCommandUtils.validateBoolean(String.valueOf(parameter.get(key2)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(parameter.get(NAME), - IS_INCLUDE, parameter.get(key2))); + IS_INCLUDE, String.valueOf(parameter.get(key2)))); } if (BOOLEAN_TRUE.equalsIgnoreCase(String.valueOf(parameter.get(key2)))) { @@ -386,7 +386,7 @@ public class OnapCommandSchemaLoader { if (validate) { if (!OnapCommandUtils.validateBoolean(String.valueOf(parameter.get(key2)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(parameter.get(NAME), - IS_DEFAULT_PARAM, parameter.get(key2))); + IS_DEFAULT_PARAM, String.valueOf(parameter.get(key2)))); } } @@ -475,7 +475,7 @@ public class OnapCommandSchemaLoader { if (validate) { if (!OnapCommandUtils.validateBoolean(String.valueOf(map.get(key4)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(ATTRIBUTES, - IS_SECURED, map.get(key4))); + IS_SECURED, String.valueOf(map.get(key4)))); } } if (BOOLEAN_TRUE.equals(String.valueOf(map.get(key4)))) { @@ -489,7 +489,7 @@ public class OnapCommandSchemaLoader { if (validate) { if (!OnapCommandUtils.validateBoolean(String.valueOf(map.get(key4)))) { exceptionList.add(OnapCommandUtils.invalidBooleanValueMessage(ATTRIBUTES, - IS_DEFAULT_ATTR, map.get(key4))); + IS_DEFAULT_ATTR, String.valueOf(map.get(key4)))); } } if (BOOLEAN_TRUE.equals(String.valueOf(map.get(key4)))) { |