Skip to content

Use upper bounded wildcard to read and delete cookie #23539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wendigo merged 1 commit into from
Sep 24, 2024
Merged

Use upper bounded wildcard to read and delete cookie #23539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/server/ui/MultipartUiCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/server/ui/OAuthIdTokenCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/main/java/io/trino/server/ui/OAuthWebUiCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down