From eedaaf983d731d0179916b3f3a8e4d3a0d80981b Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Wed, 31 Jan 2018 13:27:33 +0200 Subject: Change designer to plugin in code Changed all the use of the designer configuration in the code to be plugin Change-Id: Id9792cbd4fb9385446780c28fb7fb5418772acf6 Issue-ID: SDC-974 Signed-off-by: Idan Amit --- .../org/openecomp/sdc/common/api/Constants.java | 4 +- .../sdc/fe/config/ConfigurationManager.java | 8 +- .../sdc/fe/config/DesignersConfiguration.java | 118 --------------------- .../sdc/fe/config/PluginsConfiguration.java | 118 +++++++++++++++++++++ 4 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 common-app-api/src/main/java/org/openecomp/sdc/fe/config/DesignersConfiguration.java create mode 100644 common-app-api/src/main/java/org/openecomp/sdc/fe/config/PluginsConfiguration.java (limited to 'common-app-api') diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java index 839dc0bdd2..691b8ea159 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/Constants.java @@ -141,6 +141,6 @@ public interface Constants { public static final String HC_COMPONENT_ON_BOARDING = "ON_BOARDING"; public static final String HC_COMPONENT_DCAE = "DCAE"; - //Designer BL - public static final String DESIGNER_BL_COMPONENT = "designerStatusBL"; + //Plugin BL + public static final String PLUGIN_BL_COMPONENT = "pluginStatusBL"; } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/ConfigurationManager.java b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/ConfigurationManager.java index 807189dabb..0b19c6c910 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/ConfigurationManager.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/ConfigurationManager.java @@ -53,7 +53,7 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura loadConfigurationClass(Configuration.class); loadConfigurationClass(RestConfigurationInfo.class); loadConfigurationClass(EcompErrorConfiguration.class); - loadConfigurationClass(DesignersConfiguration.class); + loadConfigurationClass(PluginsConfiguration.class); } @@ -92,11 +92,11 @@ public class ConfigurationManager implements FileChangeCallback, IEcompConfigura } - public DesignersConfiguration getDesignersConfiguration() { + public PluginsConfiguration getPluginsConfiguration() { - log.info("requested designers configuration and got this:{}", configurations.get(getKey(DesignersConfiguration.class))); + log.info("requested plugins configuration and got this:{}", configurations.get(getKey(PluginsConfiguration.class))); - return (DesignersConfiguration) configurations.get(getKey(DesignersConfiguration.class)); + return (PluginsConfiguration) configurations.get(getKey(PluginsConfiguration.class)); } public Configuration getConfigurationAndWatch(ConfigurationListener configurationListener) { diff --git a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/DesignersConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/DesignersConfiguration.java deleted file mode 100644 index 31c4d4bc9a..0000000000 --- a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/DesignersConfiguration.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.openecomp.sdc.fe.config; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.openecomp.sdc.common.api.BasicConfiguration; - -public class DesignersConfiguration extends BasicConfiguration { - - private List designersList; - - public List getDesignersList() { - return designersList; - } - - public void setDesignersList(List designersList) { - this.designersList = designersList; - } - - public DesignersConfiguration() { - this.designersList = new ArrayList<>(); - } - - public static class Designer { - - private String designerId; - private String designerHost; - private String designerPort; - private String designerPath; - private String designerStateUrl; - private String designerProtocol; - private Map designerDisplayOptions; - - public Map getDesignerDisplayOptions() { - return designerDisplayOptions; - } - - public void setDesignerDisplayOptions(Map designerDisplayOptions) { - this.designerDisplayOptions = designerDisplayOptions; - } - - public String getDesignerStateUrl() { - return designerStateUrl; - } - - public void setDesignerStateUrl(String designerStateUrl) { - this.designerStateUrl = designerStateUrl; - } - - public String getDesignerProtocol() { - return designerProtocol; - } - - public void setDesignerProtocol(String designerProtocol) { - this.designerProtocol = designerProtocol; - } - - public String getDesignerId() { - return designerId; - } - - public void setDesignerId(String designerId) { - this.designerId = designerId; - } - - public String getDesignerHost() { - return designerHost; - } - - public void setDesignerHost(String designerHost) { - this.designerHost = designerHost; - } - - public String getDesignerPort() { - return designerPort; - } - - public void setDesignerPort(String designerPort) { - this.designerPort = designerPort; - } - - public String getDesignerPath() { - return designerPath; - } - - public void setDesignerPath(String designerPath) { - this.designerPath = designerPath; - } - - } - - public static class DesignerDisplayOptions { - - private String displayName; - private List displayContext; - - public List getDisplayContext() { - return displayContext; - } - - public void setDisplayContext(List displayContext) { - this.displayContext = displayContext; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - } - -} - - diff --git a/common-app-api/src/main/java/org/openecomp/sdc/fe/config/PluginsConfiguration.java b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/PluginsConfiguration.java new file mode 100644 index 0000000000..ae04b7a102 --- /dev/null +++ b/common-app-api/src/main/java/org/openecomp/sdc/fe/config/PluginsConfiguration.java @@ -0,0 +1,118 @@ +package org.openecomp.sdc.fe.config; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.openecomp.sdc.common.api.BasicConfiguration; + +public class PluginsConfiguration extends BasicConfiguration { + + private List pluginsList; + + public List getPluginsList() { + return pluginsList; + } + + public void setPluginsList(List pluginsList) { + this.pluginsList = pluginsList; + } + + public PluginsConfiguration() { + this.pluginsList = new ArrayList<>(); + } + + public static class Plugin { + + private String pluginId; + private String pluginHost; + private String pluginPort; + private String pluginPath; + private String pluginStateUrl; + private String pluginProtocol; + private Map pluginDisplayOptions; + + public Map getPluginDisplayOptions() { + return pluginDisplayOptions; + } + + public void setPluginDisplayOptions(Map pluginDisplayOptions) { + this.pluginDisplayOptions = pluginDisplayOptions; + } + + public String getPluginStateUrl() { + return pluginStateUrl; + } + + public void setPluginStateUrl(String pluginStateUrl) { + this.pluginStateUrl = pluginStateUrl; + } + + public String getPluginProtocol() { + return pluginProtocol; + } + + public void setPluginProtocol(String pluginProtocol) { + this.pluginProtocol = pluginProtocol; + } + + public String getPluginId() { + return pluginId; + } + + public void setPluginId(String pluginId) { + this.pluginId = pluginId; + } + + public String getPluginHost() { + return pluginHost; + } + + public void setPluginHost(String pluginHost) { + this.pluginHost = pluginHost; + } + + public String getPluginPort() { + return pluginPort; + } + + public void setPluginPort(String pluginPort) { + this.pluginPort = pluginPort; + } + + public String getPluginPath() { + return pluginPath; + } + + public void setPluginPath(String pluginPath) { + this.pluginPath = pluginPath; + } + + } + + public static class PluginDisplayOptions { + + private String displayName; + private List displayContext; + + public List getDisplayContext() { + return displayContext; + } + + public void setDisplayContext(List displayContext) { + this.displayContext = displayContext; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + } + +} + + -- cgit 1.2.3-korg