拉取官方分支

增加 Done 标记注解
tanyunpeng · Sep 23, 2017 · 103e087 · 103e087
1 parent 30a85dc
commit 103e087
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 deletions.
diff --git a/eureka-client-archaius2/src/main/java/com/netflix/discovery/EurekaArchaius2ClientConfig.java b/eureka-client-archaius2/src/main/java/com/netflix/discovery/EurekaArchaius2ClientConfig.java
@@ -1,9 +1,5 @@
 package com.netflix.discovery;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import com.google.inject.Inject;
 import com.netflix.appinfo.EurekaAccept;
 import com.netflix.archaius.api.Config;
@@ -12,12 +8,16 @@
 import com.netflix.discovery.shared.transport.EurekaTransportConfig;
 
 import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import static com.netflix.discovery.PropertyBasedClientConfigConstants.*;
 
 @Singleton
 @ConfigurationSource(CommonConstants.CONFIG_FILE_NAME)
 public class EurekaArchaius2ClientConfig implements EurekaClientConfig {
+
     public static final String DEFAULT_ZONE = "defaultZone";
 
     private static final String DEFAULT_NAMESPACE = "eureka";

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/DataCenterInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/DataCenterInfo.java
@@ -25,13 +25,14 @@
 /**
  * A simple interface for indicating which <em>datacenter</em> a particular instance belongs.
  *
- * @author Karthik Ranganathan
  *
+ * @author Karthik Ranganathan
  */
 @JsonRootName("dataCenterInfo")
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = As.PROPERTY, property = "@class")
 @JsonTypeIdResolver(DataCenterTypeInfoResolver.class)
 public interface DataCenterInfo {
+
     enum Name {Netflix, Amazon, MyOwn}
 
     Name getName();

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/UniqueIdentifier.java b/eureka-client/src/main/java/com/netflix/appinfo/UniqueIdentifier.java
@@ -1,10 +1,19 @@
 package com.netflix.appinfo;
 
+import com.netflix.yunai.Done;
+
 /**
  * Generally indicates the unique identifier of a {@link com.netflix.appinfo.DataCenterInfo}, if applicable.
  *
+ * 数据中心信息的唯一标识符接口
+ *
  * @author [email protected]
  */
 public interface UniqueIdentifier {
+
+    /**
+     * @return 标识符编号
+     */
+    @Done(progress = 100)
     String getId();
 }
diff --git a/eureka-client/src/main/java/com/netflix/yunai/Done.java b/eureka-client/src/main/java/com/netflix/yunai/Done.java
@@ -0,0 +1,14 @@
+package com.netflix.yunai;
+
+/**
+ * 非源码
+ * 笔者用来标记方法是否理解
+ */
+public @interface Done {
+
+    /**
+     * @return 进度，max 100
+     */
+    int progress() default 0;
+
+}
diff --git a/eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java b/eureka-core/src/main/java/com/netflix/eureka/EurekaBootStrap.java
@@ -16,17 +16,7 @@
 
 package com.netflix.eureka;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.util.Date;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.CloudInstanceConfig;
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.MyDataCenterInstanceConfig;
+import com.netflix.appinfo.*;
 import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider;
 import com.netflix.config.ConfigurationManager;
 import com.netflix.config.DeploymentContext;
@@ -49,6 +39,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.Date;
+
 /**
  * The class that kick starts the eureka server.
  *
@@ -124,7 +119,7 @@ public void contextInitialized(ServletContextEvent event) {
     /**
      * Users can override to initialize the environment themselves.
      */
-    protected void initEurekaEnvironment() throws Exception {
+    protected void initEurekaEnvironment() throws Exception { // TODO 芋艿：初始化 数据中心、应用环境（dev、product、test）等
         logger.info("Setting the eureka configuration..");
 
         String dataCenter = ConfigurationManager.getConfigInstance().getString(EUREKA_DATACENTER);
@@ -155,7 +150,7 @@ protected void initEurekaServerContext() throws Exception {
         logger.info(eurekaServerConfig.getJsonCodecName());
         ServerCodecs serverCodecs = new DefaultServerCodecs(eurekaServerConfig);
 
-        ApplicationInfoManager applicationInfoManager = null;
+        ApplicationInfoManager applicationInfoManager;
 
         if (eurekaClient == null) {
             EurekaInstanceConfig instanceConfig = isCloud(ConfigurationManager.getDeploymentContext())

diff --git a/eureka-core/src/main/java/com/netflix/eureka/resources/ApplicationsResource.java b/eureka-core/src/main/java/com/netflix/eureka/resources/ApplicationsResource.java
@@ -16,34 +16,25 @@
 
 package com.netflix.eureka.resources;
 
+import com.netflix.appinfo.EurekaAccept;
+import com.netflix.eureka.EurekaServerConfig;
+import com.netflix.eureka.EurekaServerContext;
+import com.netflix.eureka.EurekaServerContextHolder;
+import com.netflix.eureka.Version;
+import com.netflix.eureka.registry.*;
+import com.netflix.eureka.registry.Key.KeyType;
+import com.netflix.eureka.util.EurekaMonitors;
+
 import javax.annotation.Nullable;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 import java.util.Arrays;
 
-import com.netflix.appinfo.EurekaAccept;
-import com.netflix.eureka.EurekaServerContext;
-import com.netflix.eureka.EurekaServerContextHolder;
-import com.netflix.eureka.registry.AbstractInstanceRegistry;
-import com.netflix.eureka.EurekaServerConfig;
-import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
-import com.netflix.eureka.Version;
-import com.netflix.eureka.registry.ResponseCache;
-import com.netflix.eureka.registry.Key.KeyType;
-import com.netflix.eureka.registry.ResponseCacheImpl;
-import com.netflix.eureka.registry.Key;
-import com.netflix.eureka.util.EurekaMonitors;
-
 /**
  * A <em>jersey</em> resource that handles request related to all
  * {@link com.netflix.discovery.shared.Applications}.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 10 21:33:23 PDT 2016
+#Tue Sep 19 00:24:32 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip