Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 09:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SecurityJacksonModules->SecurityJackson2Modules

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java
+1 -1
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)
core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java
+4 -3
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);
core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java
+1 -1
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)
core/src/main/java/org/springframework/security/jackson2/SecurityJacksonModules.java → core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java
+4 -4
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) {
core/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java
+1 -1
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)
core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java
+1 -1
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)
core/src/main/java/org/springframework/security/jackson2/UserMixin.java
+1 -1
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)
core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java
+1 -1
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")
core/src/test/java/org/springframework/security/jackson2/AbstractMixinTests.java
+1 -1
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() {