From 1ef97dd00f18c87aa7023a67ad6737859a8f691d Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Mon, 26 Oct 2020 09:29:17 +0100
Subject: [PATCH] DATAJDBC-622 - Polishing.

Rolled back changes to tests.
Added @author and @since tags.

Original pull request: #245.
---
 .../data/jdbc/repository/config/EnableJdbcRepositories.java   | 2 ++
 .../jdbc/repository/config/JdbcRepositoryConfigExtension.java | 1 +
 .../config/EnableJdbcRepositoriesIntegrationTests.java        | 1 -
 .../springframework/data/jdbc/testing/TestConfiguration.java  | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java
index 94cd0c9b3..813915f95 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java
@@ -38,6 +38,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * @author Greg Turnquist
  * @author Mark Paluch
  * @author Fei Dong
+ * @author Juan Medina
  * @see AbstractJdbcConfiguration
  */
 @Target(ElementType.TYPE)
@@ -126,6 +127,7 @@ public @interface EnableJdbcRepositories {
     /**
 	 * Configures the name of the {@link DataSourceTransactionManager} bean definition to be used to create repositories
 	 * discovered through this annotation. Defaults to {@code transactionManager}.
+	 * @since 2.1
 	 */
 	String transactionManagerRef() default "transactionManager";
 
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java
index 9f461ec3c..9a2639af0 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java
@@ -35,6 +35,7 @@ import org.springframework.util.StringUtils;
  * @author Jens Schauder
  * @author Fei Dong
  * @author Mark Paluch
+ * @author Juan Medina
  */
 public class JdbcRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java
index 2c3f002f7..830f16a12 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java
@@ -134,7 +134,6 @@ public class EnableJdbcRepositoriesIntegrationTests {
 	@EnableJdbcRepositories(considerNestedRepositories = true,
 			includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class),
 			jdbcOperationsRef = "qualifierJdbcOperations", dataAccessStrategyRef = "qualifierDataAccessStrategy",
-			transactionManagerRef = "transactionManager",
 			repositoryBaseClass = DummyRepositoryBaseClass.class)
 	static class TestConfiguration {
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
index 8fb214ca5..508ff1345 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java
@@ -83,8 +83,8 @@ public class TestConfiguration {
 		return new NamedParameterJdbcTemplate(dataSource);
 	}
 
-	@Bean(name = "transactionManager")
-	PlatformTransactionManager defaultTransactionManager() {
+	@Bean
+	PlatformTransactionManager transactionManager() {
 		return new DataSourceTransactionManager(dataSource);
 	}