Skip to content

Commit e5ea75f

Browse files
ngocnhan-tran1996rwinch
authored andcommitted
Implement Serial
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
1 parent 5da7f0e commit e5ea75f

11 files changed

+10
-4
lines changed

config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
import org.springframework.security.oauth2.client.oidc.session.OidcSessionInformation;
122122
import org.springframework.security.oauth2.client.oidc.session.TestOidcSessionInformations;
123123
import org.springframework.security.oauth2.client.registration.ClientRegistration;
124+
import org.springframework.security.oauth2.client.registration.ClientRegistration.ClientSettings;
124125
import org.springframework.security.oauth2.client.registration.TestClientRegistrations;
125126
import org.springframework.security.oauth2.core.DefaultOAuth2AuthenticatedPrincipal;
126127
import org.springframework.security.oauth2.core.OAuth2AccessToken;
@@ -239,11 +240,12 @@ class SpringSecurityCoreVersionSerializableTests {
239240
(r) -> new ReactiveSessionInformation(user, r.alphanumeric(4), Instant.ofEpochMilli(1704378933936L)));
240241
generatorByClassName.put(OAuth2AccessToken.class, (r) -> TestOAuth2AccessTokens.scopes("scope"));
241242
generatorByClassName.put(OAuth2DeviceCode.class,
242-
(r) -> new OAuth2DeviceCode("token", Instant.now(), Instant.now()));
243+
(r) -> new OAuth2DeviceCode("token", Instant.now(), Instant.now().plusSeconds(1)));
243244
generatorByClassName.put(OAuth2RefreshToken.class,
244-
(r) -> new OAuth2RefreshToken("refreshToken", Instant.now(), Instant.now()));
245+
(r) -> new OAuth2RefreshToken("refreshToken", Instant.now(), Instant.now().plusSeconds(1)));
245246
generatorByClassName.put(OAuth2UserCode.class,
246-
(r) -> new OAuth2UserCode("token", Instant.now(), Instant.now()));
247+
(r) -> new OAuth2UserCode("token", Instant.now(), Instant.now().plusSeconds(1)));
248+
generatorByClassName.put(ClientSettings.class, (r) -> ClientSettings.builder().build());
247249
generatorByClassName.put(DefaultOidcUser.class, (r) -> TestOidcUsers.create());
248250
generatorByClassName.put(OidcUserAuthority.class,
249251
(r) -> new OidcUserAuthority(TestOidcIdTokens.idToken().build(),

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

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

19+
import java.io.Serial;
1920
import java.io.Serializable;
2021
import java.util.Arrays;
2122
import java.util.Collection;
@@ -748,7 +749,10 @@ private static boolean withinTheRangeOf(int c, int min, int max) {
748749
* @author DingHao
749750
* @since 6.5
750751
*/
751-
public static final class ClientSettings {
752+
public static final class ClientSettings implements Serializable {
753+
754+
@Serial
755+
private static final long serialVersionUID = 7495627155437124692L;
752756

753757
private boolean requireProofKey;
754758

0 commit comments

Comments
 (0)