Skip to content

Fix serializeCurrentVersionClasses #16443

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
merged 1 commit into from
Jan 22, 2025
Merged

Fix serializeCurrentVersionClasses #16443

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
8 changes: 5 additions & 3 deletions ...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
import org.springframework.security.oauth2.client.oidc.session.OidcSessionInformation;
import org.springframework.security.oauth2.client.oidc.session.TestOidcSessionInformations;
import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.client.registration.ClientRegistration.ClientSettings;
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
import org.springframework.security.oauth2.core.DefaultOAuth2AuthenticatedPrincipal;
import org.springframework.security.oauth2.core.OAuth2AccessToken;
Expand Down Expand Up @@ -239,11 +240,12 @@ class SpringSecurityCoreVersionSerializableTests {
(r) -> new ReactiveSessionInformation(user, r.alphanumeric(4), Instant.ofEpochMilli(1704378933936L)));
generatorByClassName.put(OAuth2AccessToken.class, (r) -> TestOAuth2AccessTokens.scopes("scope"));
generatorByClassName.put(OAuth2DeviceCode.class,
(r) -> new OAuth2DeviceCode("token", Instant.now(), Instant.now()));
(r) -> new OAuth2DeviceCode("token", Instant.now(), Instant.now().plusSeconds(1)));
generatorByClassName.put(OAuth2RefreshToken.class,
(r) -> new OAuth2RefreshToken("refreshToken", Instant.now(), Instant.now()));
(r) -> new OAuth2RefreshToken("refreshToken", Instant.now(), Instant.now().plusSeconds(1)));
generatorByClassName.put(OAuth2UserCode.class,
(r) -> new OAuth2UserCode("token", Instant.now(), Instant.now()));
(r) -> new OAuth2UserCode("token", Instant.now(), Instant.now().plusSeconds(1)));
generatorByClassName.put(ClientSettings.class, (r) -> ClientSettings.builder().build());
generatorByClassName.put(DefaultOidcUser.class, (r) -> TestOidcUsers.create());
generatorByClassName.put(OidcUserAuthority.class,
(r) -> new OidcUserAuthority(TestOidcIdTokens.idToken().build(),
Expand Down
Binary file added ...alized/6.5.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...curity.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...framework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...springframework.security.oauth2.client.registration.ClientRegistration$Builder.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...ramework.security.oauth2.client.registration.ClientRegistration$ClientSettings.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...5.x/org.springframework.security.oauth2.client.registration.ClientRegistration.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...ces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2DeviceCode.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...s/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2RefreshToken.serialized
View file
Open in desktop
Binary file not shown.
Binary file added ...urces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2UserCode.serialized
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion ...main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.security.oauth2.client.registration;

import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -748,7 +749,10 @@ private static boolean withinTheRangeOf(int c, int min, int max) {
* @author DingHao
* @since 6.5
*/
public static final class ClientSettings {
public static final class ClientSettings implements Serializable {

@Serial
private static final long serialVersionUID = 7495627155437124692L;

private boolean requireProofKey;

Expand Down
Loading