From afbb46a86498bf8942f0adf55cd2e986be6bc63c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 9 Apr 2018 10:23:35 +0200 Subject: [PATCH] DATAREDIS-808 - Limit repository test configuration filters. We now only include repository interfaces required for the test and avoid a broad scanning that also considers CDI repositories from its subpackage. --- .../repository/RedisRepositoryClusterIntegrationTests.java | 6 ++++-- .../redis/repository/RedisRepositoryIntegrationTests.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryClusterIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryClusterIntegrationTests.java index 8a377d255..453ddcb18 100644 --- a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryClusterIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryClusterIntegrationTests.java @@ -36,6 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Christoph Strobl + * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -51,8 +52,9 @@ public class RedisRepositoryClusterIntegrationTests extends RedisRepositoryInteg @Configuration @EnableRedisRepositories(considerNestedRepositories = true, indexConfiguration = MyIndexConfiguration.class, - keyspaceConfiguration = MyKeyspaceConfiguration.class, includeFilters = { - @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*PersonRepository|.*CityRepository") }) + keyspaceConfiguration = MyKeyspaceConfiguration.class, + includeFilters = { @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, + classes = { PersonRepository.class, CityRepository.class }) }) static class Config { @Bean diff --git a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java index a8fa6b2f9..6d6ade80e 100644 --- a/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTests.java @@ -54,8 +54,9 @@ public class RedisRepositoryIntegrationTests extends RedisRepositoryIntegrationT @Configuration @EnableRedisRepositories(considerNestedRepositories = true, indexConfiguration = MyIndexConfiguration.class, - keyspaceConfiguration = MyKeyspaceConfiguration.class, includeFilters = { - @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*PersonRepository|.*CityRepository") }) + keyspaceConfiguration = MyKeyspaceConfiguration.class, + includeFilters = { @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, + classes = { PersonRepository.class, CityRepository.class }) }) static class Config { @Bean