Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-14 14:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Map values directly from the JSON nodes

Browse Source 
Not only is it more efficient without converting to an intermediate String,
using JsonNode.toString() may not even produce valid JSON according to its
Javadoc (ObjectMapper.writeValueAsString() should be used).
This commit is contained in:
Frank Pavageau 2017-03-17 16:50:15 +01:00 committed by Rob Winch
parent 9f51d68e92
commit 22ea835643
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetDeserializer.java
View File

@ -50,10 +50,10 @@ class UnmodifiableSetDeserializer extends JsonDeserializer<Set> {
Iterator<JsonNode> nodeIterator = arrayNode.iterator(); Iterator<JsonNode> nodeIterator = arrayNode.iterator();
while (nodeIterator.hasNext()) { while (nodeIterator.hasNext()) {
JsonNode elementNode = nodeIterator.next(); JsonNode elementNode = nodeIterator.next();
resultSet.add(mapper.readValue(elementNode.toString(), Object.class)); resultSet.add(mapper.readValue(elementNode.traverse(mapper), Object.class));
} }
} else { } else {
resultSet.add(mapper.readValue(node.toString(), Object.class)); resultSet.add(mapper.readValue(node.traverse(mapper), Object.class));
} }
} }
return Collections.unmodifiableSet(resultSet); return Collections.unmodifiableSet(resultSet);

4
core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java
View File

@ -62,13 +62,13 @@ class UsernamePasswordAuthenticationTokenDeserializer extends JsonDeserializer<U
JsonNode principalNode = readJsonNode(jsonNode, "principal"); JsonNode principalNode = readJsonNode(jsonNode, "principal");
Object principal = null; Object principal = null;
if(principalNode.isObject()) { if(principalNode.isObject()) {
principal = mapper.readValue(principalNode.toString(), new TypeReference<User>() {}); principal = mapper.readValue(principalNode.traverse(mapper), new TypeReference<User>() {});
} else { } else {
principal = principalNode.asText(); principal = principalNode.asText();
} }
Object credentials = readJsonNode(jsonNode, "credentials").asText(); Object credentials = readJsonNode(jsonNode, "credentials").asText();
List<GrantedAuthority> authorities = mapper.readValue( List<GrantedAuthority> authorities = mapper.readValue(
readJsonNode(jsonNode, "authorities").toString(), new TypeReference<List<GrantedAuthority>>() { readJsonNode(jsonNode, "authorities").traverse(mapper), new TypeReference<List<GrantedAuthority>>() {
}); });
if (authenticated) { if (authenticated) {
token = new UsernamePasswordAuthenticationToken(principal, credentials, authorities); token = new UsernamePasswordAuthenticationToken(principal, credentials, authorities);

4
web/src/main/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenDeserializer.java
View File

@ -63,13 +63,13 @@ class PreAuthenticatedAuthenticationTokenDeserializer extends JsonDeserializer<P
JsonNode principalNode = readJsonNode(jsonNode, "principal"); JsonNode principalNode = readJsonNode(jsonNode, "principal");
Object principal = null; Object principal = null;
if(principalNode.isObject()) { if(principalNode.isObject()) {
principal = mapper.readValue(principalNode.toString(), new TypeReference<User>() {}); principal = mapper.readValue(principalNode.traverse(mapper), new TypeReference<User>() {});
} else { } else {
principal = principalNode.asText(); principal = principalNode.asText();
} }
Object credentials = readJsonNode(jsonNode, "credentials").asText(); Object credentials = readJsonNode(jsonNode, "credentials").asText();
List<GrantedAuthority> authorities = mapper.readValue( List<GrantedAuthority> authorities = mapper.readValue(
readJsonNode(jsonNode, "authorities").toString(), new TypeReference<List<GrantedAuthority>>() { readJsonNode(jsonNode, "authorities").traverse(mapper), new TypeReference<List<GrantedAuthority>>() {
}); });
if (authenticated) { if (authenticated) {
token = new PreAuthenticatedAuthenticationToken(principal, credentials, authorities); token = new PreAuthenticatedAuthenticationToken(principal, credentials, authorities);