From 7293d08fcfecc5c66310303a8351f9efd219247e Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Fri, 8 Sep 2017 16:45:43 +0530 Subject: Add CLI_DEV While working on the commands implementation CLI_DEV env can be used to refresh the YAML everytime cli is ran CLI-2 Change-Id: Ic267f3f4eba7f8bd653eee9c82269d154a44e05c Signed-off-by: Kanagaraj Manickam k00365106 --- .../src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java | 11 +++++++++++ framework/src/main/java/org/onap/cli/fw/conf/Constants.java | 4 ++++ .../src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java | 3 ++- framework/src/test/resources/short-options.txt | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 framework/src/test/resources/short-options.txt (limited to 'framework/src') diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java index 019eb824..01d4742e 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommandRegistrar.java @@ -58,6 +58,8 @@ public class OnapCommandRegistrar { private boolean isInteractiveMode = false; + private boolean isDevMode = Boolean.getBoolean(System.getenv(Constants.CLI_DEV_MODE)); + private OnapCommandParameterCache paramCache = new OnapCommandParameterCache(); public boolean isInteractiveMode() { @@ -80,6 +82,15 @@ public class OnapCommandRegistrar { paramCache.remove(this.getEnabledProductVersion(), paramName); } + public boolean isDevMode() { + return isDevMode; + } + + public void setDevMode(boolean isDevMode) { + this.isDevMode = isDevMode; + } + + private static OnapCommandRegistrar registrar = null; /** diff --git a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java index 23dfbbbe..d7e277c7 100644 --- a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java +++ b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java @@ -195,8 +195,12 @@ public class Constants { public static final String USE_DIRECTIVE = "use"; public static final String PARAM_CACHE_FILE_NAME = "cli.parameter.cache.file"; + + public static final String CLI_DEV_MODE = "CLI_DEV"; + private Constants() { } } + diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java index b31b75cf..ec735cfb 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.JsonPath; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; import org.onap.cli.fw.OnapCommand; +import org.onap.cli.fw.OnapCommandRegistrar; import org.onap.cli.fw.ad.OnapCredentials; import org.onap.cli.fw.ad.OnapService; import org.onap.cli.fw.cmd.OnapHttpCommand; @@ -1654,7 +1655,7 @@ public class OnapCommandUtils { */ public static List loadExternalSchemasFromJson() throws OnapCommandException { List schemas = new ArrayList<>(); - if (!isJsonFileDiscovered()) { + if (OnapCommandRegistrar.getRegistrar().isDevMode() || !isJsonFileDiscovered()) { schemas = findAllExternalSchemas(); if (!schemas.isEmpty()) { persist(schemas); diff --git a/framework/src/test/resources/short-options.txt b/framework/src/test/resources/short-options.txt new file mode 100644 index 00000000..d5696309 --- /dev/null +++ b/framework/src/test/resources/short-options.txt @@ -0,0 +1 @@ +a d f h m p s t u v \ No newline at end of file -- cgit 1.2.3-korg