重构gray-server

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/EurekaServerExplainer.java

@@ -1,7 +1,7 @@
 package cn.springcloud.gray.client.netflix;
 
-import cn.springcloud.gray.node.ServerExplainer;
-import cn.springcloud.gray.node.ServerSpec;
+import cn.springcloud.gray.servernode.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerSpec;
 import com.netflix.loadbalancer.Server;
 import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
 import org.springframework.cloud.netflix.ribbon.ServerIntrospector;

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/GrayClientHolder.java

@@ -1,7 +1,7 @@
 package cn.springcloud.gray.client.netflix;
 
 import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.node.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import com.netflix.loadbalancer.Server;
 

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayDecisionPredicate.java

@@ -2,7 +2,7 @@
 
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.GrayDecisionInputArgs;
-import cn.springcloud.gray.node.ServerSpec;
+import cn.springcloud.gray.servernode.ServerSpec;
 import cn.springcloud.gray.request.GrayRequest;
 import com.netflix.loadbalancer.AbstractServerPredicate;
 import com.netflix.loadbalancer.PredicateKey;

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayLoadBalanceRule.java

@@ -3,8 +3,7 @@
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.netflix.GrayClientHolder;
 import cn.springcloud.gray.model.GrayService;
-import cn.springcloud.gray.node.ServerExplainer;
-import cn.springcloud.gray.node.ServerSpec;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.request.GrayRequest;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import com.google.common.base.Optional;

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/configuration/GrayRibbonClientsConfiguration.java

@@ -3,7 +3,7 @@
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.netflix.GrayClientHolder;
 import cn.springcloud.gray.client.netflix.ribbon.GrayLoadBalanceRule;
-import cn.springcloud.gray.node.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.IRule;
@@ -13,8 +13,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
 @Configuration
 public class GrayRibbonClientsConfiguration implements InitializingBean {
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/GrayDecisionInputArgs.java

@@ -1,6 +1,6 @@
 package cn.springcloud.gray.decision;
 
-import cn.springcloud.gray.node.ServerSpec;
+import cn.springcloud.gray.servernode.ServerSpec;
 import cn.springcloud.gray.request.GrayRequest;
 import lombok.*;
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/servernode/ServerExplainer.java

@@ -0,0 +1,9 @@
+package cn.springcloud.gray.servernode;
+
+public interface ServerExplainer<INSTANCE> {
+
+
+    ServerSpec apply(INSTANCE instance);
+
+
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/servernode/ServerSpec.java

@@ -0,0 +1,32 @@
+package cn.springcloud.gray.servernode;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServerSpec {
+
+
+    private String serviceId;
+    private String instanceId;
+    private URI uri;
+    private Map<String, Object> metadatas = new HashMap<>();
+
+
+    public void setMetadata(String name, Object value) {
+        metadatas.put(name, value);
+    }
+
+    public Object getMetadata(String name) {
+        return metadatas.get(name);
+    }
+}