Skip to content

Commit

Permalink
Made SessionData an interface, and introduced DefaultSessionData (#465)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wavesonics authored and decebals committed Oct 9, 2018
1 parent c62412e commit 7304924
Show file tree
Hide file tree
Showing 15 changed files with 320 additions and 248 deletions.
Expand Up @@ -22,6 +22,7 @@
import ro.pippo.core.util.CookieUtils;
import ro.pippo.session.SerializationSessionDataTranscoder;
import ro.pippo.session.SessionData;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionDataStorage;
import ro.pippo.session.SessionDataTranscoder;

Expand All @@ -48,7 +49,7 @@ public CookieSessionDataStorage(PippoSettings pippoSettings, SessionDataTranscod

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -18,6 +18,7 @@
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand Down Expand Up @@ -60,7 +61,7 @@ public EhcacheSessionDataStorage(Cache cache) {

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -17,6 +17,7 @@

import org.ehcache.Cache;
import org.ehcache.CacheManager;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand Down Expand Up @@ -44,7 +45,7 @@ public EhcacheSessionDataStorage(Cache<String, SessionData> cache) {

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
@@ -1,84 +1,85 @@
/*
* Copyright 2016 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 ro.pippo.session.hazelcast;

import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

/**
* SessionDataStorage implementation with Hazelcast.
*
* @author Herman Barrantes
*/
public class HazelcastSessionDataStorage implements SessionDataStorage {

private static final String SESSION_NAME = "session";
private final IMap<String, SessionData> sessions;

/**
* Manage session with the map named "session" and Hazelcast specified
* instance.
*
* @param hazelcastInstance hazelcast instance
* @see #HazelcastSessionDataStorage(java.lang.String,
* com.hazelcast.core.HazelcastInstance)
*/
public HazelcastSessionDataStorage(HazelcastInstance hazelcastInstance) {
this(SESSION_NAME, hazelcastInstance);
}

/**
* Management session with the map specified in the name and Hazelcast
* specified instance.
*
* @param name name of cache
* @param hazelcastInstance hazelcast instance
*/
public HazelcastSessionDataStorage(String name, HazelcastInstance hazelcastInstance) {
this.sessions = hazelcastInstance.getMap(name);
}

/**
* Manage session with custom Hazelcast IMap for sessions.
*
* @param sessions Hazelcast IMap for sessions.
*/
public HazelcastSessionDataStorage(IMap<String, SessionData> sessions) {
this.sessions = sessions;
}

@Override
public SessionData create() {
return new SessionData();
}

@Override
public void save(SessionData sessionData) {
this.sessions.put(sessionData.getId(), sessionData);
}

@Override
public SessionData get(String sessionId) {
return this.sessions.get(sessionId);
}

@Override
public void delete(String sessionId) {
this.sessions.remove(sessionId);
}
}
/*
* Copyright 2016 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 ro.pippo.session.hazelcast;

import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

/**
* SessionDataStorage implementation with Hazelcast.
*
* @author Herman Barrantes
*/
public class HazelcastSessionDataStorage implements SessionDataStorage {

private static final String SESSION_NAME = "session";
private final IMap<String, SessionData> sessions;

/**
* Manage session with the map named "session" and Hazelcast specified
* instance.
*
* @param hazelcastInstance hazelcast instance
* @see #HazelcastSessionDataStorage(java.lang.String,
* com.hazelcast.core.HazelcastInstance)
*/
public HazelcastSessionDataStorage(HazelcastInstance hazelcastInstance) {
this(SESSION_NAME, hazelcastInstance);
}

/**
* Management session with the map specified in the name and Hazelcast
* specified instance.
*
* @param name name of cache
* @param hazelcastInstance hazelcast instance
*/
public HazelcastSessionDataStorage(String name, HazelcastInstance hazelcastInstance) {
this.sessions = hazelcastInstance.getMap(name);
}

/**
* Manage session with custom Hazelcast IMap for sessions.
*
* @param sessions Hazelcast IMap for sessions.
*/
public HazelcastSessionDataStorage(IMap<String, SessionData> sessions) {
this.sessions = sessions;
}

@Override
public SessionData create() {
return new DefaultSessionData();
}

@Override
public void save(SessionData sessionData) {
this.sessions.put(sessionData.getId(), sessionData);
}

@Override
public SessionData get(String sessionId) {
return this.sessions.get(sessionId);
}

@Override
public void delete(String sessionId) {
this.sessions.remove(sessionId);
}
}
Expand Up @@ -17,6 +17,7 @@

import org.infinispan.Cache;
import org.infinispan.manager.EmbeddedCacheManager;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand Down Expand Up @@ -60,7 +61,7 @@ public InfinispanSessionDataStorage(Cache<String, SessionData> cache) {

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -21,6 +21,8 @@
import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.Duration;
import javax.cache.expiry.TouchedExpiryPolicy;

import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand All @@ -32,7 +34,7 @@
public class JCacheSessionDataStorage implements SessionDataStorage {

private static final String SESSION_NAME = "session";
private static final long IDLE_TIME = SessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final long IDLE_TIME = DefaultSessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private final Cache<String, SessionData> sessions;

/**
Expand Down Expand Up @@ -81,7 +83,7 @@ public JCacheSessionDataStorage(Cache<String, SessionData> sessions) {

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -25,9 +25,10 @@
import org.slf4j.LoggerFactory;
import ro.pippo.core.PippoRuntimeException;
import ro.pippo.session.SerializationSessionDataTranscoder;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;
import ro.pippo.session.SessionDataTranscoder;
import ro.pippo.session.SessionData;
import ro.pippo.session.DefaultSessionData;

/**
* SessionDataStorage implementation with JDBC.
Expand Down Expand Up @@ -70,7 +71,7 @@ public JDBCSessionDataStorage(DataSource dataSource, String select, String inser

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -17,10 +17,7 @@

import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import ro.pippo.session.SerializationSessionDataTranscoder;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;
import ro.pippo.session.SessionDataTranscoder;
import ro.pippo.session.*;

/**
* SessionDataStorage implementation with Jedis.
Expand All @@ -29,7 +26,7 @@
*/
public class JedisSessionDataStorage implements SessionDataStorage {

private static final int IDLE_TIME = SessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final int IDLE_TIME = DefaultSessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private final JedisPool sessions;
private final int idleTime;
private final SessionDataTranscoder transcoder;
Expand Down Expand Up @@ -69,7 +66,7 @@ public JedisSessionDataStorage(JedisPool jedisPool, int idleTime, SessionDataTra

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -27,10 +27,7 @@
import java.util.Date;
import java.util.concurrent.TimeUnit;
import org.bson.Document;
import ro.pippo.session.SerializationSessionDataTranscoder;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;
import ro.pippo.session.SessionDataTranscoder;
import ro.pippo.session.*;

/**
* SessionDataStorage implementation with MongoDB.
Expand All @@ -40,7 +37,7 @@
public class MongoDBSessionDataStorage implements SessionDataStorage {

private static final String SESSION_NAME = "session";
private static final int IDLE_TIME = SessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final int IDLE_TIME = DefaultSessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final String SESSION_ID = "_id";
private static final String SESSION_DATA = "session_data";
private static final String SESSION_TTL = "creation_time";
Expand Down Expand Up @@ -126,7 +123,7 @@ private void createIndex(long idleTime) {

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -16,6 +16,7 @@
package ro.pippo.session.spymemcached;

import net.spy.memcached.MemcachedClient;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand All @@ -26,7 +27,7 @@
*/
public class SpymemcachedSessionDataStorage implements SessionDataStorage {

private static final int IDLE_TIME = SessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final int IDLE_TIME = DefaultSessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private final MemcachedClient sessions;
private final int idleTime;

Expand Down Expand Up @@ -55,7 +56,7 @@ public SpymemcachedSessionDataStorage(final MemcachedClient client, int idleTime

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down
Expand Up @@ -20,6 +20,7 @@
import net.rubyeye.xmemcached.exception.MemcachedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ro.pippo.session.DefaultSessionData;
import ro.pippo.session.SessionData;
import ro.pippo.session.SessionDataStorage;

Expand All @@ -31,7 +32,7 @@
public class XmemcachedSessionDataStorage implements SessionDataStorage {

private static final Logger log = LoggerFactory.getLogger(XmemcachedSessionDataStorage.class);
private static final int IDLE_TIME = SessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private static final int IDLE_TIME = DefaultSessionData.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
private final MemcachedClient sessions;
private final int idleTime;

Expand Down Expand Up @@ -61,7 +62,7 @@ public XmemcachedSessionDataStorage(final MemcachedClient client, int idleTime)

@Override
public SessionData create() {
return new SessionData();
return new DefaultSessionData();
}

@Override
Expand Down

0 comments on commit 7304924

Please sign in to comment.