diff options
Diffstat (limited to 'controller-api')
12 files changed, 20 insertions, 51 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java index 73f83a9b6e5..96a0e5baa56 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogEntry.java @@ -71,7 +71,7 @@ public class LogEntry { .replaceAll("\\\\t", "\t"))) .filter(entry -> entry.at().isAfter(from)) .limit(100_000) - .collect(Collectors.toUnmodifiableList()); + .toList(); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java index 4d019f2ce59..d3e74965c4b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZtsClientMock.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.stream.Collectors.toList; - /** * @author bjorncs */ @@ -41,7 +39,7 @@ public class ZtsClientMock implements ZtsClient { return athenz.domains.values().stream() .filter(domain -> domain.tenantAdmins.contains(userIdentity) || domain.admins.contains(userIdentity)) .map(domain -> domain.name) - .collect(toList()); + .toList(); } @Override diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java index f7e7d69cd2f..7ae03d7ce6b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java @@ -58,7 +58,7 @@ public class EndpointCertificateMock implements EndpointCertificateProvider { "athenzDomain", p.requestedDnsSans().stream() .map(san -> new EndpointCertificateRequestMetadata.DnsNameStatus(san, "done")) - .collect(Collectors.toUnmodifiableList()), + .toList(), 3600, "ok", "2021-09-28T00:14:31.946562037Z", @@ -66,7 +66,7 @@ public class EndpointCertificateMock implements EndpointCertificateProvider { p.issuer(), "rsa_2048" )) - .collect(Collectors.toUnmodifiableList()); + .toList(); } @Override diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java index a4e26fbe7b3..26330f11d65 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/LoadBalancer.java @@ -5,6 +5,7 @@ import ai.vespa.http.DomainName; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn; import java.util.List; import java.util.Objects; @@ -84,6 +85,6 @@ public class LoadBalancer { unknown } - public record PrivateServiceInfo(String id, List<String> allowedUrns) { } + public record PrivateServiceInfo(String id, List<AllowedUrn> allowedUrns) { } } 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 7ccbcf2a954..9a33113728d 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 @@ -58,11 +58,11 @@ public sealed abstract class AliasTarget permits LatencyAliasTarget, WeightedAli /** Unpack target from given record data */ public static AliasTarget unpack(RecordData data) { String[] parts = data.asString().split("/"); - switch (parts[0]) { - case LatencyAliasTarget.TARGET_TYPE: return LatencyAliasTarget.unpack(data); - case WeightedAliasTarget.TARGET_TYPE: return WeightedAliasTarget.unpack(data); - } - throw new IllegalArgumentException("Unknown alias type '" + parts[0] + "'"); + return switch (parts[0]) { + case LatencyAliasTarget.TARGET_TYPE -> LatencyAliasTarget.unpack(data); + case WeightedAliasTarget.TARGET_TYPE -> WeightedAliasTarget.unpack(data); + default -> 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 00e5218dead..b33a5e942fa 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 @@ -48,7 +48,7 @@ public final class LatencyAliasTarget extends AliasTarget { @Override public String toString() { - return "latency target for " + name() + "[id=" + id() + ",dnsZone=" + dnsZone() + "]"; + return "latency target for " + name() + " [id=" + id() + ",dnsZone=" + dnsZone() + "]"; } /** Unpack latency alias from given record data */ 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 0a71e185717..4ad54ea14b0 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 @@ -7,9 +7,7 @@ import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.TreeSet; import java.util.concurrent.ConcurrentSkipListSet; -import java.util.stream.Collectors; /** * An in-memory name service for testing purposes. @@ -81,29 +79,7 @@ public class MemoryNameService implements NameService { public List<Record> findRecords(Record.Type type, RecordName name) { return records.stream() .filter(record -> record.type() == type && record.name().equals(name)) - .collect(Collectors.toUnmodifiableList()); - } - - @Override - public List<Record> findRecords(Record.Type type, RecordData data) { - if (type == Record.Type.ALIAS && data.asString().contains("/")) { - // Validate the same expectation as of a real name service - throw new IllegalArgumentException("Finding " + Record.Type.ALIAS + " record by data should only include " + - "the FQDN name"); - } - return records.stream() - .filter(record -> { - if (record.type() == type) { - if (type == Record.Type.ALIAS) { - // Unpack ALIAS record and compare FQDN of data part - return RecordData.fqdn(AliasTarget.unpack(record.data()).name().value()) - .equals(data); - } - return record.data().equals(data); - } - return false; - }) - .collect(Collectors.toUnmodifiableList()); + .toList(); } @Override diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java index 72e983680d9..a0612fda038 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/NameService.java @@ -51,9 +51,6 @@ public interface NameService { /** Find all records matching given type and name */ List<Record> findRecords(Record.Type type, RecordName name); - /** Find all records matching given type and data */ - List<Record> findRecords(Record.Type type, RecordData data); - /** Update existing record */ void updateRecord(Record record, RecordData newData); 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 da296361535..6adcd1c1985 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.hosted.controller.api.integration.dns; import ai.vespa.http.DomainName; -import com.yahoo.config.provision.zone.ZoneId; import java.util.Objects; @@ -20,8 +19,8 @@ public final class WeightedAliasTarget extends AliasTarget { private final long weight; - public WeightedAliasTarget(DomainName name, String dnsZone, ZoneId zone, long weight) { - super(name, dnsZone, zone.value()); + public WeightedAliasTarget(DomainName name, String dnsZone, String id, long weight) { + super(name, dnsZone, id); this.weight = weight; if (weight < 0) throw new IllegalArgumentException("Weight cannot be negative"); } @@ -65,8 +64,7 @@ public final class WeightedAliasTarget extends AliasTarget { 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]), - Long.parseLong(parts[4])); + return new WeightedAliasTarget(DomainName.of(parts[1]), parts[2], parts[3], Long.parseLong(parts[4])); } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java index 6750c6d2eaf..dd80a2b3a9a 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/maven/Metadata.java @@ -23,7 +23,7 @@ public class Metadata { public Metadata(ArtifactId id, List<Version> versions) { this.id = requireNonNull(id); - this.versions = versions.stream().sorted().collect(Collectors.toUnmodifiableList()); + this.versions = versions.stream().sorted().toList(); } /** Creates a new Metadata object from the given XML document. */ diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java index 9cbba8107ef..c859cc020ab 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/integration/dns/AliasTargetTest.java @@ -19,7 +19,7 @@ public class AliasTargetTest { void packing() { List<AliasTarget> tests = List.of( new LatencyAliasTarget(HostName.of("foo.example.com"), "dns-zone-1", ZoneId.from("prod.us-north-1")), - new WeightedAliasTarget(HostName.of("bar.example.com"), "dns-zone-2", ZoneId.from("prod.us-north-2"), 50) + new WeightedAliasTarget(HostName.of("bar.example.com"), "dns-zone-2", "prod.us-north-2", 50) ); for (var target : tests) { AliasTarget unpacked = AliasTarget.unpack(target.pack()); diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java index c40788ecb3f..d010893f1d4 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -325,7 +324,7 @@ public class SystemFlagsDataArchiveTest { private static List<FlagData> getData(SystemFlagsDataArchive archive, FlagId flagId, FlagsTarget target) { return archive.flagData(target).stream() .filter(d -> d.id().equals(flagId)) - .collect(toList()); + .toList(); } private static class SimpleZone implements ZoneApi { @@ -338,4 +337,4 @@ public class SystemFlagsDataArchiveTest { @Override public String getCloudNativeRegionName() { throw new UnsupportedOperationException(); } } -}
\ No newline at end of file +} |