Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SecurityJacksonModules->SecurityJackson2Modules 

Fixes gh-4121
This commit is contained in:
Rob Winch 2016-11-09 16:40:24 -06:00
parent 36f4f7d081
commit f0a9421aa4
22 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java
View File

@ -36,7 +36,7 @@ import java.util.Map;
*
* @author Jitendra Singh
* @see CasJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java
View File

@ -33,7 +33,7 @@ import java.util.Map;
*
* @author Jitendra Singh
* @see CasJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java
View File

@ -42,7 +42,7 @@ import java.util.Collection;
*
* @author Jitendra Singh
* @see CasJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

8
cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java
View File

@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
import org.jasig.cas.client.authentication.AttributePrincipalImpl;
import org.jasig.cas.client.validation.AssertionImpl;
import org.springframework.security.cas.authentication.CasAuthenticationToken;
import org.springframework.security.jackson2.SecurityJacksonModules;
import org.springframework.security.jackson2.SecurityJackson2Modules;
/**
* Jackson module for spring-security-cas. This module register {@link AssertionImplMixin},
@ -34,10 +34,10 @@ import org.springframework.security.jackson2.SecurityJacksonModules;
* ObjectMapper mapper = new ObjectMapper();
* mapper.registerModule(new CasJackson2Module());
* </pre>
* <b>Note: use {@link SecurityJacksonModules#getModules(ClassLoader)} to get list of all security modules on the classpath.</b>
* <b>Note: use {@link SecurityJackson2Modules#getModules(ClassLoader)} to get list of all security modules on the classpath.</b>
*
* @author Jitendra Singh.
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
public class CasJackson2Module extends SimpleModule {
@ -48,7 +48,7 @@ public class CasJackson2Module extends SimpleModule {
@Override
public void setupModule(SetupContext context) {
SecurityJacksonModules.enableDefaultTyping((ObjectMapper) context.getOwner());
SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner());
context.setMixInAnnotations(AssertionImpl.class, AssertionImplMixin.class);
context.setMixInAnnotations(AttributePrincipalImpl.class, AttributePrincipalImplMixin.class);
context.setMixInAnnotations(CasAuthenticationToken.class, CasAuthenticationTokenMixin.class);

4
cas/src/test/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixinTests.java
View File

@ -36,7 +36,7 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.jackson2.SecurityJacksonModules;
import org.springframework.security.jackson2.SecurityJackson2Modules;
import static org.assertj.core.api.Assertions.assertThat;
@ -103,7 +103,7 @@ public class CasAuthenticationTokenMixinTests {
public void setup() {
mapper = new ObjectMapper();
ClassLoader loader = getClass().getClassLoader();
mapper.registerModules(SecurityJacksonModules.getModules(loader));
mapper.registerModules(SecurityJackson2Modules.getModules(loader));
}
@Test

2
core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java
View File

@ -35,7 +35,7 @@ import java.util.Collection;
*
* @author Jitendra Singh
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

7
core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java
View File

@ -38,12 +38,13 @@ import java.util.Collections;
* ObjectMapper mapper = new ObjectMapper();
* mapper.registerModule(new CoreJackson2Module());
* </pre>
* <b>Note: use {@link SecurityJacksonModules#getModules(ClassLoader)} to get list of all security modules.</b>
* <b>Note: use {@link SecurityJackson2Modules#getModules(ClassLoader)} to get list of all security modules.</b>
*
* @author Jitendra Singh.
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@SuppressWarnings("serial")
public class CoreJackson2Module extends SimpleModule {
public CoreJackson2Module() {
@ -52,7 +53,7 @@ public class CoreJackson2Module extends SimpleModule {
@Override
public void setupModule(SetupContext context) {
SecurityJacksonModules.enableDefaultTyping((ObjectMapper) context.getOwner());
SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner());
context.setMixInAnnotations(AnonymousAuthenticationToken.class, AnonymousAuthenticationTokenMixin.class);
context.setMixInAnnotations(RememberMeAuthenticationToken.class, RememberMeAuthenticationTokenMixin.class);
context.setMixInAnnotations(SimpleGrantedAuthority.class, SimpleGrantedAuthorityMixin.class);

2
core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java
View File

@ -41,7 +41,7 @@ import java.util.Collection;
*
* @author Jitendra Singh
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

8
core/src/main/java/org/springframework/security/jackson2/SecurityJacksonModules.java → core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java
View File

@ -34,7 +34,7 @@ import java.util.List;
* <p>
* <pre>
* ObjectMapper mapper = new ObjectMapper();
* mapper.registerModules(SecurityJacksonModules.getModules());
* mapper.registerModules(SecurityJackson2Modules.getModules());
* </pre>
* Above code is equivalent to
* <p>
@ -49,16 +49,16 @@ import java.util.List;
* @author Jitendra Singh.
* @since 4.2
*/
public final class SecurityJacksonModules {
public final class SecurityJackson2Modules {
private static final Log logger = LogFactory.getLog(SecurityJacksonModules.class);
private static final Log logger = LogFactory.getLog(SecurityJackson2Modules.class);
private static final List<String> securityJackson2ModuleClasses = Arrays.asList(
"org.springframework.security.jackson2.CoreJackson2Module",
"org.springframework.security.cas.jackson2.CasJackson2Module",
"org.springframework.security.web.jackson2.WebJackson2Module"
);
private SecurityJacksonModules() {
private SecurityJackson2Modules() {
}
public static void enableDefaultTyping(ObjectMapper mapper) {

2
core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java
View File

@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.*;
* </pre>
* @author Jitendra Singh
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java
View File

@ -34,7 +34,7 @@ import java.util.Set;
* @author Jitendra Singh
* @see UnmodifiableSetDeserializer
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
core/src/main/java/org/springframework/security/jackson2/UserMixin.java
View File

@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
* @author Jitendra Singh
* @see UserDeserializer
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java
View File

@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
* </pre>
* @author Jitendra Singh
* @see CoreJackson2Module
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")

2
core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java
View File

@ -33,7 +33,7 @@ public abstract class AbstractMixinTests {
public void setup() {
mapper = new ObjectMapper();
ClassLoader loader = getClass().getClassLoader();
mapper.registerModules(SecurityJacksonModules.getModules(loader));
mapper.registerModules(SecurityJackson2Modules.getModules(loader));
}
User createDefaultUser() {

2
docs/manual/src/docs/asciidoc/_includes/jackson.adoc
View File

@ -10,7 +10,7 @@ To use it, register the `JacksonJacksonModules.getModules(ClassLoader)` as http:
----
ObjectMapper mapper = new ObjectMapper();
ClassLoader loader = getClass().getClassLoader();
List<Module> modules = SecurityJacksonModules.getModules(loader);
List<Module> modules = SecurityJackson2Modules.getModules(loader);
mapper.registerModules(modules);
// ... use ObjectMapper as normally ...

2
web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java
View File

@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
*
* @author Jitendra Singh
* @see WebJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java
View File

@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
*
* @author Jitendra Singh
* @see WebJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")

2
web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java
View File

@ -34,7 +34,7 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest;
*
* @author Jitendra Singh
* @see WebJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java
View File

@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.*;
*
* @author Jitendra Singh.
* @see WebJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

2
web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java
View File

@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.*;
*
* @author Jitendra Singh
* @see WebJackson2Module
* @see org.springframework.security.jackson2.SecurityJacksonModules
* @see org.springframework.security.jackson2.SecurityJackson2Modules
* @since 4.2
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)

17
web/src/main/java/org/springframework/security/web/jackson2/WebJackson2Module.java
View File

@ -16,16 +16,17 @@
package org.springframework.security.web.jackson2;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.springframework.security.jackson2.SecurityJacksonModules;
import javax.servlet.http.Cookie;
import org.springframework.security.jackson2.SecurityJackson2Modules;
import org.springframework.security.web.authentication.WebAuthenticationDetails;
import org.springframework.security.web.csrf.DefaultCsrfToken;
import org.springframework.security.web.savedrequest.DefaultSavedRequest;
import org.springframework.security.web.savedrequest.SavedCookie;
import javax.servlet.http.Cookie;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
/**
* Jackson module for spring-security-web. This module register {@link CookieMixin},
@ -37,10 +38,10 @@ import javax.servlet.http.Cookie;
* ObjectMapper mapper = new ObjectMapper();
* mapper.registerModule(new WebJackson2Module());
* </pre>
* <b>Note: use {@link SecurityJacksonModules#getModules(ClassLoader)} to get list of all security modules.</b>
* <b>Note: use {@link SecurityJackson2Modules#getModules(ClassLoader)} to get list of all security modules.</b>
*
* @author Jitendra Singh
* @see SecurityJacksonModules
* @see SecurityJackson2Modules
* @since 4.2
*/
public class WebJackson2Module extends SimpleModule {
@ -51,7 +52,7 @@ public class WebJackson2Module extends SimpleModule {
@Override
public void setupModule(SetupContext context) {
SecurityJacksonModules.enableDefaultTyping((ObjectMapper) context.getOwner());
SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner());
context.setMixInAnnotations(Cookie.class, CookieMixin.class);
context.setMixInAnnotations(SavedCookie.class, SavedCookieMixin.class);
context.setMixInAnnotations(DefaultCsrfToken.class, DefaultCsrfTokenMixin.class);

4
web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java
View File

@ -19,7 +19,7 @@ package org.springframework.security.web.jackson2;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Before;
import org.springframework.security.jackson2.SecurityJacksonModules;
import org.springframework.security.jackson2.SecurityJackson2Modules;
/**
* @author Jitenra Singh
@ -33,6 +33,6 @@ public abstract class AbstractMixinTests {
public void setup() {
mapper = new ObjectMapper();
ClassLoader loader = getClass().getClassLoader();
mapper.registerModules(SecurityJacksonModules.getModules(loader));
mapper.registerModules(SecurityJackson2Modules.getModules(loader));
}
}