Remove custom Jackson 3 support for unmodifiable collections

Signed-off-by: Sébastien Deleuze <[email protected]>

Author: sdeleuze

core/src/main/java/org/springframework/security/jackson/AllowlistTypeResolverBuilder.java

@@ -80,6 +80,8 @@ static class AllowlistTypeIdResolver implements TypeIdResolver {
 			names.add("java.util.Collections$EmptyList");
 			names.add("java.util.Collections$EmptyMap");
 			names.add("java.util.Collections$UnmodifiableRandomAccessList");
+			names.add("java.util.Collections$UnmodifiableSet");
+			names.add("java.util.Collections$UnmodifiableMap");
 			names.add("java.util.Collections$SingletonList");
 			names.add("java.util.Date");
 			names.add("java.time.Instant");

core/src/main/java/org/springframework/security/jackson/CoreJacksonModule.java

@@ -16,8 +16,6 @@
 
 package org.springframework.security.jackson;
 
-import java.util.Collections;
-
 import tools.jackson.core.Version;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.module.SimpleModule;
@@ -32,8 +30,9 @@
 /**
  * Jackson module for spring-security-core. This module register
  * {@link AnonymousAuthenticationTokenMixin}, {@link RememberMeAuthenticationTokenMixin},
- * {@link SimpleGrantedAuthorityMixin}, {@link UnmodifiableSetMixin}, {@link UserMixin}
- * and {@link UsernamePasswordAuthenticationTokenMixin}. If no default typing enabled by
+ * {@link SimpleGrantedAuthorityMixin}, {{@link UserMixin},
+ * {@link UsernamePasswordAuthenticationTokenMixin} and
+ * {@link UsernamePasswordAuthenticationTokenMixin}. If no default typing enabled by
  * default then it'll enable it because typing info is needed to properly
  * serialize/deserialize objects. In order to use this module just add this module into
  * your JsonMapper configuration.
@@ -64,9 +63,6 @@ public void setupModule(SetupContext context) {
 		context.setMixIn(AnonymousAuthenticationToken.class, AnonymousAuthenticationTokenMixin.class);
 		context.setMixIn(RememberMeAuthenticationToken.class, RememberMeAuthenticationTokenMixin.class);
 		context.setMixIn(SimpleGrantedAuthority.class, SimpleGrantedAuthorityMixin.class);
-		context.setMixIn(Collections.unmodifiableSet(Collections.emptySet()).getClass(), UnmodifiableSetMixin.class);
-		context.setMixIn(Collections.unmodifiableList(Collections.emptyList()).getClass(), UnmodifiableListMixin.class);
-		context.setMixIn(Collections.unmodifiableMap(Collections.emptyMap()).getClass(), UnmodifiableMapMixin.class);
 		context.setMixIn(User.class, UserMixin.class);
 		context.setMixIn(UsernamePasswordAuthenticationToken.class, UsernamePasswordAuthenticationTokenMixin.class);
 		context.setMixIn(BadCredentialsException.class, BadCredentialsExceptionMixin.class);