Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove @Configuration meta-annotation from @Enable*Session annotations

Browse Source 
Closes gh-1361
This commit is contained in:
Vedran Pavic
2022-09-21 22:46:37 +02:00
committed by Rob Winch
parent a23090e7e5
commit fb66cf3150
23 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSession.java
View File

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.session.FlushMode;
@@ -41,7 +40,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
* single {@link RedisConnectionFactory} must be provided. For example:
*
* <pre class="code">
* &#064;Configuration
* &#064;Configuration(proxyBeanMethods = false)
* &#064;EnableRedisHttpSession
* public class RedisHttpSessionConfig {
*
@@ -64,7 +63,6 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
@Target(ElementType.TYPE)
@Documented
@Import(RedisHttpSessionConfiguration.class)
@Configuration(proxyBeanMethods = false)
public @interface EnableRedisHttpSession {
/**

4
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisIndexedHttpSession.java
View File

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.session.FlushMode;
@@ -41,7 +40,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
* annotation, a single {@link RedisConnectionFactory} must be provided. For example:
*
* <pre class="code">
* &#064;Configuration
* &#064;Configuration(proxyBeanMethods = false)
* &#064;EnableRedisIndexedHttpSession
* public class RedisHttpSessionConfig {
*
@@ -64,7 +63,6 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
@Target(ElementType.TYPE)
@Documented
@Import(RedisIndexedHttpSessionConfiguration.class)
@Configuration(proxyBeanMethods = false)
public @interface EnableRedisIndexedHttpSession {
/**

4
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/EnableRedisWebSession.java
View File

@@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
import org.springframework.session.MapSession;
@@ -38,7 +37,7 @@ import org.springframework.web.server.session.WebSessionManager;
* {@link ReactiveRedisConnectionFactory} must be provided. For example:
*
* <pre class="code">
* &#064;Configuration
* &#064;Configuration(proxyBeanMethods = false)
* &#064;EnableRedisWebSession
* public class RedisWebSessionConfig {
*
@@ -61,7 +60,6 @@ import org.springframework.web.server.session.WebSessionManager;
@Target(ElementType.TYPE)
@Documented
@Import(RedisWebSessionConfiguration.class)
@Configuration(proxyBeanMethods = false)
public @interface EnableRedisWebSession {
/**

2
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpsSessionConfigurationTests.java
View File

@@ -261,6 +261,7 @@ class RedisHttpsSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisHttpSession(saveMode = SaveMode.ALWAYS)
static class CustomSaveModeExpressionAnnotationConfiguration {
@@ -342,6 +343,7 @@ class RedisHttpsSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisHttpSession
static class SessionRepositoryCustomizerConfiguration {

3
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisIndexedHttpSessionConfigurationTests.java
View File

@@ -296,11 +296,13 @@ class RedisIndexedHttpSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisIndexedHttpSession(cleanupCron = CLEANUP_CRON_EXPRESSION)
static class CustomCleanupCronExpressionAnnotationConfiguration {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisIndexedHttpSession(saveMode = SaveMode.ALWAYS)
static class CustomSaveModeExpressionAnnotationConfiguration {
@@ -405,6 +407,7 @@ class RedisIndexedHttpSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisIndexedHttpSession
static class SessionRepositoryCustomizerConfiguration {

12
spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/server/RedisWebSessionConfigurationTests.java
View File

@@ -240,11 +240,13 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class DefaultConfig {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class SpringSessionRedisOperationsResolvingConfig {
@@ -257,16 +259,19 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession(redisNamespace = REDIS_NAMESPACE)
static class CustomNamespaceConfig {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession(maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
static class CustomMaxInactiveIntervalConfig {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession(saveMode = SaveMode.ALWAYS)
static class CustomSaveModeExpressionAnnotationConfiguration {
@@ -281,6 +286,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class QualifiedConnectionFactoryRedisConfig {
@@ -292,6 +298,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class PrimaryConnectionFactoryRedisConfig {
@@ -303,6 +310,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class QualifiedAndPrimaryConnectionFactoryRedisConfig {
@@ -320,6 +328,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class NamedConnectionFactoryRedisConfig {
@@ -330,6 +339,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class MultipleConnectionFactoryRedisConfig {
@@ -340,6 +350,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class CustomRedisSerializerConfig {
@@ -351,6 +362,7 @@ class RedisWebSessionConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@EnableRedisWebSession
static class SessionRepositoryCustomizerConfiguration {