From 3f6e6b443968acf2f8bd2cc2a3a6623d38abf6e8 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Tue, 26 Nov 2024 00:41:33 +0700 Subject: [PATCH 1/4] Use `Collections#emptyMap` --- .../authentication/OAuth2ClientAuthenticationToken.java | 2 +- .../jackson2/OAuth2AuthorizationServerJackson2Module.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java index 7a5c7e7d6..40d6d4fe0 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java @@ -92,7 +92,7 @@ public OAuth2ClientAuthenticationToken(RegisteredClient registeredClient, this.registeredClient = registeredClient; this.clientAuthenticationMethod = clientAuthenticationMethod; this.credentials = credentials; - this.additionalParameters = Collections.unmodifiableMap(Collections.emptyMap()); + this.additionalParameters = Collections.emptyMap(); setAuthenticated(true); } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java index 7219a95b0..8e347b4cd 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java @@ -78,8 +78,7 @@ public OAuth2AuthorizationServerJackson2Module() { @Override public void setupModule(SetupContext context) { SecurityJackson2Modules.enableDefaultTyping(context.getOwner()); - context.setMixInAnnotations(Collections.unmodifiableMap(Collections.emptyMap()).getClass(), - UnmodifiableMapMixin.class); + context.setMixInAnnotations(Collections.emptyMap().getClass(), UnmodifiableMapMixin.class); context.setMixInAnnotations(HashSet.class, HashSetMixin.class); context.setMixInAnnotations(LinkedHashSet.class, HashSetMixin.class); context.setMixInAnnotations(OAuth2TokenExchangeActor.class, OAuth2TokenExchangeActorMixin.class); From a1a53d625ab017905fcc26651868a241a1d4a47a Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Tue, 26 Nov 2024 00:42:01 +0700 Subject: [PATCH 2/4] Use pattern matching --- .../server/authorization/JdbcOAuth2AuthorizationService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java index 32f9bfe1f..86af06b06 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JdbcOAuth2AuthorizationService.java @@ -766,8 +766,7 @@ private LobCreatorArgumentPreparedStatementSetter(LobCreator lobCreator, Object[ @Override protected void doSetValue(PreparedStatement ps, int parameterPosition, Object argValue) throws SQLException { - if (argValue instanceof SqlParameterValue) { - SqlParameterValue paramValue = (SqlParameterValue) argValue; + if (argValue instanceof SqlParameterValue paramValue) { if (paramValue.getSqlType() == Types.BLOB) { if (paramValue.getValue() != null) { Assert.isInstanceOf(byte[].class, paramValue.getValue(), From 4a3d7e42f842c3bc0055dc1c0bd435b800c14df4 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Tue, 26 Nov 2024 01:11:26 +0700 Subject: [PATCH 3/4] Revert OAuth2AuthorizationServerJackson2Module --- .../jackson2/OAuth2AuthorizationServerJackson2Module.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java index 8e347b4cd..7219a95b0 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/jackson2/OAuth2AuthorizationServerJackson2Module.java @@ -78,7 +78,8 @@ public OAuth2AuthorizationServerJackson2Module() { @Override public void setupModule(SetupContext context) { SecurityJackson2Modules.enableDefaultTyping(context.getOwner()); - context.setMixInAnnotations(Collections.emptyMap().getClass(), UnmodifiableMapMixin.class); + context.setMixInAnnotations(Collections.unmodifiableMap(Collections.emptyMap()).getClass(), + UnmodifiableMapMixin.class); context.setMixInAnnotations(HashSet.class, HashSetMixin.class); context.setMixInAnnotations(LinkedHashSet.class, HashSetMixin.class); context.setMixInAnnotations(OAuth2TokenExchangeActor.class, OAuth2TokenExchangeActorMixin.class); From f6fd91bd99af373aa1606591e6b9c8959f9786c5 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Tue, 26 Nov 2024 01:12:23 +0700 Subject: [PATCH 4/4] Update copyright header --- .../authentication/OAuth2ClientAuthenticationToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java index 40d6d4fe0..a69651093 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationToken.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.