Harmonize naming of reactive components

Closes gh-897

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepositoryITests.java

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.session.Session;
-import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisReactorSession;
+import org.springframework.session.data.redis.config.annotation.web.server.EnableRedisWebSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -177,7 +177,7 @@ public class ReactiveRedisOperationsSessionRepositoryITests extends AbstractRedi
 	}
 
 	@Configuration
-	@EnableRedisReactorSession
+	@EnableRedisWebSession
 	static class Config extends BaseConfig {
 
 	}

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java

@@ -28,19 +28,19 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.data.redis.core.ReactiveRedisOperations;
 import org.springframework.session.MapSession;
-import org.springframework.session.ReactorSessionRepository;
+import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.util.Assert;
 
 /**
- * A {@link ReactorSessionRepository} that is implemented using Spring Data's
+ * A {@link ReactiveSessionRepository} that is implemented using Spring Data's
  * {@link ReactiveRedisOperations}.
  *
  * @author Vedran Pavic
  * @since 2.0
  */
 public class ReactiveRedisOperationsSessionRepository implements
-		ReactorSessionRepository<ReactiveRedisOperationsSessionRepository.RedisSession> {
+		ReactiveSessionRepository<ReactiveRedisOperationsSessionRepository.RedisSession> {
 
 	/**
 	 * The default prefix for each key and channel in Redis used by Spring Session.

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

@@ -23,7 +23,7 @@ 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.ReactorSessionRepository;
+import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.config.annotation.web.server.EnableSpringWebSession;
 import org.springframework.session.data.redis.RedisFlushMode;
@@ -35,8 +35,8 @@ import org.springframework.session.data.redis.RedisFlushMode;
  * annotation, a single {@link ReactiveRedisConnectionFactory} must be provided. For
  * example: <pre class="code">
  * &#064;Configuration
- * &#064;EnableRedisReactorSession
- * public class RedisReactorSessionConfig {
+ * &#064;EnableRedisWebSession
+ * public class RedisWebSessionConfig {
  *
  *     &#064;Bean
  *     public LettuceConnectionFactory redisConnectionFactory() {
@@ -46,7 +46,7 @@ import org.springframework.session.data.redis.RedisFlushMode;
  * }
  * </pre>
  *
- * More advanced configurations can extend {@link RedisReactorSessionConfiguration}
+ * More advanced configurations can extend {@link RedisWebSessionConfiguration}
  * instead.
  *
  * @author Vedran Pavic
@@ -56,9 +56,9 @@ import org.springframework.session.data.redis.RedisFlushMode;
 @Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
 @Target({ java.lang.annotation.ElementType.TYPE })
 @Documented
-@Import(RedisReactorSessionConfiguration.class)
+@Import(RedisWebSessionConfiguration.class)
 @Configuration
-public @interface EnableRedisReactorSession {
+public @interface EnableRedisWebSession {
 
 	int maxInactiveIntervalInSeconds() default 1800;
 
@@ -83,7 +83,7 @@ public @interface EnableRedisReactorSession {
 	/**
 	 * <p>
 	 * Sets the flush mode for the Redis sessions. The default is ON_SAVE which only
-	 * updates the backing Redis when {@link ReactorSessionRepository#save(Session)} is
+	 * updates the backing Redis when {@link ReactiveSessionRepository#save(Session)} is
 	 * invoked. In a web environment this happens just before the HTTP response is
 	 * committed.
 	 * </p>

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

@@ -44,11 +44,11 @@ import org.springframework.web.server.session.WebSessionManager;
  * Bean.
  *
  * @author Vedran Pavic
- * @see EnableRedisReactorSession
+ * @see EnableRedisWebSession
  * @since 2.0.0
  */
 @Configuration
-public class RedisReactorSessionConfiguration extends SpringWebSessionConfiguration
+public class RedisWebSessionConfiguration extends SpringWebSessionConfiguration
 		implements EmbeddedValueResolverAware, ImportAware {
 
 	private static final RedisSerializer<String> keySerializer = new StringRedisSerializer();
@@ -101,7 +101,7 @@ public class RedisReactorSessionConfiguration extends SpringWebSessionConfigurat
 
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> enableAttrMap = importMetadata
-				.getAnnotationAttributes(EnableRedisReactorSession.class.getName());
+				.getAnnotationAttributes(EnableRedisWebSession.class.getName());
 		AnnotationAttributes enableAttrs = AnnotationAttributes.fromMap(enableAttrMap);
 
 		if (enableAttrs != null) {

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

@@ -32,11 +32,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link RedisReactorSessionConfiguration}.
+ * Tests for {@link RedisWebSessionConfiguration}.
  *
  * @author Vedran Pavic
  */
-public class RedisReactorSessionConfigurationTests {
+public class RedisWebSessionConfigurationTests {
 
 	private static final String REDIS_NAMESPACE = "testNamespace";
 
@@ -115,25 +115,25 @@ public class RedisReactorSessionConfigurationTests {
 	}
 
 	@Configuration
-	@EnableRedisReactorSession
+	@EnableRedisWebSession
 	static class DefaultConfiguration {
 
 	}
 
 	@Configuration
-	@EnableRedisReactorSession(redisNamespace = REDIS_NAMESPACE)
+	@EnableRedisWebSession(redisNamespace = REDIS_NAMESPACE)
 	static class CustomNamespaceConfiguration {
 
 	}
 
 	@Configuration
-	@EnableRedisReactorSession(maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
+	@EnableRedisWebSession(maxInactiveIntervalInSeconds = MAX_INACTIVE_INTERVAL_IN_SECONDS)
 	static class CustomMaxInactiveIntervalConfiguration {
 
 	}
 
 	@Configuration
-	@EnableRedisReactorSession(redisFlushMode = RedisFlushMode.IMMEDIATE)
+	@EnableRedisWebSession(redisFlushMode = RedisFlushMode.IMMEDIATE)
 	static class CustomFlushModeConfiguration {
 
 	}