Skip to content

Commit 5de9134

Browse files
meistermeiermeistermeier
committed
GH-2531 - Change missing test config base classes.
1 parent cd0148a commit 5de9134

File tree

5 files changed

+35
-10
lines changed

5 files changed

+35
-10
lines changed

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;
3636
import org.springframework.data.annotation.Immutable;
37-
import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
3837
import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
3938
import org.springframework.data.neo4j.core.schema.GeneratedValue;
4039
import org.springframework.data.neo4j.core.schema.Id;
@@ -50,6 +49,7 @@
5049
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
5150
import org.springframework.data.neo4j.test.BookmarkCapture;
5251
import org.springframework.data.neo4j.test.Neo4jExtension;
52+
import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
5353
import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
5454
import org.springframework.transaction.PlatformTransactionManager;
5555
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -233,7 +233,7 @@ interface BaseNodeRepository extends Neo4jRepository<BaseNodeEntity, String> {
233233
@Configuration
234234
@EnableTransactionManagement
235235
@EnableNeo4jRepositories(considerNestedRepositories = true)
236-
static class Config extends AbstractNeo4jConfig {
236+
static class Config extends Neo4jImperativeTestConfiguration {
237237

238238
@Bean
239239
public BookmarkCapture bookmarkCapture() {
@@ -253,5 +253,10 @@ public PlatformTransactionManager transactionManager(
253253
public Driver driver() {
254254
return neo4jConnectionSupport.getDriver();
255255
}
256+
257+
@Override
258+
public boolean isCypher5Compatible() {
259+
return neo4jConnectionSupport.isCypher5SyntaxCompatible();
260+
}
256261
}
257262
}

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.context.annotation.Bean;
2525
import org.springframework.context.annotation.Configuration;
26-
import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
2726
import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
2827
import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
2928
import org.springframework.data.neo4j.core.transaction.Neo4jTransactionManager;
@@ -32,6 +31,7 @@
3231
import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
3332
import org.springframework.data.neo4j.test.BookmarkCapture;
3433
import org.springframework.data.neo4j.test.Neo4jExtension;
34+
import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
3535
import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
3636
import org.springframework.transaction.PlatformTransactionManager;
3737
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -85,7 +85,7 @@ interface SomethingInBetweenRepository extends Neo4jRepository<InitialEntities.S
8585
@Configuration
8686
@EnableTransactionManagement
8787
@EnableNeo4jRepositories(considerNestedRepositories = true)
88-
static class Config extends AbstractNeo4jConfig {
88+
static class Config extends Neo4jImperativeTestConfiguration {
8989

9090
@Bean
9191
public BookmarkCapture bookmarkCapture() {
@@ -111,5 +111,10 @@ public Driver driver() {
111111

112112
return neo4jConnectionSupport.getDriver();
113113
}
114+
115+
@Override
116+
public boolean isCypher5Compatible() {
117+
return neo4jConnectionSupport.isCypher5SyntaxCompatible();
118+
}
114119
}
115120
}

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.beans.factory.annotation.Autowired;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Configuration;
25-
import org.springframework.data.neo4j.config.AbstractNeo4jConfig;
2625
import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
2726
import org.springframework.data.neo4j.core.Neo4jTemplate;
2827
import org.springframework.data.neo4j.core.transaction.Neo4jBookmarkManager;
@@ -32,6 +31,7 @@
3231
import org.springframework.data.neo4j.repository.query.Query;
3332
import org.springframework.data.neo4j.test.BookmarkCapture;
3433
import org.springframework.data.neo4j.test.Neo4jExtension;
34+
import org.springframework.data.neo4j.test.Neo4jImperativeTestConfiguration;
3535
import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
3636
import org.springframework.data.repository.query.Param;
3737
import org.springframework.transaction.PlatformTransactionManager;
@@ -109,7 +109,7 @@ interface GH2533Repository extends Neo4jRepository<EntitiesAndProjections.GH2533
109109
@Configuration
110110
@EnableTransactionManagement
111111
@EnableNeo4jRepositories(considerNestedRepositories = true)
112-
static class Config extends AbstractNeo4jConfig {
112+
static class Config extends Neo4jImperativeTestConfiguration {
113113

114114
@Bean
115115
public BookmarkCapture bookmarkCapture() {
@@ -129,5 +129,10 @@ public PlatformTransactionManager transactionManager(
129129
public Driver driver() {
130130
return neo4jConnectionSupport.getDriver();
131131
}
132+
133+
@Override
134+
public boolean isCypher5Compatible() {
135+
return neo4jConnectionSupport.isCypher5SyntaxCompatible();
136+
}
132137
}
133138
}

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import org.springframework.beans.factory.annotation.Autowired;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Configuration;
25-
import org.springframework.data.neo4j.config.AbstractReactiveNeo4jConfig;
2625
import org.springframework.data.neo4j.core.ReactiveNeo4jTemplate;
2726
import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository;
2827
import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories;
2928
import org.springframework.data.neo4j.repository.query.Query;
3029
import org.springframework.data.neo4j.test.BookmarkCapture;
3130
import org.springframework.data.neo4j.test.Neo4jExtension;
3231
import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
32+
import org.springframework.data.neo4j.test.Neo4jReactiveTestConfiguration;
3333
import org.springframework.data.repository.query.Param;
3434
import reactor.core.publisher.Mono;
3535
import reactor.test.StepVerifier;
@@ -103,7 +103,7 @@ interface ReactiveGH2533Repository extends ReactiveNeo4jRepository<EntitiesAndPr
103103

104104
@Configuration
105105
@EnableReactiveNeo4jRepositories(considerNestedRepositories = true)
106-
static class Config extends AbstractReactiveNeo4jConfig {
106+
static class Config extends Neo4jReactiveTestConfiguration {
107107

108108
@Bean
109109
public BookmarkCapture bookmarkCapture() {
@@ -114,5 +114,10 @@ public BookmarkCapture bookmarkCapture() {
114114
public Driver driver() {
115115
return neo4jConnectionSupport.getDriver();
116116
}
117+
118+
@Override
119+
public boolean isCypher5Compatible() {
120+
return neo4jConnectionSupport.isCypher5SyntaxCompatible();
121+
}
117122
}
118123
}

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ import org.neo4j.driver.types.TypeSystem
2929
import org.springframework.beans.factory.annotation.Autowired
3030
import org.springframework.context.annotation.Bean
3131
import org.springframework.context.annotation.Configuration
32-
import org.springframework.data.neo4j.config.AbstractReactiveNeo4jConfig
3332
import org.springframework.data.neo4j.core.*
3433
import org.springframework.data.neo4j.core.cypher.asParam
34+
import org.springframework.data.neo4j.integration.issues.gh2526.GH2526IT
3535
import org.springframework.data.neo4j.test.Neo4jExtension
3636
import org.springframework.data.neo4j.test.Neo4jExtension.NEEDS_REACTIVE_SUPPORT
3737
import org.springframework.data.neo4j.test.Neo4jIntegrationTest
38+
import org.springframework.data.neo4j.test.Neo4jReactiveTestConfiguration
3839
import org.springframework.transaction.annotation.EnableTransactionManagement
3940
import reactor.test.StepVerifier
4041

@@ -133,11 +134,15 @@ class ReactiveNeo4jClientKotlinInteropIT @Autowired constructor(
133134

134135
@Configuration
135136
@EnableTransactionManagement
136-
open class Config : AbstractReactiveNeo4jConfig() {
137+
open class Config : Neo4jReactiveTestConfiguration() {
137138

138139
@Bean
139140
override fun driver(): Driver {
140141
return neo4jConnectionSupport.driver
141142
}
143+
144+
override fun isCypher5Compatible(): Boolean {
145+
return neo4jConnectionSupport.isCypher5SyntaxCompatible
146+
}
142147
}
143148
}

0 commit comments

Comments
 (0)