Fix failing annotator test and singletonMap => Map.of

3 files changed, 5 insertions, 6 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java
index 34045cf3804..452ee53c439 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java
@@ -17,7 +17,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
+import java.util.Map;
 
 import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
 import static com.yahoo.jdisc.http.HttpResponse.Status.BAD_REQUEST;
@@ -90,7 +90,7 @@ public class HttpGetConfigHandlerTest {
 
     @Test
     public void require_that_nocache_property_works() throws IOException {
-        HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Collections.singletonMap("nocache", "true"));
+        HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Map.of("nocache", "true"));
         HttpResponse response = handler.handle(request);
         String renderedString = SessionHandlerTest.getRenderedString(response);
         assertTrue(renderedString, renderedString.startsWith(expected));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
index a7f86133fce..b58bca074b8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Collections;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -39,7 +39,7 @@ public class HttpHandlerTest {
                 HttpRequest.createTestRequest("foo",
                                               com.yahoo.jdisc.http.HttpRequest.Method.GET,
                                               null,
-                                              Collections.singletonMap("timeout", "1.5")), Duration.ofSeconds(5)).toMillis());
+                                              Map.of("timeout", "1.5")), Duration.ofSeconds(5)).toMillis());
     }
 
     private static class HttpTestHandler extends HttpHandler {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
index 6f2c7366b62..4c140159e12 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Map;
 
 import static com.yahoo.jdisc.Response.Status.BAD_REQUEST;
@@ -126,7 +125,7 @@ public class HttpGetConfigHandlerTest {
 
     @Test
     public void require_that_nocache_property_works() throws IOException {
-        HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Collections.singletonMap("nocache", "true"));
+        HttpRequest request = HttpRequest.createTestRequest(configUri, GET, null, Map.of("nocache", "true"));
         HttpResponse response = handler.handle(request);
         String renderedString = SessionHandlerTest.getRenderedString(response);
         assertTrue(renderedString, renderedString.startsWith(expected));