Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish SecurityJacksonModules

Browse Source 
Issue gh-3736
* ClassLoader argument - this is required because we do not want to assume
the ClassLoader that should be used
* Clean up logging - logging is now at debug level because we don't expect
all of the modules are loaded (they are quite possibly off the ClassPath)
* Remove ObjectUtils as it was being used on methods that expect a
Collection or Array with non collection based objects
* Polish Javadoc warnings
This commit is contained in:
Rob Winch
2016-09-01 14:59:35 -05:00
parent c2d8ea92d0
commit 3fb77f3b59
8 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,8 @@ public abstract class AbstractMixinTests {
protected ObjectMapper buildObjectMapper() {
if (ObjectUtils.isEmpty(mapper)) {
mapper = new ObjectMapper();
mapper.registerModules(SecurityJacksonModules.getModules());
ClassLoader loader = getClass().getClassLoader();
mapper.registerModules(SecurityJacksonModules.getModules(loader));
}
return mapper;
}

3
web/src/test/java/org/springframework/security/web/jackson2/CookieMixinTests.java
View File

@@ -39,7 +39,8 @@ public class CookieMixinTests {
ObjectMapper buildObjectMapper() {
ObjectMapper mapper = new ObjectMapper();
mapper.registerModules(SecurityJacksonModules.getModules());
ClassLoader loader = getClass().getClassLoader();
mapper.registerModules(SecurityJacksonModules.getModules(loader));
return mapper;
}

3
web/src/test/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixinTests.java
View File

@@ -45,7 +45,8 @@ public class DefaultCsrfTokenMixinTests {
@Before
public void setup() {
objectMapper = new ObjectMapper();
objectMapper.registerModules(SecurityJacksonModules.getModules());
ClassLoader loader = getClass().getClassLoader();
objectMapper.registerModules(SecurityJacksonModules.getModules(loader));
defaultCsrfTokenJson = "{\"@class\": \"org.springframework.security.web.csrf.DefaultCsrfToken\", " +
"\"headerName\": \"csrf-header\", \"parameterName\": \"_csrf\", \"token\": \"1\"}";
}

3
web/src/test/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixinTests.java
View File

@@ -48,7 +48,8 @@ public class WebAuthenticationDetailsMixinTests {
@Before
public void setup() {
this.mapper = new ObjectMapper();
this.mapper.registerModules(SecurityJacksonModules.getModules());
ClassLoader loader = getClass().getClassLoader();
this.mapper.registerModules(SecurityJacksonModules.getModules(loader));
}
@Test