forked from spring-projects/spring-session
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve support for Hazelcast client-server topology
This commit improves support for use of Spring Session with Hazelcast's client-server topology by ensuring SessionUpdateEntryProcessor is easier to serialize to the cluster. This is done by refactoring SessionUpdateEntryProcessor from static inner class of HazelcastSessionRepository to a dedicated class, therefore minimizing the dependencies to other Spring Session components. Closes spring-projectsgh-1101
- Loading branch information
Showing
7 changed files
with
187 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?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 hazelcast-config-3.9.xsd"> | ||
|
|
||
| <user-code-deployment enabled="true"> | ||
| <class-cache-mode>ETERNAL</class-cache-mode> | ||
| <provider-mode>LOCAL_AND_CACHED_CLASSES</provider-mode> | ||
| </user-code-deployment> | ||
|
|
||
| </hazelcast> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...cast/src/main/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright 2014-2018 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.session.hazelcast; | ||
|
|
||
| import java.time.Duration; | ||
| import java.time.Instant; | ||
| import java.util.Map; | ||
|
|
||
| import com.hazelcast.map.AbstractEntryProcessor; | ||
| import com.hazelcast.map.EntryProcessor; | ||
|
|
||
| import org.springframework.session.MapSession; | ||
|
|
||
| /** | ||
| * Hazelcast {@link EntryProcessor} responsible for handling updates to session. | ||
| * | ||
| * @author Vedran Pavic | ||
| * @since 2.0.5 | ||
| * @see HazelcastSessionRepository#save(HazelcastSessionRepository.HazelcastSession) | ||
| */ | ||
| class SessionUpdateEntryProcessor extends AbstractEntryProcessor<String, MapSession> { | ||
|
|
||
| private Instant lastAccessedTime; | ||
|
|
||
| private Duration maxInactiveInterval; | ||
|
|
||
| private Map<String, Object> delta; | ||
|
|
||
| @Override | ||
| public Object process(Map.Entry<String, MapSession> entry) { | ||
| MapSession value = entry.getValue(); | ||
| if (value == null) { | ||
| return Boolean.FALSE; | ||
| } | ||
| if (this.lastAccessedTime != null) { | ||
| value.setLastAccessedTime(this.lastAccessedTime); | ||
| } | ||
| if (this.maxInactiveInterval != null) { | ||
| value.setMaxInactiveInterval(this.maxInactiveInterval); | ||
| } | ||
| if (this.delta != null) { | ||
| for (final Map.Entry<String, Object> attribute : this.delta.entrySet()) { | ||
| if (attribute.getValue() != null) { | ||
| value.setAttribute(attribute.getKey(), attribute.getValue()); | ||
| } | ||
| else { | ||
| value.removeAttribute(attribute.getKey()); | ||
| } | ||
| } | ||
| } | ||
| entry.setValue(value); | ||
| return Boolean.TRUE; | ||
| } | ||
|
|
||
| void setLastAccessedTime(Instant lastAccessedTime) { | ||
| this.lastAccessedTime = lastAccessedTime; | ||
| } | ||
|
|
||
| void setMaxInactiveInterval(Duration maxInactiveInterval) { | ||
| this.maxInactiveInterval = maxInactiveInterval; | ||
| } | ||
|
|
||
| void setDelta(Map<String, Object> delta) { | ||
| this.delta = delta; | ||
| } | ||
|
|
||
| } |