From f4b57805c5d981f6ad6ba6d8a5a461c92b3ebc99 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 4 Apr 2022 18:31:17 +0200 Subject: [PATCH] GH-2488 - Use default database selection. Fixes #2488. --- .../org/springframework/data/neo4j/core/Neo4jTemplate.java | 4 ++-- .../data/neo4j/core/ReactiveNeo4jTemplate.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java index 88b4a541c..04ab7df2b 100644 --- a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java @@ -129,7 +129,7 @@ public final class Neo4jTemplate implements this(neo4jClient, neo4jMappingContext, EntityCallbacks.create()); - if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) { + if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) { throw new IllegalStateException( "The provided database selection provider differs from the Neo4jClient's one."); } @@ -141,7 +141,7 @@ public final class Neo4jTemplate implements this(neo4jClient, neo4jMappingContext, entityCallbacks); - if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) { + if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) { throw new IllegalStateException( "The provided database selection provider differs from the Neo4jClient's one."); } diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java index 94b7a680e..b7b651930 100644 --- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java +++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java @@ -36,6 +36,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; @@ -131,7 +132,7 @@ public final class ReactiveNeo4jTemplate implements ReactiveDatabaseSelectionProvider databaseSelectionProvider) { this(neo4jClient, neo4jMappingContext); - if (databaseSelectionProvider != neo4jClient.getDatabaseSelectionProvider()) { + if (!Objects.equals(databaseSelectionProvider, neo4jClient.getDatabaseSelectionProvider())) { throw new IllegalStateException("The provided database selection provider differs from the ReactiveNeo4jClient's one."); } }