upgrade org.redisson:redisson from 3.16.6 to 3.27.1

dengliming · dengliming · commit b8a1619e2596 · 2024-03-10T02:11:48.000+08:00
diff --git a/commons/src/main/java/io/github/dengliming/redismodule/common/BaseRedissonClient.java b/commons/src/main/java/io/github/dengliming/redismodule/common/BaseRedissonClient.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024 dengliming.
+ *
+ * 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 io.github.dengliming.redismodule.common;
+
+import org.redisson.Redisson;
+import org.redisson.client.protocol.RedisCommands;
+import org.redisson.command.CommandAsyncExecutor;
+import org.redisson.config.Config;
+
+public abstract class BaseRedissonClient {
+    private final Redisson redisson;
+
+    protected BaseRedissonClient(Config config) {
+        this.redisson = (Redisson) Redisson.create(config);
+    }
+
+    public Void flushall() {
+        CommandAsyncExecutor commandExecutor = redisson.getCommandExecutor();
+        return commandExecutor.get(commandExecutor.writeAllVoidAsync(RedisCommands.FLUSHALL));
+    }
+
+    public void shutdown() {
+        redisson.shutdown();
+    }
+
+    public Redisson getRedisson() {
+        return redisson;
+    }
+
+    public CommandAsyncExecutor getCommandExecutor() {
+        return redisson.getCommandExecutor();
+    }
+}
diff --git a/commons/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditionClient.java b/commons/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditionClient.java
@@ -16,11 +16,11 @@
 
 package io.github.dengliming.redismodule.common.test;
 
