Browse Source

DATAJDBC-622 - Polishing.

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

Original pull request: #245.
pull/252/head
Jens Schauder 5 years ago
parent
commit
1ef97dd00f
No known key found for this signature in database
GPG Key ID: 996B1389BA0721C3
  1. 2
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java
  2. 1
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtension.java
  3. 1
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java
  4. 4
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java

2
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 Greg Turnquist
* @author Mark Paluch * @author Mark Paluch
* @author Fei Dong * @author Fei Dong
* @author Juan Medina
* @see AbstractJdbcConfiguration * @see AbstractJdbcConfiguration
*/ */
@Target(ElementType.TYPE) @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 * Configures the name of the {@link DataSourceTransactionManager} bean definition to be used to create repositories
* discovered through this annotation. Defaults to {@code transactionManager}. * discovered through this annotation. Defaults to {@code transactionManager}.
* @since 2.1
*/ */
String transactionManagerRef() default "transactionManager"; String transactionManagerRef() default "transactionManager";

1
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 Jens Schauder
* @author Fei Dong * @author Fei Dong
* @author Mark Paluch * @author Mark Paluch
* @author Juan Medina
*/ */
public class JdbcRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport { public class JdbcRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {

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

@ -134,7 +134,6 @@ public class EnableJdbcRepositoriesIntegrationTests {
@EnableJdbcRepositories(considerNestedRepositories = true, @EnableJdbcRepositories(considerNestedRepositories = true,
includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class), includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class),
jdbcOperationsRef = "qualifierJdbcOperations", dataAccessStrategyRef = "qualifierDataAccessStrategy", jdbcOperationsRef = "qualifierJdbcOperations", dataAccessStrategyRef = "qualifierDataAccessStrategy",
transactionManagerRef = "transactionManager",
repositoryBaseClass = DummyRepositoryBaseClass.class) repositoryBaseClass = DummyRepositoryBaseClass.class)
static class TestConfiguration { static class TestConfiguration {

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

@ -83,8 +83,8 @@ public class TestConfiguration {
return new NamedParameterJdbcTemplate(dataSource); return new NamedParameterJdbcTemplate(dataSource);
} }
@Bean(name = "transactionManager") @Bean
PlatformTransactionManager defaultTransactionManager() { PlatformTransactionManager transactionManager() {
return new DataSourceTransactionManager(dataSource); return new DataSourceTransactionManager(dataSource);
} }

Loading…
Cancel
Save