Skip to content

Commit 00ba1b2

Browse files
eleftheriaseleftherias
committed
Temporarily remove Hazelcast support
Closes gh-1954
1 parent cc1fd82 commit 00ba1b2

File tree

4 files changed

+57
-56
lines changed

4 files changed

+57
-56
lines changed

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include 'spring-session-core'
1616
include 'spring-session-data-mongodb'
1717
include 'spring-session-data-redis'
1818
include 'spring-session-docs'
19-
include 'spring-session-hazelcast'
19+
//include 'spring-session-hazelcast'
2020
include 'spring-session-jdbc'
2121

2222
file('spring-session-samples').eachDirMatch(~/spring-session-sample-.*/) { dir ->

‎spring-session-docs/modules/ROOT/examples/java/docs/IndexDocTests.java

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import java.time.Duration;
2020
import java.util.concurrent.ConcurrentHashMap;
2121

22-
import com.hazelcast.config.Config;
23-
import com.hazelcast.core.Hazelcast;
24-
import com.hazelcast.core.HazelcastInstance;
2522
import org.junit.jupiter.api.Test;
2623

2724
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
@@ -38,7 +35,6 @@
3835
import org.springframework.session.SessionRepository;
3936
import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
4037
import org.springframework.session.data.redis.RedisIndexedSessionRepository;
41-
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
4238
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
4339
import org.springframework.session.web.http.SessionRepositoryFilter;
4440
import org.springframework.transaction.support.TransactionTemplate;
@@ -171,20 +167,21 @@ void newJdbcIndexedSessionRepository() {
171167
// end::new-jdbcindexedsessionrepository[]
172168
}
173169

174-
@Test
175-
@SuppressWarnings("unused")
176-
void newHazelcastIndexedSessionRepository() {
177-
// tag::new-hazelcastindexedsessionrepository[]
178-
179-
Config config = new Config();
180-
181-
// ... configure Hazelcast ...
182-
183-
HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config);
184-
185-
HazelcastIndexedSessionRepository repository = new HazelcastIndexedSessionRepository(hazelcastInstance);
186-
// end::new-hazelcastindexedsessionrepository[]
187-
}
170+
// @Test
171+
// @SuppressWarnings("unused")
172+
// void newHazelcastIndexedSessionRepository() {
173+
// // tag::new-hazelcastindexedsessionrepository[]
174+
//
175+
// Config config = new Config();
176+
//
177+
// // ... configure Hazelcast ...
178+
//
179+
// HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config);
180+
//
181+
// HazelcastIndexedSessionRepository repository = new
182+
// HazelcastIndexedSessionRepository(hazelcastInstance);
183+
// // end::new-hazelcastindexedsessionrepository[]
184+
// }
188185

189186
@Test
190187
void runSpringHttpSessionConfig() {

‎spring-session-docs/modules/ROOT/examples/java/docs/http/HazelcastHttpSessionConfig.java

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2019 the original author or authors.
2+
* Copyright 2014-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,40 +16,44 @@
1616

1717
package docs.http;
1818

19-
import com.hazelcast.config.Config;
20-
import com.hazelcast.config.MapAttributeConfig;
21-
import com.hazelcast.config.MapIndexConfig;
22-
import com.hazelcast.config.SerializerConfig;
23-
import com.hazelcast.core.Hazelcast;
24-
import com.hazelcast.core.HazelcastInstance;
19+
// import com.hazelcast.config.AttributeConfig;
20+
// import com.hazelcast.config.Config;
21+
// import com.hazelcast.config.IndexConfig;
22+
// import com.hazelcast.config.IndexType;
23+
// import com.hazelcast.config.SerializerConfig;
24+
// import com.hazelcast.core.Hazelcast;
25+
// import com.hazelcast.core.HazelcastInstance;
26+
//
27+
// import org.springframework.context.annotation.Bean;
28+
// import org.springframework.context.annotation.Configuration;
29+
// import org.springframework.session.MapSession;
30+
// import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
31+
// import org.springframework.session.hazelcast.HazelcastSessionSerializer;
32+
// import org.springframework.session.hazelcast.PrincipalNameExtractor;
33+
// import
34+
// org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
2535

26-
import org.springframework.context.annotation.Bean;
27-
import org.springframework.context.annotation.Configuration;
28-
import org.springframework.session.MapSession;
29-
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
30-
import org.springframework.session.hazelcast.HazelcastSessionSerializer;
31-
import org.springframework.session.hazelcast.PrincipalNameExtractor;
32-
import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
33-
34-
//tag::config[]
35-
@EnableHazelcastHttpSession // <1>
36-
@Configuration
37-
public class HazelcastHttpSessionConfig {
38-
39-
@Bean
40-
public HazelcastInstance hazelcastInstance() {
41-
Config config = new Config();
42-
MapAttributeConfig attributeConfig = new MapAttributeConfig()
43-
.setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
44-
.setExtractor(PrincipalNameExtractor.class.getName());
45-
config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2>
46-
.addMapAttributeConfig(attributeConfig).addMapIndexConfig(
47-
new MapIndexConfig(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));
48-
SerializerConfig serializerConfig = new SerializerConfig();
49-
serializerConfig.setImplementation(new HazelcastSessionSerializer()).setTypeClass(MapSession.class);
50-
config.getSerializationConfig().addSerializerConfig(serializerConfig); // <3>
51-
return Hazelcast.newHazelcastInstance(config); // <4>
52-
}
53-
54-
}
36+
// tag::config[]
37+
// @EnableHazelcastHttpSession // <1>
38+
// @Configuration
39+
// public class HazelcastHttpSessionConfig {
40+
//
41+
// @Bean
42+
// public HazelcastInstance hazelcastInstance() {
43+
// Config config = new Config();
44+
// AttributeConfig attributeConfig = new AttributeConfig()
45+
// .setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
46+
// .setExtractorClassName(PrincipalNameExtractor.class.getName());
47+
// config.getMapConfig(HazelcastIndexedSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2>
48+
// .addAttributeConfig(attributeConfig).addIndexConfig(
49+
// new IndexConfig(IndexType.HASH,
50+
// HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE));
51+
// SerializerConfig serializerConfig = new SerializerConfig();
52+
// serializerConfig.setImplementation(new
53+
// HazelcastSessionSerializer()).setTypeClass(MapSession.class);
54+
// config.getSerializationConfig().addSerializerConfig(serializerConfig); // <3>
55+
// return Hazelcast.newHazelcastInstance(config); // <4>
56+
// }
57+
//
58+
// }
5559
// end::config[]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apply plugin: 'io.spring.convention.spring-test'
88
dependencies {
99
testImplementation project(':spring-session-core')
1010
testImplementation project(':spring-session-data-redis')
11-
testImplementation project(':spring-session-hazelcast')
11+
// testImplementation project(':spring-session-hazelcast')
1212
testImplementation project(':spring-session-jdbc')
1313
testImplementation 'org.springframework:spring-jdbc'
1414
testImplementation 'org.springframework:spring-messaging'

0 commit comments

Comments
 (0)