You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/13 06:24:16 UTC

[dubbo] branch 3.0 updated: Fix Activated Extensions order (#8248)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 89aac3c  Fix Activated Extensions order (#8248)
89aac3c is described below

commit 89aac3c2a4159701a02902777394dfa2ab328a68
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Jul 13 14:24:00 2021 +0800

    Fix Activated Extensions order (#8248)
    
    * Fix Activated Extensions order
    
    * recovery activate extensions order
    
    * Fix NPE
    
    * pretty code
    
    * fix compiling error
    
    * remove warn meg
---
 .../dubbo/common/extension/ExtensionLoader.java    | 52 +++++++++++++---------
 .../extension/support/ActivateComparator.java      | 12 ++---
 .../common/extension/ExtensionLoaderTest.java      |  7 +++
 .../extension/activate/impl/ActivateExt1Impl1.java |  2 +-
 .../activate/impl/OrderActivateExtImpl1.java       |  2 +-
 .../activate/impl/OrderActivateExtImpl2.java       |  2 +-
 .../extension/support/ActivateComparatorTest.java  |  8 ++--
 7 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index 9cd1737..bcf7397 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -275,13 +275,13 @@ public class ExtensionLoader<T> {
      * @see org.apache.dubbo.common.extension.Activate
      */
     public List<T> getActivateExtension(URL url, String[] values, String group) {
-        List<T> activateExtensions = new ArrayList<>();
         // solve the bug of using @SPI's wrapper method to report a null pointer exception.
-        TreeMap<Class, T> activateExtensionsMap = new TreeMap<>(ActivateComparator.COMPARATOR);
+        Map<Class<?>, T> activateExtensionsMap = new TreeMap<>(ActivateComparator.COMPARATOR);
         List<String> names = values == null ? new ArrayList<>(0) : asList(values);
         if (!names.contains(REMOVE_VALUE_PREFIX + DEFAULT_KEY)) {
             if (cachedActivateGroups.size() == 0) {
                 synchronized (cachedActivateGroups) {
+                    // cache all extensions
                     if (cachedActivateGroups.size() == 0) {
                         getExtensionClasses();
                         for (Map.Entry<String, Object> entry : cachedActivates.entrySet()) {
@@ -306,6 +306,7 @@ public class ExtensionLoader<T> {
                 }
             }
 
+            // traverse all cached extensions
             cachedActivateGroups.forEach((name, activateGroup)->{
                 if (isMatchGroup(group, activateGroup)
                         && !names.contains(name)
@@ -315,35 +316,46 @@ public class ExtensionLoader<T> {
                     activateExtensionsMap.put(getExtensionClass(name), getExtension(name));
                 }
             });
+        }
 
-            if (!activateExtensionsMap.isEmpty()) {
-                activateExtensions.addAll(activateExtensionsMap.values());
+        if (names.contains(DEFAULT_KEY)) {
+            // will affect order
+            // `ext1,default,ext2` means ext1 will happens before all of the default extensions while ext2 will after them
+            ArrayList<T> extensionsResult = new ArrayList<>(activateExtensionsMap.size() + names.size());
+            for (int i = 0; i < names.size(); i++) {
+                String name = names.get(i);
+                if (!name.startsWith(REMOVE_VALUE_PREFIX)
+                    && !names.contains(REMOVE_VALUE_PREFIX + name)) {
+                    if (!DEFAULT_KEY.equals(name)) {
+                        if (containsExtension(name)) {
+                            extensionsResult.add(getExtension(name));
+                        }
+                    } else {
+                        extensionsResult.addAll(activateExtensionsMap.values());
+                    }
+                }
             }
-        }
-        List<T> loadedExtensions = new ArrayList<>();
-        for (int i = 0; i < names.size(); i++) {
-            String name = names.get(i);
-            if (!name.startsWith(REMOVE_VALUE_PREFIX)
+            return extensionsResult;
+        } else {
+            // add extensions, will be sorted by its order
+            for (int i = 0; i < names.size(); i++) {
+                String name = names.get(i);
+                if (!name.startsWith(REMOVE_VALUE_PREFIX)
                     && !names.contains(REMOVE_VALUE_PREFIX + name)) {
-                if (DEFAULT_KEY.equals(name)) {
-                    if (!loadedExtensions.isEmpty()) {
-                        activateExtensions.addAll(0, loadedExtensions);
-                        loadedExtensions.clear();
+                    if (!DEFAULT_KEY.equals(name)) {
+                        if (containsExtension(name)) {
+                            activateExtensionsMap.put(getExtensionClass(name), getExtension(name));
+                        }
                     }
-                } else {
-                    loadedExtensions.add(getExtension(name));
                 }
             }
+            return new ArrayList<>(activateExtensionsMap.values());
         }
-        if (!loadedExtensions.isEmpty()) {
-            activateExtensions.addAll(loadedExtensions);
-        }
-        return activateExtensions;
     }
 
     public List<T> getActivateExtensions() {
         List<T> activateExtensions = new ArrayList<>();
-        TreeMap<Class, T> activateExtensionsMap = new TreeMap<>(ActivateComparator.COMPARATOR);
+        TreeMap<Class<?>, T> activateExtensionsMap = new TreeMap<>(ActivateComparator.COMPARATOR);
         getExtensionClasses();
         for (Map.Entry<String, Object> entry : cachedActivates.entrySet()) {
             String name = entry.getKey();
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
index 5db3b1f..3c6ebab 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java
@@ -27,9 +27,9 @@ import java.util.Comparator;
 /**
  * OrderComparator
  */
-public class ActivateComparator implements Comparator<Class> {
+public class ActivateComparator implements Comparator<Class<?>> {
 
-    public static final Comparator<Class> COMPARATOR = new ActivateComparator();
+    public static final Comparator<Class<?>> COMPARATOR = new ActivateComparator();
 
     @Override
     public int compare(Class o1, Class o2) {
@@ -90,7 +90,7 @@ public class ActivateComparator implements Comparator<Class> {
         }
     }
 
-    private Class<?> findSpi(Class clazz) {
+    private Class<?> findSpi(Class<?> clazz) {
         if (clazz.getInterfaces().length == 0) {
             return null;
         }
@@ -99,7 +99,7 @@ public class ActivateComparator implements Comparator<Class> {
             if (intf.isAnnotationPresent(SPI.class)) {
                 return intf;
             } else {
-                Class result = findSpi(intf);
+                Class<?> result = findSpi(intf);
                 if (result != null) {
                     return result;
                 }
@@ -116,12 +116,14 @@ public class ActivateComparator implements Comparator<Class> {
             info.before = activate.before();
             info.after = activate.after();
             info.order = activate.order();
-        } else {
+        } else if (clazz.isAnnotationPresent(com.alibaba.dubbo.common.extension.Activate.class)){
             com.alibaba.dubbo.common.extension.Activate activate = clazz.getAnnotation(
                     com.alibaba.dubbo.common.extension.Activate.class);
             info.before = activate.before();
             info.after = activate.after();
             info.order = activate.order();
+        } else {
+            info.order = 0;
         }
         return info;
     }
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
index b78a25d..22b73d5 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java
@@ -451,6 +451,13 @@ public class ExtensionLoaderTest {
         Assertions.assertEquals(2, list.size());
         Assertions.assertSame(list.get(0).getClass(), ActivateExt1Impl1.class);
         Assertions.assertSame(list.get(1).getClass(), OrderActivateExtImpl1.class);
+
+        url = URL.valueOf("test://localhost/test?ext=order1");
+        list = getExtensionLoader(ActivateExt1.class)
+            .getActivateExtension(url, "ext", "default_group");
+        Assertions.assertEquals(2, list.size());
+        Assertions.assertSame(list.get(0).getClass(), ActivateExt1Impl1.class);
+        Assertions.assertSame(list.get(1).getClass(), OrderActivateExtImpl1.class);
     }
 
     @Test
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/ActivateExt1Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/ActivateExt1Impl1.java
index c0121ff..fe3e082 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/ActivateExt1Impl1.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/ActivateExt1Impl1.java
@@ -20,7 +20,7 @@ package org.apache.dubbo.common.extension.activate.impl;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.common.extension.activate.ActivateExt1;
 
-@Activate(group = {"default_group"})
+@Activate(order = 1, group = {"default_group"})
 public class ActivateExt1Impl1 implements ActivateExt1 {
     public String echo(String msg) {
         return msg;
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl1.java
index b84ff21..3af7a39 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl1.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl1.java
@@ -20,7 +20,7 @@ package org.apache.dubbo.common.extension.activate.impl;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.common.extension.activate.ActivateExt1;
 
-@Activate(order = 1, group = {"order"})
+@Activate(order = 2, group = {"order"})
 public class OrderActivateExtImpl1 implements ActivateExt1 {
 
     public String echo(String msg) {
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl2.java
index 6a63dfc..46c7d42 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl2.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/activate/impl/OrderActivateExtImpl2.java
@@ -20,7 +20,7 @@ package org.apache.dubbo.common.extension.activate.impl;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.common.extension.activate.ActivateExt1;
 
-@Activate(order = 2, group = {"order"})
+@Activate(order = 100, group = {"order"})
 public class OrderActivateExtImpl2 implements ActivateExt1 {
 
     public String echo(String msg) {
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java
index 5f4a3a9..f871d6d 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java
@@ -32,7 +32,7 @@ public class ActivateComparatorTest {
         Filter3 f3 = new Filter3();
         Filter4 f4 = new Filter4();
         OldFilter5 f5 = new OldFilter5();
-        List<Class> filters = new ArrayList<>();
+        List<Class<?>> filters = new ArrayList<>();
         filters.add(f1.getClass());
         filters.add(f2.getClass());
         filters.add(f3.getClass());
@@ -53,13 +53,13 @@ public class ActivateComparatorTest {
         Order0Filter1 order0Filter1 = new Order0Filter1();
         Order0Filter2 order0Filter2 = new Order0Filter2();
 
-        List<Class> filters = null;
+        List<Class<?>> filters = null;
 
         {
             filters = new ArrayList<>();
             filters.add(order0Filter1.getClass());
             filters.add(order0Filter2.getClass());
-            Collections.sort(filters, ActivateComparator.COMPARATOR);
+            filters.sort(ActivateComparator.COMPARATOR);
             Assertions.assertEquals(order0Filter1.getClass(), filters.get(0));
             Assertions.assertEquals(order0Filter2.getClass(), filters.get(1));
         }
@@ -68,7 +68,7 @@ public class ActivateComparatorTest {
             filters = new ArrayList<>();
             filters.add(order0Filter2.getClass());
             filters.add(order0Filter1.getClass());
-            Collections.sort(filters, ActivateComparator.COMPARATOR);
+            filters.sort(ActivateComparator.COMPARATOR);
             Assertions.assertEquals(order0Filter1.getClass(), filters.get(0));
             Assertions.assertEquals(order0Filter2.getClass(), filters.get(1));
         }