From ee4c4d72ed2118ea44dd5d83e1cf1677b6ebb03c Mon Sep 17 00:00:00 2001 From: ilanap Date: Thu, 28 Nov 2019 11:13:24 +0200 Subject: Add Option to proxy to plugins Added option to proxy the plugins throught the catalog proxy. Remove hardcoded redirect to workflow and added to the plugin configuration. Issue-ID: SDC-2691 Signed-off-by: ilanap Change-Id: Ica479ff00e1a8c281b9280b5495ac022172775c4 Signed-off-by: ilanap --- .../sdc/fe/config/PluginsConfiguration.java | 108 +++------------------ 1 file changed, 13 insertions(+), 95 deletions(-) (limited to 'common-app-api/src') 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 index 449c9eaccc..55b0ea0db9 100644 --- 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 @@ -20,132 +20,50 @@ package org.openecomp.sdc.fe.config; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.openecomp.sdc.common.api.BasicConfiguration; import java.util.ArrayList; import java.util.List; import java.util.Map; +@Getter +@Setter +@ToString public class PluginsConfiguration extends BasicConfiguration { private List pluginsList; private Integer connectionTimeout; - public List getPluginsList() { - return pluginsList; - } - - public void setPluginsList(List pluginsList) { - this.pluginsList = pluginsList; - } - - public Integer getConnectionTimeout() { - return connectionTimeout; - } - - public void setConnectionTimeout(Integer connectionTimeout) { - this.connectionTimeout = connectionTimeout; - } - public PluginsConfiguration() { this.pluginsList = new ArrayList<>(); } + @Getter + @Setter public static class Plugin { - private String pluginId; private String pluginDiscoveryUrl; private String pluginSourceUrl; private String pluginStateUrl; + private String pluginFeProxyUrl; // this is optional in case it is different from the source url. + private String pluginProxyRedirectPath; private Map pluginDisplayOptions; private boolean isOnline; - public String getPluginId() { - return pluginId; - } - - public void setPluginId(String pluginId) { - this.pluginId = pluginId; - } - - public String getPluginDiscoveryUrl() { - return pluginDiscoveryUrl; - } - - public void setPluginDiscoveryUrl(String pluginDiscoveryUrl) { - this.pluginDiscoveryUrl = pluginDiscoveryUrl; - } - - public String getPluginSourceUrl() { - return pluginSourceUrl; - } - - public void setPluginSourceUrl(String pluginSourceUrl) { - this.pluginSourceUrl = pluginSourceUrl; - } - - public String getPluginStateUrl() { - return pluginStateUrl; - } - - public void setPluginStateUrl(String pluginStateUrl) { - this.pluginStateUrl = pluginStateUrl; - } - - public Map getPluginDisplayOptions() { - return pluginDisplayOptions; - } - - public void setPluginDisplayOptions(Map pluginDisplayOptions) { - this.pluginDisplayOptions = pluginDisplayOptions; - } - } + @Getter + @Setter + @ToString public static class PluginDisplayOptions { - private String displayName; private List displayContext; private List displayRoles; - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public List getDisplayContext() { - return displayContext; - } - - public void setDisplayContext(List displayContext) { - this.displayContext = displayContext; - } - - public List getDisplayRoles() { - return displayRoles; - } - - public void setDisplayRoles(List displayRoles) { - this.displayRoles = displayRoles; - } - - @Override - public String toString() { - return "PluginDisplayOptions[" - + "displayName='" + displayName - + ", displayContext=" + displayContext - + ", displayRoles=" + displayRoles - + ']'; - } } - @Override - public String toString() { - return "PluginsConfiguration[" + "pluginsList=" + pluginsList + ", connectionTimeout=" + connectionTimeout + ']'; - } } -- cgit 1.2.3-korg