Remove com.yahoo.vespa.jdk8compat

These types are often accidentally imported, and the JDK8 replacement is typically a one-liner.

2 files changed, 7 insertions, 6 deletions

diff --git a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java
index 85adeae6d78..82bf4ff8080 100644
--- a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java
+++ b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedConnectionLevelRetryHandlerTest.java
@@ -1,7 +1,6 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.util.http.retry;
 
-import com.yahoo.vespa.jdk8compat.List;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.junit.Test;
 
@@ -9,6 +8,7 @@ import javax.net.ssl.SSLException;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.time.Duration;
+import java.util.Arrays;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -105,7 +105,7 @@ public class DelayedConnectionLevelRetryHandlerTest {
 
         DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
                 .withFixedDelay(Duration.ofSeconds(2), maxRetries)
-                .retryForExceptions(List.of(SSLException.class, ConnectException.class))
+                .retryForExceptions(Arrays.asList(SSLException.class, ConnectException.class))
                 .withSleeper(mock(Sleeper.class))
                 .build();
 
@@ -122,7 +122,7 @@ public class DelayedConnectionLevelRetryHandlerTest {
     public void does_not_retry_for_non_listed_exception() {
         DelayedConnectionLevelRetryHandler handler = DelayedConnectionLevelRetryHandler.Builder
                 .withFixedDelay(Duration.ofSeconds(2), 2)
-                .retryForExceptions(List.of(SSLException.class, ConnectException.class))
+                .retryForExceptions(Arrays.asList(SSLException.class, ConnectException.class))
                 .withSleeper(mock(Sleeper.class))
                 .build();
 
diff --git a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedResponseLevelRetryHandlerTest.java b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedResponseLevelRetryHandlerTest.java
index dbc93f28d6b..b1d78fc09eb 100644
--- a/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedResponseLevelRetryHandlerTest.java
+++ b/http-utils/src/test/java/ai/vespa/util/http/retry/DelayedResponseLevelRetryHandlerTest.java
@@ -9,6 +9,7 @@ import org.apache.http.message.BasicStatusLine;
 import org.junit.Test;
 
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -82,7 +83,7 @@ public class DelayedResponseLevelRetryHandlerTest {
         HttpClientContext ctx = new HttpClientContext();
         int lastExecutionCount = maxRetries + 1;
         List<Duration> expectedIntervals =
-                com.yahoo.vespa.jdk8compat.List.of(
+                Arrays.asList(
                         startDelay, Duration.ofSeconds(1), Duration.ofSeconds(2), Duration.ofSeconds(4),
                         Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5),
                         Duration.ofSeconds(5), Duration.ofSeconds(5), Duration.ofSeconds(5));
@@ -98,7 +99,7 @@ public class DelayedResponseLevelRetryHandlerTest {
 
         DelayedResponseLevelRetryHandler handler = DelayedResponseLevelRetryHandler.Builder
                 .withFixedDelay(Duration.ofSeconds(2), maxRetries)
-                .retryForStatusCodes(com.yahoo.vespa.jdk8compat.List.of(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY))
+                .retryForStatusCodes(Arrays.asList(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY))
                 .build();
 
         HttpResponse response = createResponse(HttpStatus.SC_SERVICE_UNAVAILABLE);
@@ -114,7 +115,7 @@ public class DelayedResponseLevelRetryHandlerTest {
     public void does_not_retry_for_non_listed_exception() {
         DelayedResponseLevelRetryHandler handler = DelayedResponseLevelRetryHandler.Builder
                 .withFixedDelay(Duration.ofSeconds(2), 2)
-                .retryForStatusCodes(com.yahoo.vespa.jdk8compat.List.of(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY))
+                .retryForStatusCodes(Arrays.asList(HttpStatus.SC_SERVICE_UNAVAILABLE, HttpStatus.SC_BAD_GATEWAY))
                 .build();
 
         HttpResponse response = createResponse(HttpStatus.SC_OK);