Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer (#6321) 

* Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2021-06-02 10:34:01 +10:00 committed by GitHub
parent b3f4a57c82
commit a55b315f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-hazelcast/src/main/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreFactory.java
View File

@ -21,6 +21,7 @@ import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.client.config.XmlClientConfigBuilder; import com.hazelcast.client.config.XmlClientConfigBuilder;
import com.hazelcast.config.Config; import com.hazelcast.config.Config;
import com.hazelcast.config.MapConfig; import com.hazelcast.config.MapConfig;
import com.hazelcast.config.SerializationConfig;
import com.hazelcast.config.SerializerConfig; import com.hazelcast.config.SerializerConfig;
import com.hazelcast.config.XmlConfigBuilder; import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast; import com.hazelcast.core.Hazelcast;
@ -31,6 +32,8 @@ import org.eclipse.jetty.server.session.SessionDataStore;
import org.eclipse.jetty.server.session.SessionDataStoreFactory; import org.eclipse.jetty.server.session.SessionDataStoreFactory;
import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Factory to construct {@link HazelcastSessionDataStore} * Factory to construct {@link HazelcastSessionDataStore}
@ -39,7 +42,8 @@ public class HazelcastSessionDataStoreFactory
extends AbstractSessionDataStoreFactory extends AbstractSessionDataStoreFactory
implements SessionDataStoreFactory implements SessionDataStoreFactory
{ {
private static final Logger LOG = LoggerFactory.getLogger(HazelcastSessionDataStoreFactory.class);
private String hazelcastInstanceName = "JETTY_DISTRIBUTED_SESSION_INSTANCE"; private String hazelcastInstanceName = "JETTY_DISTRIBUTED_SESSION_INSTANCE";
private boolean onlyClient; private boolean onlyClient;
@ -78,9 +82,10 @@ public class HazelcastSessionDataStoreFactory
{ {
if (onlyClient) if (onlyClient)
{ {
ClientConfig config;
if (StringUtil.isEmpty(configurationLocation)) if (StringUtil.isEmpty(configurationLocation))
{ {
ClientConfig config = new ClientConfig(); config = new ClientConfig();
if (addresses != null && !addresses.isEmpty()) if (addresses != null && !addresses.isEmpty())
{ {
@ -91,20 +96,22 @@ public class HazelcastSessionDataStoreFactory
.setImplementation(new SessionDataSerializer()) .setImplementation(new SessionDataSerializer())
.setTypeClass(SessionData.class); .setTypeClass(SessionData.class);
config.getSerializationConfig().addSerializerConfig(sc); config.getSerializationConfig().addSerializerConfig(sc);
hazelcastInstance = HazelcastClient.newHazelcastClient(config);
} }
else else
{ {
hazelcastInstance = HazelcastClient.newHazelcastClient( config = new XmlClientConfigBuilder(configurationLocation).build();
new XmlClientConfigBuilder(configurationLocation).build()); if (config.getSerializationConfig().getSerializerConfigs().stream().noneMatch(s ->
SessionData.class.getName().equals(s.getTypeClassName()) && s.getImplementation() instanceof SessionDataSerializer))
LOG.warn("Hazelcast xml config is missing org.eclipse.jetty.hazelcast.session.SessionDataSerializer - sessions may not serialize correctly");
} }
hazelcastInstance = HazelcastClient.newHazelcastClient(config);
} }
else else
{ {
Config config; Config config;
if (StringUtil.isEmpty(configurationLocation)) if (StringUtil.isEmpty(configurationLocation))
{ {
SerializerConfig sc = new SerializerConfig() SerializerConfig sc = new SerializerConfig()
.setImplementation(new SessionDataSerializer()) .setImplementation(new SessionDataSerializer())
.setTypeClass(SessionData.class); .setTypeClass(SessionData.class);
@ -126,6 +133,9 @@ public class HazelcastSessionDataStoreFactory
else else
{ {
config = new XmlConfigBuilder(configurationLocation).build(); config = new XmlConfigBuilder(configurationLocation).build();
if (config.getSerializationConfig().getSerializerConfigs().stream().noneMatch(s ->
SessionData.class.getName().equals(s.getTypeClassName()) && s.getImplementation() instanceof SessionDataSerializer))
LOG.warn("Hazelcast xml config is missing org.eclipse.jetty.hazelcast.session.SessionDataSerializer - sessions may not serialize correctly");
} }
config.setInstanceName(hazelcastInstanceName); config.setInstanceName(hazelcastInstanceName);
hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(config); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(config);