2.7.8 service introspection

dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationFactory.java

@@ -35,7 +35,7 @@ public abstract class AbstractDynamicConfigurationFactory implements DynamicConf
 
     @Override
     public final DynamicConfiguration getDynamicConfiguration(URL url) {
-        String key = url == null ? DEFAULT_KEY : url.getAddress();
+        String key = url == null ? DEFAULT_KEY : url.toServiceString();
         return dynamicConfigurations.computeIfAbsent(key, k -> createDynamicConfiguration(url));
     }
 

dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java

@@ -20,6 +20,7 @@
 import org.apache.dubbo.common.URL;
 
 import java.net.NetworkInterface;
+import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.regex.Pattern;
 
@@ -44,6 +45,11 @@ public interface CommonConstants {
 
     String ANY_VALUE = "*";
 
+    /**
+     * @since 2.7.8
+     */
+    char COMMA_SEPARATOR_CHAR = ',';
+
     String COMMA_SEPARATOR = ",";
 
     String DOT_SEPARATOR = ".";
@@ -187,6 +193,14 @@ public interface CommonConstants {
 
     String REMOTE_METADATA_STORAGE_TYPE = "remote";
 
+    /**
+     * The composite metadata storage type includes {@link #DEFAULT_METADATA_STORAGE_TYPE "local"} and
+     * {@link #REMOTE_METADATA_STORAGE_TYPE "remote"}.
+     *
+     * @since 2.7.8
+     */
+    String COMPOSITE_METADATA_STORAGE_TYPE = "composite";
+
     /**
      * Consumer side 's proxy class
      */
@@ -314,4 +328,19 @@ public interface CommonConstants {
 
     String SSL_ENABLED_KEY = "ssl-enabled";
 
+
+    /**
+     * The parameter key for the class path of the ServiceNameMapping {@link Properties} file
+     *
+     * @since 2.7.8
+     */
+    String SERVICE_NAME_MAPPING_PROPERTIES_FILE_KEY = "service-name-mapping.properties-path";
+
+    /**
+     * The default class path of the ServiceNameMapping {@link Properties} file
+     *
+     * @since 2.7.8
+     */
+    String DEFAULT_SERVICE_NAME_MAPPING_PROPERTIES_PATH = "META-INF/dubbo/service-name-mapping.properties";
+
 }

dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java

@@ -76,6 +76,8 @@ public interface RegistryConstants {
 
     /**
      * The parameter key of the subscribed service names for Service-Oriented Registry
+     * <p>
+     * If there is a multiple-values, the  "comma" is the separator.
      *
      * @since 2.7.5
      */

dubbo-common/src/main/java/org/apache/dubbo/common/utils/PathUtils.java

@@ -63,7 +63,12 @@ static String normalize(String path) {
         if (index > -1) {
             normalizedPath = normalizedPath.substring(0, index);
         }
-        return replace(normalizedPath, "//", "/");
+
+        while (normalizedPath.contains("//")) {
+            normalizedPath = replace(normalizedPath, "//", "/");
+        }
+
+        return normalizedPath;
     }
 
 }

dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java

@@ -28,13 +28,17 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static java.lang.String.valueOf;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.unmodifiableSet;
 import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SEPARATOR;
 import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SPLIT_PATTERN;
 import static org.apache.dubbo.common.constants.CommonConstants.DOT_REGEX;
@@ -699,6 +703,45 @@ public static List<String> splitToList(String str, char ch) {
         return splitToList0(str, ch);
     }
 
+    /**
+     * Split the specified value to be a {@link Set}
+     *
+     * @param value         the content to be split
+     * @param separatorChar a char to separate
+     * @return non-null read-only {@link Set}
+     * @since 2.7.8
+     */
+    public static Set<String> splitToSet(String value, char separatorChar) {
+        return splitToSet(value, separatorChar, false);
+    }
+
+    /**
+     * Split the specified value to be a {@link Set}
+     *
+     * @param value         the content to be split
+     * @param separatorChar a char to separate
+     * @param trimElements  require to trim the elements or not
+     * @return non-null read-only {@link Set}
+     * @since 2.7.8
+     */
+    public static Set<String> splitToSet(String value, char separatorChar, boolean trimElements) {
+        List<String> values = splitToList(value, separatorChar);
+        int size = values.size();
+
+        if (size < 1) { // empty condition
+            return emptySet();
+        }
+
+        if (!trimElements) { // Do not require to trim the elements
+            return new LinkedHashSet(values);
+        }
+
+        return unmodifiableSet(values
+                .stream()
+                .map(String::trim)
+                .collect(LinkedHashSet::new, Set::add, Set::addAll));
+    }
+
     /**
      * join string.
      *
@@ -797,7 +840,7 @@ private static Map<String, String> parseKeyValuePair(String str, String itemSepa
     }
 
     public static String getQueryStringValue(String qs, String key) {
-        Map<String, String> map = StringUtils.parseQueryString(qs);
+        Map<String, String> map = parseQueryString(qs);
         return map.get(key);
     }
 
@@ -1051,4 +1094,16 @@ public static byte decodeHexByte(CharSequence s, int pos) {
         return (byte) ((hi << 4) + lo);
     }
 
+    /**
+     * Create the common-delimited {@link String} by one or more {@link String} members
+     *
+     * @param one    one {@link String}
+     * @param others others {@link String}
+     * @return <code>null</code> if <code>one</code> or <code>others</code> is <code>null</code>
+     * @since 2.7.8
+     */
+    public static String toCommaDelimitedString(String one, String... others) {
+        String another = arrayToDelimitedString(others, COMMA_SEPARATOR);
+        return isEmpty(another) ? one : one + COMMA_SEPARATOR + another;
+    }
 }

dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java

@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.config.annotation;
 
+import org.apache.dubbo.common.constants.RegistryConstants;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -279,4 +281,11 @@
      * @since 2.7.3
      */
     String id() default "";
+
+    /**
+     * @return The service names that the Dubbo interface subscribed
+     * @see RegistryConstants#SUBSCRIBED_SERVICE_NAMES_KEY
+     * @since 2.7.8
+     */
+    String[] services() default {};
 }

dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java

@@ -371,6 +371,15 @@ public void clear() {
         });
     }
 
+    /**
+     * @throws IllegalStateException
+     * @since 2.7.8
+     */
+    @Override
+    public void destroy() throws IllegalStateException {
+        clear();
+    }
+
     /**
      * Add the dubbo {@link AbstractConfig config}
      *

dubbo-common/src/test/java/org/apache/dubbo/common/utils/StringUtilsTest.java

@@ -18,19 +18,28 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
+import static org.apache.dubbo.common.utils.StringUtils.toCommaDelimitedString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StringUtilsTest {
     @Test
@@ -363,4 +372,25 @@ public void testParseParameters() {
         assertEquals(0, illegalMap.size());
     }
 
+    @Test
+    public void testToCommaDelimitedString() {
+        String value = toCommaDelimitedString(null);
+        assertNull(value);
+
+        value = toCommaDelimitedString(null, null);
+        assertNull(value);
+
+        value = toCommaDelimitedString("");
+        assertEquals("", value);
+
+        value = toCommaDelimitedString("one");
+        assertEquals("one", value);
+
+        value = toCommaDelimitedString("one", "two");
+        assertEquals("one,two", value);
+
+        value = toCommaDelimitedString("one", "two", "three");
+        assertEquals("one,two,three", value);
+    }
+
 }

dubbo-common/src/test/java/org/apache/dubbo/config/context/ConfigManagerTest.java

@@ -49,7 +49,7 @@ public class ConfigManagerTest {
 
     @BeforeEach
     public void init() {
-        configManager.clear();
+        configManager.destroy();
     }
 
     @Test

dubbo-common/src/test/java/org/apache/dubbo/event/EchoEventListener2.java

@@ -41,7 +41,7 @@ public void onEvent(Event event) {
 
     @Override
     public int getPriority() {
-        return 0;
+        return -1;
     }
 
     public int getEventOccurs() {

dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java

@@ -35,14 +35,14 @@ public class ConfigTest {
 
     @AfterEach
     public void tearDown() {
-        ApplicationModel.getConfigManager().clear();
+        ApplicationModel.reset();
     }
 
     @BeforeEach
     public void setup() {
         // In IDE env, make sure adding the following argument to VM options
         System.setProperty("java.net.preferIPv4Stack", "true");
-        ApplicationModel.getConfigManager().clear();
+        ApplicationModel.reset();
     }
 
     @Test

dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java

@@ -38,12 +38,12 @@ public class ReferenceConfigTest {
 
     @BeforeEach
     public void setUp() {
-        ApplicationModel.getConfigManager().clear();
+        ApplicationModel.reset();
     }
 
     @AfterEach
     public void tearDown() {
-        ApplicationModel.getConfigManager().clear();
+        ApplicationModel.reset();
     }
 
     @Test

dubbo-config/dubbo-config-api/pom.xml

@@ -135,6 +135,12 @@
             <artifactId>dubbo-registry-eureka</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -156,6 +162,12 @@
             <artifactId>dubbo-metadata-report-zookeeper</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -170,6 +182,12 @@
             <artifactId>dubbo-metadata-report-nacos</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -198,6 +216,12 @@
             <artifactId>dubbo-configcenter-nacos</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>