From 0691ba600f3509f30a55b589de29e486b7e70dba Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Dec 2020 12:30:48 +0100 Subject: [PATCH] Polish "Detect Persistent and RelationshipProperties with Neo4j" See gh-24239 --- .../Neo4jDataAutoConfigurationTests.java | 22 +++++++++--------- ...o4jReactiveDataAutoConfigurationTests.java | 23 +++++++++++++++++++ ...iveRepositoriesAutoConfigurationTests.java | 22 ------------------ .../{AnnotatedWithNode.java => TestNode.java} | 5 +--- ...tatedEntity.java => TestNonAnnotated.java} | 5 +--- ...ithPersistent.java => TestPersistent.java} | 5 +--- ...s.java => TestRelationshipProperties.java} | 5 +--- 7 files changed, 38 insertions(+), 49 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/{AnnotatedWithNode.java => TestNode.java} (93%) rename spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/{NotAnnotatedEntity.java => TestNonAnnotated.java} (92%) rename spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/{AnnotatedWithPersistent.java => TestPersistent.java} (92%) rename spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/{AnnotatedWithRelationshipProperties.java => TestRelationshipProperties.java} (90%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 9b145f0cc864..8fd1314d2b6e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -20,10 +20,10 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithNode; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithPersistent; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithRelationshipProperties; -import org.springframework.boot.autoconfigure.data.neo4j.scan.NotAnnotatedEntity; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestNode; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestNonAnnotated; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestPersistent; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestRelationshipProperties; import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; @@ -145,12 +145,12 @@ void shouldReuseExistingTransactionManager() { @Test void shouldFilterInitialEntityScanWithKnownAnnotations() { - this.contextRunner.withUserConfiguration(PackageConfig.class).run((context) -> { + this.contextRunner.withUserConfiguration(EntityScanConfig.class).run((context) -> { Neo4jMappingContext mappingContext = context.getBean(Neo4jMappingContext.class); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithNode.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithPersistent.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithRelationshipProperties.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(NotAnnotatedEntity.class)).isFalse(); + assertThat(mappingContext.hasPersistentEntityFor(TestNode.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestPersistent.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestRelationshipProperties.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestNonAnnotated.class)).isFalse(); }); } @@ -165,8 +165,8 @@ DatabaseSelectionProvider databaseSelectionProvider() { } @Configuration(proxyBeanMethods = false) - @TestAutoConfigurationPackage(AnnotatedWithPersistent.class) - static class PackageConfig { + @TestAutoConfigurationPackage(TestPersistent.class) + static class EntityScanConfig { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfigurationTests.java index 69096db96252..a107a8128118 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfigurationTests.java @@ -21,6 +21,11 @@ import reactor.test.StepVerifier; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestNode; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestNonAnnotated; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestPersistent; +import org.springframework.boot.autoconfigure.data.neo4j.scan.TestRelationshipProperties; import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; @@ -30,6 +35,7 @@ import org.springframework.data.neo4j.core.ReactiveNeo4jClient; import org.springframework.data.neo4j.core.ReactiveNeo4jOperations; import org.springframework.data.neo4j.core.ReactiveNeo4jTemplate; +import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext; import org.springframework.transaction.ReactiveTransactionManager; import org.springframework.transaction.TransactionManager; @@ -121,6 +127,17 @@ void shouldUseExistingReactiveTransactionManager() { .hasSingleBean(TransactionManager.class)); } + @Test + void shouldFilterInitialEntityScanWithKnownAnnotations() { + this.contextRunner.withUserConfiguration(EntityScanConfig.class).run((context) -> { + Neo4jMappingContext mappingContext = context.getBean(Neo4jMappingContext.class); + assertThat(mappingContext.hasPersistentEntityFor(TestNode.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestPersistent.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestRelationshipProperties.class)).isTrue(); + assertThat(mappingContext.hasPersistentEntityFor(TestNonAnnotated.class)).isFalse(); + }); + } + @Configuration(proxyBeanMethods = false) static class CustomReactiveDatabaseSelectionProviderConfiguration { @@ -131,4 +148,10 @@ ReactiveDatabaseSelectionProvider databaseNameProvider() { } + @Configuration(proxyBeanMethods = false) + @TestAutoConfigurationPackage(TestPersistent.class) + static class EntityScanConfig { + + } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveRepositoriesAutoConfigurationTests.java index 2895ff0288c6..66afb613f5e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveRepositoriesAutoConfigurationTests.java @@ -26,14 +26,9 @@ import org.springframework.boot.autoconfigure.data.neo4j.city.ReactiveCityRepository; import org.springframework.boot.autoconfigure.data.neo4j.country.CountryRepository; import org.springframework.boot.autoconfigure.data.neo4j.country.ReactiveCountryRepository; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithNode; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithPersistent; -import org.springframework.boot.autoconfigure.data.neo4j.scan.AnnotatedWithRelationshipProperties; -import org.springframework.boot.autoconfigure.data.neo4j.scan.NotAnnotatedEntity; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Configuration; import org.springframework.data.neo4j.core.ReactiveNeo4jTemplate; -import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext; import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository; import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories; @@ -89,17 +84,6 @@ void shouldRespectAtEnableReactiveNeo4jRepositories() { .hasSingleBean(ReactiveCountryRepository.class)); } - @Test - void shouldFilterInitialEntityScanWithKnownAnnotations() { - this.contextRunner.withUserConfiguration(PackageConfig.class).run((context) -> { - Neo4jMappingContext mappingContext = context.getBean(Neo4jMappingContext.class); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithNode.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithPersistent.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(AnnotatedWithRelationshipProperties.class)).isTrue(); - assertThat(mappingContext.hasPersistentEntityFor(NotAnnotatedEntity.class)).isFalse(); - }); - } - @Configuration(proxyBeanMethods = false) @TestAutoConfigurationPackage(City.class) static class TestConfiguration { @@ -125,10 +109,4 @@ static class WithCustomReactiveRepositoryScan { } - @Configuration(proxyBeanMethods = false) - @TestAutoConfigurationPackage(AnnotatedWithPersistent.class) - static class PackageConfig { - - } - } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithNode.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNode.java similarity index 93% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithNode.java rename to spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNode.java index 9c44e5479615..50293f98b833 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithNode.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNode.java @@ -20,11 +20,8 @@ import org.springframework.data.neo4j.core.schema.Id; import org.springframework.data.neo4j.core.schema.Node; -/** - * @author Gerrit Meier - */ @Node -public class AnnotatedWithNode { +public class TestNode { @Id @GeneratedValue diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/NotAnnotatedEntity.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNonAnnotated.java similarity index 92% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/NotAnnotatedEntity.java rename to spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNonAnnotated.java index dd78d4cfe129..c754c3877503 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/NotAnnotatedEntity.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestNonAnnotated.java @@ -19,10 +19,7 @@ import org.springframework.data.neo4j.core.schema.GeneratedValue; import org.springframework.data.neo4j.core.schema.Id; -/** - * @author Gerrit Meier - */ -public class NotAnnotatedEntity { +public class TestNonAnnotated { @Id @GeneratedValue diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithPersistent.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestPersistent.java similarity index 92% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithPersistent.java rename to spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestPersistent.java index f987df09ab65..54aee30b7b14 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithPersistent.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestPersistent.java @@ -20,11 +20,8 @@ import org.springframework.data.neo4j.core.schema.GeneratedValue; import org.springframework.data.neo4j.core.schema.Id; -/** - * @author Gerrit Meier - */ @Persistent -public class AnnotatedWithPersistent { +public class TestPersistent { @Id @GeneratedValue diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithRelationshipProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestRelationshipProperties.java similarity index 90% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithRelationshipProperties.java rename to spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestRelationshipProperties.java index 062e5bf15a19..dbd848694283 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/AnnotatedWithRelationshipProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/scan/TestRelationshipProperties.java @@ -18,10 +18,7 @@ import org.springframework.data.neo4j.core.schema.RelationshipProperties; -/** - * @author Gerrit Meier - */ @RelationshipProperties -public class AnnotatedWithRelationshipProperties { +public class TestRelationshipProperties { }