diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-12-02 23:09:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-02 23:09:25 +0100 |
commit | afcf1bb71cb7b87a03149d197f724cfc7603ef92 (patch) | |
tree | fff1df3e68101edc3d3d3b98b5eb51b7758c209c /athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java | |
parent | 7f870bf3cb8dd0a3d015a448608ba7291a783932 (diff) | |
parent | fcf664e1a6bb9890bd54ff4f8b78497236152bf2 (diff) |
Merge pull request #25096 from vespa-engine/revert-25091-revert-25088-balder/immutablelist-2-listv8.94.46
Revert "Revert "Let list handling catch up with Java 17""
Diffstat (limited to 'athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java index fc21f8271c4..6b7a4835aee 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidator.java @@ -19,11 +19,11 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import java.net.InetAddress; import java.security.PublicKey; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -119,10 +119,7 @@ public class InstanceValidator { // Find a list of SAN DNS List<String> sanDNS = Optional.ofNullable(instanceConfirmation.attributes.get(SAN_DNS_ATTRNAME)) .map(s -> s.split(",")) - .map(Arrays::asList) - .map(List::stream) - .orElse(Stream.empty()) - .collect(Collectors.toList()); + .map(Arrays::asList).stream().flatMap(Collection::stream).toList(); return sanDNS.stream() .filter(dns -> dns.contains(INSTANCE_ID_DELIMITER)) @@ -152,15 +149,13 @@ public class InstanceValidator { // Find list of ipaddresses List<InetAddress> ips = Optional.ofNullable(confirmation.attributes.get(SAN_IPS_ATTRNAME)) .map(s -> s.split(",")) - .map(Arrays::asList) - .map(List::stream) - .orElse(Stream.empty()) + .map(Arrays::asList).stream().flatMap(Collection::stream) .map(InetAddresses::forString) - .collect(Collectors.toList()); + .toList(); List<InetAddress> nodeIpAddresses = node.ipConfig().primary().stream() .map(InetAddresses::forString) - .collect(Collectors.toList()); + .toList(); // Validate that ipaddresses in request are valid for node @@ -187,7 +182,7 @@ public class InstanceValidator { Optional<ApplicationInfo> applicationInfo = superModelProvider.getSuperModel().getApplicationInfo(applicationId); - if (!applicationInfo.isPresent()) { + if (applicationInfo.isEmpty()) { log.info(String.format("Could not find application info for %s, existing applications: %s", applicationId.serializedForm(), superModelProvider.getSuperModel().getAllApplicationInfos())); @@ -207,7 +202,7 @@ public class InstanceValidator { .filter(serviceInfo -> serviceInfo.getProperty(SERVICE_PROPERTIES_SERVICE_KEY).isPresent()) .findFirst(); - if (!matchingServiceInfo.isPresent()) { + if (matchingServiceInfo.isEmpty()) { log.info(String.format("Application %s has not specified domain/service", applicationId.serializedForm())); return false; } |