Remove deprecated code in spring-session-hazelcast

Author: vpavic

spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastFlushMode.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.
@@ -32,7 +32,6 @@
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
-import org.springframework.session.hazelcast.HazelcastFlushMode;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 
 /**
@@ -85,21 +84,6 @@
 	 */
 	String sessionMapName() default "spring:session:sessions";
 
-	/**
-	 * Flush mode for the Hazelcast sessions. The default is {@code ON_SAVE} which only
-	 * updates the backing Hazelcast when {@link SessionRepository#save(Session)} is
-	 * invoked. In a web environment this happens just before the HTTP response is
-	 * committed.
-	 * <p>
-	 * Setting the value to {@code IMMEDIATE} will ensure that the any updates to the
-	 * Session are immediately written to the Hazelcast instance.
-	 * @return the {@link HazelcastFlushMode} to use
-	 * @since 1.3.0
-	 * @deprecated since 2.2.0 in favor of {@link #flushMode()}
-	 */
-	@Deprecated
-	HazelcastFlushMode hazelcastFlushMode() default HazelcastFlushMode.ON_SAVE;
-
 	/**
 	 * Flush mode for the Hazelcast sessions. The default is {@code ON_SAVE} which only
 	 * updates the backing Hazelcast when {@link SessionRepository#save(Session)} is

spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 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.
@@ -38,7 +38,6 @@
 import org.springframework.session.Session;
 import org.springframework.session.config.SessionRepositoryCustomizer;
 import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
-import org.springframework.session.hazelcast.HazelcastFlushMode;
 import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
 import org.springframework.session.hazelcast.config.annotation.SpringSessionHazelcastInstance;
 import org.springframework.session.web.http.SessionRepositoryFilter;
@@ -86,11 +85,6 @@ public void setSessionMapName(String sessionMapName) {
 		this.sessionMapName = sessionMapName;
 	}
 
-	@Deprecated
-	public void setHazelcastFlushMode(HazelcastFlushMode hazelcastFlushMode) {
-		setFlushMode(hazelcastFlushMode.getFlushMode());
-	}
-
 	public void setFlushMode(FlushMode flushMode) {
 		this.flushMode = flushMode;
 	}
@@ -127,7 +121,6 @@ public void setSessionRepositoryCustomizer(
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> attributeMap = importMetadata
 				.getAnnotationAttributes(EnableHazelcastHttpSession.class.getName());
@@ -137,12 +130,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 		if (StringUtils.hasText(sessionMapNameValue)) {
 			this.sessionMapName = sessionMapNameValue;
 		}
-		FlushMode flushMode = attributes.getEnum("flushMode");
-		HazelcastFlushMode hazelcastFlushMode = attributes.getEnum("hazelcastFlushMode");
-		if (flushMode == FlushMode.ON_SAVE && hazelcastFlushMode != HazelcastFlushMode.ON_SAVE) {
-			flushMode = hazelcastFlushMode.getFlushMode();
-		}
-		this.flushMode = flushMode;
+		this.flushMode = attributes.getEnum("flushMode");
 		this.saveMode = attributes.getEnum("saveMode");
 	}
 

spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSession.java

@@ -34,7 +34,6 @@
 import org.springframework.session.SaveMode;
 import org.springframework.session.Session;
 import org.springframework.session.config.SessionRepositoryCustomizer;
-import org.springframework.session.hazelcast.HazelcastFlushMode;
 import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
 import org.springframework.session.hazelcast.config.annotation.SpringSessionHazelcastInstance;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -130,15 +129,6 @@ void customFlushImmediately() {
 		assertThat(ReflectionTestUtils.getField(repository, "flushMode")).isEqualTo(FlushMode.IMMEDIATE);
 	}
 
-	@Test
-	void customFlushImmediatelyLegacy() {
-		registerAndRefresh(CustomFlushImmediatelyLegacyConfiguration.class);
-
-		HazelcastIndexedSessionRepository repository = this.context.getBean(HazelcastIndexedSessionRepository.class);
-		assertThat(repository).isNotNull();
-		assertThat(ReflectionTestUtils.getField(repository, "flushMode")).isEqualTo(FlushMode.IMMEDIATE);
-	}
-
 	@Test
 	void setCustomFlushImmediately() {
 		registerAndRefresh(BaseConfiguration.class, CustomFlushImmediatelySetConfiguration.class);
@@ -148,15 +138,6 @@ void setCustomFlushImmediately() {
 		assertThat(ReflectionTestUtils.getField(repository, "flushMode")).isEqualTo(FlushMode.IMMEDIATE);
 	}
 
-	@Test
-	void setCustomFlushImmediatelyLegacy() {
-		registerAndRefresh(BaseConfiguration.class, CustomFlushImmediatelySetLegacyConfiguration.class);
-
-		HazelcastIndexedSessionRepository repository = this.context.getBean(HazelcastIndexedSessionRepository.class);
-		assertThat(repository).isNotNull();
-		assertThat(ReflectionTestUtils.getField(repository, "flushMode")).isEqualTo(FlushMode.IMMEDIATE);
-	}
-
 	@Test
 	void customSaveModeAnnotation() {
 		registerAndRefresh(BaseConfiguration.class, CustomSaveModeExpressionAnnotationConfiguration.class);
@@ -319,16 +300,6 @@ static class CustomFlushImmediatelySetConfiguration extends HazelcastHttpSession
 
 	}
 
-	@Configuration
-	@SuppressWarnings("deprecation")
-	static class CustomFlushImmediatelySetLegacyConfiguration extends HazelcastHttpSessionConfiguration {
-
-		CustomFlushImmediatelySetLegacyConfiguration() {
-			setHazelcastFlushMode(HazelcastFlushMode.IMMEDIATE);
-		}
-
-	}
-
 	@EnableHazelcastHttpSession(saveMode = SaveMode.ALWAYS)
 	static class CustomSaveModeExpressionAnnotationConfiguration {
 
@@ -349,13 +320,6 @@ static class CustomFlushImmediatelyConfiguration extends BaseConfiguration {
 
 	}
 
-	@Configuration
-	@EnableHazelcastHttpSession(hazelcastFlushMode = HazelcastFlushMode.IMMEDIATE)
-	@SuppressWarnings("deprecation")
-	static class CustomFlushImmediatelyLegacyConfiguration extends BaseConfiguration {
-
-	}
-
 	@Configuration
 	@EnableHazelcastHttpSession
 	static class QualifiedHazelcastInstanceConfiguration extends BaseConfiguration {