Refactor eureka related classes to separate module

Netflix · Mar 11, 2020 · 16367e0 · 16367e0
1 parent d78f490
commit 16367e0
Show file tree

Hide file tree

Showing 29 changed files with 735 additions and 497 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name='zuul'
 
 include 'zuul-core'
+include 'zuul-eureka'
 include 'zuul-sample'
diff --git a/zuul-core/build.gradle b/zuul-core/build.gradle
@@ -2,7 +2,6 @@ apply plugin: "groovy"
 apply plugin: "com.google.osdetector"
 
 dependencies {
-
     compile "log4j:log4j:1.2.17"
     compile "commons-io:commons-io:2.4"
     compile "commons-fileupload:commons-fileupload:1.3"
@@ -26,8 +25,6 @@ dependencies {
     compile "com.netflix.ribbon:ribbon-core:${versions_ribbon}"
     compile "com.netflix.ribbon:ribbon-httpclient:${versions_ribbon}"
     compile "com.netflix.ribbon:ribbon-loadbalancer:${versions_ribbon}"
-    compile "com.netflix.ribbon:ribbon-eureka:${versions_ribbon}"
-    compile "com.netflix.eureka:eureka-client:1.9.4"
     compile "io.reactivex:rxjava:1.2.1"
 
     compile "io.netty:netty-common:${versions_netty}"

diff --git a/zuul-core/dependencies.lock b/zuul-core/dependencies.lock
@@ -37,13 +37,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -64,10 +60,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -77,7 +69,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -226,10 +218,6 @@
             "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -250,10 +238,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -409,13 +393,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -436,10 +416,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -449,7 +425,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -599,13 +575,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -626,10 +598,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -639,7 +607,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -789,13 +757,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -816,10 +780,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -829,7 +789,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -979,13 +939,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -1010,10 +966,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -1023,7 +975,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -1172,10 +1124,6 @@
             "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -1200,10 +1148,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -1359,13 +1303,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -1390,10 +1330,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -1403,7 +1339,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {
@@ -1557,13 +1493,9 @@
             "requested": "4.2.2"
         },
         "com.netflix.archaius:archaius-core": {
-            "locked": "0.7.6",
+            "locked": "0.7.5",
             "requested": "0.7.5"
         },
-        "com.netflix.eureka:eureka-client": {
-            "locked": "1.9.4",
-            "requested": "1.9.4"
-        },
         "com.netflix.governator:governator": {
             "locked": "1.17.10",
             "requested": "1.+"
@@ -1588,10 +1520,6 @@
             "locked": "2.2.4",
             "requested": "2.2.4"
         },
-        "com.netflix.ribbon:ribbon-eureka": {
-            "locked": "2.2.4",
-            "requested": "2.2.4"
-        },
         "com.netflix.ribbon:ribbon-httpclient": {
             "locked": "2.2.4",
             "requested": "2.2.4"
@@ -1601,7 +1529,7 @@
             "requested": "2.2.4"
         },
         "com.netflix.servo:servo-core": {
-            "locked": "0.12.21",
+            "locked": "0.10.1",
             "requested": "0.7.2"
         },
         "com.netflix.spectator:spectator-api": {

diff --git a/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatus.java b/zuul-core/src/main/java/com/netflix/netty/common/status/ServerStatus.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2020 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.netty.common.status;
+
+public enum ServerStatus {
+    UP,
+    DOWN
+}