From bb9a334dc4ab33a90533fc5d35508db3edfa34b6 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 13 Sep 2017 10:52:49 +0530 Subject: Namespace migration to open_cli_schema_version CLI-3 Change-Id: I87d739c9c9b9f8e7724f1aa736a51b0fd91c30df Signed-off-by: Kanagaraj Manickam k00365106 --- framework/src/main/java/org/onap/cli/fw/OnapCommand.java | 2 +- framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java | 2 +- framework/src/main/java/org/onap/cli/fw/conf/Constants.java | 4 ++-- .../org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java | 2 +- .../src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'framework/src/main/java/org/onap') diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java index c65ca9a8..dc90314a 100644 --- a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java +++ b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java @@ -71,7 +71,7 @@ public abstract class OnapCommand { protected boolean isInitialzied = false; public String getSchemaVersion() { - return Constants.ONAP_CMD_SCHEMA_VERSION_VALUE; + return Constants.OPEN_CLI_SCHEMA_VERSION_VALUE; } /** diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java index 9438102f..e3ec17de 100644 --- a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java +++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java @@ -48,7 +48,7 @@ public class OnapHttpCommand extends OnapCommand { @Override public String getSchemaVersion() { - return Constants.ONAP_CMD_SCHEMA_VERSION_VALUE; + return Constants.OPEN_CLI_SCHEMA_VERSION_VALUE; } public void setSuccessStatusCodes(List successStatusCodes) { 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 00bdb855..17b771c0 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 @@ -80,7 +80,7 @@ public class Constants { public static final String SCOPE = "scope"; - public static final String ONAP_CMD_SCHEMA_VERSION_VALUE = "1.0"; + public static final String OPEN_CLI_SCHEMA_VERSION_VALUE = "1.0"; public static final String DESCRIPTION = "description"; public static final String SERVICE = "service"; public static final String PARAMETERS = "parameters"; @@ -90,7 +90,7 @@ public class Constants { public static final String RESULTS = "results"; - public static final String ONAP_CMD_SCHEMA_VERSION = "onap_cmd_schema_version"; + public static final String OPEN_CLI_SCHEMA_VERSION = "open_cli_schema_version"; public static final String NAME = "name"; public static final String VERSION = "version"; public static final String BASE_PATH = "base_path"; diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java index 75530ab4..e330283f 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java @@ -25,7 +25,7 @@ public class OnapCommandInvalidSchemaVersion extends OnapCommandException { private static final long serialVersionUID = 4459731110721370387L; public OnapCommandInvalidSchemaVersion(String schemaVersion) { - super("0x0008", "Command schema onap_cmd_schema_version " + schemaVersion + " is invalid or missing"); + super("0x0008", "Command schema open_cli_schema_version " + schemaVersion + " is invalid or missing"); } } 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 f4fb7515..9b824d32 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 @@ -62,7 +62,7 @@ import static org.onap.cli.fw.conf.Constants.MODE; import static org.onap.cli.fw.conf.Constants.MODE_VALUES; import static org.onap.cli.fw.conf.Constants.MULTIPART_ENTITY_NAME; import static org.onap.cli.fw.conf.Constants.NAME; -import static org.onap.cli.fw.conf.Constants.ONAP_CMD_SCHEMA_VERSION; +import static org.onap.cli.fw.conf.Constants.OPEN_CLI_SCHEMA_VERSION; import static org.onap.cli.fw.conf.Constants.PARAMETERS; import static org.onap.cli.fw.conf.Constants.QUERIES; import static org.onap.cli.fw.conf.Constants.REQUEST; @@ -200,8 +200,8 @@ public class OnapCommandUtils { throw new OnapCommandInvalidSchema(schemaName, e); } String schemaVersion = ""; - if (values.keySet().contains(ONAP_CMD_SCHEMA_VERSION)) { - Object obj = values.get(ONAP_CMD_SCHEMA_VERSION); + if (values.keySet().contains(OPEN_CLI_SCHEMA_VERSION)) { + Object obj = values.get(OPEN_CLI_SCHEMA_VERSION); schemaVersion = obj.toString(); } @@ -1528,7 +1528,7 @@ public class OnapCommandUtils { schema.setSchemaName(resource.getFilename()); schema.setSchemaURI(resource.getURI().toString()); schema.setCmdName((String) resourceMap.get(NAME)); - Object obj = resourceMap.get(ONAP_CMD_SCHEMA_VERSION); + Object obj = resourceMap.get(OPEN_CLI_SCHEMA_VERSION); schema.setVersion(obj.toString()); schema.setCmdVersion(resourceMap.get(Constants.VERSION).toString()); if (resourceMap.get(Constants.HTTP) != null) { -- cgit 1.2.3-korg