mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily remove Hazelcast support

Browse Source 
Closes gh-1954
This commit is contained in:
Eleftheria Stein
2021-11-12 11:14:47 +01:00
parent cc1fd826ac
commit 00ba1b2028
4 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
settings.gradle
View File

@@ -16,7 +16,7 @@ include 'spring-session-core'
include 'spring-session-data-mongodb' include 'spring-session-data-mongodb'
include 'spring-session-data-redis' include 'spring-session-data-redis'
include 'spring-session-docs' include 'spring-session-docs'
include 'spring-session-hazelcast' //include 'spring-session-hazelcast'
include 'spring-session-jdbc' include 'spring-session-jdbc'
file('spring-session-samples').eachDirMatch(~/spring-session-sample-.*/) { dir -> file('spring-session-samples').eachDirMatch(~/spring-session-sample-.*/) { dir ->

33
spring-session-docs/modules/ROOT/examples/java/docs/IndexDocTests.java
View File

@@ -19,9 +19,6 @@ package docs;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
@@ -38,7 +35,6 @@ import org.springframework.session.Session;
import org.springframework.session.SessionRepository; import org.springframework.session.SessionRepository;
import org.springframework.session.data.redis.ReactiveRedisSessionRepository; import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
import org.springframework.session.data.redis.RedisIndexedSessionRepository; import org.springframework.session.data.redis.RedisIndexedSessionRepository;
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
import org.springframework.session.web.http.SessionRepositoryFilter; import org.springframework.session.web.http.SessionRepositoryFilter;
import org.springframework.transaction.support.TransactionTemplate; import org.springframework.transaction.support.TransactionTemplate;
@@ -171,20 +167,21 @@ class IndexDocTests {
// end::new-jdbcindexedsessionrepository[] // end::new-jdbcindexedsessionrepository[]
} }
@Test // @Test
@SuppressWarnings("unused") // @SuppressWarnings("unused")
void newHazelcastIndexedSessionRepository() { // void newHazelcastIndexedSessionRepository() {
// tag::new-hazelcastindexedsessionrepository[] // // tag::new-hazelcastindexedsessionrepository[]
//
Config config = new Config(); // Config config = new Config();
//
// ... configure Hazelcast ... // // ... configure Hazelcast ...
//
HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config); // HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config);
//
HazelcastIndexedSessionRepository repository = new HazelcastIndexedSessionRepository(hazelcastInstance); // HazelcastIndexedSessionRepository repository = new
// end::new-hazelcastindexedsessionrepository[] // HazelcastIndexedSessionRepository(hazelcastInstance);
} // // end::new-hazelcastindexedsessionrepository[]
// }
@Test @Test
void runSpringHttpSessionConfig() { void runSpringHttpSessionConfig() {

76
spring-session-docs/modules/ROOT/examples/java/docs/http/HazelcastHttpSessionConfig.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2019 the original author or authors. * Copyright 2014-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,40 +16,44 @@
package docs.http; package docs.http;
import com.hazelcast.config.Config; // import com.hazelcast.config.AttributeConfig;
import com.hazelcast.config.MapAttributeConfig; // import com.hazelcast.config.Config;
import com.hazelcast.config.MapIndexConfig; // import com.hazelcast.config.IndexConfig;
import com.hazelcast.config.SerializerConfig; // import com.hazelcast.config.IndexType;
import com.hazelcast.core.Hazelcast; // import com.hazelcast.config.SerializerConfig;
import com.hazelcast.core.HazelcastInstance; // import com.hazelcast.core.Hazelcast;
// import com.hazelcast.core.HazelcastInstance;
//
// import org.springframework.context.annotation.Bean;
// import org.springframework.context.annotation.Configuration;
// import org.springframework.session.MapSession;
// import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
// import org.springframework.session.hazelcast.HazelcastSessionSerializer;
// import org.springframework.session.hazelcast.PrincipalNameExtractor;
// import
// org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
import org.springframework.context.annotation.Bean; // tag::config[]
import org.springframework.context.annotation.Configuration; // @EnableHazelcastHttpSession // <1>
import org.springframework.session.MapSession; // @Configuration
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; // public class HazelcastHttpSessionConfig {
import org.springframework.session.hazelcast.HazelcastSessionSerializer; //
import org.springframework.session.hazelcast.PrincipalNameExtractor; // @Bean
import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession; // public HazelcastInstance hazelcastInstance() {
// Config config = new Config();
//tag::config[] // AttributeConfig attributeConfig = new AttributeConfig()
@EnableHazelcastHttpSession // <1> // .setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
@Configuration // .setExtractorClassName(PrincipalNameExtractor.class.getName());
public class HazelcastHttpSessionConfig { // config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2>
// .addAttributeConfig(attributeConfig).addIndexConfig(
@Bean // new IndexConfig(IndexType.HASH,
public HazelcastInstance hazelcastInstance() { // HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE));
Config config = new Config(); // SerializerConfig serializerConfig = new SerializerConfig();
MapAttributeConfig attributeConfig = new MapAttributeConfig() // serializerConfig.setImplementation(new
.setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE) // HazelcastSessionSerializer()).setTypeClass(MapSession.class);
.setExtractor(PrincipalNameExtractor.class.getName()); // config.getSerializationConfig().addSerializerConfig(serializerConfig); // <3>
config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2> // return Hazelcast.newHazelcastInstance(config); // <4>
.addMapAttributeConfig(attributeConfig).addMapIndexConfig( // }
new MapIndexConfig(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false)); //
SerializerConfig serializerConfig = new SerializerConfig(); // }
serializerConfig.setImplementation(new HazelcastSessionSerializer()).setTypeClass(MapSession.class);
config.getSerializationConfig().addSerializerConfig(serializerConfig); // <3>
return Hazelcast.newHazelcastInstance(config); // <4>
}
}
// end::config[] // end::config[]

2
spring-session-docs/spring-session-docs.gradle
View File

@@ -8,7 +8,7 @@ apply plugin: 'io.spring.convention.spring-test'
dependencies { dependencies {
testImplementation project(':spring-session-core') testImplementation project(':spring-session-core')
testImplementation project(':spring-session-data-redis') testImplementation project(':spring-session-data-redis')
testImplementation project(':spring-session-hazelcast') // testImplementation project(':spring-session-hazelcast')
testImplementation project(':spring-session-jdbc') testImplementation project(':spring-session-jdbc')
testImplementation 'org.springframework:spring-jdbc' testImplementation 'org.springframework:spring-jdbc'
testImplementation 'org.springframework:spring-messaging' testImplementation 'org.springframework:spring-messaging'