feature: seata client support jdk17 (apache#4877)

conghuhu · Oct 24, 2022 · 83ac9f3 · 83ac9f3
1 parent f56b02c
commit 83ac9f3
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 25 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -411,8 +411,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>

diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -7,6 +7,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4863](https://github.com/seata/seata/pull/4863)] support oracle and postgresql multi primary key
 - [[#4649](https://github.com/seata/seata/pull/4649)] seata-server support multiple registry
 - [[#4479](https://github.com/seata/seata/pull/4479)] TCC mode supports tcc annotation marked on both interface and implementation class
+- [[#4877](https://github.com/seata/seata/pull/4877)] seata client support jdk17
 - [[#4468](https://github.com/seata/seata/pull/4968)] support kryo 5.3.0
 
 

diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -7,9 +7,11 @@
 - [[#4863](https://github.com/seata/seata/pull/4863)] support oracle and postgresql multi primary key
 - [[#4649](https://github.com/seata/seata/pull/4649)] seata-server支持多注册中心
 - [[#4479](https://github.com/seata/seata/pull/4479)] TCC注解支持添加在实现类及其方法上也生效
+- [[#4877](https://github.com/seata/seata/pull/4877)] seata client支持jdk17
 - [[#4468](https://github.com/seata/seata/pull/4968)] 支持kryo 5.3.0
 
 
+
 ### bugfix：
 - [[#4780](https://github.com/seata/seata/pull/4780)] 修复超时回滚成功后无法发送TimeoutRollbacked事件
 - [[#4954](https://github.com/seata/seata/pull/4954)] 修复output表达式错误时，保存执行结果空指针异常

diff --git a/config/seata-config-core/pom.xml b/config/seata-config-core/pom.xml
@@ -41,8 +41,8 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationCache.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationCache.java
@@ -24,8 +24,9 @@
 import io.seata.common.util.CollectionUtils;
 import io.seata.common.util.DurationUtil;
 import io.seata.common.util.StringUtils;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.implementation.InvocationHandlerAdapter;
+import net.bytebuddy.matcher.ElementMatchers;
 
 /**
  * @author funkye
@@ -100,19 +101,22 @@ public void onChangeEvent(ConfigurationChangeEvent event) {
         }
     }
 
-    public Configuration proxy(Configuration originalConfiguration) {
-        return (Configuration)Enhancer.create(Configuration.class,
-            (MethodInterceptor)(proxy, method, args, methodProxy) -> {
-                if (method.getName().startsWith(METHOD_PREFIX)
-                        && !method.getName().equalsIgnoreCase(METHOD_LATEST_CONFIG)) {
+    public Configuration proxy(Configuration originalConfiguration) throws Exception {
+        return new ByteBuddy().subclass(Configuration.class).method(ElementMatchers.any())
+            .intercept(InvocationHandlerAdapter.of((proxy, method, args) -> {
+                String methodName = method.getName();
+                if (methodName.startsWith(METHOD_PREFIX) && !method.getName().equalsIgnoreCase(METHOD_LATEST_CONFIG)) {
                     String rawDataId = (String)args[0];
                     ObjectWrapper wrapper = CONFIG_CACHE.get(rawDataId);
-                    ObjectWrapper.ConfigType type = ObjectWrapper.getTypeByName(method.getName().substring(METHOD_PREFIX.length()));
+                    ObjectWrapper.ConfigType type =
+                        ObjectWrapper.getTypeByName(method.getName().substring(METHOD_PREFIX.length()));
                     Object defaultValue = null;
-                    if (args.length > 1 && method.getParameterTypes()[1].getSimpleName().equalsIgnoreCase(type.name())) {
+                    if (args.length > 1
+                        && method.getParameterTypes()[1].getSimpleName().equalsIgnoreCase(type.name())) {
                         defaultValue = args[1];
                     }
-                    if (null == wrapper || (null != defaultValue && !Objects.equals(defaultValue, wrapper.lastDefaultValue))) {
+                    if (null == wrapper
+                        || (null != defaultValue && !Objects.equals(defaultValue, wrapper.lastDefaultValue))) {
                         Object result = method.invoke(originalConfiguration, args);
                         // The wrapper.data only exists in the cache when it is not null.
                         if (result != null) {
@@ -123,7 +127,8 @@ public Configuration proxy(Configuration originalConfiguration) {
                     return wrapper == null ? null : wrapper.convertData(type);
                 }
                 return method.invoke(originalConfiguration, args);
-            });
+            })).make().load(originalConfiguration.getClass().getClassLoader()).getLoaded().getDeclaredConstructor()
+            .newInstance();
     }
 
     private static class ConfigurationCacheInstance {
@@ -244,7 +249,8 @@ public String getCode() {
             }
 
             public static ConfigType fromCode(String code) {
-                return CODE_TO_VALUE.get(code.toUpperCase());
+                ConfigType configType = CODE_TO_VALUE.get(code.toUpperCase());
+                return configType == null ? ConfigType.STRING : configType;
             }
 
             public static ConfigType fromName(String name) {

diff --git a/config/seata-config-core/src/test/java/io/seata/config/FileConfigurationTest.java b/config/seata-config-core/src/test/java/io/seata/config/FileConfigurationTest.java
@@ -16,6 +16,7 @@
 package io.seata.config;
 
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +47,7 @@ void addConfigListener() throws InterruptedException {
             countDownLatch.countDown();
         });
         System.setProperty("service.disableGlobalTransaction", String.valueOf(!value));
-        countDownLatch.await();
+        countDownLatch.await(5, TimeUnit.SECONDS);
         System.setProperty("file.listener.enabled", "false");
         System.setProperty("service.disableGlobalTransaction", String.valueOf(value));
         Thread.sleep(2000);

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -35,14 +35,14 @@
         <dubbo-seata.version>1.0.0</dubbo-seata.version>
         <brpc.version>2.5.9</brpc.version>
         <hsf.version>1.8.3</hsf.version>
+        <bytebuddy.version>1.12.13</bytebuddy.version>
         <dubbo.alibaba.version>2.6.5</dubbo.alibaba.version>
         <sofa.rpc.version>5.5.3</sofa.rpc.version>
         <fastjson.version>1.2.83</fastjson.version>
         <protostuff.version>1.5.9</protostuff.version>
         <config.version>1.2.1</config.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <cglib.version>3.1</cglib.version>
         <aopalliance.version>1.0</aopalliance.version>
         <zkclient.version>0.11</zkclient.version>
         <apache-zookeeper.version>3.5.9</apache-zookeeper.version>
@@ -247,9 +247,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib</artifactId>
-                <version>${cglib.version}</version>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${bytebuddy.version}</version>
             </dependency>
             <dependency>
                 <groupId>aopalliance</groupId>

diff --git a/spring/pom.xml b/spring/pom.xml
@@ -54,10 +54,6 @@
             <artifactId>seata-serializer-all</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-        </dependency>
 
         <!-- spring  -->
         <dependency>