diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-11-27 09:37:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-27 09:37:25 +0100 |
commit | df4aea495dfc6b780d483dd5d4d8bd0d2c0315d9 (patch) | |
tree | 112de9e7e6b9c705507479d72e8adfd8aa882af8 /config-model-api | |
parent | 5a3c79977b4405426d909aa4cf3bff08f6156a89 (diff) |
Revert "read routingmethod"
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ApplicationClusterEndpoint.java | 5 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ContainerEndpoint.java | 19 |
2 files changed, 4 insertions, 20 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 10effd47707..f6583468322 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 @@ -112,11 +112,6 @@ public class ApplicationClusterEndpoint { return this; } - public Builder routingMethod(RoutingMethod routingMethod) { - this.routingMethod = routingMethod; - return this; - } - public Builder weight(int weigth) { this.weigth = weigth; return this; diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ContainerEndpoint.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ContainerEndpoint.java index 78da750fb5b..cd31eb2a49a 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ContainerEndpoint.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ContainerEndpoint.java @@ -20,22 +20,16 @@ public class ContainerEndpoint { private final ApplicationClusterEndpoint.Scope scope; private final List<String> names; private final OptionalInt weight; - private final ApplicationClusterEndpoint.RoutingMethod routingMethod; public ContainerEndpoint(String clusterId, ApplicationClusterEndpoint.Scope scope, List<String> names) { this(clusterId, scope, names, OptionalInt.empty()); } public ContainerEndpoint(String clusterId, ApplicationClusterEndpoint.Scope scope, List<String> names, OptionalInt weight) { - this(clusterId, scope, names, weight, ApplicationClusterEndpoint.RoutingMethod.sharedLayer4); - } - - public ContainerEndpoint(String clusterId, ApplicationClusterEndpoint.Scope scope, List<String> names, OptionalInt weight, ApplicationClusterEndpoint.RoutingMethod routingMethod) { this.clusterId = Objects.requireNonNull(clusterId); this.scope = Objects.requireNonNull(scope); this.names = List.copyOf(Objects.requireNonNull(names)); this.weight = weight; - this.routingMethod = routingMethod; } public String clusterId() { @@ -54,10 +48,6 @@ public class ContainerEndpoint { return weight; } - public ApplicationClusterEndpoint.RoutingMethod routingMethod() { - return routingMethod; - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -65,18 +55,17 @@ public class ContainerEndpoint { ContainerEndpoint that = (ContainerEndpoint) o; return Objects.equals(clusterId, that.clusterId) && Objects.equals(scope, that.scope) && - Objects.equals(names, that.names) && - Objects.equals(weight, that.weight) && - Objects.equals(routingMethod, that.routingMethod); + Objects.equals(names, that.names); } @Override public int hashCode() { - return Objects.hash(clusterId, names, scope, weight, routingMethod); + return Objects.hash(clusterId, names, scope); } @Override public String toString() { - return String.format("container endpoint %s -> %s [scope=%s, weight=%s, routingMetod=%s]", clusterId, names, scope, weight, routingMethod); + return String.format("container endpoint %s -> %s [scope=%s]", clusterId, names, scope); } + } |