spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Rename …DataAutoConfiguration to Data…AutoConfiguration

Browse Source 
Closes gh-47049
This commit is contained in:
Andy Wilkinson
2025-10-01 17:39:08 +01:00
parent 787840735b
commit 26364c27e2
227 changed files with 709 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfigurationTests.java → module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java
+9 -8
View File
@@ -27,7 +27,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
import org.springframework.boot.session.autoconfigure.AbstractSessionAutoConfigurationTests;
import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
@@ -51,21 +51,22 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
/**
* Tests for {@link RedisSessionAutoConfiguration}.
* Tests for {@link SessionDataRedisAutoConfiguration}.
*
* @author Stephane Nicoll
* @author Vedran Pavic
*/
@Testcontainers(disabledWithoutDocker = true)
class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
class SessionDataRedisAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
@Container
public static RedisContainer redis = TestImage.container(RedisContainer.class);
@BeforeEach
void prepareContextRunner() {
this.contextRunner = new WebApplicationContextRunner().withConfiguration(AutoConfigurations
.of(SessionAutoConfiguration.class, RedisSessionAutoConfiguration.class, RedisAutoConfiguration.class));
this.contextRunner = new WebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SessionAutoConfiguration.class,
SessionDataRedisAutoConfiguration.class, DataRedisAutoConfiguration.class));
}
@Test
@@ -73,7 +74,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
this.contextRunner
.withPropertyValues("spring.data.redis.host=" + redis.getHost(),
"spring.data.redis.port=" + redis.getFirstMappedPort())
.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
.run(validateSpringSessionUsesDefaultRedis("spring:session:", FlushMode.ON_SAVE,
SaveMode.ON_SET_ATTRIBUTE));
}
@@ -84,7 +85,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
.withPropertyValues("spring.data.redis.host=" + redis.getHost(),
"spring.data.redis.port=" + redis.getFirstMappedPort(),
"spring.session.data.redis.cleanup-cron=0 0 * * * *")
.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
.run((context) -> {
assertThat(context).hasFailed();
assertThat(context.getStartupFailure())
@@ -118,7 +119,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
this.contextRunner
.withPropertyValues("spring.session.data.redis.repository-type=indexed",
"spring.data.redis.host=" + redis.getHost(), "spring.data.redis.port=" + redis.getFirstMappedPort())
.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
.run(validateSpringSessionUsesIndexedRedis("spring:session:", FlushMode.ON_SAVE, SaveMode.ON_SET_ATTRIBUTE,
"0 * * * * *"));
}
module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/ReactiveRedisSessionAutoConfigurationTests.java → module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java
+7 -7
View File
@@ -28,9 +28,9 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import reactor.core.publisher.Mono;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration;
import org.springframework.boot.session.autoconfigure.AbstractReactiveSessionAutoConfigurationTests;
import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
import org.springframework.boot.session.autoconfigure.AbstractSessionReactiveAutoConfigurationTests;
import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
import org.springframework.boot.test.context.runner.ContextConsumer;
@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
/**
* Tests for the reactive support of {@link RedisSessionAutoConfiguration}.
* Tests for the reactive support of {@link SessionDataRedisAutoConfiguration}.
*
* @author Stephane Nicoll
* @author Andy Wilkinson
@@ -61,7 +61,7 @@ import static org.assertj.core.api.Assertions.entry;
* @author Weix Sun
*/
@Testcontainers(disabledWithoutDocker = true)
class ReactiveRedisSessionAutoConfigurationTests extends AbstractReactiveSessionAutoConfigurationTests {
class SessionDataRedisReactiveAutoConfigurationTests extends AbstractSessionReactiveAutoConfigurationTests {
@Container
public static RedisContainer redis = TestImage.container(RedisContainer.class);
@@ -70,8 +70,8 @@ class ReactiveRedisSessionAutoConfigurationTests extends AbstractReactiveSession
void prepareRunner() {
this.contextRunner = new ReactiveWebApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SessionAutoConfiguration.class,
WebSessionIdResolverAutoConfiguration.class, RedisSessionAutoConfiguration.class,
RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class));
WebSessionIdResolverAutoConfiguration.class, SessionDataRedisAutoConfiguration.class,
DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class));
}
@Test
module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java → module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfiguration.java
+4 -4
View File
@@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
import org.springframework.boot.session.autoconfigure.SessionProperties;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
@@ -71,11 +71,11 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis
@AutoConfiguration(before = SessionAutoConfiguration.class,
beforeName = { "org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration",
"org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration" },
after = { RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class },
after = { DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class },
afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
@ConditionalOnClass(Session.class)
@EnableConfigurationProperties({ SessionDataRedisProperties.class, ServerProperties.class, SessionProperties.class })
public final class RedisSessionAutoConfiguration {
public final class SessionDataRedisAutoConfiguration {
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ RedisTemplate.class, RedisIndexedSessionRepository.class })
module/spring-boot-session-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+1 -1
View File
@@ -1 +1 @@
org.springframework.boot.session.data.redis.autoconfigure.RedisSessionAutoConfiguration
org.springframework.boot.session.data.redis.autoconfigure.SessionDataRedisAutoConfiguration