Fix failing annotator test and singletonMap => Map.of

2 files changed, 3 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/processing/request/Properties.java b/container-core/src/main/java/com/yahoo/processing/request/Properties.java
index d06e8b26cd9..e689ea76f3a 100644
--- a/container-core/src/main/java/com/yahoo/processing/request/Properties.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/Properties.java
@@ -3,7 +3,6 @@ package com.yahoo.processing.request;
 
 import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
 
 /**
  * The properties of a request
@@ -271,7 +270,7 @@ public class Properties implements Cloneable {
      * @throws RuntimeException if no instance in the chain accepted this name-value pair
      */
     public final void clearAll(String name) {
-        clearAll(new CompoundName(name), Collections.<String,String>emptyMap());
+        clearAll(new CompoundName(name), Map.of());
     }
 
     /**
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/HttpRequestTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/HttpRequestTestCase.java
index f70772b7331..2aa5c888865 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/HttpRequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/HttpRequestTestCase.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.Map;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,7 +30,7 @@ public class HttpRequestTestCase {
     @BeforeEach
     public void setUp() throws Exception {
         requestData = new ByteArrayInputStream(Utf8.toBytes(X_RAY_YANKEE_ZULU));
-        r = HttpRequest.createTestRequest(HTTP_MAILHOST_25_ALPHA_BRAVO_CHARLIE_DELTA, Method.GET, requestData, Collections.singletonMap("foxtrot", "golf"));
+        r = HttpRequest.createTestRequest(HTTP_MAILHOST_25_ALPHA_BRAVO_CHARLIE_DELTA, Method.GET, requestData, Map.of("foxtrot", "golf"));
     }
 
     @AfterEach