Revert "Let list handling catch up with Java 17"

2 files changed, 15 insertions, 9 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;
         }
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
index c3e4ba44fc8..9a91d7372da 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.athenz.instanceproviderservice;
 
+import com.google.common.collect.ImmutableList;
 import com.yahoo.component.Version;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.HostInfo;
@@ -144,7 +145,7 @@ public class InstanceValidatorTest {
         nodeList = allocateNode(nodeList, node, applicationId);
         when(nodes.list()).thenReturn(NodeList.copyOf(nodeList));
         String nodeIp = node.ipConfig().primary().stream().findAny().orElseThrow(() -> new RuntimeException("No ipaddress for mocked node"));
-        InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, List.of(nodeIp));
+        InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, ImmutableList.of(nodeIp));
 
         assertTrue(instanceValidator.isValidRefresh(instanceConfirmation));
     }
@@ -178,7 +179,7 @@ public class InstanceValidatorTest {
         List<Node> nodeList = createNodes(10);
 
         when(nodes.list()).thenReturn(NodeList.copyOf(nodeList));
-        InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, List.of("::11"));
+        InstanceConfirmation instanceConfirmation = createRefreshInstanceConfirmation(applicationId, domain, service, ImmutableList.of("::11"));
 
         assertFalse(instanceValidator.isValidRefresh(instanceConfirmation));