Merge pull request #32456 from vespa-engine/hmusum/remove-dead-code-6

Remove dead code, and fix a typo
vespa-engine · Sep 24, 2024 · bddfcd8 · bddfcd8
2 parents 9461127 + 1f6a4e7
commit bddfcd8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
@@ -854,8 +854,6 @@
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder dnsName(com.yahoo.config.model.api.ApplicationClusterEndpoint$DnsName)",
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder zoneScope()",
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder scope(com.yahoo.config.model.api.ApplicationClusterEndpoint$Scope)",
-      "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder sharedRouting()",
-      "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder sharedL4Routing()",
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder routingMethod(com.yahoo.config.model.api.ApplicationClusterEndpoint$RoutingMethod)",
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder weight(int)",
       "public com.yahoo.config.model.api.ApplicationClusterEndpoint$Builder hosts(java.util.List)",

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java
@@ -106,25 +106,13 @@ public Builder scope(Scope scope) {
             return this;
         }
 
-        // TODO: Remove after 8.407 is gone.
-        public Builder sharedRouting() {
-            this.routingMethod = RoutingMethod.shared;
-            return this;
-        }
-
-        // TODO: Remove after 8.407 is gone.
-        public Builder sharedL4Routing() {
-            this.routingMethod = RoutingMethod.sharedLayer4;
-            return this;
-        }
-
         public Builder routingMethod(RoutingMethod routingMethod) {
             this.routingMethod = routingMethod;
             return this;
         }
 
-        public Builder weight(int weigth) {
-            this.weight = weigth;
+        public Builder weight(int weight) {
+            this.weight = weight;
             return this;
         }
 

diff --git a/...odel/src/main/java/com/yahoo/vespa/model/container/configserver/option/ConfigOptions.java b/...odel/src/main/java/com/yahoo/vespa/model/container/configserver/option/ConfigOptions.java
@@ -29,9 +29,6 @@ public ConfigServer(String hostName, Optional<Integer> port) {
     Optional<String> system();
     default Optional<String> cloud() { return Optional.empty(); }
     Optional<Boolean> useVespaVersionInRequest();
-    default Optional<String> loadBalancerAddress() { return Optional.empty(); } // TODO: Remove when 8.409 is oldest version in use
-    default Optional<String> athenzDnsSuffix() { return Optional.empty(); } // TODO: Remove when 8.409 is oldest version in use
-    default Optional<String> ztsUrl() { return Optional.empty(); } // TODO: Remove when 8.409 is oldest version in use
     String zooKeeperSnapshotMethod();
     Integer zookeeperJuteMaxBuffer(); // in bytes