Skip to content

Commit f4b5780

Browse files
GH-2488 - Use default database selection.
Fixes #2488.
1 parent 2bd53c6 commit f4b5780

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public Neo4jTemplate(Neo4jClient neo4jClient, Neo4jMappingContext neo4jMappingCo
129129

130130
this(neo4jClient, neo4jMappingContext, EntityCallbacks.create());
131131

132-
if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) {
132+
if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) {
133133
throw new IllegalStateException(
134134
"The provided database selection provider differs from the Neo4jClient's one.");
135135
}
@@ -141,7 +141,7 @@ public Neo4jTemplate(Neo4jClient neo4jClient, Neo4jMappingContext neo4jMappingCo
141141

142142
this(neo4jClient, neo4jMappingContext, entityCallbacks);
143143

144-
if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) {
144+
if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) {
145145
throw new IllegalStateException(
146146
"The provided database selection provider differs from the Neo4jClient's one.");
147147
}

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.LinkedHashSet;
3737
import java.util.List;
3838
import java.util.Map;
39+
import java.util.Objects;
3940
import java.util.Set;
4041
import java.util.concurrent.ConcurrentHashMap;
4142
import java.util.concurrent.atomic.AtomicReference;
@@ -131,7 +132,7 @@ public ReactiveNeo4jTemplate(ReactiveNeo4jClient neo4jClient, Neo4jMappingContex
131132
ReactiveDatabaseSelectionProvider databaseSelectionProvider) {
132133

133134
this(neo4jClient, neo4jMappingContext);
134-
if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) {
135+
if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) {
135136
throw new IllegalStateException("The provided database selection provider differs from the ReactiveNeo4jClient's one.");
136137
}
137138
}

0 commit comments

Comments
 (0)