Spring/spring-session-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Jackson operational.

Browse Source 
Resolves https://github.com/spring-projects/spring-session/issues/913
This commit is contained in:
Greg Turnquist
2017-10-25 16:35:59 -05:00
parent fde5a85f49
commit 7a4e14cfbf
6 changed files with 188 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java
View File

@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.Document;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.data.domain.Sort;

27
src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java
View File

@@ -17,13 +17,16 @@ package org.springframework.session.data.mongo;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.Document;
import org.bson.json.JsonMode;
import org.bson.json.JsonWriterSettings;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.security.jackson2.SecurityJackson2Modules;
import org.springframework.session.FindByIndexNameSessionRepository;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -85,9 +88,27 @@ public class JacksonMongoSessionConverter extends AbstractMongoSessionConverter
objectMapper.setPropertyNamingStrategy(new MongoIdNamingStrategy());
objectMapper.registerModules(SecurityJackson2Modules.getModules(getClass().getClassLoader()));
objectMapper.addMixIn(MongoSession.class, MongoSessionMixin.class);
objectMapper.addMixIn(HashMap.class, HashMapMixin.class);
return objectMapper;
}
/**
* Used to whitelist {@link MongoSession} for {@link SecurityJackson2Modules}.
*/
private static class MongoSessionMixin {
// Nothing special
}
/**
* Used to whitelist {@link HashMap} for {@link SecurityJackson2Modules}.
*/
private static class HashMapMixin {
// Nothing special
}
@Override
protected DBObject convert(MongoSession source) {
@@ -103,8 +124,8 @@ public class JacksonMongoSessionConverter extends AbstractMongoSessionConverter
@Override
protected MongoSession convert(Document source) {
String json = JSON.serialize(source);
String json = source.toJson(JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build());
try {
return this.objectMapper.readValue(json, MongoSession.class);
} catch (IOException e) {