Suggested changes for compatibility with hazelcast:4.0.1 and spring-boot:2.3.0 on the branch 'v2.3.x'

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.2.7.RELEASE'
+		springBootVersion = '2.3.0.RELEASE'
 	}
 
 	repositories {

spring-session-docs/spring-session-docs.gradle

@@ -16,7 +16,7 @@ dependencies {
 	testCompile 'org.mockito:mockito-core'
 	testCompile 'org.springframework:spring-test'
 	testCompile 'org.assertj:assertj-core'
-	testCompile 'com.hazelcast:hazelcast'
+	testCompile 'com.hazelcast:hazelcast:4.0.1'
 	testCompile 'io.lettuce:lettuce-core'
 	testCompile 'javax.servlet:javax.servlet-api'
 	testCompile 'org.junit.jupiter:junit-jupiter-api'

spring-session-docs/src/test/java/docs/http/HazelcastHttpSessionConfig.java

@@ -17,8 +17,9 @@
 package docs.http;
 
 import com.hazelcast.config.Config;
-import com.hazelcast.config.MapAttributeConfig;
-import com.hazelcast.config.MapIndexConfig;
+import com.hazelcast.config.AttributeConfig;
+import com.hazelcast.config.IndexConfig;
+import com.hazelcast.config.IndexType;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
@@ -36,12 +37,12 @@ public class HazelcastHttpSessionConfig {
 	@Bean
 	public HazelcastInstance hazelcastInstance() {
 		Config config = new Config();
-		MapAttributeConfig attributeConfig = new MapAttributeConfig()
+		AttributeConfig attributeConfig = new AttributeConfig()
 				.setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
-				.setExtractor(PrincipalNameExtractor.class.getName());
+				.setExtractorClassName(PrincipalNameExtractor.class.getName());
 		config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2>
-				.addMapAttributeConfig(attributeConfig).addMapIndexConfig(
-						new MapIndexConfig(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));
+				.addAttributeConfig(attributeConfig).addIndexConfig(
+				new IndexConfig(IndexType.HASH, HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE));
 		return Hazelcast.newHazelcastInstance(config); // <3>
 	}
 

spring-session-hazelcast/spring-session-hazelcast.gradle

@@ -2,7 +2,7 @@ apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
 	compile project(':spring-session-core')
-	compile "com.hazelcast:hazelcast"
+	compile "com.hazelcast:hazelcast:4.0.1"
 	compile "javax.annotation:javax.annotation-api"
 	compile "org.springframework:spring-context"
 

spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastIndexedSessionRepositoryITests.java

@@ -17,8 +17,8 @@
 package org.springframework.session.hazelcast;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import com.hazelcast.instance.HazelcastInstanceProxy;
+import com.hazelcast.instance.impl.HazelcastInstanceProxy;
+import com.hazelcast.map.IMap;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 

spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java

@@ -46,7 +46,7 @@
 @WebAppConfiguration
 class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastIndexedSessionRepositoryITests {
 
-	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:3.12.3")
+	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.0.1")
 			.withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"),
 					"/opt/hazelcast/hazelcast.xml");
 

spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java

@@ -16,9 +16,10 @@
 
 package org.springframework.session.hazelcast;
 
+import com.hazelcast.config.AttributeConfig;
 import com.hazelcast.config.Config;
-import com.hazelcast.config.MapAttributeConfig;
-import com.hazelcast.config.MapIndexConfig;
+import com.hazelcast.config.IndexConfig;
+import com.hazelcast.config.IndexType;
 import com.hazelcast.config.NetworkConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
@@ -42,12 +43,12 @@ static HazelcastInstance embeddedHazelcastServer() {
 		NetworkConfig networkConfig = config.getNetworkConfig();
 		networkConfig.setPort(0);
 		networkConfig.getJoin().getMulticastConfig().setEnabled(false);
-		MapAttributeConfig attributeConfig = new MapAttributeConfig()
+		AttributeConfig attributeConfig = new AttributeConfig()
 				.setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
-				.setExtractor(PrincipalNameExtractor.class.getName());
+				.setExtractorClassName(PrincipalNameExtractor.class.getName());
 		config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME)
-				.addMapAttributeConfig(attributeConfig).addMapIndexConfig(
-						new MapIndexConfig(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));
+				.addAttributeConfig(attributeConfig).addIndexConfig(
+				new IndexConfig(IndexType.HASH, HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE));
 		return Hazelcast.newHazelcastInstance(config);
 	}
 

spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://www.hazelcast.com/schema/config https://www.hazelcast.com/schema/config/hazelcast-config-3.12.xsd">
+		xsi:schemaLocation="http://www.hazelcast.com/schema/config https://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
 
 	<network>
 		<join>

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

@@ -23,14 +23,15 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import com.hazelcast.core.EntryEvent;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.hazelcast.map.listener.EntryAddedListener;
 import com.hazelcast.map.listener.EntryEvictedListener;
 import com.hazelcast.map.listener.EntryRemovedListener;
@@ -152,7 +153,7 @@ public class HazelcastIndexedSessionRepository
 
 	private IMap<String, MapSession> sessions;
 
-	private String sessionListenerId;
+	private UUID sessionListenerId;
 
 	/**
 	 * Create a new {@link HazelcastIndexedSessionRepository} instance.

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

@@ -29,7 +29,7 @@
  * @author Vedran Pavic
  * @since 1.3.0
  */
-public class PrincipalNameExtractor extends ValueExtractor<MapSession, String> {
+public class PrincipalNameExtractor implements ValueExtractor<MapSession, String> {
 
 	@Override
 	@SuppressWarnings("unchecked")

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

@@ -21,7 +21,6 @@
 import java.util.Map;
 
 import com.hazelcast.core.Offloadable;
-import com.hazelcast.map.AbstractEntryProcessor;
 import com.hazelcast.map.EntryProcessor;
 
 import org.springframework.session.MapSession;
@@ -34,7 +33,7 @@
  * @since 1.3.4
  * @see HazelcastIndexedSessionRepository#save(HazelcastSession)
  */
-public class SessionUpdateEntryProcessor extends AbstractEntryProcessor<String, MapSession> implements Offloadable {
+public class SessionUpdateEntryProcessor implements EntryProcessor<String, MapSession, Object>, Offloadable {
 
 	private Instant lastAccessedTime;
 

spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastIndexedSessionRepositoryTests.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.hazelcast.map.EntryProcessor;
 import com.hazelcast.map.listener.MapListener;
 import com.hazelcast.query.impl.predicates.EqualPredicate;

spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfigurationTests.java

@@ -17,7 +17,7 @@
 package org.springframework.session.hazelcast.config.annotation.web.http;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 

spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle

@@ -20,6 +20,7 @@ dependencies {
 	compile "org.webjars:stomp-websocket"
 	compile "org.webjars:webjars-locator-core"
 	compile "com.h2database:h2"
+    compile "javax.validation:validation-api"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "org.springframework.security:spring-security-test"