Skip to content

Commit

Permalink
refactor some codes because of a little redisson api changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@streamone
streamone committed May 7, 2020
1 parent 48f2f0a commit 89b42d3
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 35 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ services:
- redis-server

jdk:
- oraclejdk8
- openjdk8
- openjdk9
- openjdk10
Expand Down
48 changes: 24 additions & 24 deletions src/main/java/com/github/streamone/shiro/session/RedissonSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ protected void init(final Session session) {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
script.eval(this.infoKey, RScript.Mode.READ_WRITE, this.infoCodec, INIT_SCRIPT,
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
script.eval(this.infoKey, RScript.Mode.READ_WRITE, INIT_SCRIPT,
RScript.ReturnType.VALUE, keys, session.getId(), timeout, startTimeStamp,
host);
}
Expand All @@ -103,11 +103,11 @@ public Date getStartTimestamp() {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
Date res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
this.infoCodec, GET_START_SCRIPT,
GET_START_SCRIPT,
RScript.ReturnType.MAPVALUE, keys);
} catch (RedisException e) {
convertException(e);
Expand All @@ -125,11 +125,11 @@ public Date getLastAccessTime() {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
Date res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
this.infoCodec, GET_LAST_SCRIPT,
GET_LAST_SCRIPT,
RScript.ReturnType.MAPVALUE, keys);
} catch (RedisException e) {
convertException(e);
Expand All @@ -147,11 +147,11 @@ public long getTimeout() throws InvalidSessionException {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
Long res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
this.infoCodec, GET_TIMEOUT_SCRIPT,
GET_TIMEOUT_SCRIPT,
RScript.ReturnType.MAPVALUE, keys);
} catch (RedisException e) {
convertException(e);
Expand All @@ -170,10 +170,10 @@ public void setTimeout(long maxIdleTimeInMillis) throws InvalidSessionException
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
try {
script.eval(this.infoKey, RScript.Mode.READ_WRITE,
this.infoCodec, SET_TIMEOUT_SCRIPT,
SET_TIMEOUT_SCRIPT,
RScript.ReturnType.VALUE, keys, maxIdleTimeInMillis);
} catch (RedisException e) {
convertException(e);
Expand All @@ -185,11 +185,11 @@ public String getHost() {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
String res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
this.infoCodec, GET_HOST_SCRIPT,
GET_HOST_SCRIPT,
RScript.ReturnType.MAPVALUE, keys);
} catch (RedisException e) {
convertException(e);
Expand All @@ -208,9 +208,9 @@ public void touch() throws InvalidSessionException {
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
try {
script.eval(this.infoKey, RScript.Mode.READ_WRITE, this.infoCodec,
script.eval(this.infoKey, RScript.Mode.READ_WRITE,
TOUCH_SCRIPT, RScript.ReturnType.VALUE, keys, new Date());
} catch (RedisException e) {
convertException(e);
Expand All @@ -222,9 +222,9 @@ public void stop() throws InvalidSessionException {
List<Object> keys = new ArrayList<>(1);
keys.add(this.infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.infoCodec);
try {
script.eval(this.infoKey, RScript.Mode.READ_WRITE, this.infoCodec,
script.eval(this.infoKey, RScript.Mode.READ_WRITE,
STOP_SCRIPT, RScript.ReturnType.VALUE, keys, new Date());
} catch (RedisException e) {
convertException(e);
Expand All @@ -237,10 +237,10 @@ public Collection<Object> getAttributeKeys() throws InvalidSessionException {
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
Collection<Object> res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY, this.codec,
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
GET_ATTRKEYS_SCRIPT, RScript.ReturnType.MAPVALUELIST, keys);
} catch (RedisException e) {
convertException(e);
Expand All @@ -259,10 +259,10 @@ public Object getAttribute(Object key) throws InvalidSessionException {
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
Object res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY, this.codec,
res = script.eval(this.infoKey, RScript.Mode.READ_ONLY,
GET_ATTR_SCRIPT, RScript.ReturnType.MAPVALUE, keys, key);
} catch (RedisException e) {
convertException(e);
Expand All @@ -277,9 +277,9 @@ public void setAttribute(Object key, Object value) throws InvalidSessionExceptio
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
try {
script.eval(this.infoKey, RScript.Mode.READ_WRITE, this.codec,
script.eval(this.infoKey, RScript.Mode.READ_WRITE,
SET_ATTR_SCRIPT, RScript.ReturnType.VALUE, keys, key, value);
} catch (RedisException e) {
convertException(e);
Expand All @@ -292,10 +292,10 @@ public Object removeAttribute(Object key) throws InvalidSessionException {
keys.add(this.infoKey);
keys.add(this.attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
Object res = null;
try {
res = script.eval(this.infoKey, RScript.Mode.READ_WRITE, this.codec,
res = script.eval(this.infoKey, RScript.Mode.READ_WRITE,
REMOVE_ATTR_SCRIPT, RScript.ReturnType.MAPVALUE, keys, key);
} catch (RedisException e) {
convertException(e);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/github/streamone/shiro/session/RedissonSessionDao.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ protected Session doReadSession(Serializable sessionId) {
List<Object> keys = new ArrayList<>(1);
keys.add(infoKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
Long remainTimeToLive = script.eval(infoKey, RScript.Mode.READ_ONLY, this.codec,
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
Long remainTimeToLive = script.eval(infoKey, RScript.Mode.READ_ONLY,
RedissonSessionScript.READ_SCRIPT,
RScript.ReturnType.INTEGER, keys);

Expand Down Expand Up @@ -74,8 +74,8 @@ public void delete(Session session) {
keys.add(infoKey);
keys.add(attrKey);

RedissonScript script = (RedissonScript) this.redisson.getScript();
script.eval(infoKey, RScript.Mode.READ_WRITE, this.codec,
RedissonScript script = (RedissonScript) this.redisson.getScript(this.codec);
script.eval(infoKey, RScript.Mode.READ_WRITE,
RedissonSessionScript.DELETE_SCRIPT,
RScript.ReturnType.VALUE, keys);
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/github/streamone/cache/entity/KeyEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.github.streamone.cache.entity;

import java.io.Serializable;

/**
* <p>A key entity class for cache testing.</p>
*
* @author streamone
*/
public class KeyEntity {
public class KeyEntity implements Serializable {

private String key;

Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/github/streamone/cache/entity/ValueEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.github.streamone.cache.entity;

import java.io.Serializable;

/**
* <p>A value entity class for cache testing.</p>
*
* @author streamone
*/
public class ValueEntity {
public class ValueEntity implements Serializable {

private String value;

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/github/streamone/shiro/session/RedissonSessionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public void testCreateSessionByIllegalArguments3() {
@Test(expected = ExpiredSessionException.class)
public void testCreateSessionByInvalidState() {
RedissonScript mockedScript = mock(RedissonScript.class);
when(mockedScript.eval(anyString(), any(RScript.Mode.class), any(Codec.class), anyString(),
when(mockedScript.eval(anyString(), any(RScript.Mode.class), anyString(),
any(RScript.ReturnType.class), anyList(), any())).thenThrow(new RedisException("-1"));
RedissonClient mockedRedisson = mock(RedissonClient.class);
when(mockedRedisson.getScript()).thenReturn(mockedScript);
when(mockedRedisson.getScript(any(Codec.class))).thenReturn(mockedScript);

RedissonSession newSession = new RedissonSession(mockedRedisson, null, "", "", UUID.randomUUID());
newSession.getAttributeKeys();
Expand All @@ -76,10 +76,10 @@ public void testCreateSessionByInvalidState() {
@Test(expected = StoppedSessionException.class)
public void testCreateSessionByInvalidState2() {
RedissonScript mockedScript = mock(RedissonScript.class);
when(mockedScript.eval(anyString(), any(RScript.Mode.class), any(Codec.class), anyString(),
when(mockedScript.eval(anyString(), any(RScript.Mode.class), anyString(),
any(RScript.ReturnType.class), anyList(), any())).thenThrow(new RedisException("-2"));
RedissonClient mockedRedisson = mock(RedissonClient.class);
when(mockedRedisson.getScript()).thenReturn(mockedScript);
when(mockedRedisson.getScript(any(Codec.class))).thenReturn(mockedScript);

RedissonSession newSession = new RedissonSession(mockedRedisson, null, "", "", UUID.randomUUID());
newSession.getAttributeKeys();
Expand Down

0 comments on commit 89b42d3

Please sign in to comment.