github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge cae8378ed6 into 1786614d2c

Browse Source
pull/6478/merge
seakider 2 days ago committed by GitHub
parent 1786614d2c cae8378ed6
commit 0175debd85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 323 additions and 42 deletions
Show Stats Download Patch File Download Diff File

7
redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -263,7 +263,7 @@ public class RedissonSession extends StandardSession {
return;
}
m.fastPut(name, value);
if (readMode == ReadMode.MEMORY && this.broadcastSessionUpdates) {
if (readMode == ReadMode.REDIS || this.broadcastSessionUpdates) {
try {
Encoder encoder = m.getCodec().getMapValueEncoder();
topic.publish(new AttributeUpdateMessage(redissonManager.getNodeId(), getId(), name, value, encoder));
@ -335,11 +335,6 @@ public class RedissonSession extends StandardSession {
expireSession();
}
}
public void superSetAttribute(String name, Object value, boolean notify) {
super.setAttribute(name, value, notify);
}
@Override
public void setAttribute(String name, Object value, boolean notify) {

4
redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -324,7 +324,9 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(codecToUse.getMapValueDecoder()), true);
Map<String, Object> attrs = new HashMap<>();
attrs.put(m.getName(), m.getValue(codecToUse.getMapValueDecoder()));
session.load(attrs);
}
} else {
if (msg instanceof SessionCreatedMessage) {

41
redisson-tomcat/redisson-tomcat-10/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -40,7 +40,34 @@ public class RedissonSessionManagerTest {
Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateMaxInactiveInterval(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try {
server1.start();
server2.start();
Executor executor = Executor.newInstance();
BasicCookieStore cookieStore = new BasicCookieStore();
executor.use(cookieStore);
write(8080, executor, "test", "from_server1");
write(8081, executor, "test", "from_server2");
writeInternal(8080, executor, 3000);
readInternal(8081, executor, 3000);
} finally {
Executor.closeIdleConnections();
server1.stop();
server2.stop();
}
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateTwoServers_readValue(String contextName) throws Exception {
@ -376,6 +403,18 @@ public class RedissonSessionManagerTest {
Assertions.assertEquals(value, response);
}
private void writeInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/writeInternal?value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals("OK", response);
}
private void readInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/readInternal";
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals(value.toString(), response);
}
private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString();

22
redisson-tomcat/redisson-tomcat-10/src/test/java/org/redisson/tomcat/TestServlet.java
Unescape Escape View File

@ -73,7 +73,27 @@ public class TestServlet extends HttpServlet {
Object attr = session.getAttribute(key);
resp.getWriter().print(attr);
} else if (req.getPathInfo().equals("/remove")) {
} else if (req.getPathInfo().equals("/writeInternal")) {
String[] params = req.getQueryString().split("&");
String value = null;
for (String param : params) {
String[] paramLine = param.split("=");
String keyParam = paramLine[0];
String valueParam = paramLine[1];
if ("value".equals(keyParam)) {
value = valueParam;
}
}
if (value == null) {
resp.getWriter().print("ERROR");
} else {
session.setMaxInactiveInterval(Integer.parseInt(value));
resp.getWriter().print("OK");
}
} else if (req.getPathInfo().equals("/readInternal")) {
resp.getWriter().print(session.getMaxInactiveInterval());
} else if (req.getPathInfo().equals("/remove")) {
String[] params = req.getQueryString().split("&");
String key = null;
for (String param : params) {

7
redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -263,7 +263,7 @@ public class RedissonSession extends StandardSession {
return;
}
m.fastPut(name, value);
if (readMode == ReadMode.MEMORY && this.broadcastSessionUpdates) {
if (readMode == ReadMode.REDIS || this.broadcastSessionUpdates) {
try {
Encoder encoder = m.getCodec().getMapValueEncoder();
topic.publish(new AttributeUpdateMessage(redissonManager.getNodeId(), getId(), name, value, encoder));
@ -335,11 +335,6 @@ public class RedissonSession extends StandardSession {
expireSession();
}
}
public void superSetAttribute(String name, Object value, boolean notify) {
super.setAttribute(name, value, notify);
}
@Override
public void setAttribute(String name, Object value, boolean notify) {

4
redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -324,7 +324,9 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(codecToUse.getMapValueDecoder()), true);
Map<String, Object> attrs = new HashMap<>();
attrs.put(m.getName(), m.getValue(codecToUse.getMapValueDecoder()));
session.load(attrs);
}
} else {
if (msg instanceof SessionCreatedMessage) {

39
redisson-tomcat/redisson-tomcat-11/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -40,6 +40,33 @@ public class RedissonSessionManagerTest {
Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateMaxInactiveInterval(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try {
server1.start();
server2.start();
Executor executor = Executor.newInstance();
BasicCookieStore cookieStore = new BasicCookieStore();
executor.use(cookieStore);
write(8080, executor, "test", "from_server1");
write(8081, executor, "test", "from_server2");
writeInternal(8080, executor, 3000);
readInternal(8081, executor, 3000);
} finally {
Executor.closeIdleConnections();
server1.stop();
server2.stop();
}
}
@ParameterizedTest
@MethodSource("data")
@ -376,6 +403,18 @@ public class RedissonSessionManagerTest {
Assertions.assertEquals(value, response);
}
private void writeInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/writeInternal?value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals("OK", response);
}
private void readInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/readInternal";
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals(value.toString(), response);
}
private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString();

22
redisson-tomcat/redisson-tomcat-11/src/test/java/org/redisson/tomcat/TestServlet.java
Unescape Escape View File

@ -73,7 +73,27 @@ public class TestServlet extends HttpServlet {
Object attr = session.getAttribute(key);
resp.getWriter().print(attr);
} else if (req.getPathInfo().equals("/remove")) {
} else if (req.getPathInfo().equals("/writeInternal")) {
String[] params = req.getQueryString().split("&");
String value = null;
for (String param : params) {
String[] paramLine = param.split("=");
String keyParam = paramLine[0];
String valueParam = paramLine[1];
if ("value".equals(keyParam)) {
value = valueParam;
}
}
if (value == null) {
resp.getWriter().print("ERROR");
} else {
session.setMaxInactiveInterval(Integer.parseInt(value));
resp.getWriter().print("OK");
}
} else if (req.getPathInfo().equals("/readInternal")) {
resp.getWriter().print(session.getMaxInactiveInterval());
} else if (req.getPathInfo().equals("/remove")) {
String[] params = req.getQueryString().split("&");
String key = null;
for (String param : params) {

7
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -258,7 +258,7 @@ public class RedissonSession extends StandardSession {
return;
}
m.fastPut(name, value);
if (readMode == ReadMode.MEMORY && this.broadcastSessionUpdates) {
if (readMode == ReadMode.REDIS || this.broadcastSessionUpdates) {
try {
Encoder encoder = m.getCodec().getMapValueEncoder();
topic.publish(new AttributeUpdateMessage(redissonManager.getNodeId(), getId(), name, value, encoder));
@ -330,11 +330,6 @@ public class RedissonSession extends StandardSession {
expireSession();
}
}
public void superSetAttribute(String name, Object value, boolean notify) {
super.setAttribute(name, value, notify);
}
@Override
public void setAttribute(String name, Object value, boolean notify) {

4
redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -324,7 +324,9 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(codecToUse.getMapValueDecoder()), true);
Map<String, Object> attrs = new HashMap<>();
attrs.put(m.getName(), m.getValue(codecToUse.getMapValueDecoder()));
session.load(attrs);
}
} else {
if (msg instanceof SessionCreatedMessage) {

40
redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -34,6 +34,33 @@ public class RedissonSessionManagerTest {
Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateMaxInactiveInterval(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try {
server1.start();
server2.start();
Executor executor = Executor.newInstance();
BasicCookieStore cookieStore = new BasicCookieStore();
executor.use(cookieStore);
write(8080, executor, "test", "from_server1");
write(8081, executor, "test", "from_server2");
writeInternal(8080, executor, 3000);
readInternal(8081, executor, 3000);
} finally {
Executor.closeIdleConnections();
server1.stop();
server2.stop();
}
}
@ParameterizedTest
@MethodSource("data")
@ -321,6 +348,19 @@ public class RedissonSessionManagerTest {
Assertions.assertEquals(value, response);
}
private void writeInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/writeInternal?value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals("OK", response);
}
private void readInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/readInternal";
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals(value.toString(), response);
}
private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString();

22
redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/TestServlet.java
Unescape Escape View File

@ -48,7 +48,27 @@ public class TestServlet extends HttpServlet {
Object attr = session.getAttribute(key);
resp.getWriter().print(attr);
} else if (req.getPathInfo().equals("/remove")) {
} else if (req.getPathInfo().equals("/writeInternal")) {
String[] params = req.getQueryString().split("&");
String value = null;
for (String param : params) {
String[] paramLine = param.split("=");
String keyParam = paramLine[0];
String valueParam = paramLine[1];
if ("value".equals(keyParam)) {
value = valueParam;
}
}
if (value == null) {
resp.getWriter().print("ERROR");
} else {
session.setMaxInactiveInterval(Integer.parseInt(value));
resp.getWriter().print("OK");
}
} else if (req.getPathInfo().equals("/readInternal")) {
resp.getWriter().print(session.getMaxInactiveInterval());
} else if (req.getPathInfo().equals("/remove")) {
String[] params = req.getQueryString().split("&");
String key = null;
for (String param : params) {

7
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -258,7 +258,7 @@ public class RedissonSession extends StandardSession {
return;
}
m.fastPut(name, value);
if (readMode == ReadMode.MEMORY && this.broadcastSessionUpdates) {
if (readMode == ReadMode.REDIS || this.broadcastSessionUpdates) {
try {
Encoder encoder = m.getCodec().getMapValueEncoder();
topic.publish(new AttributeUpdateMessage(redissonManager.getNodeId(), getId(), name, value, encoder));
@ -330,11 +330,6 @@ public class RedissonSession extends StandardSession {
expireSession();
}
}
public void superSetAttribute(String name, Object value, boolean notify) {
super.setAttribute(name, value, notify);
}
@Override
public void setAttribute(String name, Object value, boolean notify) {

4
redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -324,7 +324,9 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(codecToUse.getMapValueDecoder()), true);
Map<String, Object> attrs = new HashMap<>();
attrs.put(m.getName(), m.getValue(codecToUse.getMapValueDecoder()));
session.load(attrs);
}
} else {
if (msg instanceof SessionCreatedMessage) {

39
redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -34,6 +34,33 @@ public class RedissonSessionManagerTest {
Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateMaxInactiveInterval(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try {
server1.start();
server2.start();
Executor executor = Executor.newInstance();
BasicCookieStore cookieStore = new BasicCookieStore();
executor.use(cookieStore);
write(8080, executor, "test", "from_server1");
write(8081, executor, "test", "from_server2");
writeInternal(8080, executor, 3000);
readInternal(8081, executor, 3000);
} finally {
Executor.closeIdleConnections();
server1.stop();
server2.stop();
}
}
@ParameterizedTest
@MethodSource("data")
@ -321,6 +348,18 @@ public class RedissonSessionManagerTest {
Assertions.assertEquals(value, response);
}
private void writeInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/writeInternal?value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals("OK", response);
}
private void readInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/readInternal";
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals(value.toString(), response);
}
private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString();

22
redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/TestServlet.java
Unescape Escape View File

@ -48,7 +48,27 @@ public class TestServlet extends HttpServlet {
Object attr = session.getAttribute(key);
resp.getWriter().print(attr);
} else if (req.getPathInfo().equals("/remove")) {
} else if (req.getPathInfo().equals("/writeInternal")) {
String[] params = req.getQueryString().split("&");
String value = null;
for (String param : params) {
String[] paramLine = param.split("=");
String keyParam = paramLine[0];
String valueParam = paramLine[1];
if ("value".equals(keyParam)) {
value = valueParam;
}
}
if (value == null) {
resp.getWriter().print("ERROR");
} else {
session.setMaxInactiveInterval(Integer.parseInt(value));
resp.getWriter().print("OK");
}
} else if (req.getPathInfo().equals("/readInternal")) {
resp.getWriter().print(session.getMaxInactiveInterval());
} else if (req.getPathInfo().equals("/remove")) {
String[] params = req.getQueryString().split("&");
String key = null;
for (String param : params) {

7
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSession.java
Unescape Escape View File

@ -258,7 +258,7 @@ public class RedissonSession extends StandardSession {
return;
}
m.fastPut(name, value);
if (readMode == ReadMode.MEMORY && this.broadcastSessionUpdates) {
if (readMode == ReadMode.REDIS || this.broadcastSessionUpdates) {
try {
Encoder encoder = m.getCodec().getMapValueEncoder();
topic.publish(new AttributeUpdateMessage(redissonManager.getNodeId(), getId(), name, value, encoder));
@ -330,11 +330,6 @@ public class RedissonSession extends StandardSession {
expireSession();
}
}
public void superSetAttribute(String name, Object value, boolean notify) {
super.setAttribute(name, value, notify);
}
@Override
public void setAttribute(String name, Object value, boolean notify) {

4
redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java
Unescape Escape View File

@ -332,7 +332,9 @@ public class RedissonSessionManager extends ManagerBase {
if (msg instanceof AttributeUpdateMessage) {
AttributeUpdateMessage m = (AttributeUpdateMessage)msg;
session.superSetAttribute(m.getName(), m.getValue(codecToUse.getMapValueDecoder()), true);
Map<String, Object> attrs = new HashMap<>();
attrs.put(m.getName(), m.getValue(codecToUse.getMapValueDecoder()));
session.load(attrs);
}
} else {
if (msg instanceof SessionCreatedMessage) {

41
redisson-tomcat/redisson-tomcat-9/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -53,7 +53,34 @@ public class RedissonSessionManagerTest {
return redissonSessionManager;
}
@ParameterizedTest
@MethodSource("data")
public void testUpdateMaxInactiveInterval(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try {
server1.start();
server2.start();
Executor executor = Executor.newInstance();
BasicCookieStore cookieStore = new BasicCookieStore();
executor.use(cookieStore);
write(8080, executor, "test", "from_server1");
write(8081, executor, "test", "from_server2");
writeInternal(8080, executor, 3000);
readInternal(8081, executor, 3000);
} finally {
Executor.closeIdleConnections();
server1.stop();
server2.stop();
}
}
@Test
public void testProgrammaticManagerConfigurationUpdateTwoServers_readValue() throws Exception {
prepare("context_empty.xml");
@ -368,6 +395,18 @@ public class RedissonSessionManagerTest {
Assertions.assertEquals(value, response);
}
private void writeInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/writeInternal?value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals("OK", response);
}
private void readInternal(int port, Executor executor, Object value) throws IOException {
String url = "http://localhost:" + port + "/myapp/readInternal";
String response = executor.execute(Request.Get(url)).returnContent().asString();
Assertions.assertEquals(value.toString(), response);
}
private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString();

22
redisson-tomcat/redisson-tomcat-9/src/test/java/org/redisson/tomcat/TestServlet.java
Unescape Escape View File

@ -48,7 +48,27 @@ public class TestServlet extends HttpServlet {
Object attr = session.getAttribute(key);
resp.getWriter().print(attr);
} else if (req.getPathInfo().equals("/remove")) {
} else if (req.getPathInfo().equals("/writeInternal")) {
String[] params = req.getQueryString().split("&");
String value = null;
for (String param : params) {
String[] paramLine = param.split("=");
String keyParam = paramLine[0];
String valueParam = paramLine[1];
if ("value".equals(keyParam)) {
value = valueParam;
}
}
if (value == null) {
resp.getWriter().print("ERROR");
} else {
session.setMaxInactiveInterval(Integer.parseInt(value));
resp.getWriter().print("OK");
}
} else if (req.getPathInfo().equals("/readInternal")) {
resp.getWriter().print(session.getMaxInactiveInterval());
} else if (req.getPathInfo().equals("/remove")) {
String[] params = req.getQueryString().split("&");
String key = null;
for (String param : params) {

Write Preview
Loading…
Cancel
Save