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

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.events.SessionCreatedEvent;
@@ -34,7 +33,7 @@
  *
  * <pre>
  * <code>
- * {@literal @Configuration}
+ * {@literal @Configuration(proxyBeanMethods = false)}
  * {@literal @EnableSpringHttpSession}
  * public class SpringHttpSessionConfig {
  *
@@ -74,7 +73,6 @@
 @Target({ java.lang.annotation.ElementType.TYPE })
 @Documented
 @Import(SpringHttpSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableSpringHttpSession {
 
 }

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -31,7 +30,7 @@
  *
  * <pre>
  * <code>
- * {@literal @Configuration}
+ * {@literal @Configuration(proxyBeanMethods = false)}
  * {@literal @EnableSpringWebSession}
  * public class SpringWebFluxConfig {
  *
@@ -50,7 +49,6 @@
 @Target({ java.lang.annotation.ElementType.TYPE })
 @Documented
 @Import(SpringWebSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableSpringWebSession {
 
 }

spring-session-core/src/test/java/org/springframework/session/config/annotation/web/server/SpringWebSessionConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.session.ReactiveMapSessionRepository;
 import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
@@ -105,6 +106,7 @@ void providedSessionIdResolverShouldBePickedUpAutomatically() {
 	/**
 	 * A configuration with all the right parts.
 	 */
+	@Configuration(proxyBeanMethods = false)
 	@EnableSpringWebSession
 	static class GoodConfig {
 
@@ -122,11 +124,13 @@ ReactiveSessionRepository<?> reactiveSessionRepository() {
 	/**
 	 * A configuration where no {@link ReactiveSessionRepository} is defined. It's BAD!
 	 */
+	@Configuration(proxyBeanMethods = false)
 	@EnableSpringWebSession
 	static class BadConfig {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableSpringWebSession
 	static class OverrideSessionIdResolver {
 

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/EnableMongoHttpSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 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.session.data.mongo.MongoIndexedSessionRepository;
 
@@ -34,6 +33,7 @@
  *
  * <pre>
  * <code>
+ * {@literal @Configuration(proxyBeanMethods = false)}
  * {@literal @EnableMongoHttpSession}
  * public class MongoHttpSessionConfig {
  *
@@ -52,7 +52,6 @@
 @Target(ElementType.TYPE)
 @Documented
 @Import(MongoHttpSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableMongoHttpSession {
 
 	/**

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/EnableMongoWebSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.session.data.mongo.ReactiveMongoSessionRepository;
 
@@ -32,7 +31,7 @@
  *
  * <pre>
  * <code>
- * {@literal @Configuration}
+ * {@literal @Configuration(proxyBeanMethods = false)}
  * {@literal @EnableMongoWebSession}
  * public class SpringWebFluxConfig {
  *
@@ -52,7 +51,6 @@
 @Target({ java.lang.annotation.ElementType.TYPE })
 @Documented
 @Import(ReactiveMongoWebSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableMongoWebSession {
 
 	/**

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -286,6 +286,7 @@ PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoHttpSession
 	static class SessionRepositoryCustomizerConfiguration {
 

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.index.IndexOperations;
@@ -239,6 +240,7 @@ private AbstractMongoSessionConverter findMongoSessionConverter(ReactiveMongoSes
 	/**
 	 * A configuration with all the right parts.
 	 */
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class GoodConfig {
 
@@ -252,11 +254,13 @@ ReactiveMongoOperations operations() {
 	/**
 	 * A configuration where no {@link ReactiveMongoOperations} is defined. It's BAD!
 	 */
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class BadConfig {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class OverrideSessionConverterConfig {
 
@@ -272,6 +276,7 @@ AbstractMongoSessionConverter mongoSessionConverter() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession(maxInactiveIntervalInSeconds = 123, collectionName = "test-case")
 	static class OverrideMongoParametersConfig {
 
@@ -282,6 +287,7 @@ ReactiveMongoOperations operations() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class ConfigWithReactiveAndImperativeMongoOperations {
 
@@ -308,6 +314,7 @@ MongoOperations mongoOperations(IndexOperations indexOperations) {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableSpringWebSession
 	static class CustomizedReactiveConfiguration extends ReactiveMongoWebSessionConfiguration {
 
@@ -324,6 +331,7 @@ ReactiveMongoOperations reactiveMongoOperations() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class SessionRepositoryCustomizerConfiguration {
 
@@ -346,6 +354,7 @@ ReactiveSessionRepositoryCustomizer<ReactiveMongoSessionRepository> sessionRepos
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class CustomIndexResolverConfigurationWithDefaultMongoSessionConverter {
 
@@ -362,6 +371,7 @@ IndexResolver<MongoSession> indexResolver() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableMongoWebSession
 	static class CustomIndexResolverConfigurationWithProvidedtMongoSessionConverter {
 

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

@@ -22,7 +22,6 @@
 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 @@
  * 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 @@
 @Target(ElementType.TYPE)
 @Documented
 @Import(RedisHttpSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableRedisHttpSession {
 
 	/**

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

@@ -22,7 +22,6 @@
 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 @@
  * 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 @@
 @Target(ElementType.TYPE)
 @Documented
 @Import(RedisIndexedHttpSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableRedisIndexedHttpSession {
 
 	/**

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

@@ -22,7 +22,6 @@
 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 @@
  * {@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 @@
 @Target(ElementType.TYPE)
 @Documented
 @Import(RedisWebSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
 public @interface EnableRedisWebSession {
 
 	/**

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

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

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

@@ -296,11 +296,13 @@ static class CustomFlushImmediatelyConfiguration {
 
 	}
 
+	@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 @@ RedisMessageListenerContainer redisMessageListenerContainer() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
 	@EnableRedisIndexedHttpSession
 	static class SessionRepositoryCustomizerConfiguration {