Bump org.redisson:redisson from 3.17.3 to 3.30.0 (#4924)

* Bump org.redisson:redisson from 3.17.3 to 3.30.0 Bumps [org.redisson:redisson](https://github.com/redisson/redisson) from 3.17.3 to 3.30.0. - [Release notes](https://github.com/redisson/redisson/releases) - [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) - [Commits](redisson/redisson@redisson-3.17.3...redisson-3.30.0) --- updated-dependencies: - dependency-name: org.redisson:redisson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * manual upgrade * Update dependency that are no longer maintained * Streamline build command * Fix address in use and try to fix countDownLatch await blocking * Update deprecated ENV --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pil0tXia <[email protected]>
apache · Jun 3, 2024 · 499aa7a · 499aa7a
1 parent e520848
commit 499aa7a
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 53 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,7 +59,7 @@ jobs:
       - name: GenerateGrammarSource
         run: ./gradlew clean generateGrammarSource --parallel --daemon --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
@@ -69,14 +69,16 @@ jobs:
 
       # https://docs.gradle.org/current/userguide/performance.html
       - name: Build
-        run: ./gradlew clean build dist jacocoTestReport -x spotlessJava -x generateGrammarSource --parallel --daemon --scan
+        run: >
+          ./gradlew clean build dist jacocoTestReport --parallel --daemon --scan
+          -x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Install plugin
         run: ./gradlew installPlugin --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Upload coverage report to codecov.io
         run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
@@ -68,7 +68,7 @@ jobs:
         if: matrix.language == 'java'
         run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3
diff --git a/eventmesh-connectors/eventmesh-connector-redis/build.gradle b/eventmesh-connectors/eventmesh-connector-redis/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation project(":eventmesh-common")
     implementation project(":eventmesh-openconnect:eventmesh-openconnect-java")
 
-    implementation 'org.redisson:redisson:3.17.3'
+    implementation 'org.redisson:redisson:3.30.0'
 
     api 'io.cloudevents:cloudevents-json-jackson'
 

diff --git a/eventmesh-storage-plugin/eventmesh-storage-redis/build.gradle b/eventmesh-storage-plugin/eventmesh-storage-redis/build.gradle
@@ -20,24 +20,16 @@ dependencies {
     implementation project(":eventmesh-storage-plugin:eventmesh-storage-api")
 
     // redisson
-    implementation('org.redisson:redisson:3.17.3') {
-        exclude group: 'io.netty', module: 'netty-common'
-        exclude group: 'io.netty', module: 'netty-buffer'
-        exclude group: 'io.netty', module: 'netty-codec'
-        exclude group: 'io.netty', module: 'netty-transport'
-        exclude group: 'io.netty', module: 'netty-resolver'
-        exclude group: 'io.netty', module: 'netty-resolver-dns'
-        exclude group: 'io.netty', module: 'netty-handler'
-    }
+    implementation 'org.redisson:redisson:3.30.0'
 
     // netty
-    implementation "io.netty:netty-all"
+    implementation 'io.netty:netty-all'
 
     // auxiliary serialize
     api 'io.cloudevents:cloudevents-json-jackson'
 
     // test dependencies
-    testImplementation 'ai.grakn:redis-mock:0.1.6'
+    testImplementation 'com.github.fppt:jedis-mock:1.1.1'
     testImplementation "org.mockito:mockito-core"
 
     compileOnly 'org.projectlombok:lombok'

diff --git a/eventmesh-storage-plugin/eventmesh-storage-redis/gradle.properties b/eventmesh-storage-plugin/eventmesh-storage-redis/gradle.properties
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

diff --git a/...storage-redis/src/main/java/org/apache/eventmesh/storage/redis/client/RedissonClient.java b/...storage-redis/src/main/java/org/apache/eventmesh/storage/redis/client/RedissonClient.java
@@ -73,18 +73,15 @@ private static Redisson create(RedisProperties properties) {
             throw new StorageRuntimeException(message, ie);
         }
 
+        Config config = new Config();
+        config.setCodec(CloudEventCodec.getInstance());
+        config.setThreads(properties.getRedissonThreads());
+        config.setNettyThreads(properties.getRedissonNettyThreads());
+
         String serverAddress = properties.getServerAddress();
         String serverPassword = properties.getServerPassword();
         String masterName = properties.getServerMasterName();
 
-        Config config = OBJECT_MAPPER.convertValue(properties.getRedissonProperties(), Config.class);
-
-        if (config == null) {
-            config = new Config();
-        }
-
-        config.setCodec(CloudEventCodec.getInstance());
-
         switch (serverType) {
             case SINGLE:
                 config.useSingleServer()

diff --git a/...torage-redis/src/main/java/org/apache/eventmesh/storage/redis/config/RedisProperties.java b/...torage-redis/src/main/java/org/apache/eventmesh/storage/redis/config/RedisProperties.java
@@ -20,8 +20,6 @@
 import org.apache.eventmesh.common.config.Config;
 import org.apache.eventmesh.common.config.ConfigField;
 
-import java.util.Properties;
-
 import lombok.Data;
 
 @Data
@@ -44,7 +42,7 @@ public class RedisProperties {
      * The address of the redis server following format -- host1:port1,host2:port2,……
      */
     @ConfigField(field = "serverAddress")
-    private String serverAddress;
+    private String serverAddress = "redis://127.0.0.1:6379";
 
     /**
      * The password for redis authentication.
@@ -55,8 +53,11 @@ public class RedisProperties {
     /**
      * The redisson options, redisson properties prefix is `eventMesh.server.redis.redisson`
      */
-    @ConfigField(field = "redisson")
-    private Properties redissonProperties;
+    @ConfigField(field = "redisson.threads")
+    private int redissonThreads = 16;
+
+    @ConfigField(field = "redisson.nettyThreads")
+    private int redissonNettyThreads = 32;
 
     public enum ServerType {
         SINGLE,

diff --git a/eventmesh-storage-plugin/eventmesh-storage-redis/src/main/resources/redis-client.properties b/eventmesh-storage-plugin/eventmesh-storage-redis/src/main/resources/redis-client.properties
@@ -15,5 +15,9 @@
 # limitations under the License.
 #
 
-eventMesh.server.redis.serverAddress=
+eventMesh.server.redis.serverAddress=redis://127.0.0.1:6379
 eventMesh.server.redis.serverPassword=
+eventMesh.server.redis.serverType=SINGLE
+eventMesh.server.redis.serverMasterName=master
+eventMesh.server.redis.redisson.threads=
+eventMesh.server.redis.redisson.nettyThreads=
diff --git a/...h-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/AbstractRedisServer.java b/...h-storage-redis/src/test/java/org/apache/eventmesh/storage/redis/AbstractRedisServer.java
@@ -17,25 +17,19 @@
 
 package org.apache.eventmesh.storage.redis;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import java.io.IOException;
 
-import ai.grakn.redismock.RedisServer;
+import com.github.fppt.jedismock.RedisServer;
 
 public abstract class AbstractRedisServer {
 
-    private static RedisServer redisServer;
+    private static final RedisServer redisServer;
 
-    @BeforeAll
-    public static void setupRedisServer() throws Exception {
-        redisServer = RedisServer.newRedisServer(6379);
-        redisServer.start();
-    }
-
-    @AfterAll
-    public static void shutdownRedisServer() {
-        if (redisServer != null) {
-            redisServer.stop();
+    static {
+        try {
+            redisServer = RedisServer.newRedisServer(6379).start();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
 }
diff --git a/...ge-redis/src/test/java/org/apache/eventmesh/storage/redis/config/RedisPropertiesTest.java b/...ge-redis/src/test/java/org/apache/eventmesh/storage/redis/config/RedisPropertiesTest.java
@@ -19,8 +19,6 @@
 
 import org.apache.eventmesh.common.config.ConfigService;
 
-import java.util.Properties;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -37,11 +35,7 @@ private void assertConfig(RedisProperties config) {
         Assertions.assertEquals("redis://127.0.0.1:6379", config.getServerAddress());
         Assertions.assertEquals(RedisProperties.ServerType.SINGLE, config.getServerType());
         Assertions.assertEquals("serverMasterName-success!!!", config.getServerMasterName());
-
-        Properties properties = new Properties();
-        properties.put("threads", "2");
-        properties.put("nettyThreads", "2");
-        Properties redissonProperties = config.getRedissonProperties();
-        Assertions.assertEquals(properties, redissonProperties);
+        Assertions.assertEquals(2, config.getRedissonThreads());
+        Assertions.assertEquals(2, config.getRedissonNettyThreads());
     }
 }