Dubbo cloud native

dubbo-all/pom.xml

@@ -682,8 +682,15 @@
                                 </includes>
                             </artifactSet>
                             <transformers>
+                                <!-- dubbo-common beginning -->
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler
+                                    </resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory
                                     </resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -692,15 +699,34 @@
                                     </resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.infra.InfraAdapter
+                                    </resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter
                                     </resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker
                                     </resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore
+                                    </resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>
+                                        META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool
+                                    </resource>
+                                </transformer>
+                                <!-- dubbo-common end -->
+
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
                                     </resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -784,22 +810,10 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory</resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore
-                                    </resource>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter
-                                    </resource>
-                                </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand
                                     </resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/dubbo/internal/org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory
-                                    </resource>
-                                </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
                                     </resource>

dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java

@@ -27,6 +27,7 @@
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.UrlUtils;
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ConfigCenterConfig;
 import org.apache.dubbo.config.ConsumerConfig;
@@ -602,6 +603,11 @@ private Collection<ServiceDiscovery> getServiceDiscoveries() {
      */
     @Override
     public DubboBootstrap start() {
+
+        if (!shouldStart()) {
+            return this;
+        }
+
         if (!isInitialized()) {
             initialize();
         }
@@ -632,6 +638,22 @@ public DubboBootstrap start() {
         return this;
     }
 
+    /**
+     * Should Start current bootstrap
+     *
+     * @return If there is not any service discovery registry in the {@link ConfigManager#getRegistries()}, it will not
+     * start current bootstrap
+     */
+    private boolean shouldStart() {
+        return configManager.getRegistries()
+                .stream()
+                .map(RegistryConfig::getAddress)
+                .map(URL::valueOf)
+                .filter(UrlUtils::isServiceDiscoveryRegistryType)
+                .count() > 0;
+    }
+
+
     private boolean hasExportedServices() {
         return !metadataService.getExportedURLs().isEmpty();
     }

dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/ZookeeperDubboServiceProviderBootstrap.java

@@ -29,7 +29,7 @@ public static void main(String[] args) {
                 .application("zookeeper-dubbo-provider")
                 .registry(builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service"))
                 .protocol("dubbo", builder -> builder.port(-1).name("dubbo"))
-                .protocol("rest", builder -> builder.port(8082).name("rest"))
+                .protocol("rest", builder -> builder.port(8081).name("rest"))
                 .service("echo", builder -> builder.interfaceClass(EchoService.class).ref(new EchoServiceImpl()).protocolIds("dubbo"))
                 .service("user", builder -> builder.interfaceClass(UserService.class).ref(new UserServiceImpl()).protocolIds("rest"))
                 .start()

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

@@ -189,11 +189,11 @@ protected static String getThreadPoolPrefixName(URL url) {
     }
 
     protected static int getThreadPoolSize(URL url) {
-        return url.getParameter(THREAD_POOL_SIZE_PARAM_NAME, DEFAULT_THREAD_POOL_SIZE);
+        return getParameter(url, THREAD_POOL_SIZE_PARAM_NAME, DEFAULT_THREAD_POOL_SIZE);
     }
 
     protected static long getThreadPoolKeepAliveTime(URL url) {
-        return url.getParameter(THREAD_POOL_KEEP_ALIVE_TIME_PARAM_NAME, DEFAULT_THREAD_POOL_KEEP_ALIVE_TIME);
+        return getParameter(url, THREAD_POOL_KEEP_ALIVE_TIME_PARAM_NAME, DEFAULT_THREAD_POOL_KEEP_ALIVE_TIME);
     }
 
     protected static String getParameter(URL url, String name, String defaultValue) {
@@ -202,4 +202,18 @@ protected static String getParameter(URL url, String name, String defaultValue)
         }
         return defaultValue;
     }
+
+    protected static int getParameter(URL url, String name, int defaultValue) {
+        if (url != null) {
+            return url.getParameter(name, defaultValue);
+        }
+        return defaultValue;
+    }
+
+    protected static long getParameter(URL url, String name, long defaultValue) {
+        if (url != null) {
+            return url.getParameter(name, defaultValue);
+        }
+        return defaultValue;
+    }
 }

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

@@ -24,14 +24,17 @@
 import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
 
 /**
+ * Abstract {@link DynamicConfigurationFactory} implementation with cache ability
  *
+ * @see DynamicConfigurationFactory
+ * @since 2.7.4
  */
 public abstract class AbstractDynamicConfigurationFactory implements DynamicConfigurationFactory {
 
     private volatile Map<String, DynamicConfiguration> dynamicConfigurations = new ConcurrentHashMap<>();
 
     @Override
-    public DynamicConfiguration getDynamicConfiguration(URL url) {
+    public final DynamicConfiguration getDynamicConfiguration(URL url) {
         String key = url == null ? DEFAULT_KEY : url.getAddress();
         return dynamicConfigurations.computeIfAbsent(key, k -> createDynamicConfiguration(url));
     }

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

@@ -39,7 +39,7 @@ public ConfigChangedEvent(String key, String group, String content) {
     }
 
     public ConfigChangedEvent(String key, String group, String content, ConfigChangeType changeType) {
-        super(key + "=" + content);
+        super(key + "," + group);
         this.key = key;
         this.group = group;
         this.content = content;
@@ -62,29 +62,29 @@ public ConfigChangeType getChangeType() {
         return changeType;
     }
 
+    @Override
+    public String toString() {
+        return "ConfigChangedEvent{" +
+                "key='" + key + '\'' +
+                ", group='" + group + '\'' +
+                ", content='" + content + '\'' +
+                ", changeType=" + changeType +
+                "} " + super.toString();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof ConfigChangedEvent)) return false;
         ConfigChangedEvent that = (ConfigChangedEvent) o;
         return Objects.equals(getKey(), that.getKey()) &&
-                Objects.equals(group, that.group) &&
+                Objects.equals(getGroup(), that.getGroup()) &&
                 Objects.equals(getContent(), that.getContent()) &&
                 getChangeType() == that.getChangeType();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getKey(), group, getContent(), getChangeType());
-    }
-
-    @Override
-    public String toString() {
-        return "ConfigChangedEvent{" +
-                "key='" + key + '\'' +
-                ", group='" + group + '\'' +
-                ", content='" + content + '\'' +
-                ", changeType=" + changeType +
-                "} " + super.toString();
+        return Objects.hash(getKey(), getGroup(), getContent(), getChangeType());
     }
 }

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

@@ -582,13 +582,13 @@ private static Optional<WatchService> newWatchService() {
     }
 
     protected static File initDirectory(URL url) {
-        String directoryPath = url.getParameter(CONFIG_CENTER_DIR_PARAM_NAME, url.getPath());
+        String directoryPath = getParameter(url, CONFIG_CENTER_DIR_PARAM_NAME, url == null ? null : url.getPath());
         File rootDirectory = null;
         if (!StringUtils.isBlank(directoryPath)) {
             rootDirectory = new File("/" + directoryPath);
         }
 
-        if (!rootDirectory.exists()) { // If the directory does not exist
+        if (directoryPath == null || !rootDirectory.exists()) { // If the directory does not exist
             rootDirectory = new File(DEFAULT_CONFIG_CENTER_DIR_PATH);
         }
 

dubbo-common/src/main/java/org/apache/dubbo/common/lang/ShutdownHookCallbacks.java

@@ -35,7 +35,7 @@ public class ShutdownHookCallbacks {
 
     private final List<ShutdownHookCallback> callbacks = new LinkedList<>();
 
-    public ShutdownHookCallbacks() {
+    ShutdownHookCallbacks() {
         loadCallbacks();
     }
 

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

@@ -27,6 +27,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyMap;
 import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
 import static org.apache.dubbo.common.constants.CommonConstants.CLASSIFIER_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SPLIT_PATTERN;
@@ -50,9 +51,11 @@
 import static org.apache.dubbo.common.constants.RegistryConstants.OVERRIDE_PROTOCOL;
 import static org.apache.dubbo.common.constants.RegistryConstants.PROVIDERS_CATEGORY;
 import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PROTOCOL;
+import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_TYPE_KEY;
 import static org.apache.dubbo.common.constants.RegistryConstants.ROUTERS_CATEGORY;
 import static org.apache.dubbo.common.constants.RegistryConstants.ROUTE_PROTOCOL;
 import static org.apache.dubbo.common.constants.RegistryConstants.SERVICE_REGISTRY_PROTOCOL;
+import static org.apache.dubbo.common.constants.RegistryConstants.SERVICE_REGISTRY_TYPE;
 
 public class UrlUtils {
 
@@ -490,6 +493,31 @@ public static boolean isRegistry(URL url) {
         return REGISTRY_PROTOCOL.equals(url.getProtocol()) || SERVICE_REGISTRY_PROTOCOL.equalsIgnoreCase(url.getProtocol());
     }
 
+    /**
+     * The specified {@link URL} is service discovery registry type or not
+     *
+     * @param url the {@link URL} connects to the registry
+     * @return If it is, return <code>true</code>, or <code>false</code>
+     * @since 2.7.4
+     */
+    public static boolean isServiceDiscoveryRegistryType(URL url) {
+        return isServiceDiscoveryRegistryType(url == null ? emptyMap() : url.getParameters());
+    }
+
+    /**
+     * The specified parameters of {@link URL} is service discovery registry type or not
+     *
+     * @param parameters the parameters of {@link URL} that connects to the registry
+     * @return If it is, return <code>true</code>, or <code>false</code>
+     * @since 2.7.4
+     */
+    public static boolean isServiceDiscoveryRegistryType(Map<String, String> parameters) {
+        if (parameters == null || parameters.isEmpty()) {
+            return false;
+        }
+        return SERVICE_REGISTRY_TYPE.equals(parameters.get(REGISTRY_TYPE_KEY));
+    }
+
     /**
      * Check if the given value matches the given pattern. The pattern supports wildcard "*".
      *
@@ -507,7 +535,7 @@ static boolean isItemMatch(String pattern, String value) {
 
     /**
      * @param serviceKey, {group}/{interfaceName}:{version}
-     * @return  [group, interfaceName, version]
+     * @return [group, interfaceName, version]
      */
     public static String[] parseServiceKey(String serviceKey) {
         String[] arr = new String[3];

dubbo-common/src/test/java/org/apache/dubbo/common/config/InmemoryConfigurationTest.java

@@ -29,7 +29,7 @@
  */
 class InmemoryConfigurationTest {
 
-    private static InmemoryConfiguration memConfig;
+    private InmemoryConfiguration memConfig;
     private static final String MOCK_KEY = "mockKey";
     private static final String MOCK_VALUE = "mockValue";
     private static final String MOCK_ONE_KEY = "one";
@@ -59,7 +59,6 @@ public void testGetMemProperty() {
         Assertions.assertEquals(MOCK_VALUE, memConfig.getInternalProperty(MOCK_KEY));
         Assertions.assertEquals(MOCK_VALUE, memConfig.getString(MOCK_KEY, MOCK_VALUE));
         Assertions.assertEquals(MOCK_VALUE, memConfig.getProperty(MOCK_KEY, MOCK_VALUE));
-
     }
 
     /**
@@ -84,11 +83,27 @@ public void testGetProperties() {
 
     }
 
+    @Test
+    public void testGetInt() {
+        memConfig.addProperty("a", "1");
+        Assertions.assertEquals(1, memConfig.getInt("a"));
+        Assertions.assertEquals(Integer.valueOf(1), memConfig.getInteger("a", 2));
+        Assertions.assertEquals(2, memConfig.getInt("b", 2));
+    }
+
+    @Test
+    public void getBoolean() {
+        memConfig.addProperty("a", Boolean.TRUE.toString());
+        Assertions.assertTrue(memConfig.getBoolean("a"));
+        Assertions.assertFalse(memConfig.getBoolean("b", false));
+        Assertions.assertTrue(memConfig.getBoolean("b", Boolean.TRUE));
+    }
+
     /**
      * Clean.
      */
     @AfterEach
-    public void clean(){
+    public void clean() {
 
     }