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
web/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java
+1 -1
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)
web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java
+1 -1
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")
web/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java
+1 -1
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)
web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java
+1 -1
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)
web/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java
+1 -1
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)
web/src/main/java/org/springframework/security/web/jackson2/WebJackson2Module.java
+9 -8
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);
web/src/test/java/org/springframework/security/web/jackson2/AbstractMixinTests.java
+2 -2
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));
}
}