Implement Serial

Signed-off-by: Tran Ngoc Nhan <[email protected]>
franticticktick · Jan 22, 2025 · e5ea75f · e5ea75f
1 parent 5da7f0e
commit e5ea75f
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 4 deletions.
diff --git a/...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
@@ -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;
@@ -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(),

diff --git a/...alized/6.5.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized b/...alized/6.5.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized
diff --git a/...curity.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized b/...curity.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized
diff --git a/...framework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized b/...framework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized
diff --git a/...springframework.security.oauth2.client.registration.ClientRegistration$Builder.serialized b/...springframework.security.oauth2.client.registration.ClientRegistration$Builder.serialized
diff --git a/...ramework.security.oauth2.client.registration.ClientRegistration$ClientSettings.serialized b/...ramework.security.oauth2.client.registration.ClientRegistration$ClientSettings.serialized
diff --git a/...5.x/org.springframework.security.oauth2.client.registration.ClientRegistration.serialized b/...5.x/org.springframework.security.oauth2.client.registration.ClientRegistration.serialized
diff --git a/...ces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2DeviceCode.serialized b/...ces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2DeviceCode.serialized
diff --git a/...s/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2RefreshToken.serialized b/...s/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2RefreshToken.serialized
diff --git a/...urces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2UserCode.serialized b/...urces/serialized/6.5.x/org.springframework.security.oauth2.core.OAuth2UserCode.serialized
diff --git a/...main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java b/...main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java
@@ -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;
@@ -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;