Skip to content

Commit 1ef97dd

Browse files
committed
DATAJDBC-622 - Polishing.
Rolled back changes to tests. Added @author and @SInCE tags. Original pull request: #245.
1 parent 41c88bc commit 1ef97dd

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* @author Greg Turnquist
3939
* @author Mark Paluch
4040
* @author Fei Dong
41+
* @author Juan Medina
4142
* @see AbstractJdbcConfiguration
4243
*/
4344
@Target(ElementType.TYPE)
@@ -126,6 +127,7 @@
126127
/**
127128
* Configures the name of the {@link DataSourceTransactionManager} bean definition to be used to create repositories
128129
* discovered through this annotation. Defaults to {@code transactionManager}.
130+
* @since 2.1
129131
*/
130132
String transactionManagerRef() default "transactionManager";
131133

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* @author Jens Schauder
3636
* @author Fei Dong
3737
* @author Mark Paluch
38+
* @author Juan Medina
3839
*/
3940
public class JdbcRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {
4041

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ static class DummyEntity {
134134
@EnableJdbcRepositories(considerNestedRepositories = true,
135135
includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class),
136136
jdbcOperationsRef = "qualifierJdbcOperations", dataAccessStrategyRef = "qualifierDataAccessStrategy",
137-
transactionManagerRef = "transactionManager",
138137
repositoryBaseClass = DummyRepositoryBaseClass.class)
139138
static class TestConfiguration {
140139

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ NamedParameterJdbcOperations namedParameterJdbcTemplate() {
8383
return new NamedParameterJdbcTemplate(dataSource);
8484
}
8585

86-
@Bean(name = "transactionManager")
87-
PlatformTransactionManager defaultTransactionManager() {
86+
@Bean
87+
PlatformTransactionManager transactionManager() {
8888
return new DataSourceTransactionManager(dataSource);
8989
}
9090

0 commit comments

Comments
 (0)