diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-02-19 15:47:59 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-02-20 08:54:55 +0100 |
commit | 187e5420d09ac7fc95cebb224ffa1fd06314029d (patch) | |
tree | 9f97c286792e7224ebddd19807ca068ae21fc18f /controller-server | |
parent | 85f82b6002e267cce4de370b597cb52c93b4d724 (diff) |
Remove unused field from RoutingPolicy
Diffstat (limited to 'controller-server')
4 files changed, 12 insertions, 27 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java index acf4be70f50..484d5043d8b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/RoutingPolicy.java @@ -28,17 +28,15 @@ public class RoutingPolicy { private final ApplicationId owner; private final ZoneId zone; - private final String recordId; private final HostName alias; private final HostName canonicalName; private final Optional<String> dnsZone; private final Set<RotationName> rotations; - public RoutingPolicy(ApplicationId owner, ZoneId zone, String recordId, HostName alias, HostName canonicalName, + public RoutingPolicy(ApplicationId owner, ZoneId zone, HostName alias, HostName canonicalName, Optional<String> dnsZone, Set<RotationName> rotations) { this.owner = Objects.requireNonNull(owner, "owner must be non-null"); this.zone = Objects.requireNonNull(zone, "zone must be non-null"); - this.recordId = Objects.requireNonNull(recordId, "recordId must be non-null"); this.alias = Objects.requireNonNull(alias, "alias must be non-null"); this.canonicalName = Objects.requireNonNull(canonicalName, "canonicalName must be non-null"); this.dnsZone = Objects.requireNonNull(dnsZone, "dnsZone must be non-null"); @@ -55,12 +53,6 @@ public class RoutingPolicy { return zone; } - /** The ID of the DNS record identifying this */ - // TODO: Remove this field as it's no longer needed - public String recordId() { - return recordId; - } - /** This alias (lhs of a CNAME or ALIAS record) */ public HostName alias() { return alias; @@ -85,24 +77,23 @@ public class RoutingPolicy { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - RoutingPolicy that = (RoutingPolicy) o; - return owner.equals(that.owner) && - zone.equals(that.zone) && - recordId.equals(that.recordId) && - alias.equals(that.alias) && - canonicalName.equals(that.canonicalName) && - dnsZone.equals(that.dnsZone) && - rotations.equals(that.rotations); + RoutingPolicy policy = (RoutingPolicy) o; + return owner.equals(policy.owner) && + zone.equals(policy.zone) && + alias.equals(policy.alias) && + canonicalName.equals(policy.canonicalName) && + dnsZone.equals(policy.dnsZone) && + rotations.equals(policy.rotations); } @Override public int hashCode() { - return Objects.hash(owner, zone, recordId, alias, canonicalName, dnsZone, rotations); + return Objects.hash(owner, zone, alias, canonicalName, dnsZone, rotations); } @Override public String toString() { - return String.format("%s: %s -> %s [rotations: %s%s], owned by %s, in %s", recordId, alias, canonicalName, rotations, + return String.format("%s -> %s [rotations: %s%s], owned by %s, in %s", alias, canonicalName, rotations, dnsZone.map(z -> ", DNS zone: " + z).orElse(""), owner.toShortString(), zone.value()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicyMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicyMaintainer.java index 9455c44a2f9..6af9a6d42d7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicyMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicyMaintainer.java @@ -147,8 +147,8 @@ public class RoutingPolicyMaintainer extends Maintainer { } else { nameService.createCname(name, data); } - return new RoutingPolicy(application, zone, "fake-id" + alias, alias, loadBalancer.hostname(), - loadBalancer.dnsZone(), loadBalancer.rotations()); + return new RoutingPolicy(application, zone, alias, loadBalancer.hostname(), loadBalancer.dnsZone(), + loadBalancer.rotations()); } /** Remove all DNS records that point to non-existing load balancers */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java index ccea83caef4..86ef56a2587 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java @@ -42,7 +42,6 @@ public class RoutingPolicySerializer { Cursor policyArray = root.setArray(routingPoliciesField); routingPolicies.forEach(policy -> { Cursor policyObject = policyArray.addObject(); - policyObject.setString(recordIdField, policy.recordId()); policyObject.setString(aliasField, policy.alias().value()); policyObject.setString(zoneField, policy.zone().value()); policyObject.setString(canonicalNameField, policy.canonicalName().value()); @@ -72,7 +71,6 @@ public class RoutingPolicySerializer { policies.add(new RoutingPolicy(owner, // TODO: Remove fallback after 7.13 has been released optionalField(inspect.field(zoneField), ZoneId::from).orElse(ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName())), - recordId.asString(), HostName.from(inspect.field(aliasField).asString()), HostName.from(inspect.field(canonicalNameField).asString()), optionalField(inspect.field(dnsZoneField), Function.identity()), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java index 99a2f6406ef..505bcce50d5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java @@ -30,14 +30,12 @@ public class RoutingPolicySerializerTest { Set<RotationName> rotations = Set.of(RotationName.from("r1"), RotationName.from("r2")); Set<RoutingPolicy> loadBalancers = ImmutableSet.of(new RoutingPolicy(owner, ZoneId.from("prod", "us-north-1"), - "record-id-1", HostName.from("my-pretty-alias"), HostName.from("long-and-ugly-name"), Optional.of("zone1"), rotations), new RoutingPolicy(owner, ZoneId.from("prod", "us-north-2"), - "record-id-2", HostName.from("my-pretty-alias-2"), HostName.from("long-and-ugly-name-2"), Optional.empty(), @@ -66,14 +64,12 @@ public class RoutingPolicySerializerTest { ApplicationId owner = ApplicationId.defaultId(); Set<RoutingPolicy> loadBalancers = ImmutableSet.of(new RoutingPolicy(owner, ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName()), - "record-id-1", HostName.from("my-pretty-alias"), HostName.from("long-and-ugly-name"), Optional.empty(), Collections.emptySet()), new RoutingPolicy(owner, ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName()), - "record-id-2", HostName.from("my-pretty-alias-2"), HostName.from("long-and-ugly-name-2"), Optional.empty(), |