Skip to content

Commit 2ae93cb

Browse files
committed
Expose configureObjectMapper as static.
1 parent 0468697 commit 2ae93cb

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java

+4-15
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.springframework.security.jackson2.SecurityJackson2Modules;
3939
import org.springframework.session.FindByIndexNameSessionRepository;
4040
import org.springframework.util.Assert;
41+
import org.springframework.util.ClassUtils;
4142

4243
import java.io.IOException;
4344
import java.util.Collections;
@@ -79,18 +80,6 @@ public JacksonMongoSessionConverter(ObjectMapper objectMapper) {
7980
this.objectMapper = objectMapper;
8081
}
8182

82-
public JacksonMongoSessionConverter(ObjectMapper objectMapper, boolean copyToUse) {
83-
Assert.notNull(objectMapper, "ObjectMapper can not be null!");
84-
if (!copyToUse) {
85-
configureObjectMapper(objectMapper);
86-
this.objectMapper = objectMapper;
87-
return;
88-
}
89-
var objectMapperCopy = objectMapper.copy();
90-
configureObjectMapper(objectMapperCopy);
91-
this.objectMapper = objectMapperCopy;
92-
}
93-
9483
@Nullable
9584
protected Query getQueryForIndex(String indexName, Object indexValue) {
9685

@@ -104,11 +93,11 @@ protected Query getQueryForIndex(String indexName, Object indexValue) {
10493

10594
private ObjectMapper buildObjectMapper() {
10695
ObjectMapper objectMapper = new ObjectMapper();
107-
this.configureObjectMapper(objectMapper);
96+
configureObjectMapper(objectMapper);
10897
return objectMapper;
10998
}
11099

111-
private void configureObjectMapper(ObjectMapper objectMapper) {
100+
public static void configureObjectMapper(ObjectMapper objectMapper) {
112101
// serialize fields instead of properties
113102
objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
114103
objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
@@ -118,7 +107,7 @@ private void configureObjectMapper(ObjectMapper objectMapper) {
118107

119108
objectMapper.setPropertyNamingStrategy(new MongoIdNamingStrategy());
120109

121-
objectMapper.registerModules(SecurityJackson2Modules.getModules(getClass().getClassLoader()));
110+
objectMapper.registerModules(SecurityJackson2Modules.getModules(ClassUtils.getDefaultClassLoader()));
122111
objectMapper.addMixIn(MongoSession.class, MongoSessionMixin.class);
123112
objectMapper.addMixIn(HashMap.class, HashMapMixin.class);
124113
}

0 commit comments

Comments
 (0)