Add naming support gRPC for query instance list and service info

address/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

api/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java

@@ -99,6 +99,18 @@ public void setHosts(List<Instance> hosts) {
         this.hosts = hosts;
     }
 
+    public void addHost(Instance host) {
+        hosts.add(host);
+    }
+
+    public void addAllHosts(List<? extends Instance> hosts) {
+        this.hosts.addAll(hosts);
+    }
+
+    public List<Instance> getHosts() {
+        return new ArrayList<Instance>(hosts);
+    }
+
     public boolean isValid() {
         return hosts != null;
     }
@@ -143,10 +155,6 @@ public void setCacheMillis(long cacheMillis) {
         this.cacheMillis = cacheMillis;
     }
 
-    public List<Instance> getHosts() {
-        return new ArrayList<Instance>(hosts);
-    }
-
     /**
      * Judge whether service info is validate.
      *

api/src/main/java/com/alibaba/nacos/api/naming/remote/NamingRemoteConstants.java

@@ -30,4 +30,6 @@ public class NamingRemoteConstants {
 
     public static final String SUBSCRIBE_SERVICE = "subscribeService";
 
+    public static final String QUERY_SERVICE = "queryService";
+
 }

api/src/main/java/com/alibaba/nacos/api/naming/remote/request/InstanceRequest.java

@@ -17,7 +17,6 @@
 package com.alibaba.nacos.api.naming.remote.request;
 
 import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.api.naming.utils.NamingUtils;
 
 /**
  * Nacos instances request.
@@ -33,10 +32,6 @@ public class InstanceRequest extends NamingCommonRequest {
     public InstanceRequest() {
     }
 
-    public InstanceRequest(String namespace, String type, Instance instance) {
-        this(namespace, instance.getServiceName(), NamingUtils.getGroupName(instance.getServiceName()), type, instance);
-    }
-
     public InstanceRequest(String namespace, String serviceName, String type, Instance instance) {
         super(namespace, serviceName, null);
         this.type = type;

api/src/main/java/com/alibaba/nacos/api/naming/remote/request/ServiceQueryRequest.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.api.naming.remote.request;
+
+import com.alibaba.nacos.api.naming.remote.NamingRemoteConstants;
+
+/**
+ * Nacos naming query request.
+ *
+ * @author xiweng.yy
+ */
+public class ServiceQueryRequest extends NamingCommonRequest {
+
+    private String cluster;
+
+    private boolean healthyOnly;
+
+    private int udpPort;
+
+    public ServiceQueryRequest() {
+    }
+
+    public ServiceQueryRequest(String namespace, String serviceName) {
+        super(namespace, serviceName, null);
+    }
+
+    @Override
+    public String getType() {
+        return NamingRemoteConstants.QUERY_SERVICE;
+    }
+
+    public String getCluster() {
+        return cluster;
+    }
+
+    public void setCluster(String cluster) {
+        this.cluster = cluster;
+    }
+
+    public boolean isHealthyOnly() {
+        return healthyOnly;
+    }
+
+    public void setHealthyOnly(boolean healthyOnly) {
+        this.healthyOnly = healthyOnly;
+    }
+
+    public int getUdpPort() {
+        return udpPort;
+    }
+
+    public void setUdpPort(int udpPort) {
+        this.udpPort = udpPort;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/naming/remote/response/ServiceQueryResponse.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.api.naming.remote.response;
+
+import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
+import com.alibaba.nacos.api.naming.remote.NamingRemoteConstants;
+import com.alibaba.nacos.api.remote.response.Response;
+
+/**
+ * Nacos naming query request.
+ *
+ * @author xiweng.yy
+ */
+public class ServiceQueryResponse extends Response {
+
+    private ServiceInfo serviceInfo;
+
+    public ServiceQueryResponse() {
+        setType(NamingRemoteConstants.QUERY_SERVICE);
+    }
+
+    public ServiceQueryResponse(ServiceInfo serviceInfo) {
+        this(200, "success");
+        this.serviceInfo = serviceInfo;
+    }
+
+    public ServiceQueryResponse(int resultCode, String message) {
+        super(NamingRemoteConstants.QUERY_SERVICE, resultCode, message);
+    }
+
+    public ServiceInfo getServiceInfo() {
+        return serviceInfo;
+    }
+
+    public void setServiceInfo(ServiceInfo serviceInfo) {
+        this.serviceInfo = serviceInfo;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/remote/ResponseRegistry.java

@@ -22,6 +22,7 @@
 import com.alibaba.nacos.api.config.remote.response.ConfigResponseTypeConstants;
 import com.alibaba.nacos.api.naming.remote.NamingRemoteConstants;
 import com.alibaba.nacos.api.naming.remote.response.InstanceResponse;
+import com.alibaba.nacos.api.naming.remote.response.ServiceQueryResponse;
 import com.alibaba.nacos.api.remote.response.ConnectResetResponse;
 import com.alibaba.nacos.api.remote.response.HeartBeatResponse;
 import com.alibaba.nacos.api.remote.response.ResponseTypeConstants;
@@ -54,6 +55,7 @@ public class ResponseRegistry {
         //REGISTRY_RESPONSES.put(NamingRequestTypeConstants.SERVICE_INSTANCE_CHANGE, ServiceI.class);
         REGISTRY_RESPONSES.put(NamingRemoteConstants.REGISTER_INSTANCE, InstanceResponse.class);
         REGISTRY_RESPONSES.put(NamingRemoteConstants.DE_REGISTER_INSTANCE, InstanceResponse.class);
+        REGISTRY_RESPONSES.put(NamingRemoteConstants.QUERY_SERVICE, ServiceQueryResponse.class);
     }
 
     public static Class getClassByType(String type) {

client/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/src/main/java/com/alibaba/nacos/client/naming/net/NamingGrpcClientProxy.java

@@ -18,8 +18,12 @@
 
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
 import com.alibaba.nacos.api.naming.remote.NamingRemoteConstants;
 import com.alibaba.nacos.api.naming.remote.request.InstanceRequest;
+import com.alibaba.nacos.api.naming.remote.request.ServiceQueryRequest;
+import com.alibaba.nacos.api.naming.remote.response.ServiceQueryResponse;
+import com.alibaba.nacos.api.remote.request.Request;
 import com.alibaba.nacos.api.remote.response.Response;
 import com.alibaba.nacos.client.remote.RpcClient;
 import com.alibaba.nacos.client.remote.RpcClientFactory;
@@ -43,18 +47,8 @@ public NamingGrpcClientProxy(String namespaceId) {
         rpcClient = RpcClientFactory.getClient("naming");
     }
 
-    public void start() throws NacosException {
-        rpcClient.init(new ServerListFactory() {
-            @Override
-            public String genNextServer() {
-                return "localhost:8848";
-            }
-
-            @Override
-            public String getCurrentServer() {
-                return "localhost:8848";
-            }
-        });
+    public void start(ServerListFactory serverListFactory) throws NacosException {
+        rpcClient.init(serverListFactory);
         rpcClient.start();
     }
 
@@ -72,9 +66,7 @@ public void registerService(String serviceName, String groupName, Instance insta
         InstanceRequest request = new InstanceRequest(namespaceId, serviceName, groupName,
                 NamingRemoteConstants.REGISTER_INSTANCE, instance);
         Response response = rpcClient.request(request);
-        if (200 != response.getResultCode()) {
-            throw new NacosException(response.getErrorCode(), response.getMessage());
-        }
+        requestToServer(request, Response.class);
     }
 
     /**
@@ -90,9 +82,43 @@ public void deregisterService(String serviceName, Instance instance) throws Naco
                         instance);
         InstanceRequest request = new InstanceRequest(namespaceId, serviceName,
                 NamingRemoteConstants.DE_REGISTER_INSTANCE, instance);
-        Response response = rpcClient.request(request);
-        if (200 != response.getResultCode()) {
-            throw new NacosException(response.getErrorCode(), response.getMessage());
+        requestToServer(request, Response.class);
+    }
+
+    /**
+     * Query instance list.
+     *
+     * @param serviceName service name
+     * @param clusters    clusters
+     * @param udpPort     udp port
+     * @param healthyOnly healthy only
+     * @return service info
+     * @throws NacosException nacos exception
+     */
+    public ServiceInfo queryInstancesOfService(String serviceName, String clusters, int udpPort, boolean healthyOnly)
+            throws NacosException {
+        ServiceQueryRequest request = new ServiceQueryRequest(namespaceId, serviceName);
+        request.setCluster(clusters);
+        request.setHealthyOnly(healthyOnly);
+        request.setUdpPort(udpPort);
+        ServiceQueryResponse response = requestToServer(request, ServiceQueryResponse.class);
+        return response.getServiceInfo();
+    }
+
+    private <T extends Response> T requestToServer(Request request, Class<T> responseClass) throws NacosException {
+        try {
+            Response response = rpcClient.request(request);
+            if (200 != response.getResultCode()) {
+                throw new NacosException(response.getErrorCode(), response.getMessage());
+            }
+            if (responseClass.isAssignableFrom(response.getClass())) {
+                return (T) response;
+            }
+            NAMING_LOGGER.error("Server return unexpected response '{}', expected response should be '{}'",
+                    response.getClass().getName(), responseClass.getName());
+        } catch (Exception e) {
+            throw new NacosException(NacosException.SERVER_ERROR, "Request nacos server failed: ", e);
         }
+        throw new NacosException(NacosException.SERVER_ERROR, "Server return invalid response");
     }
 }

cmdb/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

config/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

consistency/pom.xml

@@ -85,7 +85,7 @@
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <properties>

console/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>nacos-console</artifactId>
     <packaging>jar</packaging>

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

distribution/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

example/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

istio/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.3.1</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>