diff options
Diffstat (limited to 'controller-api')
3 files changed, 16 insertions, 10 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java index 9f4af82c5b0..ec9cf0b3436 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java @@ -39,7 +39,7 @@ public class MemoryNameService implements NameService { public Optional<Record> findRecord(Record.Type type, RecordData data) { return records.values() .stream() - .filter(record -> record.type() == type && record.value().equals(data)) + .filter(record -> record.type() == type && record.data().equals(data)) .findFirst(); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java index fd9bddac2c6..b51202e8261 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java @@ -13,13 +13,13 @@ public class Record { private final RecordId id; private final Type type; private final RecordName name; - private final RecordData value; + private final RecordData data; - public Record(RecordId id, Type type, RecordName name, RecordData value) { + public Record(RecordId id, Type type, RecordName name, RecordData data) { this.id = Objects.requireNonNull(id, "id cannot be null"); this.type = Objects.requireNonNull(type, "type cannot be null"); this.name = Objects.requireNonNull(name, "name cannot be null"); - this.value = Objects.requireNonNull(value, "value cannot be null"); + this.data = Objects.requireNonNull(data, "data cannot be null"); } /** Unique identifier for this */ @@ -32,9 +32,9 @@ public class Record { return type; } - /** Value for this, e.g. IP address for "A" record */ - public RecordData value() { - return value; + /** Data in this, e.g. IP address for "A" record */ + public RecordData data() { + return data; } /** Name of this, e.g. a FQDN for "A" record */ @@ -60,7 +60,7 @@ public class Record { "id=" + id + ", type=" + type + ", name='" + name + '\'' + - ", value='" + value + '\'' + + ", data='" + data + '\'' + '}'; } @@ -72,11 +72,11 @@ public class Record { return Objects.equals(id, record.id) && type == record.type && Objects.equals(name, record.name) && - Objects.equals(value, record.value); + Objects.equals(data, record.data); } @Override public int hashCode() { - return Objects.hash(id, type, name, value); + return Objects.hash(id, type, name, data); } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/RecordData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/RecordData.java index 444ee28f672..e0d19e0fff9 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/RecordData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/RecordData.java @@ -42,8 +42,14 @@ public class RecordData { '}'; } + /** Create a new record containing the given data */ public static RecordData from(String data) { return new RecordData(data); } + /** Create a new record and append a trailing dot to given data, if missing */ + public static RecordData fqdn(String data) { + return from(data.endsWith(".") ? data : data + "."); + } + } |