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

Add support for properties using deep map-in-map/list-in-map nesting.

Browse Source 
Original Pull Request: #2420
This commit is contained in:
Mark Paluch
2021-12-08 09:40:24 +01:00
committed by Christoph Strobl
parent 0744580766
commit a63774e6ec
3 changed files with 163 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/test/java/org/springframework/data/mapping/context/EntityProjectionIntrospectorUnitTests.java
View File

@@ -17,10 +17,12 @@ package org.springframework.data.mapping.context;
import static org.assertj.core.api.Assertions.*;
import lombok.Getter;
import lombok.Value;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -62,7 +64,7 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
assertThat(paths).hasSize(2).extracting(PropertyPath::toDotPath).containsOnly("id", "value");
}
@@ -75,7 +77,7 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
assertThat(paths).hasSize(2).extracting(PropertyPath::toDotPath).containsOnly("id", "value");
}
@@ -89,7 +91,7 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
assertThat(paths).hasSize(3).extracting(PropertyPath::toDotPath).containsOnly("domain.id", "domain.value",
"domain2");
@@ -103,7 +105,7 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
assertThat(paths).isEmpty();
}
@@ -116,7 +118,7 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
// cycles are tracked on a per-property root basis. Global tracking would not expand "secondaryAddress" into its
// components.
@@ -133,11 +135,27 @@ class EntityProjectionIntrospectorUnitTests {
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEach(paths::add);
descriptor.forEachRecursive(it -> paths.add(it.getPropertyPath()));
assertThat(paths).hasSize(2).extracting(PropertyPath::toDotPath).containsOnly("domains.id", "domains.value");
}
@Test // GH-2420
void considersPropertiesWithinContainers() {
EntityProjection<?, ?> descriptor = discoverer.introspect(WithMapOfCollectionProjection.class,
WithMapOfCollection.class);
assertThat(descriptor.isProjection()).isTrue();
List<PropertyPath> paths = new ArrayList<>();
descriptor.forEachRecursive(it -> {
paths.add(it.getPropertyPath());
});
assertThat(paths).hasSize(3).extracting(PropertyPath::toDotPath).containsOnly("domains", "id", "value");
}
interface SuperInterface {
}
@@ -159,6 +177,17 @@ class EntityProjectionIntrospectorUnitTests {
List<DomainClass> domains;
}
static class WithMapOfCollection {
Map<String, List<DomainClass>> domains;
}
@Getter
static class WithMapOfCollectionProjection {
Map<String, List<DomainClassProjection>> domains;
}
interface WithCollectionProjection {
List<DomainClassProjection> getDomains();