Revert "Add clusterid"

1 files changed, 7 insertions, 19 deletions

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
index 1c45e4ba5dd..a91f95d71b1 100644
--- 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
@@ -26,15 +26,13 @@ public class ApplicationClusterEndpoint {
     private final RoutingMethod routingMethod;
     private final int weight;
     private final List<String> hostNames;
-    private final String clusterId;
 
-    private ApplicationClusterEndpoint(DnsName dnsName, Scope scope, RoutingMethod routingMethod, int weight, List<String> hostNames, String clusterId) {
-        this.dnsName = Objects.requireNonNull(dnsName);
-        this.scope = Objects.requireNonNull(scope);
-        this.routingMethod = Objects.requireNonNull(routingMethod);
+    public ApplicationClusterEndpoint(DnsName dnsName, Scope scope, RoutingMethod routingMethod, int weight, List<String> hostNames) {
+        this.dnsName = dnsName;
+        this.scope = scope;
+        this.routingMethod = routingMethod;
         this.weight = weight;
-        this.hostNames = List.copyOf(Objects.requireNonNull(hostNames));
-        this.clusterId = Objects.requireNonNull(clusterId);
+        this.hostNames = List.copyOf(hostNames);
     }
 
     public DnsName dnsName() {
@@ -57,10 +55,6 @@ public class ApplicationClusterEndpoint {
         return hostNames;
     }
 
-    public String clusterId() {
-        return clusterId;
-    }
-
     public static Builder builder() {
         return new Builder();
     }
@@ -70,9 +64,8 @@ public class ApplicationClusterEndpoint {
         private DnsName dnsName;
         private Scope scope;
         private RoutingMethod routingMethod;
-        private int weigth = 1;
+        private int weigth = 0;
         private List<String> hosts;
-        private String clusterId;
 
         public Builder dnsName(DnsName name) {
             this.dnsName = name;
@@ -109,13 +102,8 @@ public class ApplicationClusterEndpoint {
             return this;
         }
 
-        public Builder clusterId(String clusterId) {
-            this.clusterId = clusterId;
-            return this;
-        }
-
         public ApplicationClusterEndpoint build() {
-            return new ApplicationClusterEndpoint(dnsName, scope, routingMethod, weigth, hosts, clusterId);
+            return new ApplicationClusterEndpoint(dnsName, scope, routingMethod, weigth, hosts);
         }
     }