Polish apache#3984 : Add Service registration and discovery implement…

…ation for Zookeeper

dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableConsumer.java

@@ -0,0 +1,66 @@
+/*
+ * 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.common.function;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * {@link Consumer} with {@link Throwable}
+ *
+ * @param <T> the source type
+ * @see Function
+ * @see Throwable
+ * @since 2.7.2
+ */
+@FunctionalInterface
+public interface ThrowableConsumer<T> {
+
+    /**
+     * Applies this function to the given argument.
+     *
+     * @param t the function argument
+     * @throws Throwable if met with any error
+     */
+    void accept(T t) throws Throwable;
+
+    /**
+     * Executes {@link ThrowableConsumer}
+     *
+     * @param t the function argument
+     * @throws RuntimeException wrappers {@link Throwable}
+     */
+    default void execute(T t) throws RuntimeException {
+        try {
+            accept(t);
+        } catch (Throwable e) {
+            throw new RuntimeException(e.getMessage(), e.getCause());
+        }
+    }
+
+    /**
+     * Executes {@link ThrowableConsumer}
+     *
+     * @param t        the function argument
+     * @param consumer {@link ThrowableConsumer}
+     * @param <T>      the source type
+     * @return the result after execution
+     */
+    static <T> void execute(T t, ThrowableConsumer<T> consumer) {
+        consumer.execute(t);
+    }
+}

dubbo-common/src/main/java/org/apache/dubbo/common/function/ThrowableFunction.java

@@ -0,0 +1,71 @@
+/*
+ * 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.common.function;
+
+import java.util.function.Function;
+
+/**
+ * {@link Function} with {@link Throwable}
+ *
+ * @param <T> the source type
+ * @param <R> the return type
+ * @see Function
+ * @see Throwable
+ * @since 2.7.2
+ */
+@FunctionalInterface
+public interface ThrowableFunction<T, R> {
+
+    /**
+     * Applies this function to the given argument.
+     *
+     * @param t the function argument
+     * @return the function result
+     * @throws Throwable if met with any error
+     */
+    R apply(T t) throws Throwable;
+
+    /**
+     * Executes {@link ThrowableFunction}
+     *
+     * @param t the function argument
+     * @return the function result
+     * @throws RuntimeException wrappers {@link Throwable}
+     */
+    default R execute(T t) throws RuntimeException {
+        R result = null;
+        try {
+            result = apply(t);
+        } catch (Throwable e) {
+            throw new RuntimeException(e.getCause());
+        }
+        return result;
+    }
+
+    /**
+     * Executes {@link ThrowableFunction}
+     *
+     * @param t        the function argument
+     * @param function {@link ThrowableFunction}
+     * @param <T>      the source type
+     * @param <R>      the return type
+     * @return the result after execution
+     */
+    static <T, R> R execute(T t, ThrowableFunction<T, R> function) {
+        return function.execute(t);
+    }
+}

dubbo-dependencies-bom/pom.xml

@@ -228,6 +228,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-x-discovery</artifactId>
+                <version>${curator_version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>zookeeper</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>redis.clients</groupId>
                 <artifactId>jedis</artifactId>

dubbo-registry/dubbo-registry-zookeeper/pom.xml

@@ -39,6 +39,10 @@
             <artifactId>dubbo-remoting-zookeeper</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>

dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperInstance.java

@@ -0,0 +1,77 @@
+/*
+ * 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.registry.zookeeper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents the default payload of a registered service in Zookeeper.
+ * <p>
+ * It's compatible with Spring Cloud
+ *
+ * @since 2.7.2
+ */
+public class ZookeeperInstance {
+
+    private String id;
+
+    private String name;
+
+    private Map<String, String> metadata = new HashMap<>();
+
+    @SuppressWarnings("unused")
+    private ZookeeperInstance() {
+    }
+
+    public ZookeeperInstance(String id, String name, Map<String, String> metadata) {
+        this.id = id;
+        this.name = name;
+        this.metadata = metadata;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map<String, String> getMetadata() {
+        return this.metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
+
+    @Override
+    public String toString() {
+        return "ZookeeperInstance{" + "id='" + this.id + '\'' + ", name='" + this.name
+                + '\'' + ", metadata=" + this.metadata + '}';
+    }
+
+}