Skip to content

Commit a3b2305

Browse files
committed
Formatting and split auto-config tests.
Until we decided what to do with the reactive and imperative auto-configuration, we will keep both. To remove the `@Nested` annotation but keep it readable the tests get split up into different classes.
1 parent db5b940 commit a3b2305

File tree

5 files changed

+297
-334
lines changed

5 files changed

+297
-334
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataConfiguration.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ class Neo4jDataConfiguration {
6060
@ConditionalOnMissingBean
6161
@Order(-30)
6262
DatabaseSelectionProvider staticDatabaseSelectionProvider(Neo4jDataProperties dataProperties) {
63-
6463
return DatabaseSelectionProvider.createStaticDatabaseSelectionProvider(dataProperties.getDatabase());
6564
}
6665

6766
@Bean("databaseSelectionProvider")
6867
@ConditionalOnMissingBean
6968
@Order(-20)
7069
DatabaseSelectionProvider defaultSelectionProvider() {
71-
7270
return DatabaseSelectionProvider.getDefaultSelectionProvider();
7371
}
7472

@@ -82,18 +80,15 @@ Neo4jClient neo4jClient(Driver driver) {
8280
@ConditionalOnMissingBean(Neo4jOperations.class)
8381
Neo4jTemplate neo4jTemplate(Neo4jClient neo4jClient, Neo4jMappingContext neo4jMappingContext,
8482
DatabaseSelectionProvider databaseNameProvider) {
85-
8683
return new Neo4jTemplate(neo4jClient, neo4jMappingContext, databaseNameProvider);
8784
}
8885

8986
@Bean(Neo4jRepositoryConfigurationExtension.DEFAULT_TRANSACTION_MANAGER_BEAN_NAME)
9087
@ConditionalOnMissingBean(PlatformTransactionManager.class)
9188
Neo4jTransactionManager transactionManager(Driver driver, DatabaseSelectionProvider databaseNameProvider,
9289
ObjectProvider<TransactionManagerCustomizers> optionalCustomizers) {
93-
94-
final Neo4jTransactionManager transactionManager = new Neo4jTransactionManager(driver, databaseNameProvider);
90+
Neo4jTransactionManager transactionManager = new Neo4jTransactionManager(driver, databaseNameProvider);
9591
optionalCustomizers.ifAvailable((customizer) -> customizer.customize(transactionManager));
96-
9792
return transactionManager;
9893
}
9994

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataConfiguration.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,20 @@
5252
@AutoConfigureAfter(Neo4jDriverAutoConfiguration.class)
5353
@AutoConfigureBefore(Neo4jReactiveRepositoriesConfiguration.class)
5454
@Import(Neo4jDefaultReactiveCallbacksRegistrar.class)
55-
final class Neo4jReactiveDataConfiguration {
55+
class Neo4jReactiveDataConfiguration {
5656

5757
@Bean("reactiveDatabaseSelectionProvider")
5858
@ConditionalOnProperty(prefix = "spring.data.neo4j", name = "database")
5959
@ConditionalOnMissingBean
6060
@Order(-30)
6161
ReactiveDatabaseSelectionProvider staticDatabaseSelectionProvider(Neo4jDataProperties dataProperties) {
62-
6362
return ReactiveDatabaseSelectionProvider.createStaticDatabaseSelectionProvider(dataProperties.getDatabase());
6463
}
6564

6665
@Bean("reactiveDatabaseSelectionProvider")
6766
@ConditionalOnMissingBean
6867
@Order(-20)
6968
ReactiveDatabaseSelectionProvider defaultSelectionProvider() {
70-
7169
return ReactiveDatabaseSelectionProvider.getDefaultSelectionProvider();
7270
}
7371

@@ -81,15 +79,13 @@ ReactiveNeo4jClient neo4jClient(Driver driver) {
8179
@ConditionalOnMissingBean(ReactiveNeo4jOperations.class)
8280
ReactiveNeo4jTemplate neo4jTemplate(ReactiveNeo4jClient neo4jClient, Neo4jMappingContext neo4jMappingContext,
8381
ReactiveDatabaseSelectionProvider databaseNameProvider) {
84-
8582
return new ReactiveNeo4jTemplate(neo4jClient, neo4jMappingContext, databaseNameProvider);
8683
}
8784

8885
@Bean(ReactiveNeo4jRepositoryConfigurationExtension.DEFAULT_TRANSACTION_MANAGER_BEAN_NAME)
8986
@ConditionalOnMissingBean(ReactiveTransactionManager.class)
9087
ReactiveTransactionManager transactionManager(Driver driver,
9188
ReactiveDatabaseSelectionProvider databaseNameProvider) {
92-
9389
return new ReactiveNeo4jTransactionManager(driver, databaseNameProvider);
9490
}
9591

0 commit comments

Comments
 (0)