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

Properly merge non-entity arrays.

Browse Source 
Fixes #2325.
This commit is contained in:
Oliver Drotbohm
2023-11-16 15:01:03 +01:00
parent 4f7884ef58
commit 6326fe1ac7
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java
View File

@@ -365,7 +365,8 @@ public class DomainObjectReader {
if (array.isEmpty()
|| collection.isEmpty()
|| ClassUtils.isPrimitiveOrWrapper(componentType.getType())
|| componentType.getType().isEnum()) {
|| componentType.getType().isEnum()
|| !entities.getPersistentEntity(componentType.getType()).isPresent()) {
return false;
}

49
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java
View File

@@ -115,6 +115,7 @@ class DomainObjectReaderUnitTests {
mappingContext.getPersistentEntity(Pear.class);
mappingContext.getPersistentEntity(WithCustomMappedPrimitiveCollection.class);
mappingContext.getPersistentEntity(BugModel.class);
mappingContext.getPersistentEntity(ArrayListHolder.class);
mappingContext.afterPropertiesSet();
this.entities = new PersistentEntities(Collections.singleton(mappingContext));
@@ -704,6 +705,42 @@ class DomainObjectReaderUnitTests {
.containsExactly("Foo", "Bar");
}
@Test // #2325
void arraysCanMutateAndAppendDuringMerge() throws Exception {
ObjectMapper mapper = new ObjectMapper();
ArrayHolder target = new ArrayHolder(new String[] { "ancient", "old", "older" });
JsonNode node = mapper.readTree("{ \"array\" : [ \"new\", \"old\", \"newer\", \"bleeding edge\" ] }");
ArrayHolder updated = reader.doMerge((ObjectNode) node, target, mapper);
assertThat(updated.array).containsExactly("new", "old", "newer", "bleeding edge");
}
@Test // #2325
void arraysCanAppendMoreThanOneElementDuringMerge() throws Exception {
ObjectMapper mapper = new ObjectMapper();
ArrayListHolder target = new ArrayListHolder("ancient", "old", "older");
JsonNode node = mapper.readTree("{ \"values\" : [ \"ancient\", \"old\", \"older\", \"new\", \"newer\" ] }");
ArrayListHolder updated = reader.doMerge((ObjectNode) node, target, mapper);
assertThat(updated.values).containsExactly("ancient", "old", "older", "new", "newer");
}
@Test // #2325
void arraysCanRemoveElementsDuringMerge() throws Exception {
ObjectMapper mapper = new ObjectMapper();
ArrayHolder target = new ArrayHolder(new String[] { "ancient", "old", "older" });
JsonNode node = mapper.readTree("{ \"array\" : [ \"ancient\" ] }");
ArrayHolder updated = reader.doMerge((ObjectNode) node, target, mapper);
assertThat(updated.array).containsExactly("ancient");
}
@SuppressWarnings("unchecked")
private static <T> T as(Object source, Class<T> type) {
@@ -1000,4 +1037,16 @@ class DomainObjectReaderUnitTests {
public String value;
}
}
static class ArrayListHolder {
Collection<String> values;
ArrayListHolder(String... values) {
this.values = new ArrayList<>(Arrays.asList(values));
}
public void setValues(Collection<String> values) {
this.values = values;
}
}
}