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

DATAREST-743 - Made ProjectionResourceContentSerializer immutable.

Browse Source 
ProjectionResourceContentSerializer.unwrappingSerializer(…) now returns a new unwrapping instance instead of mutating the current instance to prevent the source one from answering subsequent calls to isUnwrappingSerializer() with true.

This allows the source instance to be reused and produce reliable results on multiple serialization attempts.

Related tickets: DATAREST-716.
This commit is contained in:
Oliver Gierke
2016-01-07 21:37:43 +01:00
parent a0a84c7959
commit a8f271a67d
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityJackson2Module.java
View File

@@ -112,8 +112,8 @@ public class PersistentEntityJackson2Module extends SimpleModule {
LinkCollector collector = new LinkCollector(entities, entityLinks, associationLinks);
addSerializer(new PersistentEntityResourceSerializer(collector));
addSerializer(new ProjectionSerializer(collector, mappings));
addSerializer(new ProjectionResourceContentSerializer());
addSerializer(new ProjectionSerializer(collector, mappings, false));
addSerializer(new ProjectionResourceContentSerializer(false));
setSerializerModifier(new AssociationOmittingSerializerModifier(entities, associationLinks, config));
setDeserializerModifier(new AssociationUriResolvingDeserializerModifier(entities, converter, associationLinks));
@@ -436,16 +436,6 @@ public class PersistentEntityJackson2Module extends SimpleModule {
private final ResourceMappings mappings;
private final boolean unwrapping;
/**
* Creates a new {@link ProjectionSerializer} for the given {@link LinkCollector} and {@link ResourceMappings}.
*
* @param collector must not be {@literal null}.
* @param mappings must not be {@literal null}.
*/
public ProjectionSerializer(LinkCollector collector, ResourceMappings mappings) {
this(collector, mappings, false);
}
/**
* Creates a new {@link ProjectionSerializer} for the given {@link LinkCollector}, {@link ResourceMappings} whether
* to be in unwrapping mode or not.
@@ -541,13 +531,17 @@ public class PersistentEntityJackson2Module extends SimpleModule {
@SuppressWarnings("serial")
private static class ProjectionResourceContentSerializer extends StdSerializer<ProjectionResourceContent> {
private boolean unwrapping;
private final boolean unwrapping;
/**
* Creates a new {@link ProjectionResourceContentSerializer}.
*
* @param unwrapping whether to expose the unwrapping state.
*/
public ProjectionResourceContentSerializer() {
public ProjectionResourceContentSerializer(boolean unwrapping) {
super(ProjectionResourceContent.class);
this.unwrapping = unwrapping;
}
/*
@@ -579,9 +573,7 @@ public class PersistentEntityJackson2Module extends SimpleModule {
*/
@Override
public JsonSerializer<ProjectionResourceContent> unwrappingSerializer(NameTransformer unwrapper) {
this.unwrapping = true;
return this;
return new ProjectionResourceContentSerializer(true);
}
}