Upgrade supported JDK version to 11 (#842)

sofastack · Jul 27, 2021 · 11db148 · 11db148
1 parent c941f18
commit 11db148
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 87 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -11,14 +11,16 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
-
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        jdk: [8, 11]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: ${{ matrix.jdk }}
     - name: Install Zookeeper
       run: echo "Install Zookeeper 3.5.6"
         && wget https://archive.apache.org/dist/zookeeper/zookeeper-3.5.6/apache-zookeeper-3.5.6-bin.tar.gz

diff --git a/...sofa-boot/src/test/java/com/alipay/sofa/isle/test/util/SeparateClassLoaderTestRunner.java b/...sofa-boot/src/test/java/com/alipay/sofa/isle/test/util/SeparateClassLoaderTestRunner.java
@@ -17,7 +17,9 @@
 package com.alipay.sofa.isle.test.util;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.net.URLClassLoader;
 
 import org.junit.runner.notification.RunNotifier;
@@ -81,7 +83,19 @@ public static AddCustomJar getAddCustomJarAnnotationRecursively(Class<?> klass)
 
     public static class SeparateClassLoader extends URLClassLoader {
         public SeparateClassLoader() {
-            super(((URLClassLoader) getSystemClassLoader()).getURLs(), null);
+            super(new URL[0], null);
+
+            try {
+                Field f = getSystemClassLoader().getClass().getDeclaredField("ucp");
+                f.setAccessible(true);
+                Object path = f.get(getSystemClassLoader());
+                Method m = path.getClass().getDeclaredMethod("getURLs");
+                for (URL url : (URL[]) m.invoke(path)) {
+                    addURL(url);
+                }
+            } catch (Throwable e) {
+                // ignore
+            }
         }
 
         @Override

diff --git a/...core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/binding/RpcBinding.java b/...core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/binding/RpcBinding.java
@@ -111,7 +111,7 @@ public HealthResult healthCheck() {
     }
 
     /**
-     * Getter method for property <tt>appName</tt>.
+     * Getter method for property <code>appName</code>.
      *
      * @return property value of appName
      */
@@ -120,7 +120,7 @@ public String getAppName() {
     }
 
     /**
-     * Setter method for property <tt>appName</tt>.
+     * Setter method for property <code>appName</code>.
      *
      * @param appName value to be assigned to property appName
      */
@@ -129,7 +129,7 @@ public void setAppName(String appName) {
     }
 
     /**
-     * Getter method for property <tt>beanId</tt>.
+     * Getter method for property <code>beanId</code>.
      *
      * @return property value of beanId
      */
@@ -138,7 +138,7 @@ public String getBeanId() {
     }
 
     /**
-     * Setter method for property <tt>beanId</tt>.
+     * Setter method for property <code>beanId</code>.
      *
      * @param beanId value to be assigned to property beanId
      */
@@ -147,7 +147,7 @@ public void setBeanId(String beanId) {
     }
 
     /**
-     * Getter method for property <tt>rpcBindingParam</tt>.
+     * Getter method for property <code>rpcBindingParam</code>.
      *
      * @return property value of rpcBindingParam
      */
@@ -156,7 +156,7 @@ public RpcBindingParam getRpcBindingParam() {
     }
 
     /**
-     * Setter method for property <tt>rpcBindingParam</tt>.
+     * Setter method for property <code>rpcBindingParam</code>.
      *
      * @param rpcBindingParam value to be assigned to property rpcBindingParam
      */
@@ -165,7 +165,7 @@ public void setRpcBindingParam(RpcBindingParam rpcBindingParam) {
     }
 
     /**
-     * Getter method for property <tt>applicationContext</tt>.
+     * Getter method for property <code>applicationContext</code>.
      *
      * @return property value of applicationContext
      */
@@ -174,7 +174,7 @@ public ApplicationContext getApplicationContext() {
     }
 
     /**
-     * Setter method for property <tt>applicationContext</tt>.
+     * Setter method for property <code>applicationContext</code>.
      *
      * @param applicationContext value to be assigned to property applicationContext
      */
@@ -183,7 +183,7 @@ public void setApplicationContext(ApplicationContext applicationContext) {
     }
 
     /**
-     * Getter method for property <tt>inBinding</tt>.
+     * Getter method for property <code>inBinding</code>.
      *
      * @return property value of inBinding
      */
@@ -192,7 +192,7 @@ public boolean isInBinding() {
     }
 
     /**
-     * Setter method for property <tt>inBinding</tt>.
+     * Setter method for property <code>inBinding</code>.
      *
      * @param inBinding value to be assigned to property inBinding
      */
@@ -201,7 +201,7 @@ public void setInBinding(boolean inBinding) {
     }
 
     /**
-     * Getter method for property <tt>consumerConfig</tt>.
+     * Getter method for property <code>consumerConfig</code>.
      *
      * @return property value of consumerConfig
      */
@@ -210,7 +210,7 @@ public ConsumerConfig getConsumerConfig() {
     }
 
     /**
-     * Setter method for property <tt>consumerConfig</tt>.
+     * Setter method for property <code>consumerConfig</code>.
      *
      * @param consumerConfig value to be assigned to property consumerConfig
      */

diff --git a/...ofa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/binding/RpcBindingMethodInfo.java b/...ofa-boot/src/main/java/com/alipay/sofa/rpc/boot/runtime/binding/RpcBindingMethodInfo.java
@@ -38,7 +38,7 @@ public class RpcBindingMethodInfo {
     private Object  callbackHandler;
 
     /**
-     * Getter method for property <tt>name</tt>.
+     * Getter method for property <code>name</code>.
      *
      * @return property value of name
      */
@@ -47,7 +47,7 @@ public String getName() {
     }
 
     /**
-     * Setter method for property <tt>name</tt>.
+     * Setter method for property <code>name</code>.
      *
      * @param name  value to be assigned to property name
      */
@@ -56,7 +56,7 @@ public void setName(String name) {
     }
 
     /**
-     * Getter method for property <tt>type</tt>.
+     * Getter method for property <code>type</code>.
      *
      * @return property value of type
      */
@@ -65,7 +65,7 @@ public String getType() {
     }
 
     /**
-     * Setter method for property <tt>type</tt>.
+     * Setter method for property <code>type</code>.
      *
      * @param type  value to be assigned to property type
      */
@@ -74,7 +74,7 @@ public void setType(String type) {
     }
 
     /**
-     * Getter method for property <tt>timeout</tt>.
+     * Getter method for property <code>timeout</code>.
      *
      * @return property value of timeout
      */
@@ -83,7 +83,7 @@ public Integer getTimeout() {
     }
 
     /**
-     * Setter method for property <tt>timeout</tt>.
+     * Setter method for property <code>timeout</code>.
      *
      * @param timeout  value to be assigned to property timeout
      */
@@ -92,7 +92,7 @@ public void setTimeout(Integer timeout) {
     }
 
     /**
-     * Getter method for property <tt>retries</tt>.
+     * Getter method for property <code>retries</code>.
      *
      * @return property value of retries
      */
@@ -101,7 +101,7 @@ public Integer getRetries() {
     }
 
     /**
-     * Setter method for property <tt>retries</tt>.
+     * Setter method for property <code>retries</code>.
      *
      * @param retries  value to be assigned to property retries
      */
@@ -110,7 +110,7 @@ public void setRetries(Integer retries) {
     }
 
     /**
-     * Getter method for property <tt>callbackClass</tt>.
+     * Getter method for property <code>callbackClass</code>.
      *
      * @return property value of callbackClass
      */
@@ -119,7 +119,7 @@ public String getCallbackClass() {
     }
 
     /**
-     * Setter method for property <tt>callbackClass</tt>.
+     * Setter method for property <code>callbackClass</code>.
      *
      * @param callbackClass  value to be assigned to property callbackClass
      */
@@ -128,7 +128,7 @@ public void setCallbackClass(String callbackClass) {
     }
 
     /**
-     * Getter method for property <tt>callbackRef</tt>.
+     * Getter method for property <code>callbackRef</code>.
      *
      * @return property value of callbackRef
      */
@@ -137,7 +137,7 @@ public String getCallbackRef() {
     }
 
     /**
-     * Setter method for property <tt>callbackRef</tt>.
+     * Setter method for property <code>callbackRef</code>.
      *
      * @param callbackRef  value to be assigned to property callbackRef
      */
@@ -146,7 +146,7 @@ public void setCallbackRef(String callbackRef) {
     }
 
     /**
-     * Getter method for property <tt>callbackHandler</tt>.
+     * Getter method for property <code>callbackHandler</code>.
      *
      * @return property value of callbackHandler
      */
@@ -155,7 +155,7 @@ public Object getCallbackHandler() {
     }
 
     /**
-     * Setter method for property <tt>callbackHandler</tt>.
+     * Setter method for property <code>callbackHandler</code>.
      *
      * @param callbackHandler  value to be assigned to property callbackHandler
      */