Dubbo cloud native

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

@@ -32,11 +32,11 @@ public class NacosDubboServiceConsumerBootstrap {
     public static void main(String[] args) throws Exception {
 
         ApplicationConfig applicationConfig = new ApplicationConfig("dubbo-nacos-consumer-demo");
-        applicationConfig.setMetadataType("remote");
+//        applicationConfig.setMetadataType("remote");
         new DubboBootstrap()
                 .application(applicationConfig)
                 // Zookeeper
-                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-nacos-provider-demo"))
+                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=dubbo-nacos-provider-demo"))
                 .metadataReport(new MetadataReportConfig("nacos://127.0.0.1:8848"))
                 // Nacos
 //                .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))

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

@@ -30,11 +30,11 @@ public class NacosDubboServiceProviderBootstrap {
 
     public static void main(String[] args) {
         ApplicationConfig applicationConfig = new ApplicationConfig("dubbo-nacos-provider-demo");
-        applicationConfig.setMetadataType("remote");
+//        applicationConfig.setMetadataType("remote");
         new DubboBootstrap()
                 .application(applicationConfig)
                 // Zookeeper in service registry type
-                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service"))
+                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service"))
                 // Nacos
 //                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service"))
 //                .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry.type=service").build())

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

@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.bootstrap;
+
+import org.apache.dubbo.bootstrap.rest.UserService;
+import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.config.context.ConfigManager;
+
+/**
+ * Dubbo Provider Bootstrap
+ *
+ * @since 2.7.4
+ */
+public class ZookeeperDubboServiceConsumerBootstrap {
+
+    public static void main(String[] args) throws Exception {
+
+        new DubboBootstrap()
+                .application("zookeeper-dubbo-consumer")
+                .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=zookeeper-dubbo-provider"))
+                .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo"))
+                .reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest"))
+                .start()
+                .await();
+
+        ConfigManager configManager = ConfigManager.getInstance();
+
+        ReferenceConfig<EchoService> referenceConfig = configManager.getReference("echo");
+
+        EchoService echoService = referenceConfig.get();
+
+        ReferenceConfig<UserService> referenceConfig2 = configManager.getReference("user");
+
+        UserService userService = referenceConfig2.get();
+
+        for (int i = 0; i < 500; i++) {
+            Thread.sleep(2000L);
+            System.out.println(echoService.echo("Hello,World"));
+            System.out.println(userService.getUser(i * 1L));
+        }
+
+
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.bootstrap;
+
+import org.apache.dubbo.bootstrap.rest.UserService;
+import org.apache.dubbo.bootstrap.rest.UserServiceImpl;
+
+/**
+ * TODO
+ */
+public class ZookeeperDubboServiceProviderBootstrap {
+
+    public static void main(String[] args) {
+        new DubboBootstrap()
+                .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"))
+                .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()
+                .await();
+    }
+}

dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java

@@ -26,26 +26,40 @@
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.StringUtils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.AbstractSharedListener;
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.client.config.http.HttpAgent;
+import com.alibaba.nacos.client.config.impl.HttpSimpleClient;
 
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.Executor;
+import java.util.stream.Stream;
 
 import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY;
 import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
+import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
 import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
 import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE;
 import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY;
 import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
 import static com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static org.apache.dubbo.common.constants.CommonConstants.GROUP_CHAR_SEPERATOR;
 import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
 
@@ -54,30 +68,37 @@
  */
 public class NacosDynamicConfiguration implements DynamicConfiguration {
 
+    private static final String GET_CONFIG_KEYS_PATH = "/v1/cs/configs";
+
     private final Logger logger = LoggerFactory.getLogger(getClass());
     /**
      * the default timeout in millis to get config from nacos
      */
     private static final long DEFAULT_TIMEOUT = 5000L;
 
+    private Properties nacosProperties;
+
     /**
      * The nacos configService
      */
+    private final ConfigService configService;
 
-    private ConfigService configService;
+    private HttpAgent httpAgent;
 
     /**
      * The map store the key to {@link NacosConfigListener} mapping
      */
     private final ConcurrentMap<String, NacosConfigListener> watchListenerMap;
 
     NacosDynamicConfiguration(URL url) {
-        buildConfigService(url);
+        this.nacosProperties = buildNacosProperties(url);
+        this.configService = buildConfigService(url);
+        this.httpAgent = getHttpAgent(configService);
         watchListenerMap = new ConcurrentHashMap<>();
     }
 
     private ConfigService buildConfigService(URL url) {
-        Properties nacosProperties = buildNacosProperties(url);
+        ConfigService configService = null;
         try {
             configService = NacosFactory.createConfigService(nacosProperties);
         } catch (NacosException e) {
@@ -89,6 +110,18 @@ private ConfigService buildConfigService(URL url) {
         return configService;
     }
 
+    private HttpAgent getHttpAgent(ConfigService configService) {
+        HttpAgent agent = null;
+        try {
+            Field field = configService.getClass().getDeclaredField("agent");
+            field.setAccessible(true);
+            agent = (HttpAgent) field.get(configService);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return agent;
+    }
+
     public void publishNacosConfig(String key, String value) {
         String[] keyAndGroup = getKeyAndGroup(key);
         publishConfig(keyAndGroup[0], keyAndGroup[1], value);
@@ -143,6 +176,7 @@ private void setProperties(URL url, Properties properties) {
         putPropertyIfAbsent(url, properties, ACCESS_KEY);
         putPropertyIfAbsent(url, properties, SECRET_KEY);
         putPropertyIfAbsent(url, properties, CLUSTER_NAME);
+        putPropertyIfAbsent(url, properties, ENCODE);
     }
 
     private void putPropertyIfAbsent(URL url, Properties properties, String propertyName) {
@@ -208,6 +242,36 @@ public Object getInternalProperty(String key) {
         return null;
     }
 
+    @Override
+    public SortedSet<String> getConfigKeys(String group) {
+        // TODO use Nacos Client API to replace HTTP Open API
+        SortedSet<String> keys = new TreeSet<>();
+        try {
+            List<String> paramsValues = asList("search", "accurate", "dataId", "", "group", group, "pageNo", "1", "pageSize", String.valueOf(Integer.MAX_VALUE));
+            String encoding = getProperty(ENCODE, "UTF-8");
+            HttpSimpleClient.HttpResult result = httpAgent.httpGet(GET_CONFIG_KEYS_PATH, emptyList(), paramsValues, encoding, 5 * 1000);
+            Stream<String> keysStream = toKeysStream(result.content);
+            keysStream.forEach(keys::add);
+        } catch (IOException e) {
+            if (logger.isErrorEnabled()) {
+                logger.error(e.getMessage(), e);
+            }
+        }
+        return keys;
+    }
+
+    private Stream<String> toKeysStream(String content) {
+        JSONObject jsonObject = JSON.parseObject(content);
+        JSONArray pageItems = jsonObject.getJSONArray("pageItems");
+        return pageItems.stream()
+                .map(object -> (JSONObject) object)
+                .map(json -> json.getString("dataId"));
+    }
+
+    private String getProperty(String name, String defaultValue) {
+        return nacosProperties.getProperty(name, defaultValue);
+    }
+
     public class NacosConfigListener extends AbstractSharedListener {
 
         private Set<ConfigurationListener> listeners = new CopyOnWriteArraySet<>();
@@ -259,5 +323,4 @@ private ConfigChangeType getChangeType(String configInfo, String oldValue) {
             return ConfigChangeType.MODIFIED;
         }
     }
-
 }

dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java

@@ -33,6 +33,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.SortedSet;
 import java.util.concurrent.CountDownLatch;
 
 
@@ -99,6 +100,18 @@ public void testAddListener() throws Exception {
 
     }
 
+    @Test
+    public void testGetConfigKeys() {
+
+        put("key1", "a");
+        put("key2", "b");
+
+        SortedSet<String> keys = config.getConfigKeys(DynamicConfiguration.DEFAULT_GROUP);
+
+        Assertions.assertFalse(keys.isEmpty());
+
+    }
+
     private void put(String key, String value) {
         put(key, DynamicConfiguration.DEFAULT_GROUP, value);
     }

dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java

@@ -76,10 +76,8 @@
 import static org.apache.dubbo.metadata.WritableMetadataService.DEFAULT_EXTENSION;
 import static org.apache.dubbo.registry.client.ServiceDiscoveryFactory.getExtension;
 import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getExportedServicesRevision;
-import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getMetadataServiceURLsParams;
 import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getMetadataStorageType;
-import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getProviderHost;
-import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getProviderPort;
+import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getProtocolPort;
 
 /**
  * {@link ServiceDiscoveryRegistry} is the service-oriented {@link Registry} and dislike the traditional one that
@@ -419,33 +417,27 @@ private List<URL> cloneSubscribedURLs(URL subscribedURL, Collection<ServiceInsta
 
         serviceInstances.forEach(serviceInstance -> {
 
-            List<URL> templateURLs = getTemplateURLs(subscribedURL, serviceInstance);
-            // The parameters of URLs that the MetadataService exported
-            Map<String, Map<String, Object>> serviceURLsParams = getMetadataServiceURLsParams(serviceInstance);
-
-            serviceURLsParams.forEach((protocol, parametersMap) -> {
-                templateURLs.stream()
-                        .filter(templateURL -> isCompatibleProtocol(protocol, templateURL))
-                        .map(templateURL -> templateURL.removeParameter(TIMESTAMP_KEY))
-                        .map(templateURL -> templateURL.removeParameter(PID_KEY))
-                        .map(templateURL -> {
-
-                            String host = getProviderHost(parametersMap);
-                            Integer port = getProviderPort(parametersMap);
-
-                            if (Objects.equals(templateURL.getHost(), host)
-                                    && Objects.equals(templateURL.getPort(), port)) { // use templateURL if equals
-                                return templateURL;
-                            }
-
-                            URLBuilder clonedURLBuilder = from(templateURL) // remove the parameters from the template URL
-                                    .setHost(host)  // reset the host
-                                    .setPort(port); // reset the port
-
-                            return clonedURLBuilder.build();
-                        })
-                        .forEach(clonedURLs::add);
-            });
+            String host = serviceInstance.getHost();
+
+            getTemplateURLs(subscribedURL, serviceInstance)
+                    .stream()
+                    .map(templateURL -> templateURL.removeParameter(TIMESTAMP_KEY))
+                    .map(templateURL -> templateURL.removeParameter(PID_KEY))
+                    .map(templateURL -> {
+                        String protocol = templateURL.getProtocol();
+                        int port = getProtocolPort(serviceInstance, protocol);
+                        if (Objects.equals(templateURL.getHost(), host)
+                                && Objects.equals(templateURL.getPort(), port)) { // use templateURL if equals
+                            return templateURL;
+                        }
+
+                        URLBuilder clonedURLBuilder = from(templateURL) // remove the parameters from the template URL
+                                .setHost(host)  // reset the host
+                                .setPort(port); // reset the port
+
+                        return clonedURLBuilder.build();
+                    })
+                    .forEach(clonedURLs::add);
         });
         return clonedURLs;
     }