Commit 37890e8f by Nepxion

增加getMetaData适配接口

parent 5d6c43fa
...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter; ...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter;
* @version 1.0 * @version 1.0
*/ */
import java.util.Map;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
...@@ -76,17 +78,22 @@ public class ConsulAdapter extends AbstractPluginAdapter { ...@@ -76,17 +78,22 @@ public class ConsulAdapter extends AbstractPluginAdapter {
} }
@Override @Override
public String getServerVersion(Server server) { public Map<String, String> getMetaData(Server server) {
if (server instanceof ConsulServer) { if (server instanceof ConsulServer) {
ConsulServer consulServer = (ConsulServer) server; ConsulServer consulServer = (ConsulServer) server;
return consulServer.getMetadata().get(PluginConstant.VERSION); return consulServer.getMetadata();
} }
throw new PluginException("Server instance isn't the type of ConsulServer"); throw new PluginException("Server instance isn't the type of ConsulServer");
} }
@Override @Override
public String getServerVersion(Server server) {
return getMetaData(server).get(PluginConstant.VERSION);
}
@Override
public String getLocalVersion() { public String getLocalVersion() {
return version; return version;
} }
......
...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter; ...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter;
* @version 1.0 * @version 1.0
*/ */
import java.util.Map;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import com.nepxion.discovery.plugin.framework.constant.EurekaConstant; import com.nepxion.discovery.plugin.framework.constant.EurekaConstant;
...@@ -49,17 +51,22 @@ public class EurekaAdapter extends AbstractPluginAdapter { ...@@ -49,17 +51,22 @@ public class EurekaAdapter extends AbstractPluginAdapter {
} }
@Override @Override
public String getServerVersion(Server server) { public Map<String, String> getMetaData(Server server) {
if (server instanceof DiscoveryEnabledServer) { if (server instanceof DiscoveryEnabledServer) {
DiscoveryEnabledServer discoveryEnabledServer = (DiscoveryEnabledServer) server; DiscoveryEnabledServer discoveryEnabledServer = (DiscoveryEnabledServer) server;
return discoveryEnabledServer.getInstanceInfo().getMetadata().get(PluginConstant.VERSION); return discoveryEnabledServer.getInstanceInfo().getMetadata();
} }
throw new PluginException("Server instance isn't the type of DiscoveryEnabledServer"); throw new PluginException("Server instance isn't the type of DiscoveryEnabledServer");
} }
@Override @Override
public String getServerVersion(Server server) {
return getMetaData(server).get(PluginConstant.VERSION);
}
@Override
public String getLocalVersion() { public String getLocalVersion() {
return pluginContextAware.getEnvironment().getProperty(EurekaConstant.METADATA_VERSION); return pluginContextAware.getEnvironment().getProperty(EurekaConstant.METADATA_VERSION);
} }
......
...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter; ...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter;
* @version 1.0 * @version 1.0
*/ */
import java.util.Map;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.zookeeper.discovery.ZookeeperServer; import org.springframework.cloud.zookeeper.discovery.ZookeeperServer;
...@@ -45,17 +47,22 @@ public class ZookeeperAdapter extends AbstractPluginAdapter { ...@@ -45,17 +47,22 @@ public class ZookeeperAdapter extends AbstractPluginAdapter {
} }
@Override @Override
public String getServerVersion(Server server) { public Map<String, String> getMetaData(Server server) {
if (server instanceof ZookeeperServer) { if (server instanceof ZookeeperServer) {
ZookeeperServer zookeeperServer = (ZookeeperServer) server; ZookeeperServer zookeeperServer = (ZookeeperServer) server;
return zookeeperServer.getInstance().getPayload().getMetadata().get(PluginConstant.VERSION); return zookeeperServer.getInstance().getPayload().getMetadata();
} }
throw new PluginException("Server instance isn't the type of ZookeeperServer"); throw new PluginException("Server instance isn't the type of ZookeeperServer");
} }
@Override @Override
public String getServerVersion(Server server) {
return getMetaData(server).get(PluginConstant.VERSION);
}
@Override
public String getLocalVersion() { public String getLocalVersion() {
return pluginContextAware.getEnvironment().getProperty(ZookeeperConstant.METADATA_VERSION); return pluginContextAware.getEnvironment().getProperty(ZookeeperConstant.METADATA_VERSION);
} }
......
...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter; ...@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.adapter;
* @version 1.0 * @version 1.0
*/ */
import java.util.Map;
import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.cloud.client.serviceregistry.Registration;
import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.Server;
...@@ -20,6 +22,8 @@ public interface PluginAdapter { ...@@ -20,6 +22,8 @@ public interface PluginAdapter {
int getPort(Registration registration); int getPort(Registration registration);
Map<String, String> getMetaData(Server server);
String getServerVersion(Server server); String getServerVersion(Server server);
String getVersion(); String getVersion();
......
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