Merge 4.0.x to 4.1.0

sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/SofaRuntimeContainer.java

@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.Assert;
 
 import java.util.Collection;
 import java.util.Map;
@@ -50,16 +51,17 @@ public SofaRuntimeContainer(SofaRuntimeManager sofaRuntimeManager) {
     }
 
     public SofaRuntimeContainer(SofaRuntimeManager sofaRuntimeManager, ClassLoader classLoader) {
+        Assert.notNull(classLoader, "classLoader must not be null");
         this.contextClassLoader = classLoader;
         SOFA_RUNTIME_MANAGER_MAP.put(contextClassLoader, sofaRuntimeManager);
     }
 
     public void setJvmServiceCache(boolean jvmServiceCache) {
-        JVM_SERVICE_CACHE_MAP.put(contextClassLoader, jvmServiceCache);
+        JVM_SERVICE_CACHE_MAP.putIfAbsent(contextClassLoader, jvmServiceCache);
     }
 
     public void setJvmInvokeSerialize(boolean jvmInvokeSerialize) {
-        JVM_INVOKE_SERIALIZE_MAP.put(contextClassLoader, jvmInvokeSerialize);
+        JVM_INVOKE_SERIALIZE_MAP.putIfAbsent(contextClassLoader, jvmInvokeSerialize);
     }
 
     @Override
@@ -75,10 +77,18 @@ public static SofaRuntimeManager getSofaRuntimeManager(ClassLoader classLoader)
         return SOFA_RUNTIME_MANAGER_MAP.get(classLoader);
     }
 
+    public static void updateJvmServiceCache(ClassLoader classLoader, Boolean value) {
+        JVM_SERVICE_CACHE_MAP.put(classLoader, value);
+    }
+
     public static boolean isJvmServiceCache(ClassLoader classLoader) {
         return JVM_SERVICE_CACHE_MAP.getOrDefault(classLoader, false);
     }
 
+    public static void updateJvmInvokeSerialize(ClassLoader classLoader, Boolean value) {
+        JVM_INVOKE_SERIALIZE_MAP.put(classLoader, value);
+    }
+
     public static boolean isJvmInvokeSerialize(ClassLoader classLoader) {
         return JVM_INVOKE_SERIALIZE_MAP.getOrDefault(classLoader, true);
     }
@@ -95,7 +105,10 @@ public static void clear() {
     }
 
     @Override
-    public void destroy() throws Exception {
+    public void destroy() {
         APPLICATION_CONTEXT_MAP.remove(contextClassLoader);
+        SOFA_RUNTIME_MANAGER_MAP.remove(contextClassLoader);
+        JVM_SERVICE_CACHE_MAP.remove(contextClassLoader);
+        JVM_INVOKE_SERIALIZE_MAP.remove(contextClassLoader);
     }
 }

sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/invoke/DynamicJvmServiceInvoker.java

@@ -114,7 +114,7 @@ protected Object doInvoke(MethodInvocation invocation) throws Throwable {
             if (DynamicJvmServiceProxyFinder.getInstance().getBizManagerService() != null) {
                 ReplayContext.clearPlaceHolder();
             }
-            setClientClassloader(null);
+            clearClientClassloader();
         }
     }
 
@@ -144,6 +144,10 @@ public void setClientClassloader(ClassLoader clientClassloader) {
         this.clientClassloader.set(clientClassloader);
     }
 
