Use upper bounded wildcard to read and delete cookie in OAuthWebUiCookie

trinodb · Sep 24, 2024 · 60225b1 · 60225b1
1 parent 870c0bb
commit 60225b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/server/ui/MultipartUiCookie.java b/core/trino-main/src/main/java/io/trino/server/ui/MultipartUiCookie.java
@@ -63,7 +63,7 @@ public NewCookie[] create(String token, Instant tokenExpiration, boolean isSecur
         return cookiesToSet.build().toArray(new NewCookie[0]);
     }
 
-    public Optional<String> read(Map<String, Cookie> existingCookies)
+    public Optional<String> read(Map<String, ? extends Cookie> existingCookies)
     {
         long cookiesCount = existingCookies.values().stream()
                 .filter(this::matchesName)
@@ -85,7 +85,7 @@ public Optional<String> read(Map<String, Cookie> existingCookies)
         return Optional.of(token.toString());
     }
 
-    public NewCookie[] delete(Map<String, Cookie> existingCookies, boolean isSecured)
+    public NewCookie[] delete(Map<String, ? extends Cookie> existingCookies, boolean isSecured)
     {
         ImmutableSet.Builder<NewCookie> cookiesToDelete = ImmutableSet.builder();
         cookiesToDelete.add(deleteCookie(cookieName, isSecured)); // Always invalidate first cookie even if it doesn't exist

diff --git a/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java b/core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java
@@ -35,12 +35,12 @@ public static NewCookie[] create(String token, Instant tokenExpiration)
         return MULTIPART_COOKIE.create(token, tokenExpiration, true);
     }
 
-    public static Optional<String> read(Map<String, Cookie> availableCookies)
+    public static Optional<String> read(Map<String, ? extends Cookie> availableCookies)
     {
         return MULTIPART_COOKIE.read(availableCookies);
     }
 
-    public static NewCookie[] delete(Map<String, Cookie> availableCookies)
+    public static NewCookie[] delete(Map<String, ? extends Cookie> availableCookies)
     {
         return MULTIPART_COOKIE.delete(availableCookies, true);
     }