Reuse constants

3 files changed, 10 insertions, 6 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTarget.java
index 1659a87acb3..7ccbcf2a954 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTarget.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTarget.java
@@ -59,8 +59,8 @@ public sealed abstract class AliasTarget permits LatencyAliasTarget, WeightedAli
     public static AliasTarget unpack(RecordData data) {
         String[] parts = data.asString().split("/");
         switch (parts[0]) {
-            case "latency": return LatencyAliasTarget.unpack(data);
-            case "weighted": return WeightedAliasTarget.unpack(data);
+            case LatencyAliasTarget.TARGET_TYPE: return LatencyAliasTarget.unpack(data);
+            case WeightedAliasTarget.TARGET_TYPE: return WeightedAliasTarget.unpack(data);
         }
         throw new IllegalArgumentException("Unknown alias type '" + parts[0] + "'");
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/LatencyAliasTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/LatencyAliasTarget.java
index 70c89b05f09..00e5218dead 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/LatencyAliasTarget.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/LatencyAliasTarget.java
@@ -13,6 +13,8 @@ import java.util.Objects;
  */
 public final class LatencyAliasTarget extends AliasTarget {
 
+    static final String TARGET_TYPE = "latency";
+
     private final ZoneId zone;
 
     public LatencyAliasTarget(DomainName name, String dnsZone, ZoneId zone) {
@@ -27,7 +29,7 @@ public final class LatencyAliasTarget extends AliasTarget {
 
     @Override
     public RecordData pack() {
-        return RecordData.from("latency/" + name().value() + "/" + dnsZone() + "/" + id());
+        return RecordData.from(String.join("/", TARGET_TYPE, name().value(), dnsZone(), id()));
     }
 
     @Override
@@ -56,7 +58,7 @@ public final class LatencyAliasTarget extends AliasTarget {
             throw new IllegalArgumentException("Expected data to be on format type/name/DNS-zone/zone-id, but got " +
                                                data.asString());
         }
-        if (!"latency".equals(parts[0])) {
+        if (!TARGET_TYPE.equals(parts[0])) {
             throw new IllegalArgumentException("Unexpected type '" + parts[0] + "'");
         }
         return new LatencyAliasTarget(DomainName.of(parts[1]), parts[2], ZoneId.from(parts[3]));
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
index 6a61b62f3a4..ca01c713e93 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/WeightedAliasTarget.java
@@ -16,6 +16,8 @@ import java.util.Objects;
  */
 public final class WeightedAliasTarget extends AliasTarget {
 
+    static final String TARGET_TYPE = "weighted";
+
     private final long weight;
 
     public WeightedAliasTarget(DomainName name, String dnsZone, ZoneId zone, long weight) {
@@ -31,7 +33,7 @@ public final class WeightedAliasTarget extends AliasTarget {
 
     @Override
     public RecordData pack() {
-        return RecordData.from("weighted/" + name().value() + "/" + dnsZone() + "/" + id() + "/" + weight);
+        return RecordData.from(String.join("/", TARGET_TYPE, name().value(), dnsZone(), id(), Long.toString(weight)));
     }
 
     @Override
@@ -60,7 +62,7 @@ public final class WeightedAliasTarget extends AliasTarget {
             throw new IllegalArgumentException("Expected data to be on format type/name/DNS-zone/zone-id/weight, " +
                                                "but got " + data.asString());
         }
-        if (!"weighted".equals(parts[0])) {
+        if (!TARGET_TYPE.equals(parts[0])) {
             throw new IllegalArgumentException("Unexpected type '" + parts[0] + "'");
         }
         return new WeightedAliasTarget(DomainName.of(parts[1]), parts[2], ZoneId.from(parts[3]),