GH-2531 - Change missing test config base classes.

Author: meistermeier

src/test/java/org/springframework/data/neo4j/integration/issues/gh2526/GH2526IT.java

@@ -34,7 +34,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.annotation.Immutable;
-import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;
@@ -50,6 +49,7 @@
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.test.BookmarkCapture;
 import org.springframework.data.neo4j.test.Neo4jExtension;
+import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -233,7 +233,7 @@ interface BaseNodeRepository extends Neo4jRepository<BaseNodeEntity, String> {
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)
-	static class Config extends AbstractNeo4jConfig {
+	static class Config extends Neo4jImperativeTestConfiguration {
 
 		@Bean
 		public BookmarkCapture bookmarkCapture() {
@@ -253,5 +253,10 @@ public PlatformTransactionManager transactionManager(
 		public Driver driver() {
 			return neo4jConnectionSupport.getDriver();
 		}
+
+		@Override
+		public boolean isCypher5Compatible() {
+			return neo4jConnectionSupport.isCypher5SyntaxCompatible();
+		}
 	}
 }

src/test/java/org/springframework/data/neo4j/integration/issues/gh2530/GH2530IT.java

@@ -23,7 +23,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
 import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
@@ -32,6 +31,7 @@
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
 import org.springframework.data.neo4j.test.BookmarkCapture;
 import org.springframework.data.neo4j.test.Neo4jExtension;
+import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -85,7 +85,7 @@ interface SomethingInBetweenRepository extends Neo4jRepository<InitialEntities.S
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)
-	static class Config extends AbstractNeo4jConfig {
+	static class Config extends Neo4jImperativeTestConfiguration {
 
 		@Bean
 		public BookmarkCapture bookmarkCapture() {
@@ -111,5 +111,10 @@ public Driver driver() {
 
 			return neo4jConnectionSupport.getDriver();
 		}
+
+		@Override
+		public boolean isCypher5Compatible() {
+			return neo4jConnectionSupport.isCypher5SyntaxCompatible();
+		}
 	}
 }

src/test/java/org/springframework/data/neo4j/integration/issues/gh2533/GH2533IT.java

@@ -22,7 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.Neo4jTemplate;
 import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
@@ -32,6 +31,7 @@
 import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.test.BookmarkCapture;
 import org.springframework.data.neo4j.test.Neo4jExtension;
+import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -109,7 +109,7 @@ interface GH2533Repository extends Neo4jRepository<EntitiesAndProjections.GH2533
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)
-	static class Config extends AbstractNeo4jConfig {
+	static class Config extends Neo4jImperativeTestConfiguration {
 
 		@Bean
 		public BookmarkCapture bookmarkCapture() {
@@ -129,5 +129,10 @@ public PlatformTransactionManager transactionManager(
 		public Driver driver() {
 			return neo4jConnectionSupport.getDriver();
 		}
+
+		@Override
+		public boolean isCypher5Compatible() {
+			return neo4jConnectionSupport.isCypher5SyntaxCompatible();
+		}
 	}
 }

src/test/java/org/springframework/data/neo4j/integration/issues/gh2533/GH2533ReactiveIT.java

@@ -22,14 +22,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.neo4j.config.AbstractReactiveNeo4jConfig;
 import org.springframework.data.neo4j.core.ReactiveNeo4jTemplate;
 import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository;
 import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories;
 import org.springframework.data.neo4j.repository.query.Query;
 import org.springframework.data.neo4j.test.BookmarkCapture;
 import org.springframework.data.neo4j.test.Neo4jExtension;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
+import org.springframework.data.neo4j.test.Neo4jReactiveTestConfiguration;
 import org.springframework.data.repository.query.Param;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -103,7 +103,7 @@ interface ReactiveGH2533Repository extends ReactiveNeo4jRepository<EntitiesAndPr
 
 	@Configuration
 	@EnableReactiveNeo4jRepositories(considerNestedRepositories = true)
-	static class Config extends AbstractReactiveNeo4jConfig {
+	static class Config extends Neo4jReactiveTestConfiguration {
 
 		@Bean
 		public BookmarkCapture bookmarkCapture() {
@@ -114,5 +114,10 @@ public BookmarkCapture bookmarkCapture() {
 		public Driver driver() {
 			return neo4jConnectionSupport.getDriver();
 		}
+
+		@Override
+		public boolean isCypher5Compatible() {
+			return neo4jConnectionSupport.isCypher5SyntaxCompatible();
+		}
 	}
 }

src/test/kotlin/org/springframework/data/neo4j/integration/reactive/ReactiveNeo4jClientKotlinInteropIT.kt

@@ -29,12 +29,13 @@ import org.neo4j.driver.types.TypeSystem
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.data.neo4j.config.AbstractReactiveNeo4jConfig
 import org.springframework.data.neo4j.core.*
 import org.springframework.data.neo4j.core.cypher.asParam
+import org.springframework.data.neo4j.integration.issues.gh2526.GH2526IT
 import org.springframework.data.neo4j.test.Neo4jExtension
 import org.springframework.data.neo4j.test.Neo4jExtension.NEEDS_REACTIVE_SUPPORT
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest
+import org.springframework.data.neo4j.test.Neo4jReactiveTestConfiguration
 import org.springframework.transaction.annotation.EnableTransactionManagement
 import reactor.test.StepVerifier
 
@@ -133,11 +134,15 @@ class ReactiveNeo4jClientKotlinInteropIT @Autowired constructor(
 
     @Configuration
     @EnableTransactionManagement
-    open class Config : AbstractReactiveNeo4jConfig() {
+    open class Config : Neo4jReactiveTestConfiguration() {
 
         @Bean
         override fun driver(): Driver {
             return neo4jConnectionSupport.driver
         }
+
+        override fun isCypher5Compatible(): Boolean {
+            return neo4jConnectionSupport.isCypher5SyntaxCompatible
+        }
     }
 }