-import org.redisson.Redisson;
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
-public class RedisConditionClient extends Redisson {
+public class RedisConditionClient extends BaseRedissonClient {
 
     public RedisConditionClient(Config config) {
         super(config);
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <redisson.version>3.16.6</redisson.version>
+        <redisson.version>3.27.1</redisson.version>
         <junit.version>5.6.2</junit.version>
         <java.version>1.8</java.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
diff --git a/redisai/src/main/java/io/github/dengliming/redismodule/redisai/RedisAI.java b/redisai/src/main/java/io/github/dengliming/redismodule/redisai/RedisAI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public class RedisAI {
 
     public RedisAI(CommandAsyncExecutor commandExecutor) {
         this.commandExecutor = commandExecutor;
-        this.codec = commandExecutor.getConnectionManager().getCodec();
+        this.codec = commandExecutor.getServiceManager().getCfg().getCodec();
     }
 
     /**
diff --git a/redisai/src/main/java/io/github/dengliming/redismodule/redisai/client/RedisAIClient.java b/redisai/src/main/java/io/github/dengliming/redismodule/redisai/client/RedisAIClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,14 @@
 
 package io.github.dengliming.redismodule.redisai.client;
 
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import io.github.dengliming.redismodule.redisai.RedisAI;
-import org.redisson.Redisson;
-import org.redisson.client.protocol.RedisCommands;
-import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
 /**
  * @author dengliming
  */
-public class RedisAIClient extends Redisson {
-
+public class RedisAIClient extends BaseRedissonClient {
     public RedisAIClient(Config config) {
         super(config);
     }
@@ -35,8 +32,4 @@ public RedisAI getRedisAI() {
         return new RedisAI(getCommandExecutor());
     }
 
-    public Void flushall() {
-        CommandAsyncExecutor commandExecutor = getCommandExecutor();
-        return commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
 }
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/BloomFilter.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/BloomFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public BloomFilter(Codec codec, CommandAsyncExecutor commandExecutor, String nam
     }
 
     public BloomFilter(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     /**
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/CountMinSketch.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/CountMinSketch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public CountMinSketch(Codec codec, CommandAsyncExecutor commandExecutor, String
     }
 
     public CountMinSketch(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     /**
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/CuckooFilter.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/CuckooFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public CuckooFilter(Codec codec, CommandAsyncExecutor commandExecutor, String na
     }
 
     public CuckooFilter(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     /**
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/TDigest.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/TDigest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 dengliming.
+ * Copyright 2021-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public TDigest(Codec codec, CommandAsyncExecutor commandExecutor, String name) {
     }
 
     public TDigest(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     /**
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/TopKFilter.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/TopKFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
 public class TopKFilter extends RedissonObject {
 
     public TopKFilter(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     public TopKFilter(Codec codec, CommandAsyncExecutor commandExecutor, String name) {
diff --git a/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/client/RedisBloomClient.java b/redisbloom/src/main/java/io/github/dengliming/redismodule/redisbloom/client/RedisBloomClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,18 @@
 
 package io.github.dengliming.redismodule.redisbloom.client;
 
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import io.github.dengliming.redismodule.redisbloom.BloomFilter;
 import io.github.dengliming.redismodule.redisbloom.CountMinSketch;
 import io.github.dengliming.redismodule.redisbloom.CuckooFilter;
 import io.github.dengliming.redismodule.redisbloom.TDigest;
 import io.github.dengliming.redismodule.redisbloom.TopKFilter;
-import org.redisson.Redisson;
-import org.redisson.client.protocol.RedisCommands;
-import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
 /**
  * @author dengliming
  */
-public class RedisBloomClient extends Redisson {
+public class RedisBloomClient extends BaseRedissonClient {
 
     public RedisBloomClient(Config config) {
         super(config);
@@ -54,9 +52,4 @@ public TopKFilter getTopKFilter(String name) {
     public TDigest getTDigest(String name) {
         return new TDigest(getCommandExecutor(), name);
     }
-
-    public Void flushall() {
-        CommandAsyncExecutor commandExecutor = getCommandExecutor();
-        return commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
 }
diff --git a/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/RediSearch.java b/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/RediSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public RediSearch(Codec codec, CommandAsyncExecutor commandExecutor, String name
     }
 
     public RediSearch(CommandAsyncExecutor commandExecutor, String name) {
-        this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);
+        this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);
     }
 
     /**
diff --git a/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/client/RediSearchClient.java b/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/client/RediSearchClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dengliming.
+ * Copyright 2020-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,14 @@
 
 package io.github.dengliming.redismodule.redisearch.client;
 
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import io.github.dengliming.redismodule.redisearch.RediSearch;
-import org.redisson.Redisson;
-import org.redisson.client.protocol.RedisCommands;
-import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
 /**
  * @author dengliming
  */
-public class RediSearchClient extends Redisson {
+public class RediSearchClient extends BaseRedissonClient {
 
     public RediSearchClient(Config config) {
         super(config);
@@ -34,9 +32,4 @@ public RediSearchClient(Config config) {
     public RediSearch getRediSearch(String name) {
         return new RediSearch(getCommandExecutor(), name);
     }
-
-    public Void flushall() {
-        CommandAsyncExecutor commandExecutor = getCommandExecutor();
-        return commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
 }
diff --git a/redisearch/src/test/java/io/github/dengliming/redismodule/redisearch/RediSearchTest.java b/redisearch/src/test/java/io/github/dengliming/redismodule/redisearch/RediSearchTest.java
@@ -103,7 +103,7 @@ public void testAddHash() {
         assertThat(rediSearch.createIndex(new Schema().addField(new TextField("title")))).isTrue();
         Map<String, Object> fields = new HashMap<>();
         fields.put("title", "hello world");
-        RMap<String, Object> map = getRediSearchClient().getMap("foo");
+        RMap<String, Object> map = getRediSearchClient().getRedisson().getMap("foo");
         map.putAll(fields);
         assertThat(rediSearch.addHash("foo", 1, RSLanguage.ENGLISH)).isTrue();
     }
diff --git a/redisgears/src/main/java/io/github/dengliming/redismodule/redisgears/client/RedisGearsClient.java b/redisgears/src/main/java/io/github/dengliming/redismodule/redisgears/client/RedisGearsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 dengliming.
+ * Copyright 2021-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 
 package io.github.dengliming.redismodule.redisgears.client;
 
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import io.github.dengliming.redismodule.redisgears.RedisGears;
-import org.redisson.Redisson;
-import org.redisson.client.protocol.RedisCommands;
-import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
-public class RedisGearsClient extends Redisson {
+public class RedisGearsClient extends BaseRedissonClient {
 
     public RedisGearsClient(Config config) {
         super(config);
@@ -31,9 +29,4 @@ public RedisGearsClient(Config config) {
     public RedisGears getRedisGears() {
         return new RedisGears(getCommandExecutor());
     }
-
-    public Void flushall() {
-        CommandAsyncExecutor commandExecutor = getCommandExecutor();
-        return commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
 }
diff --git a/redisgraph/src/main/java/io/github/dengliming/redismodule/redisgraph/RedisGraph.java b/redisgraph/src/main/java/io/github/dengliming/redismodule/redisgraph/RedisGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 dengliming.
+ * Copyright 2022-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class RedisGraph {
     private final Codec codec;
 
     public RedisGraph(CommandAsyncExecutor commandExecutor) {
-        this(commandExecutor, commandExecutor.getConnectionManager().getCodec());
+        this(commandExecutor, commandExecutor.getServiceManager().getCfg().getCodec());
     }
 
     public RedisGraph(CommandAsyncExecutor commandExecutor, Codec codec) {
diff --git a/redisgraph/src/main/java/io/github/dengliming/redismodule/redisgraph/client/RedisGraphClient.java b/redisgraph/src/main/java/io/github/dengliming/redismodule/redisgraph/client/RedisGraphClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 dengliming.
+ * Copyright 2022-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,13 @@
 
 package io.github.dengliming.redismodule.redisgraph.client;
 
+import io.github.dengliming.redismodule.common.BaseRedissonClient;
 import io.github.dengliming.redismodule.redisgraph.RedisGraph;
 import io.github.dengliming.redismodule.redisgraph.RedisGraphBatch;
-import org.redisson.Redisson;
 import org.redisson.api.BatchOptions;
-import org.redisson.client.protocol.RedisCommands;
-import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.config.Config;
 
-public class RedisGraphClient extends Redisson {
+public class RedisGraphClient extends BaseRedissonClient {
 
     public RedisGraphClient(Config config) {
         super(config);
@@ -41,9 +39,4 @@ public RedisGraphBatch createRedisGraphBatch() {
     public RedisGraphBatch createRedisGraphBatch(BatchOptions options) {
         return new RedisGraphBatch(getCommandExecutor(), options);
     }
-
-    public Void flushall() {
-        CommandAsyncExecutor commandExecutor = getCommandExecutor();
-        return commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
-    }
 }
diff --git a/redisjson/src/main/java/io/github/dengliming/redismodule/redisjson/RedisJSON.java b/redisjson/src/main/java/io/github/dengliming/redismodule/redisjson/RedisJSON.java
diff --git a/redisjson/src/main/java/io/github/dengliming/redismodule/redisjson/client/RedisJSONClient.java b/redisjson/src/main/java/io/github/dengliming/redismodule/redisjson/client/RedisJSONClient.java
diff --git a/redistimeseries/src/main/java/io/github/dengliming/redismodule/redistimeseries/RedisTimeSeries.java b/redistimeseries/src/main/java/io/github/dengliming/redismodule/redistimeseries/RedisTimeSeries.java
diff --git a/redistimeseries/src/main/java/io/github/dengliming/redismodule/redistimeseries/client/RedisTimeSeriesClient.java b/redistimeseries/src/main/java/io/github/dengliming/redismodule/redistimeseries/client/RedisTimeSeriesClient.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020 dengliming.`
	`2`	`+ * Copyright 2020-2024 dengliming.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -57,7 +57,7 @@ public class RedisAI {`
`57`	`57`
`58`	`58`	`public RedisAI(CommandAsyncExecutor commandExecutor) {`
`59`	`59`	`this.commandExecutor = commandExecutor;`
`60`		`- this.codec = commandExecutor.getConnectionManager().getCodec();`
	`60`	`+ this.codec = commandExecutor.getServiceManager().getCfg().getCodec();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021-2022 dengliming.`
	`2`	`+ * Copyright 2021-2024 dengliming.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -51,7 +51,7 @@ public TDigest(Codec codec, CommandAsyncExecutor commandExecutor, String name) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public TDigest(CommandAsyncExecutor commandExecutor, String name) {`
`54`		`- this(commandExecutor.getConnectionManager().getCodec(), commandExecutor, name);`
	`54`	`+ this(commandExecutor.getServiceManager().getCfg().getCodec(), commandExecutor, name);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`