diff options
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, 12 insertions, 7 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 6b7a4835aee..fc21f8271c4 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,7 +119,10 @@ 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).stream().flatMap(Collection::stream).toList(); + .map(Arrays::asList) + .map(List::stream) + .orElse(Stream.empty()) + .collect(Collectors.toList()); return sanDNS.stream() .filter(dns -> dns.contains(INSTANCE_ID_DELIMITER)) @@ -149,13 +152,15 @@ 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).stream().flatMap(Collection::stream) + .map(Arrays::asList) + .map(List::stream) + .orElse(Stream.empty()) .map(InetAddresses::forString) - .toList(); + .collect(Collectors.toList()); List<InetAddress> nodeIpAddresses = node.ipConfig().primary().stream() .map(InetAddresses::forString) - .toList(); + .collect(Collectors.toList()); // Validate that ipaddresses in request are valid for node @@ -182,7 +187,7 @@ public class InstanceValidator { Optional<ApplicationInfo> applicationInfo = superModelProvider.getSuperModel().getApplicationInfo(applicationId); - if (applicationInfo.isEmpty()) { + if (!applicationInfo.isPresent()) { log.info(String.format("Could not find application info for %s, existing applications: %s", applicationId.serializedForm(), superModelProvider.getSuperModel().getAllApplicationInfos())); @@ -202,7 +207,7 @@ public class InstanceValidator { .filter(serviceInfo -> serviceInfo.getProperty(SERVICE_PROPERTIES_SERVICE_KEY).isPresent()) .findFirst(); - if (matchingServiceInfo.isEmpty()) { + if (!matchingServiceInfo.isPresent()) { log.info(String.format("Application %s has not specified domain/service", applicationId.serializedForm())); return false; } |