Skip to content

D
discovery
Commit 68884af6 by Nepxion
Options

重构出common工程

parent 029b7cf3
Showing with 205 additions and 198 deletions
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/constant/PluginConstant.java → discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java
package com.nepxion.discovery.plugin.framework.constant;
package com.nepxion.discovery.common.constant;
/**
* <p>Title: Nepxion Discovery</p>
......@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.framework.constant;
* @version 1.0
*/
public class PluginConstant {
public class DiscoveryConstant {
public static final String SPRING_APPLICATION_DISCOVERY_PLUGIN = "spring.application.discovery.plugin";
public static final String SPRING_APPLICATION_REGISTER_CONTROL_ENABLED = "spring.application.register.control.enabled";
public static final String SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED = "spring.application.discovery.control.enabled";
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/CountFilterEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/CountFilterEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/DiscoveryEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/DiscoveryEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/FilterType.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/FilterType.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......@@ -10,8 +10,8 @@ package com.nepxion.discovery.plugin.framework.entity;
*/
public enum FilterType {
BLACKLIST("blacklist", "黑名单"),
WHITELIST("whitelist", "白名单");
BLACKLIST("blacklist", "blacklist"),
WHITELIST("whitelist", "whitelist");
private String value;
private String description;
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/HostFilterEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/HostFilterEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/InstanceEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/InstanceEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/RegisterEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/RegisterEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/ResultEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/ResultEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/RouterEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/RouterEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......@@ -18,7 +18,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
public class RouterEntity implements Serializable {
private static final long serialVersionUID = -4480475963615166799L;
......@@ -73,10 +73,10 @@ public class RouterEntity implements Serializable {
public String toInfo() {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("[")
.append(PluginConstant.SERVICE_ID).append("=").append(serviceId).append(", ")
.append(PluginConstant.VERSION).append("=").append(version).append(", ")
.append(PluginConstant.HOST).append("=").append(host).append(", ")
.append(PluginConstant.PORT).append("=").append(port)
.append(DiscoveryConstant.SERVICE_ID).append("=").append(serviceId).append(", ")
.append(DiscoveryConstant.VERSION).append("=").append(version).append(", ")
.append(DiscoveryConstant.HOST).append("=").append(host).append(", ")
.append(DiscoveryConstant.PORT).append("=").append(port)
.append("]");
return stringBuilder.toString();
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/entity/RuleEntity.java → discovery-common/src/main/java/com/nepxion/discovery/common/entity/RuleEntity.java
package com.nepxion.discovery.plugin.framework.entity;
package com.nepxion.discovery.common.entity;
/**
* <p>Title: Nepxion Discovery</p>
......
discovery-common/src/main/java/com/nepxion/discovery/plugin/framework/exception/PluginException.java → discovery-common/src/main/java/com/nepxion/discovery/common/exception/DiscoveryException.java
package com.nepxion.discovery.plugin.framework.exception;
package com.nepxion.discovery.common.exception;
/**
* <p>Title: Nepxion Discovery</p>
......@@ -9,22 +9,22 @@ package com.nepxion.discovery.plugin.framework.exception;
* @version 1.0
*/
public class PluginException extends RuntimeException {
public class DiscoveryException extends RuntimeException {
private static final long serialVersionUID = 7975167663357170655L;
public PluginException() {
public DiscoveryException() {
super();
}
public PluginException(String message) {
public DiscoveryException(String message) {
super(message);
}
public PluginException(String message, Throwable cause) {
public DiscoveryException(String message, Throwable cause) {
super(message, cause);
}
public PluginException(Throwable cause) {
public DiscoveryException(Throwable cause) {
super(cause);
}
}
\ No newline at end of file
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/controller/ServiceController.java
......@@ -19,11 +19,11 @@ import org.springframework.http.MediaType;
import org.springframework.web.client.RestTemplate;
import com.fasterxml.jackson.core.type.TypeReference;
import com.nepxion.discovery.common.entity.ResultEntity;
import com.nepxion.discovery.common.entity.RouterEntity;
import com.nepxion.discovery.console.desktop.context.PropertiesContext;
import com.nepxion.discovery.console.desktop.entity.Instance;
import com.nepxion.discovery.console.desktop.serializer.JacksonSerializer;
import com.nepxion.discovery.plugin.framework.entity.ResultEntity;
import com.nepxion.discovery.plugin.framework.entity.RouterEntity;
public class ServiceController {
public static RestTemplate restTemplate;
......
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/entity/Instance.java
......@@ -13,8 +13,8 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.InstanceEntity;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.InstanceEntity;
public class Instance extends InstanceEntity {
private static final long serialVersionUID = -3381928574242229614L;
......@@ -49,7 +49,7 @@ public class Instance extends InstanceEntity {
public String getFilter() {
Map<String, String> metadata = getMetadata();
String filterKey = metadata.get(PluginConstant.SPRING_APPLICATION_GROUP_KEY);
String filterKey = metadata.get(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY);
if (StringUtils.isEmpty(filterKey)) {
return "";
}
......@@ -64,7 +64,7 @@ public class Instance extends InstanceEntity {
public String getPlugin() {
Map<String, String> metadata = getMetadata();
String plugin = metadata.get(PluginConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN);
String plugin = metadata.get(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN);
if (plugin == null) {
return "";
}
......@@ -74,7 +74,7 @@ public class Instance extends InstanceEntity {
public boolean isDiscoveryControlEnabled() {
Map<String, String> metadata = getMetadata();
String flag = metadata.get(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
String flag = metadata.get(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
if (flag == null) {
return true;
}
......@@ -84,7 +84,7 @@ public class Instance extends InstanceEntity {
public boolean isConfigRestControlEnabled() {
Map<String, String> metadata = getMetadata();
String flag = metadata.get(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
String flag = metadata.get(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
if (flag == null) {
return true;
}
......
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/RouterTopology.java
......@@ -37,6 +37,7 @@ import com.nepxion.cots.twaver.graph.TGraphControlBar;
import com.nepxion.cots.twaver.graph.TGraphManager;
import com.nepxion.cots.twaver.graph.TLayoutPanel;
import com.nepxion.cots.twaver.graph.TLayouterBar;
import com.nepxion.discovery.common.entity.RouterEntity;
import com.nepxion.discovery.console.desktop.controller.ServiceController;
import com.nepxion.discovery.console.desktop.entity.Instance;
import com.nepxion.discovery.console.desktop.icon.ConsoleIconFactory;
......@@ -46,7 +47,6 @@ import com.nepxion.discovery.console.desktop.workspace.topology.LocationEntity;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyEntity;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyEntityType;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyStyleType;
import com.nepxion.discovery.plugin.framework.entity.RouterEntity;
import com.nepxion.swing.action.JSecurityAction;
import com.nepxion.swing.button.ButtonManager;
import com.nepxion.swing.button.JBasicButton;
......
discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java
......@@ -45,6 +45,7 @@ import com.nepxion.cots.twaver.element.TGroupType;
import com.nepxion.cots.twaver.element.TNode;
import com.nepxion.cots.twaver.graph.TGraphBackground;
import com.nepxion.cots.twaver.graph.TGraphManager;
import com.nepxion.discovery.common.entity.ResultEntity;
import com.nepxion.discovery.console.desktop.constant.ConsoleConstant;
import com.nepxion.discovery.console.desktop.controller.ServiceController;
import com.nepxion.discovery.console.desktop.entity.Instance;
......@@ -56,7 +57,6 @@ import com.nepxion.discovery.console.desktop.workspace.topology.LocationEntity;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyEntity;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyEntityType;
import com.nepxion.discovery.console.desktop.workspace.topology.TopologyStyleType;
import com.nepxion.discovery.plugin.framework.entity.ResultEntity;
import com.nepxion.swing.action.JSecurityAction;
import com.nepxion.swing.button.ButtonManager;
import com.nepxion.swing.button.JClassicButton;
......
discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java
......@@ -32,12 +32,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import com.nepxion.discovery.common.entity.InstanceEntity;
import com.nepxion.discovery.console.remote.ConfigAdapter;
import com.nepxion.discovery.console.rest.ConfigClearRestInvoker;
import com.nepxion.discovery.console.rest.ConfigUpdateRestInvoker;
import com.nepxion.discovery.console.rest.VersionClearRestInvoker;
import com.nepxion.discovery.console.rest.VersionUpdateRestInvoker;
import com.nepxion.discovery.plugin.framework.entity.InstanceEntity;
@RestController
@Api(tags = { "控制台接口" })
......
discovery-console/src/main/java/com/nepxion/discovery/console/rest/AbstractRestInvoker.java
......@@ -22,9 +22,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.ResultEntity;
import com.nepxion.discovery.console.handler.ConsoleErrorHandler;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.ResultEntity;
public abstract class AbstractRestInvoker {
private static final Logger LOG = LoggerFactory.getLogger(AbstractRestInvoker.class);
......@@ -79,9 +79,9 @@ public abstract class AbstractRestInvoker {
protected void checkDiscoveryControlPermission(ServiceInstance serviceInstance) {
Map<String, String> metadata = serviceInstance.getMetadata();
String discoveryControlEnabled = metadata.get(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
String discoveryControlEnabled = metadata.get(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
if (StringUtils.isEmpty(discoveryControlEnabled)) {
throw new IllegalArgumentException("No metadata for key=" + PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
throw new IllegalArgumentException("No metadata for key=" + DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED);
}
if (!Boolean.valueOf(discoveryControlEnabled)) {
......@@ -92,9 +92,9 @@ public abstract class AbstractRestInvoker {
protected void checkConfigRestControlPermission(ServiceInstance serviceInstance) {
Map<String, String> metadata = serviceInstance.getMetadata();
String configRestControlEnabled = metadata.get(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
String configRestControlEnabled = metadata.get(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
if (StringUtils.isEmpty(configRestControlEnabled)) {
throw new IllegalArgumentException("No metadata for key=" + PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
throw new IllegalArgumentException("No metadata for key=" + DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED);
}
if (!Boolean.valueOf(configRestControlEnabled)) {
......
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/ConfigEndpoint.java
......@@ -26,9 +26,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.event.PluginEventWapper;
import com.nepxion.discovery.plugin.framework.event.RuleClearedEvent;
import com.nepxion.discovery.plugin.framework.event.RuleUpdatedEvent;
......
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/RouterEndpoint.java
......@@ -31,10 +31,10 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.RouterEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.RouterEntity;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
@RestController
@Api(tags = { "路由接口" })
......@@ -113,7 +113,7 @@ public class RouterEndpoint {
try {
instanceList = getInstanceList(routeServiceId);
} catch (Exception e) {
throw new PluginException("Get instance list for route serviceId=" + routeServiceId + " failed", e);
throw new DiscoveryException("Get instance list for route serviceId=" + routeServiceId + " failed", e);
}
if (CollectionUtils.isEmpty(instanceList)) {
......@@ -123,7 +123,7 @@ public class RouterEndpoint {
List<RouterEntity> routerEntityList = new ArrayList<RouterEntity>();
for (ServiceInstance instance : instanceList) {
String serviceId = instance.getServiceId().toLowerCase();
String version = instance.getMetadata().get(PluginConstant.VERSION);
String version = instance.getMetadata().get(DiscoveryConstant.VERSION);
String host = instance.getHost();
int port = instance.getPort();
......@@ -147,7 +147,7 @@ public class RouterEndpoint {
try {
instanceList = routerRestTemplate.getForEntity(url, List.class).getBody();
} catch (RestClientException e) {
throw new PluginException("Get instance list for route serviceId=" + routeServiceId + " with url=" + url + " failed", e);
throw new DiscoveryException("Get instance list for route serviceId=" + routeServiceId + " with url=" + url + " failed", e);
}
if (CollectionUtils.isEmpty(instanceList)) {
......@@ -156,10 +156,10 @@ public class RouterEndpoint {
List<RouterEntity> routerEntityList = new ArrayList<RouterEntity>();
for (Map<String, ?> instance : instanceList) {
String serviceId = instance.get(PluginConstant.SERVICE_ID).toString().toLowerCase();
String version = ((Map<String, String>) instance.get(PluginConstant.METADATA)).get(PluginConstant.VERSION);
String host = instance.get(PluginConstant.HOST).toString();
Integer port = (Integer) instance.get(PluginConstant.PORT);
String serviceId = instance.get(DiscoveryConstant.SERVICE_ID).toString().toLowerCase();
String version = ((Map<String, String>) instance.get(DiscoveryConstant.METADATA)).get(DiscoveryConstant.VERSION);
String host = instance.get(DiscoveryConstant.HOST).toString();
Integer port = (Integer) instance.get(DiscoveryConstant.PORT);
RouterEntity routerEntity = new RouterEntity();
routerEntity.setServiceId(serviceId);
......@@ -175,14 +175,14 @@ public class RouterEndpoint {
public RouterEntity routeTree(String routeServiceIds) {
if (StringUtils.isEmpty(routeServiceIds)) {
throw new PluginException("Route serviceIds is empty");
throw new DiscoveryException("Route serviceIds is empty");
}
String[] serviceIdArray = null;
try {
serviceIdArray = StringUtils.split(routeServiceIds, PluginConstant.SEPARATE);
serviceIdArray = StringUtils.split(routeServiceIds, DiscoveryConstant.SEPARATE);
} catch (Exception e) {
throw new PluginException("Route serviceIds must be separated with '" + PluginConstant.SEPARATE + "'", e);
throw new DiscoveryException("Route serviceIds must be separated with '" + DiscoveryConstant.SEPARATE + "'", e);
}
RouterEntity firstRouterEntity = getRouterEntity();
......
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/VersionEndpoint.java
......@@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.event.PluginEventWapper;
import com.nepxion.discovery.plugin.framework.event.VersionClearedEvent;
......@@ -58,7 +58,7 @@ public class VersionEndpoint {
String dynamicVersion = null;
String localVersion = null;
String[] versionArray = StringUtils.split(version, PluginConstant.SEPARATE);
String[] versionArray = StringUtils.split(version, DiscoveryConstant.SEPARATE);
if (versionArray.length == 2) {
dynamicVersion = versionArray[0];
localVersion = versionArray[1];
......
discovery-plugin-config-center-extension-nacos/src/main/java/com/nepxion/discovery/plugin/configcenter/extension/nacos/adapter/NacosConfigAdapter.java
......@@ -16,12 +16,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.nacos.operation.NacosOperation;
import com.nepxion.discovery.common.nacos.operation.NacosSubscribeCallback;
import com.nepxion.discovery.plugin.configcenter.ConfigAdapter;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.event.RuleClearedEvent;
import com.nepxion.discovery.plugin.framework.event.RuleUpdatedEvent;
......
discovery-plugin-config-center-extension-redis/src/main/java/com/nepxion/discovery/plugin/configcenter/extension/redis/adapter/RedisConfigAdapter.java
......@@ -14,12 +14,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.redis.operation.RedisOperation;
import com.nepxion.discovery.common.redis.operation.RedisSubscribeCallback;
import com.nepxion.discovery.plugin.configcenter.ConfigAdapter;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.event.RuleClearedEvent;
import com.nepxion.discovery.plugin.framework.event.RuleUpdatedEvent;
......
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigInitializer.java
......@@ -16,12 +16,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader;
import com.nepxion.discovery.plugin.configcenter.loader.RemoteConfigLoader;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
public class ConfigInitializer {
private static final Logger LOG = LoggerFactory.getLogger(ConfigInitializer.class);
......
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/configuration/ConfigAutoConfiguration.java
......@@ -14,14 +14,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.configcenter.ConfigInitializer;
import com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader;
import com.nepxion.discovery.plugin.configcenter.parser.json.JsonConfigParser;
import com.nepxion.discovery.plugin.configcenter.parser.xml.XmlConfigParser;
import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
@Configuration
public class ConfigAutoConfiguration {
......@@ -31,13 +31,13 @@ public class ConfigAutoConfiguration {
@Bean
public PluginConfigParser pluginConfigParser() {
String configFormat = pluginContextAware.getConfigFormat();
if (StringUtils.equals(configFormat, PluginConstant.XML_FORMAT)) {
if (StringUtils.equals(configFormat, DiscoveryConstant.XML_FORMAT)) {
return new XmlConfigParser();
} else if (StringUtils.equals(configFormat, PluginConstant.JSON_FORMAT)) {
} else if (StringUtils.equals(configFormat, DiscoveryConstant.JSON_FORMAT)) {
return new JsonConfigParser();
}
throw new PluginException("Invalid config format for '" + configFormat + "'");
throw new DiscoveryException("Invalid config format for '" + configFormat + "'");
}
@Bean
......
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/loader/LocalConfigLoader.java
......@@ -16,7 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
public abstract class LocalConfigLoader implements ConfigLoader {
@Autowired
......@@ -34,7 +34,7 @@ public abstract class LocalConfigLoader implements ConfigLoader {
String filePath = applicationContext.getEnvironment().resolvePlaceholders(path);
inputStream = applicationContext.getResource(filePath).getInputStream();
return IOUtils.toString(inputStream, PluginConstant.ENCODING_UTF_8);
return IOUtils.toString(inputStream, DiscoveryConstant.ENCODING_UTF_8);
} catch (Exception e) {
throw e;
} finally {
......
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/json/JsonConfigParser.java
......@@ -13,10 +13,10 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.configcenter.parser.json.jackson.JacksonSerializer;
import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
public class JsonConfigParser implements PluginConfigParser {
private static final Logger LOG = LoggerFactory.getLogger(JsonConfigParser.class);
......@@ -24,7 +24,7 @@ public class JsonConfigParser implements PluginConfigParser {
@Override
public RuleEntity parse(String config) {
if (StringUtils.isEmpty(config)) {
throw new PluginException("Config is null or empty");
throw new DiscoveryException("Config is null or empty");
}
try {
......@@ -35,7 +35,7 @@ public class JsonConfigParser implements PluginConfigParser {
return ruleEntity;
} catch (Exception e) {
throw new PluginException(e.getMessage(), e);
throw new DiscoveryException(e.getMessage(), e);
}
}
}
\ No newline at end of file
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/json/jackson/JacksonSerializer.java
......@@ -16,14 +16,14 @@ import org.apache.commons.lang3.StringUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
public class JacksonSerializer {
private static ObjectMapper objectMapper;
static {
objectMapper = new ObjectMapper();
objectMapper.setDateFormat(new SimpleDateFormat(PluginConstant.DATE_FORMAT));
objectMapper.setDateFormat(new SimpleDateFormat(DiscoveryConstant.DATE_FORMAT));
}
public static <T> String toJson(T object) {
......
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/XmlConfigParser.java
......@@ -22,20 +22,20 @@ import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.CountFilterEntity;
import com.nepxion.discovery.common.entity.DiscoveryEntity;
import com.nepxion.discovery.common.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.common.entity.FilterHolderEntity;
import com.nepxion.discovery.common.entity.FilterType;
import com.nepxion.discovery.common.entity.HostFilterEntity;
import com.nepxion.discovery.common.entity.RegisterEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.entity.VersionFilterEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
import com.nepxion.discovery.plugin.configcenter.parser.xml.dom4j.Dom4JReader;
import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.CountFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterHolderEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
public class XmlConfigParser implements PluginConfigParser {
private static final Logger LOG = LoggerFactory.getLogger(XmlConfigParser.class);
......@@ -43,7 +43,7 @@ public class XmlConfigParser implements PluginConfigParser {
@Override
public RuleEntity parse(String config) {
if (StringUtils.isEmpty(config)) {
throw new PluginException("Config is null or empty");
throw new DiscoveryException("Config is null or empty");
}
try {
......@@ -53,7 +53,7 @@ public class XmlConfigParser implements PluginConfigParser {
return parseRoot(config, rootElement);
} catch (Exception e) {
throw new PluginException(e.getMessage(), e);
throw new DiscoveryException(e.getMessage(), e);
}
}
......@@ -63,12 +63,12 @@ public class XmlConfigParser implements PluginConfigParser {
int registerElementCount = element.elements(ConfigConstant.REGISTER_ELEMENT_NAME).size();
if (registerElementCount > 1) {
throw new PluginException("Allow only one element[" + ConfigConstant.REGISTER_ELEMENT_NAME + "] to be configed");
throw new DiscoveryException("Allow only one element[" + ConfigConstant.REGISTER_ELEMENT_NAME + "] to be configed");
}
int discoveryElementCount = element.elements(ConfigConstant.DISCOVERY_ELEMENT_NAME).size();
if (discoveryElementCount > 1) {
throw new PluginException("Allow only one element[" + ConfigConstant.DISCOVERY_ELEMENT_NAME + "] to be configed");
throw new DiscoveryException("Allow only one element[" + ConfigConstant.DISCOVERY_ELEMENT_NAME + "] to be configed");
}
RegisterEntity registerEntity = null;
......@@ -138,7 +138,7 @@ public class XmlConfigParser implements PluginConfigParser {
private void parseHostFilter(Element element, String filterTypeValue, FilterHolderEntity filterHolderEntity) {
HostFilterEntity hostFilterEntity = filterHolderEntity.getHostFilterEntity();
if (hostFilterEntity != null) {
throw new PluginException("Allow only one filter element to be configed, [" + ConfigConstant.BLACKLIST_ELEMENT_NAME + "] or [" + ConfigConstant.WHITELIST_ELEMENT_NAME + "]");
throw new DiscoveryException("Allow only one filter element to be configed, [" + ConfigConstant.BLACKLIST_ELEMENT_NAME + "] or [" + ConfigConstant.WHITELIST_ELEMENT_NAME + "]");
}
hostFilterEntity = new HostFilterEntity();
......@@ -160,7 +160,7 @@ public class XmlConfigParser implements PluginConfigParser {
if (StringUtils.equals(childElement.getName(), ConfigConstant.SERVICE_ELEMENT_NAME)) {
Attribute serviceNameAttribute = childElement.attribute(ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME);
if (serviceNameAttribute == null) {
throw new PluginException("Attribute[" + ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
throw new DiscoveryException("Attribute[" + ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
}
String serviceName = serviceNameAttribute.getData().toString().trim();
......@@ -182,7 +182,7 @@ public class XmlConfigParser implements PluginConfigParser {
private void parseCountFilter(Element element, RegisterEntity registerEntity) {
CountFilterEntity countFilterEntity = registerEntity.getCountFilterEntity();
if (countFilterEntity != null) {
throw new PluginException("Allow only one element[" + ConfigConstant.COUNT_ELEMENT_NAME + "] to be configed");
throw new DiscoveryException("Allow only one element[" + ConfigConstant.COUNT_ELEMENT_NAME + "] to be configed");
}
countFilterEntity = new CountFilterEntity();
......@@ -195,7 +195,7 @@ public class XmlConfigParser implements PluginConfigParser {
try {
globalValue = Integer.valueOf(globalFilterValue);
} catch (NumberFormatException e) {
throw new PluginException("Attribute[" + ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME + "] value in element[" + element.getName() + "] is invalid, must be int type", e);
throw new DiscoveryException("Attribute[" + ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME + "] value in element[" + element.getName() + "] is invalid, must be int type", e);
}
countFilterEntity.setFilterValue(globalValue);
}
......@@ -210,7 +210,7 @@ public class XmlConfigParser implements PluginConfigParser {
if (StringUtils.equals(childElement.getName(), ConfigConstant.SERVICE_ELEMENT_NAME)) {
Attribute serviceNameAttribute = childElement.attribute(ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME);
if (serviceNameAttribute == null) {
throw new PluginException("Attribute[" + ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
throw new DiscoveryException("Attribute[" + ConfigConstant.SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
}
String serviceName = serviceNameAttribute.getData().toString().trim();
......@@ -222,7 +222,7 @@ public class XmlConfigParser implements PluginConfigParser {
try {
value = Integer.valueOf(filterValue);
} catch (NumberFormatException e) {
throw new PluginException("Attribute[" + ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME + "] value in element[" + childElement.getName() + "] is invalid, must be int type", e);
throw new DiscoveryException("Attribute[" + ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME + "] value in element[" + childElement.getName() + "] is invalid, must be int type", e);
}
}
}
......@@ -239,7 +239,7 @@ public class XmlConfigParser implements PluginConfigParser {
private void parseVersionFilter(Element element, DiscoveryEntity discoveryEntity) {
VersionFilterEntity versionFilterEntity = discoveryEntity.getVersionFilterEntity();
if (versionFilterEntity != null) {
throw new PluginException("Allow only one element[" + ConfigConstant.VERSION_ELEMENT_NAME + "] to be configed");
throw new DiscoveryException("Allow only one element[" + ConfigConstant.VERSION_ELEMENT_NAME + "] to be configed");
}
versionFilterEntity = new VersionFilterEntity();
......@@ -255,14 +255,14 @@ public class XmlConfigParser implements PluginConfigParser {
Attribute consumerServiceNameAttribute = childElement.attribute(ConfigConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME);
if (consumerServiceNameAttribute == null) {
throw new PluginException("Attribute[" + ConfigConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
throw new DiscoveryException("Attribute[" + ConfigConstant.CONSUMER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
}
String consumerServiceName = consumerServiceNameAttribute.getData().toString().trim();
serviceEntity.setConsumerServiceName(consumerServiceName);
Attribute providerServiceNameAttribute = childElement.attribute(ConfigConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME);
if (providerServiceNameAttribute == null) {
throw new PluginException("Attribute[" + ConfigConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
throw new DiscoveryException("Attribute[" + ConfigConstant.PROVIDER_SERVICE_NAME_ATTRIBUTE_NAME + "] in element[" + childElement.getName() + "] is missing");
}
String providerServiceName = providerServiceNameAttribute.getData().toString().trim();
serviceEntity.setProviderServiceName(providerServiceName);
......@@ -300,7 +300,7 @@ public class XmlConfigParser implements PluginConfigParser {
return null;
}
String[] valueArray = StringUtils.split(value, PluginConstant.SEPARATE);
String[] valueArray = StringUtils.split(value, DiscoveryConstant.SEPARATE);
return Arrays.asList(valueArray);
}
......
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/adapter/ConsulAdapter.java
......@@ -13,7 +13,7 @@ import java.util.Map;
import org.springframework.cloud.consul.discovery.ConsulServer;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.netflix.loadbalancer.Server;
public class ConsulAdapter extends AbstractPluginAdapter {
......@@ -25,6 +25,6 @@ public class ConsulAdapter extends AbstractPluginAdapter {
return consulServer.getMetadata();
}
throw new PluginException("Server instance isn't the type of ConsulServer");
throw new DiscoveryException("Server instance isn't the type of ConsulServer");
}
}
\ No newline at end of file
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/context/ConsulApplicationContextInitializer.java
......@@ -17,8 +17,8 @@ import org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistry;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.plugin.framework.constant.ConsulConstant;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.decorator.ConsulServiceRegistryDecorator;
public class ConsulApplicationContextInitializer extends PluginApplicationContextInitializer {
......@@ -35,11 +35,11 @@ public class ConsulApplicationContextInitializer extends PluginApplicationContex
consulDiscoveryProperties.setPreferIpAddress(true);
List<String> tags = consulDiscoveryProperties.getTags();
tags.add(PluginConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN + "=" + ConsulConstant.DISCOVERY_PLUGIN);
tags.add(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED + "=" + PluginContextAware.isRegisterControlEnabled(environment));
tags.add(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED + "=" + PluginContextAware.isDiscoveryControlEnabled(environment));
tags.add(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED + "=" + PluginContextAware.isConfigRestControlEnabled(environment));
tags.add(PluginConstant.SPRING_APPLICATION_GROUP_KEY + "=" + PluginContextAware.getGroupKey(environment));
tags.add(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN + "=" + ConsulConstant.DISCOVERY_PLUGIN);
tags.add(DiscoveryConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED + "=" + PluginContextAware.isRegisterControlEnabled(environment));
tags.add(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED + "=" + PluginContextAware.isDiscoveryControlEnabled(environment));
tags.add(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED + "=" + PluginContextAware.isConfigRestControlEnabled(environment));
tags.add(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY + "=" + PluginContextAware.getGroupKey(environment));
return bean;
} else {
......
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/adapter/EurekaAdapter.java
......@@ -11,7 +11,7 @@ package com.nepxion.discovery.plugin.framework.adapter;
import java.util.Map;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.netflix.loadbalancer.Server;
import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
......@@ -24,6 +24,6 @@ public class EurekaAdapter extends AbstractPluginAdapter {
return discoveryEnabledServer.getInstanceInfo().getMetadata();
}
throw new PluginException("Server instance isn't the type of DiscoveryEnabledServer");
throw new DiscoveryException("Server instance isn't the type of DiscoveryEnabledServer");
}
}
\ No newline at end of file
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/context/EurekaApplicationContextInitializer.java
......@@ -17,8 +17,8 @@ import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceReg
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.plugin.framework.constant.EurekaConstant;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.decorator.EurekaServiceRegistryDecorator;
public class EurekaApplicationContextInitializer extends PluginApplicationContextInitializer {
......@@ -35,11 +35,11 @@ public class EurekaApplicationContextInitializer extends PluginApplicationContex
eurekaInstanceConfig.setPreferIpAddress(true);
Map<String, String> metadataMap = eurekaInstanceConfig.getMetadataMap();
metadataMap.put(PluginConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN, EurekaConstant.DISCOVERY_PLUGIN);
metadataMap.put(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, PluginContextAware.isRegisterControlEnabled(environment).toString());
metadataMap.put(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, PluginContextAware.isDiscoveryControlEnabled(environment).toString());
metadataMap.put(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, PluginContextAware.isConfigRestControlEnabled(environment).toString());
metadataMap.put(PluginConstant.SPRING_APPLICATION_GROUP_KEY, PluginContextAware.getGroupKey(environment));
metadataMap.put(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN, EurekaConstant.DISCOVERY_PLUGIN);
metadataMap.put(DiscoveryConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, PluginContextAware.isRegisterControlEnabled(environment).toString());
metadataMap.put(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, PluginContextAware.isDiscoveryControlEnabled(environment).toString());
metadataMap.put(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, PluginContextAware.isConfigRestControlEnabled(environment).toString());
metadataMap.put(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY, PluginContextAware.getGroupKey(environment));
return bean;
} else {
......
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/adapter/ZookeeperAdapter.java
......@@ -13,8 +13,8 @@ import java.util.Map;
import org.springframework.cloud.zookeeper.discovery.ZookeeperServer;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.constant.ZookeeperConstant;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.netflix.loadbalancer.Server;
public class ZookeeperAdapter extends AbstractPluginAdapter {
......@@ -32,6 +32,6 @@ public class ZookeeperAdapter extends AbstractPluginAdapter {
return zookeeperServer.getInstance().getPayload().getMetadata();
}
throw new PluginException("Server instance isn't the type of ZookeeperServer");
throw new DiscoveryException("Server instance isn't the type of ZookeeperServer");
}
}
\ No newline at end of file
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/context/ZookeeperApplicationContextInitializer.java
......@@ -17,7 +17,7 @@ import org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegis
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.plugin.framework.constant.ZookeeperConstant;
import com.nepxion.discovery.plugin.framework.decorator.ZookeeperServiceRegistryDecorator;
......@@ -35,11 +35,11 @@ public class ZookeeperApplicationContextInitializer extends PluginApplicationCon
zookeeperDiscoveryProperties.setPreferIpAddress(true);
Map<String, String> metadata = zookeeperDiscoveryProperties.getMetadata();
metadata.put(PluginConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN, ZookeeperConstant.DISCOVERY_PLUGIN);
metadata.put(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, PluginContextAware.isRegisterControlEnabled(environment).toString());
metadata.put(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, PluginContextAware.isDiscoveryControlEnabled(environment).toString());
metadata.put(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, PluginContextAware.isConfigRestControlEnabled(environment).toString());
metadata.put(PluginConstant.SPRING_APPLICATION_GROUP_KEY, PluginContextAware.getGroupKey(environment));
metadata.put(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_PLUGIN, ZookeeperConstant.DISCOVERY_PLUGIN);
metadata.put(DiscoveryConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, PluginContextAware.isRegisterControlEnabled(environment).toString());
metadata.put(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, PluginContextAware.isDiscoveryControlEnabled(environment).toString());
metadata.put(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, PluginContextAware.isConfigRestControlEnabled(environment).toString());
metadata.put(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY, PluginContextAware.getGroupKey(environment));
return bean;
} else {
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/AbstractPluginAdapter.java
......@@ -15,12 +15,12 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.serviceregistry.Registration;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.cache.PluginCache;
import com.nepxion.discovery.plugin.framework.cache.RuleCache;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.netflix.loadbalancer.Server;
public abstract class AbstractPluginAdapter implements PluginAdapter {
......@@ -42,7 +42,7 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
String group = getGroup(groupKey);
if (StringUtils.isEmpty(group)) {
throw new PluginException("The value is null or empty for metadata key=" + groupKey + ", please check your configuration");
throw new DiscoveryException("The value is null or empty for metadata key=" + groupKey + ", please check your configuration");
}
return group;
......@@ -84,22 +84,22 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
@Override
public String getLocalVersion() {
return getMetadata().get(PluginConstant.VERSION);
return getMetadata().get(DiscoveryConstant.VERSION);
}
@Override
public String getDynamicVersion() {
return pluginCache.get(PluginConstant.DYNAMIC_VERSION);
return pluginCache.get(DiscoveryConstant.DYNAMIC_VERSION);
}
@Override
public void setDynamicVersion(String version) {
pluginCache.put(PluginConstant.DYNAMIC_VERSION, version);
pluginCache.put(DiscoveryConstant.DYNAMIC_VERSION, version);
}
@Override
public void clearDynamicVersion() {
pluginCache.clear(PluginConstant.DYNAMIC_VERSION);
pluginCache.clear(DiscoveryConstant.DYNAMIC_VERSION);
}
@Override
......@@ -114,31 +114,31 @@ public abstract class AbstractPluginAdapter implements PluginAdapter {
@Override
public RuleEntity getLocalRule() {
return ruleCache.get(PluginConstant.RULE);
return ruleCache.get(DiscoveryConstant.RULE);
}
@Override
public void setLocalRule(RuleEntity ruleEntity) {
ruleCache.put(PluginConstant.RULE, ruleEntity);
ruleCache.put(DiscoveryConstant.RULE, ruleEntity);
}
@Override
public RuleEntity getDynamicRule() {
return ruleCache.get(PluginConstant.DYNAMIC_RULE);
return ruleCache.get(DiscoveryConstant.DYNAMIC_RULE);
}
@Override
public void setDynamicRule(RuleEntity ruleEntity) {
ruleCache.put(PluginConstant.DYNAMIC_RULE, ruleEntity);
ruleCache.put(DiscoveryConstant.DYNAMIC_RULE, ruleEntity);
}
@Override
public void clearDynamicRule() {
ruleCache.clear(PluginConstant.DYNAMIC_RULE);
ruleCache.clear(DiscoveryConstant.DYNAMIC_RULE);
}
@Override
public String getServerVersion(Server server) {
return getServerMetadata(server).get(PluginConstant.VERSION);
return getServerMetadata(server).get(DiscoveryConstant.VERSION);
}
}
\ No newline at end of file
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/adapter/PluginAdapter.java
......@@ -11,7 +11,7 @@ package com.nepxion.discovery.plugin.framework.adapter;
import java.util.Map;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.netflix.loadbalancer.Server;
public interface PluginAdapter {
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/cache/RuleCache.java
......@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
public class RuleCache {
private LoadingCache<String, RuleEntity> loadingCache;
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/config/PluginConfigParser.java
......@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.framework.config;
* @version 1.0
*/
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
public interface PluginConfigParser {
RuleEntity parse(String config);
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/context/PluginContextAware.java
......@@ -16,7 +16,7 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.ResolvableType;
import org.springframework.core.env.Environment;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
public class PluginContextAware implements ApplicationContextAware {
private ApplicationContext applicationContext;
......@@ -109,26 +109,26 @@ public class PluginContextAware implements ApplicationContextAware {
}
public static Boolean isRegisterControlEnabled(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_REGISTER_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
}
public static Boolean isDiscoveryControlEnabled(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
}
public static Boolean isConfigRestControlEnabled(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_CONFIG_REST_CONTROL_ENABLED, Boolean.class, Boolean.TRUE);
}
public static String getConfigFormat(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_CONFIG_FORMAT, PluginConstant.XML_FORMAT);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_CONFIG_FORMAT, DiscoveryConstant.XML_FORMAT);
}
public static String getConfigPath(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_CONFIG_PATH);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_CONFIG_PATH);
}
public static String getGroupKey(Environment environment) {
return environment.getProperty(PluginConstant.SPRING_APPLICATION_GROUP_KEY, String.class, PluginConstant.GROUP);
return environment.getProperty(DiscoveryConstant.SPRING_APPLICATION_GROUP_KEY, String.class, DiscoveryConstant.GROUP);
}
}
\ No newline at end of file
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/PluginSubscriber.java
......@@ -15,11 +15,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.google.common.eventbus.Subscribe;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
import com.nepxion.eventbus.annotation.EventBus;
import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
......@@ -52,7 +52,7 @@ public class PluginSubscriber {
LOG.info("Rule updating has been triggered");
if (ruleUpdatedEvent == null) {
throw new PluginException("RuleUpdatedEvent can't be null");
throw new DiscoveryException("RuleUpdatedEvent can't be null");
}
String rule = ruleUpdatedEvent.getRule();
......@@ -80,7 +80,7 @@ public class PluginSubscriber {
LOG.info("Rule clearing has been triggered");
if (ruleClearedEvent == null) {
throw new PluginException("RuleClearedEvent can't be null");
throw new DiscoveryException("RuleClearedEvent can't be null");
}
pluginAdapter.clearDynamicRule();
......@@ -100,7 +100,7 @@ public class PluginSubscriber {
LOG.info("Version updating has been triggered");
if (versionUpdatedEvent == null) {
throw new PluginException("VersionUpdatedEvent can't be null");
throw new DiscoveryException("VersionUpdatedEvent can't be null");
}
String dynamicVersion = versionUpdatedEvent.getDynamicVersion();
......@@ -120,7 +120,7 @@ public class PluginSubscriber {
LOG.info("Version has been updated, new version is {}", dynamicVersion);
} else {
throw new PluginException("Version updating will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
throw new DiscoveryException("Version updating will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
}
}
}
......@@ -137,7 +137,7 @@ public class PluginSubscriber {
LOG.info("Version clearing has been triggered");
if (versionClearedEvent == null) {
throw new PluginException("VersionClearedEvent can't be null");
throw new DiscoveryException("VersionClearedEvent can't be null");
}
String localVersion = versionClearedEvent.getLocalVersion();
......@@ -156,7 +156,7 @@ public class PluginSubscriber {
LOG.info("Version has been cleared");
} else {
throw new PluginException("Version clearing will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
throw new DiscoveryException("Version clearing will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
}
}
}
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/VersionUpdatedEvent.java
......@@ -13,7 +13,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
import com.nepxion.discovery.common.exception.DiscoveryException;
public class VersionUpdatedEvent implements Serializable {
private static final long serialVersionUID = 7749946311426379329L;
......@@ -31,7 +31,7 @@ public class VersionUpdatedEvent implements Serializable {
}
if (StringUtils.isEmpty(this.dynamicVersion)) {
throw new PluginException("Dynamic version can't be null or empty while updating");
throw new DiscoveryException("Dynamic version can't be null or empty while updating");
}
if (StringUtils.isNotEmpty(localVersion)) {
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/HostFilterDiscoveryListener.java
......@@ -17,10 +17,10 @@ import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.cloud.client.ServiceInstance;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.DiscoveryEntity;
import com.nepxion.discovery.common.entity.FilterType;
import com.nepxion.discovery.common.entity.HostFilterEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
public class HostFilterDiscoveryListener extends AbstractDiscoveryListener {
@Override
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/VersionFilterDiscoveryListener.java
......@@ -19,11 +19,11 @@ import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cloud.client.ServiceInstance;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.DiscoveryEntity;
import com.nepxion.discovery.common.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.entity.VersionFilterEntity;
public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
@Override
......@@ -107,7 +107,7 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
Iterator<ServiceInstance> iterator = instances.iterator();
while (iterator.hasNext()) {
ServiceInstance serviceInstance = iterator.next();
String metadataVersion = serviceInstance.getMetadata().get(PluginConstant.VERSION);
String metadataVersion = serviceInstance.getMetadata().get(DiscoveryConstant.VERSION);
if (!allNoFilterValueList.contains(metadataVersion)) {
iterator.remove();
}
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/HostFilterLoadBalanceListener.java
......@@ -16,10 +16,10 @@ import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.DiscoveryEntity;
import com.nepxion.discovery.common.entity.FilterType;
import com.nepxion.discovery.common.entity.HostFilterEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.netflix.loadbalancer.Server;
public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener {
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/VersionFilterLoadBalanceListener.java
......@@ -18,10 +18,10 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
import com.nepxion.discovery.common.entity.DiscoveryEntity;
import com.nepxion.discovery.common.entity.DiscoveryServiceEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.entity.VersionFilterEntity;
import com.netflix.loadbalancer.Server;
public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListener {
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/CountFilterRegisterListener.java
......@@ -14,13 +14,13 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.serviceregistry.Registration;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.CountFilterEntity;
import com.nepxion.discovery.common.entity.RegisterEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.decorator.DiscoveryClientDecorator;
import com.nepxion.discovery.plugin.framework.entity.CountFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.event.RegisterFailureEvent;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
public class CountFilterRegisterListener extends AbstractRegisterListener {
@Autowired
......@@ -76,9 +76,9 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
private void onRegisterFailure(int maxCount, String serviceId, String host, int port) {
String description = host + " isn't allowed to register to Register server, reach max limited count=" + maxCount;
pluginEventWapper.fireRegisterFailure(new RegisterFailureEvent(PluginConstant.REACH_MAX_LIMITED_COUNT, description, serviceId, host, port));
pluginEventWapper.fireRegisterFailure(new RegisterFailureEvent(DiscoveryConstant.REACH_MAX_LIMITED_COUNT, description, serviceId, host, port));
throw new PluginException(description);
throw new DiscoveryException(description);
}
@Override
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/HostFilterRegisterListener.java
......@@ -16,12 +16,12 @@ import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.cloud.client.serviceregistry.Registration;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.common.entity.FilterType;
import com.nepxion.discovery.common.entity.HostFilterEntity;
import com.nepxion.discovery.common.entity.RegisterEntity;
import com.nepxion.discovery.common.entity.RuleEntity;
import com.nepxion.discovery.common.exception.DiscoveryException;
import com.nepxion.discovery.plugin.framework.event.RegisterFailureEvent;
import com.nepxion.discovery.plugin.framework.exception.PluginException;
public class HostFilterRegisterListener extends AbstractRegisterListener {
@Override
......@@ -101,7 +101,7 @@ public class HostFilterRegisterListener extends AbstractRegisterListener {
pluginEventWapper.fireRegisterFailure(new RegisterFailureEvent(filterType.toString(), description, serviceId, host, port));
throw new PluginException(description);
throw new DiscoveryException(description);
}
@Override
......
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/extension/MyDiscoveryEnabledAdapter.java
......@@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.plugin.strategy.discovery.DiscoveryEnabledAdapter;
import com.nepxion.discovery.plugin.strategy.extension.service.constant.ServiceStrategyConstant;
import com.nepxion.discovery.plugin.strategy.extension.service.context.ServiceStrategyContext;
......@@ -31,7 +31,7 @@ public class MyDiscoveryEnabledAdapter implements DiscoveryEnabledAdapter {
Map<String, Object> attributes = context.getAttributes();
String serviceId = server.getMetaInfo().getAppName().toLowerCase();
String version = metadata.get(PluginConstant.VERSION);
String version = metadata.get(DiscoveryConstant.VERSION);
LOG.info("Serivice端负载均衡用户定制触发：serviceId={}, host={}, metadata={}, context={}", serviceId, server.toString(), metadata, context);
......
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/feign/AFeignImpl.java
......@@ -16,10 +16,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
@RestController
@ConditionalOnProperty(name = PluginConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-a")
@ConditionalOnProperty(name = DiscoveryConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-a")
public class AFeignImpl extends AbstractFeignImpl implements AFeign {
private static final Logger LOG = LoggerFactory.getLogger(AFeignImpl.class);
......
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/feign/BFeignImpl.java
......@@ -16,10 +16,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
@RestController
@ConditionalOnProperty(name = PluginConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-b")
@ConditionalOnProperty(name = DiscoveryConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-b")
public class BFeignImpl extends AbstractFeignImpl implements BFeign {
private static final Logger LOG = LoggerFactory.getLogger(BFeignImpl.class);
......
discovery-springcloud-example-service/src/main/java/com/nepxion/discovery/plugin/example/service/feign/CFeignImpl.java
......@@ -15,10 +15,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
@RestController
@ConditionalOnProperty(name = PluginConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-c")
@ConditionalOnProperty(name = DiscoveryConstant.SPRING_APPLICATION_NAME, havingValue = "discovery-springcloud-example-c")
public class CFeignImpl extends AbstractFeignImpl implements CFeign {
private static final Logger LOG = LoggerFactory.getLogger(CFeignImpl.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment