Skip to content

Commit 5a1becd

Browse files
committed
Deprecate Jackson 2 support
This commit does not cover webauthn which is a special case (uses jackson sub-package for Jackson 2 support) which will be handled in a distinct commit. See spring-projectsgh-17832 Signed-off-by: Sébastien Deleuze <[email protected]>
1 parent e49a425 commit 5a1becd

File tree

88 files changed

+297
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+297
-14
lines changed

cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* this class we need to register with
3434
* {@link com.fasterxml.jackson.databind.ObjectMapper}. Type information will be stored
3535
* in @class property.
36+
*
3637
* <p>
3738
* <pre>
3839
* ObjectMapper mapper = new ObjectMapper();
@@ -43,7 +44,10 @@
4344
* @since 4.2
4445
* @see CasJackson2Module
4546
* @see org.springframework.security.jackson2.SecurityJackson2Modules
47+
* @deprecated as of 7.0 in favor of
48+
* {@code org.springframework.security.cas.jackson.AssertionImplMixin} based on Jackson 3
4649
*/
50+
@Deprecated(forRemoval = true)
4751
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
4852
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
4953
isGetterVisibility = JsonAutoDetect.Visibility.NONE)

cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* {@link org.apereo.cas.client.authentication.AttributePrincipalImpl} which is used with
3131
* {@link org.springframework.security.cas.authentication.CasAuthenticationToken}. Type
3232
* information will be stored in property named @class.
33+
*
3334
* <p>
3435
* <pre>
3536
* ObjectMapper mapper = new ObjectMapper();
@@ -40,7 +41,11 @@
4041
* @since 4.2
4142
* @see CasJackson2Module
4243
* @see org.springframework.security.jackson2.SecurityJackson2Modules
44+
* @deprecated as of 7.0 in favor of
45+
* {@code org.springframework.security.cas.jackson.AttributePrincipalImplMixin} based on
46+
* Jackson 3
4347
*/
48+
@Deprecated(forRemoval = true)
4449
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
4550
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
4651
isGetterVisibility = JsonAutoDetect.Visibility.NONE)

cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
* </ol>
4141
*
4242
* <p>
43-
*
4443
* <pre>
4544
* ObjectMapper mapper = new ObjectMapper();
4645
* mapper.registerModule(new CasJackson2Module());
@@ -50,7 +49,11 @@
5049
* @since 4.2
5150
* @see CasJackson2Module
5251
* @see org.springframework.security.jackson2.SecurityJackson2Modules
52+
* @deprecated as of 7.0 in favor of
53+
* {@code org.springframework.security.cas.jackson.CasAuthenticationTokenMixin} based on
54+
* Jackson 3
5355
*/
56+
@Deprecated(forRemoval = true)
5457
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
5558
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
5659
getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)

cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@
3737
* </pre> <b>Note: use {@link SecurityJackson2Modules#getModules(ClassLoader)} to get list
3838
* of all security modules on the classpath.</b>
3939
*
40-
* @author Jitendra Singh.
40+
* @author Jitendra Singh
4141
* @since 4.2
4242
* @see org.springframework.security.jackson2.SecurityJackson2Modules
43+
* @deprecated as of 7.0 in favor of
44+
* {@link org.springframework.security.cas.jackson.CasJacksonModule} based on Jackson 3
4345
*/
44-
@SuppressWarnings("serial")
46+
@Deprecated(forRemoval = true)
47+
@SuppressWarnings({ "serial", "removal" })
4548
public class CasJackson2Module extends SimpleModule {
4649

4750
public CasJackson2Module() {

cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
* @author Jitendra Singh
4545
* @since 4.2
4646
*/
47+
@SuppressWarnings("removal")
4748
public class CasAuthenticationTokenMixinTests {
4849

4950
private static final String KEY = "casKey";

core/src/main/java/org/springframework/security/jackson2/AbstractUnmodifiableCollectionDeserializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@
3838
* @param <T> the type of the unmodifiable collection, such as {@link List} or
3939
* {@link Set}.
4040
* @author Hyunmin Choi
41+
* @deprecated as of 7.0 in favor of
42+
* {@code org.springframework.security.jackson.AbstractUnmodifiableCollectionDeserializer}
43+
* based on Jackson 3
4144
*/
45+
@Deprecated(forRemoval = true)
4246
abstract class AbstractUnmodifiableCollectionDeserializer<T> extends JsonDeserializer<T> {
4347

4448
@Override

core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@
4343
* @since 4.2
4444
* @see CoreJackson2Module
4545
* @see SecurityJackson2Modules
46+
* @deprecated as of 7.0 in favor of
47+
* {@code org.springframework.security.jackson.AnonymousAuthenticationTokenMixin} based on
48+
* Jackson 3
4649
*/
4750
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
4851
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE,
4952
getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
5053
@JsonIgnoreProperties(ignoreUnknown = true)
54+
@Deprecated(forRemoval = true)
5155
class AnonymousAuthenticationTokenMixin {
5256

5357
/**

core/src/main/java/org/springframework/security/jackson2/BadCredentialsExceptionMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,13 @@
3838
* @author Yannick Lombardi
3939
* @since 5.0
4040
* @see CoreJackson2Module
41+
* @deprecated as of 7.0 in favor of
42+
* {@code org.springframework.security.jackson.BadCredentialsExceptionMixin} based on
43+
* Jackson 3
4144
*/
4245
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
4346
@JsonIgnoreProperties(ignoreUnknown = true, value = { "cause", "stackTrace", "authenticationRequest" })
47+
@Deprecated(forRemoval = true)
4448
class BadCredentialsExceptionMixin {
4549

4650
/**

core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@
4343
* </pre> <b>Note: use {@link SecurityJackson2Modules#getModules(ClassLoader)} to get list
4444
* of all security modules.</b>
4545
*
46-
* @author Jitendra Singh.
46+
* @author Jitendra Singh
4747
* @since 4.2
4848
* @see SecurityJackson2Modules
49+
* @deprecated as of 7.0 in favor of
50+
* {@link org.springframework.security.jackson.CoreJacksonModule} based on Jackson 3
4951
*/
50-
@SuppressWarnings("serial")
52+
@SuppressWarnings({ "serial", "removal" })
53+
@Deprecated(forRemoval = true)
5154
public class CoreJackson2Module extends SimpleModule {
5255

5356
public CoreJackson2Module() {

core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@
5050
* @since 4.2
5151
* @see CoreJackson2Module
5252
* @see SecurityJackson2Modules
53+
* @deprecated as of 7.0 in favor of
54+
* {@code org.springframework.security.jackson.RememberMeAuthenticationTokenMixin} based
55+
* on Jackson 3
5356
*/
5457
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
5558
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
5659
isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
5760
@JsonIgnoreProperties(ignoreUnknown = true)
61+
@Deprecated(forRemoval = true)
5862
class RememberMeAuthenticationTokenMixin {
5963

6064
/**

0 commit comments

Comments
 (0)