+    public void clearClientClassloader() {
+        this.clientClassloader.remove();
+    }
+
     private Method getTargetMethod(Method method, Class<?>[] argumentTypes) {
         try {
             return targetService.getClass().getMethod(method.getName(), argumentTypes);

sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/test/java/com/alipay/sofa/boot/ark/SofaRuntimeContainerTests.java

@@ -126,4 +126,27 @@ public void updateProperties() {
         assertThat(SofaRuntimeContainer.isJvmInvokeSerialize(classLoaderA)).isFalse();
         assertThat(SofaRuntimeContainer.isJvmServiceCache(classLoaderA)).isTrue();
     }
+
+    @Test
+    public void updatePropertiesAfterStaticSet() {
+        Thread.currentThread().setContextClassLoader(classLoaderA);
+        SofaRuntimeContainer sofaRuntimeContainer = new SofaRuntimeContainer(sofaRuntimeManagerA);
+        GenericApplicationContext genericApplicationContext = new GenericApplicationContext();
+        sofaRuntimeContainer.setApplicationContext(genericApplicationContext);
+
+        assertThat(SofaRuntimeContainer.isJvmInvokeSerialize(classLoaderA)).isTrue();
+        assertThat(SofaRuntimeContainer.isJvmServiceCache(classLoaderA)).isFalse();
+
+        SofaRuntimeContainer.updateJvmInvokeSerialize(classLoaderA, false);
+        SofaRuntimeContainer.updateJvmServiceCache(classLoaderA, true);
+
+        assertThat(SofaRuntimeContainer.isJvmInvokeSerialize(classLoaderA)).isFalse();
+        assertThat(SofaRuntimeContainer.isJvmServiceCache(classLoaderA)).isTrue();
+
+        sofaRuntimeContainer.setJvmInvokeSerialize(true);
+        sofaRuntimeContainer.setJvmServiceCache(false);
+
+        assertThat(SofaRuntimeContainer.isJvmInvokeSerialize(classLoaderA)).isFalse();
+        assertThat(SofaRuntimeContainer.isJvmServiceCache(classLoaderA)).isTrue();
+    }
 }

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/spring/ServiceBeanFactoryPostProcessor.java

@@ -59,7 +59,9 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ScannedGenericBeanDefinition;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.Ordered;
+import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.type.MethodMetadata;
 import org.springframework.core.type.StandardMethodMetadata;
@@ -107,8 +109,12 @@ public class ServiceBeanFactoryPostProcessor implements BeanFactoryPostProcessor
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
                                                                                    throws BeansException {
         if (beanFactory instanceof AbstractAutowireCapableBeanFactory) {
+            ParameterNameDiscoverer parameterNameDiscoverer = ((AbstractAutowireCapableBeanFactory) beanFactory).getParameterNameDiscoverer();
+            if (parameterNameDiscoverer == null) {
+                parameterNameDiscoverer = new DefaultParameterNameDiscoverer();
+            }
             ((AbstractAutowireCapableBeanFactory) beanFactory)
-                    .setParameterNameDiscoverer(new SofaParameterNameDiscoverer(referenceAnnotationWrapper));
+                    .setParameterNameDiscoverer(new SofaParameterNameDiscoverer(parameterNameDiscoverer, referenceAnnotationWrapper));
         }
 
         Arrays.stream(beanFactory.getBeanDefinitionNames())

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/spring/bean/SofaParameterNameDiscoverer.java

@@ -19,7 +19,6 @@
 import com.alipay.sofa.boot.annotation.AnnotationWrapper;
 import com.alipay.sofa.runtime.api.annotation.SofaReference;
 import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.StandardReflectionParameterNameDiscoverer;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -33,26 +32,27 @@
  */
 public class SofaParameterNameDiscoverer implements ParameterNameDiscoverer {
 
-    private final StandardReflectionParameterNameDiscoverer standardReflectionParameterNameDiscoverer = new StandardReflectionParameterNameDiscoverer();
+    private final ParameterNameDiscoverer          parameterNameDiscoverer;
 
-    private final AnnotationWrapper<SofaReference>          referenceAnnotationWrapper;
+    private final AnnotationWrapper<SofaReference> referenceAnnotationWrapper;
 
-    public SofaParameterNameDiscoverer(AnnotationWrapper<SofaReference> referenceAnnotationWrapper) {
+    public SofaParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer,
+                                       AnnotationWrapper<SofaReference> referenceAnnotationWrapper) {
+        this.parameterNameDiscoverer = parameterNameDiscoverer;
         this.referenceAnnotationWrapper = referenceAnnotationWrapper;
     }
 
     @Override
     public String[] getParameterNames(Method method) {
-        String[] parameterNames = standardReflectionParameterNameDiscoverer
-            .getParameterNames(method);
+        String[] parameterNames = parameterNameDiscoverer.getParameterNames(method);
         Class<?>[] parameterTypes = method.getParameterTypes();
         Annotation[][] annotations = method.getParameterAnnotations();
         return transformParameterNames(parameterNames, parameterTypes, annotations);
     }
 
     @Override
     public String[] getParameterNames(Constructor<?> ctor) {
-        String[] parameterNames = standardReflectionParameterNameDiscoverer.getParameterNames(ctor);
+        String[] parameterNames = parameterNameDiscoverer.getParameterNames(ctor);
         Class<?>[] parameterTypes = ctor.getParameterTypes();
         Annotation[][] annotations = ctor.getParameterAnnotations();
         return transformParameterNames(parameterNames, parameterTypes, annotations);

sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/spring/bean/SofaParameterNameDiscovererTests.java

@@ -21,6 +21,7 @@
 import com.alipay.sofa.runtime.api.annotation.SofaReference;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.util.ReflectionUtils;
 
@@ -48,7 +49,8 @@ public void setUp() {
         mockEnvironment = new MockEnvironment();
         annotationWrapper = AnnotationWrapper.create(SofaReference.class)
             .withEnvironment(mockEnvironment).withBinder(DefaultPlaceHolderBinder.INSTANCE);
-        parameterNameDiscoverer = new SofaParameterNameDiscoverer(annotationWrapper);
+        parameterNameDiscoverer = new SofaParameterNameDiscoverer(
+            new DefaultParameterNameDiscoverer(), annotationWrapper);
     }
 
     @Test

sofa-boot-project/sofa-boot/src/main/java/com/alipay/sofa/boot/context/SofaSpringContextSupport.java

@@ -20,7 +20,7 @@
 import org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver;
 import org.springframework.beans.propertyeditors.ClassArrayEditor;
 import org.springframework.beans.propertyeditors.ClassEditor;
-import org.springframework.core.StandardReflectionParameterNameDiscoverer;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -40,7 +40,7 @@ public static SofaDefaultListableBeanFactory createBeanFactory(ClassLoader beanC
         if (!(beanFactory.getAutowireCandidateResolver() instanceof QualifierAnnotationAutowireCandidateResolver)) {
             beanFactory.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
         }
-        beanFactory.setParameterNameDiscoverer(new StandardReflectionParameterNameDiscoverer());
+        beanFactory.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
         beanFactory.setBeanClassLoader(beanClassLoader);
         beanFactory.addPropertyEditorRegistrar(registry -> {
             registry.registerCustomEditor(Class.class, new ClassEditor(beanClassLoader));

sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/context/SofaSpringContextSupportTests.java

@@ -18,7 +18,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver;
-import org.springframework.core.StandardReflectionParameterNameDiscoverer;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -39,7 +39,7 @@ public void createBeanFactory() {
         assertThat(beanFactory).isNotNull();
         assertThat(beanFactory.getAutowireCandidateResolver()).isInstanceOf(QualifierAnnotationAutowireCandidateResolver.class);
         assertThat(beanFactory.getBeanClassLoader()).isEqualTo(classLoader);
-        assertThat(beanFactory.getParameterNameDiscoverer()).isInstanceOf(StandardReflectionParameterNameDiscoverer.class);
+        assertThat(beanFactory.getParameterNameDiscoverer()).isInstanceOf(DefaultParameterNameDiscoverer.class);
         assertThat(beanFactory.getPropertyEditorRegistrars().size() >= 1).isTrue();
     }
 

sofa-boot-project/sofaboot-dependencies/pom.xml

@@ -435,6 +435,18 @@
                 <version>${sofa.ark.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alipay.sofa</groupId>
+                <artifactId>sofa-ark-all</artifactId>
+                <version>${sofa.ark.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alipay.sofa</groupId>
+                <artifactId>sofa-ark-exception</artifactId>
+                <version>${sofa.ark.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.alipay.sofa.lookout</groupId>
                 <artifactId>lookout-api</artifactId>