diff --git a/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/EnableMongoWebSession.java b/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/EnableMongoWebSession.java index 0a8ed97..492c712 100644 --- a/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/EnableMongoWebSession.java +++ b/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/EnableMongoWebSession.java @@ -21,7 +21,6 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.session.config.annotation.web.server.EnableSpringWebSession; import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository; /** @@ -45,12 +44,12 @@ import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepo * * * @author Greg Turnquist + * @author Vedran Pavić * @since 2.0 */ @Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @Target({ java.lang.annotation.ElementType.TYPE }) @Documented -@EnableSpringWebSession @Import(ReactiveMongoWebSessionConfiguration.class) @Configuration public @interface EnableMongoWebSession { diff --git a/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java b/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java index 24ac698..06abd3c 100644 --- a/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java +++ b/src/main/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfiguration.java @@ -24,6 +24,7 @@ import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.ReactiveMongoOperations; +import org.springframework.session.config.annotation.web.server.SpringWebSessionConfiguration; import org.springframework.session.data.mongo.AbstractMongoSessionConverter; import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository; import org.springframework.util.StringUtils; @@ -33,9 +34,11 @@ import org.springframework.util.StringValueResolver; * Configure a {@link ReactiveMongoOperationsSessionRepository} using a provided {@link ReactiveMongoOperations}. * * @author Greg Turnquist + * @author Vedran Pavić */ @Configuration -public class ReactiveMongoWebSessionConfiguration implements EmbeddedValueResolverAware, ImportAware { +public class ReactiveMongoWebSessionConfiguration extends SpringWebSessionConfiguration + implements EmbeddedValueResolverAware, ImportAware { private AbstractMongoSessionConverter mongoSessionConverter; private Integer maxInactiveIntervalInSeconds; diff --git a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java index 10b2d04..8b862d9 100644 --- a/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java +++ b/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java @@ -47,6 +47,7 @@ import org.springframework.web.server.session.WebSessionManager; * Verify various configurations through {@link EnableSpringWebSession}. * * @author Greg Turnquist + * @author Vedran Pavić */ public class ReactiveMongoWebSessionConfigurationTest { @@ -85,7 +86,7 @@ public class ReactiveMongoWebSessionConfigurationTest { assertThatExceptionOfType(UnsatisfiedDependencyException.class) .isThrownBy(this.context::refresh) - .withMessageContaining("Error creating bean with name 'webSessionManager'") + .withMessageContaining("Error creating bean with name 'reactiveMongoOperationsSessionRepository'") .withMessageContaining("No qualifying bean of type '" + ReactiveMongoOperations.class.getCanonicalName()); }