GH-2234 - Clean up.

Author: meistermeier

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

@@ -182,19 +182,6 @@ private static RuntimeException potentiallyConvertRuntimeException(RuntimeExcept
 		return resolved == null ? ex : resolved;
 	}
 
-	private String resolveTargetDatabaseName(@Nullable String parameterTargetDatabase) {
-		if (parameterTargetDatabase != null) {
-			return parameterTargetDatabase;
-		}
-		if (databaseSelectionProvider != null) {
-			String databaseSelectionProviderValue = databaseSelectionProvider.getDatabaseSelection().getValue();
-			if (databaseSelectionProviderValue != null) {
-				return databaseSelectionProviderValue;
-			}
-		}
-		return DatabaseSelectionProvider.getDefaultSelectionProvider().getDatabaseSelection().getValue();
-	}
-
 	class DefaultRunnableSpec implements RunnableSpec {
 
 		private RunnableStatement runnableStatement;
@@ -271,6 +258,19 @@ public ResultSummary run() {
 				throw potentiallyConvertRuntimeException(e, persistenceExceptionTranslator);
 			}
 		}
+
+		private String resolveTargetDatabaseName(@Nullable String parameterTargetDatabase) {
+			if (parameterTargetDatabase != null) {
+				return parameterTargetDatabase;
+			}
+			if (databaseSelectionProvider != null) {
+				String databaseSelectionProviderValue = databaseSelectionProvider.getDatabaseSelection().getValue();
+				if (databaseSelectionProviderValue != null) {
+					return databaseSelectionProviderValue;
+				}
+			}
+			return DatabaseSelectionProvider.getDefaultSelectionProvider().getDatabaseSelection().getValue();
+		}
 	}
 
 	class DefaultRecordFetchSpec<T> implements RecordFetchSpec<T>, MappingSpec<T> {
@@ -359,7 +359,7 @@ class DefaultRunnableDelegation<T> implements RunnableDelegation<T>, OngoingDele
 
 		DefaultRunnableDelegation(Function<QueryRunner, Optional<T>> callback, @Nullable String targetDatabase) {
 			this.callback = callback;
-			this.targetDatabase = Neo4jClient.verifyDatabaseName(resolveTargetDatabaseName(targetDatabase));
+			this.targetDatabase = Neo4jClient.verifyDatabaseName(targetDatabase);
 		}
 
 		@Override