Merge branch 'master' into dependabot/maven/dubbo-api-docs/com.puppycrawl.tools-checkstyle-8.29
diff --git a/.asf.yaml b/.asf.yaml
index c7c0081..563124d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -26,3 +26,10 @@
features:
# Enable issue management
issues: true
+ enabled_merge_buttons:
+ # enable squash button:
+ squash: true
+ # enable merge button:
+ merge: false
+ # disable rebase button:
+ rebase: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18d385a..e881190 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-18.04, windows-2019 ]
+ os: [ ubuntu-latest]
jdk: [ 8, 11 ]
steps:
- uses: actions/checkout@v2
@@ -42,7 +42,7 @@
./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
- name: "Test with Maven"
timeout-minutes: 50
- if: ${{ startsWith( matrix.os, 'windows') }}
+ if: ${{ startsWith( matrix.os) }}
run: |
cd ./dubbo-spi-extensions
./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
index dd3700b..e2a0861 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -122,7 +122,7 @@
strategy:
fail-fast: false
matrix:
- java: [ 8,11 ]
+ java: [ 8,11]
env:
JAVA_VER: ${{matrix.java}}
steps:
diff --git a/README.md b/README.md
index ef5d07b..3037d58 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,104 @@
# dubbo-spi-extensions
-
[](https://travis-ci.org/apache/dubbo-spi-extensions)
+[](https://codecov.io/gh/apache/dubbo-spi-extensions)
+[](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)
+[]
+
+The purpose of dubbo-spi-extensions is to provide open, community-driven, reusable components to build microservice programs with different needs. These components extend the core of the Apache Dubbo project, but they are separated and decoupled.
+
+Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs.
+
+For version release notes, please refer to the documentation:
+- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)
+- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)
+
+The available extensions are as follows:
+
+- [dubbo-api-docs](dubbo-api-docs)
+ - [dubbo-api-docs-annotations](dubbo-api-docs/dubbo-api-docs-annotations)
+ - [dubbo-api-docs-core](dubbo-api-docs/dubbo-api-docs-core)
+ - [dubbo-api-docs-examples](dubbo-api-docs/dubbo-api-docs-examples)
+- [dubbo-cluster-extensions](dubbo-cluster-extensions)
+ - [dubbo-cluster-broadcast-1](dubbo-cluster-extensions/dubbo-cluster-broadcast-1)
+ - [dubbo-cluster-loadbalance-peakewma](dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma)
+ - [dubbo-cluster-polaris-dubbo2](dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2)
+ - [dubbo-cluster-specify-address-common](dubbo-cluster-extensions/dubbo-cluster-specify-address-common)
+ - [dubbo-cluster-specify-address-dubbo2](dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2)
+ - [dubbo-cluster-specify-address-dubbo3](dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3)
+- [dubbo-common-extensions](dubbo-common-extensions)
+- [dubbo-configcenter-extensions](dubbo-configcenter-extensions)
+ - [dubbo-configcenter-consul](dubbo-configcenter-extensions/dubbo-configcenter-consul)
+ - [dubbo-configcenter-etcd](dubbo-configcenter-extensions/dubbo-configcenter-etcd)
+- [dubbo-cross-thread-extensions](dubbo-cross-thread-extensions)
+- [dubbo-extensions-dependencies-bom](dubbo-extensions-dependencies-bom)
+- [dubbo-extensions-distribution](dubbo-extensions-distribution)
+ - [dubbo-apache-release](dubbo-extensions-distribution/dubbo-apache-release)
+ - [dubbo-bom](dubbo-extensions-distribution/dubbo-bom)
+- [dubbo-filter-extensions](dubbo-filter-extensions)
+ - [dubbo-filter-polaris-dubbo2](dubbo-filter-extensions/dubbo-filter-polaris-dubbo2)
+ - [dubbo-filter-polaris-circuitbreaker-dubbo2](dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2)
+ - [dubbo-filter-polaris-ratelimit-dubbo2](dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2)
+ - [dubbo-filter-seata](dubbo-filter-extensions/dubbo-filter-seata)
+- [dubbo-gateway-extensions](dubbo-gateway-extensions)
+ - [dubbo-gateway-common](dubbo-gateway-extensions/dubbo-gateway-common)
+ - [dubbo-gateway-consumer](dubbo-gateway-extensions/dubbo-gateway-consumer)
+ - [dubbo-gateway-provider](dubbo-gateway-extensions/dubbo-gateway-provider)
+- [dubbo-kubernetes](dubbo-kubernetes)
+- [dubbo-metadata-report-extensions](dubbo-metadata-report-extensions)
+ - [dubbo-metadata-report-consul](dubbo-metadata-report-extensions/dubbo-metadata-report-consul)
+ - [dubbo-metadata-report-etcd](dubbo-metadata-report-extensions/dubbo-metadata-report-etcd)
+- [dubbo-mock-extensions](dubbo-mock-extensions)
+ - [dubbo-mock-admin](dubbo-mock-extensions/dubbo-mock-admin)
+ - [dubbo-mock-api](dubbo-mock-extensions/dubbo-mock-api)
+- [dubbo-registry-extensions](dubbo-registry-extensions)
+ - [dubbo-registry-consul](dubbo-registry-extensions/dubbo-registry-consul)
+ - [dubbo-registry-dns](dubbo-registry-extensions/dubbo-registry-dns)
+ - [dubbo-registry-etcd3](dubbo-registry-extensions/dubbo-registry-etcd3)
+ - [dubbo-registry-nameservice](dubbo-registry-extensions/dubbo-registry-nameservice)
+ - [dubbo-registry-polaris](dubbo-registry-extensions/dubbo-registry-polaris)
+ - [dubbo-registry-redis](dubbo-registry-extensions/dubbo-registry-redis)
+ - [dubbo-registry-sofa](dubbo-registry-extensions/dubbo-registry-sofa)
+- [dubbo-remoting-extensions](dubbo-remoting-extensions)
+ - [dubbo-remoting-etcd3](dubbo-remoting-extensions/dubbo-remoting-etcd3)
+ - [dubbo-remoting-grizzly](dubbo-remoting-extensions/dubbo-remoting-grizzly)
+ - [dubbo-remoting-mina](dubbo-remoting-extensions/dubbo-remoting-mina)
+ - [dubbo-remoting-p2p](dubbo-remoting-extensions/dubbo-remoting-p2p)
+ - [dubbo-remoting-quic](dubbo-remoting-extensions/dubbo-remoting-quic)
+ - [dubbo-remoting-redis](dubbo-remoting-extensions/dubbo-remoting-redis)
+- [dubbo-rpc-extensions](dubbo-rpc-extensions)
+ - [dubbo-rpc-hessian](dubbo-rpc-extensions/dubbo-rpc-hessian)
+ - [dubbo-rpc-http](dubbo-rpc-extensions/dubbo-rpc-http)
+ - [dubbo-rpc-memcached](dubbo-rpc-extensions/dubbo-rpc-memcached)
+ - [dubbo-rpc-native-thrift](dubbo-rpc-extensions/dubbo-rpc-native-thrift)
+ - [dubbo-rpc-redis](dubbo-rpc-extensions/dubbo-rpc-redis)
+ - [dubbo-rpc-rmi](dubbo-rpc-extensions/dubbo-rpc-rmi)
+ - [dubbo-rpc-rocketmq](dubbo-rpc-extensions/dubbo-rpc-rocketmq)
+ - [dubbo-rpc-webservice](dubbo-rpc-extensions/dubbo-rpc-webservice)
+- [dubbo-serialization-extensions](dubbo-serialization-extensions)
+ - [dubbo-serialization-avro](dubbo-serialization-extensions/dubbo-serialization-avro)
+ - [dubbo-serialization-fastjson](dubbo-serialization-extensions/dubbo-serialization-fastjson)
+ - [dubbo-serialization-fst](dubbo-serialization-extensions/dubbo-serialization-fst)
+ - [dubbo-serialization-fury](dubbo-serialization-extensions/dubbo-serialization-fury)
+ - [dubbo-serialization-gson](dubbo-serialization-extensions/dubbo-serialization-gson)
+ - [dubbo-serialization-jackson](dubbo-serialization-extensions/dubbo-serialization-jackson)
+ - [dubbo-serialization-kryo](dubbo-serialization-extensions/dubbo-serialization-kryo)
+ - [dubbo-serialization-msgpack](dubbo-serialization-extensions/dubbo-serialization-msgpack)
+ - [dubbo-serialization-native-hession](dubbo-serialization-extensions/dubbo-serialization-native-hession)
+ - [dubbo-serialization-protobuf](dubbo-serialization-extensions/dubbo-serialization-protobuf)
+ - [dubbo-serialization-protostuff](dubbo-serialization-extensions/dubbo-serialization-protostuff)
+ - [dubbo-serialization-test](dubbo-serialization-extensions/dubbo-serialization-test)
+- [dubbo-tag-extensions](dubbo-tag-extensions)
+ - [dubbo-tag-subnets](dubbo-tag-extensions/dubbo-tag-subnets)
+- [dubbo-xds](dubbo-xds)
+
+## Contribution
+
+
+Thanks to everyone who has contributed!
+
+
+<a href="https://github.com/apache/dubbo-spi-extensions/graphs/contributors">
+ <img src="https://contributors-img.web.app/image?repo=apache/dubbo-spi-extensions" />
+</a>
+
+
diff --git a/README_CN.md b/README_CN.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README_CN.md
diff --git a/dobbo-doc-auto-gen/pom.xml b/dobbo-doc-auto-gen/pom.xml
new file mode 100644
index 0000000..f00250d
--- /dev/null
+++ b/dobbo-doc-auto-gen/pom.xml
@@ -0,0 +1,48 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <version>1.0.1-SNAPSHOT</version>
+ <description>Dubbo interface documentation, testing tools</description>
+
+ <artifactId>dobbo-doc-auto-gen</artifactId>
+ <packaging>jar</packaging>
+
+ <name>doc-auto-gen</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java b/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java
new file mode 100644
index 0000000..878803f
--- /dev/null
+++ b/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java
@@ -0,0 +1,98 @@
+/*
+ * 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.doc;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Arrays;
+
+public class DocAutoGen {
+ public static void main(String[] args) throws IOException {
+ String filePath = System.getProperty("user.dir");
+ File file = new File(filePath);
+ int level = 0;
+ String parentPath = "";
+ System.setOut(new PrintStream(filePath + "/" + "README.md"));
+ String title = "# dubbo-spi-extensions";
+ System.out.println(title);
+ String x = "[](https://travis-ci.org/apache/dubbo-spi-extensions)\n" +
+ "[](https://codecov.io/gh/apache/dubbo-spi-extensions)\n" +
+ "[](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)\n" +
+ "[]";
+ System.out.println(x);
+ System.out.println();
+ String description = "The purpose of dubbo-spi-extensions is to provide open, community-driven, reusable components to build microservice programs with different needs. These components extend the core of the Apache Dubbo project, but they are separated and decoupled.";
+ System.out.println(description);
+
+ System.out.println();
+ String usage = "Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. ";
+ System.out.println(usage);
+ System.out.println();
+ System.out.println("For version release notes, please refer to the documentation:");
+ System.out.println("- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)");
+ System.out.println("- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)");
+ System.out.println();
+
+ String asFollow = "The available extensions are as follows:";
+ System.out.println(asFollow);
+ System.out.println();
+
+ visitFile(file, parentPath, level);
+ System.out.println();
+ String contributorTitle = "## Contribution\n";
+ String thanks = "Thanks to everyone who has contributed!\n";
+ String contributorImg =
+ "<a href=\"https://github.com/apache/dubbo-spi-extensions/graphs/contributors\">\n" +
+ " <img src=\"https://contributors-img.web.app/image?repo=apache/dubbo-spi-extensions\" />\n" +
+ "</a>\n" ;
+ System.out.println(contributorTitle);
+ System.out.println();
+ System.out.println(thanks);
+ System.out.println();
+ System.out.println(contributorImg);
+ System.out.println();
+ }
+
+ private static void visitFile(File file, String parentPath, int level) {
+ File[] files = file.listFiles();
+ // gen code sort by file name
+ Arrays.sort(files, (o1, o2) -> {
+ if (o1.isDirectory() && o2.isFile()) {
+ return -1;
+ }
+ if (o1.isFile() && o2.isDirectory()) {
+ return 1;
+ }
+ return o1.getName().compareTo(o2.getName());
+ });
+ for (int i = 0; i < files.length; i++) {
+ File f = files[i];
+ String name = f.getName();
+ if (name.startsWith("dubbo-")) {
+ String blank = "";
+ for (int j = 0; j < level; j++) {
+ blank += " ";
+ }
+
+ String currentPath = level == 0 ? name : parentPath + "/" + name;
+ System.out.println(blank + "- [" + name + "]" + "(" + currentPath + ")");
+ visitFile(f, currentPath, level + 1);
+ }
+ }
+ }
+}
diff --git a/dubbo-api-docs/README.md b/dubbo-api-docs/README.md
index 64843b9..0f5c4f7 100644
--- a/dubbo-api-docs/README.md
+++ b/dubbo-api-docs/README.md
@@ -9,7 +9,7 @@
## Involving repositorys
* [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions)
- [\branch: 2.7.x\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/2.7.x/dubbo-api-docs):
+ [\branch: 3.2.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.2.0/dubbo-api-docs):
Dubbo-Api-Docs related annotation ,annotation parsing
* [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs document display, test function
@@ -25,7 +25,7 @@
* Of course, Dubbo API Docs consumed a little CPU resources when the project starting and used a little memory
for caching. In the future, it will consider putting the contents of the cache into the metadata center
-### Current Version: 2.7.8.3
+### Current Version: 3.2.0
```
<dependency>
diff --git a/dubbo-api-docs/README_ch.md b/dubbo-api-docs/README_ch.md
index 63ae7e2..4a19809 100644
--- a/dubbo-api-docs/README_ch.md
+++ b/dubbo-api-docs/README_ch.md
@@ -9,7 +9,7 @@
## 相关项目
* [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions)
- [\分支: 2.7.x\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/2.7.x/dubbo-api-docs):
+ [\分支: 3.2.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.2.0/dubbo-api-docs):
Dubbo-Api-Docs 相关注解,解析注解
* [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs 文档展示,测试功能
@@ -22,7 +22,7 @@
* 为避免增加生产环境中的资源占用, 建议单独创建一个配制类用于启用Dubbo Api Docs, 并配合 @Profile("dev") 注解使用
* 当然, Dubbo Api Docs 仅在项目启动时多消耗了点CPU资源, 并使用了一点点内存用于缓存, 将来会考虑将缓存中的内容放到元数据中心.
-### 当前版本: 2.7.8.3
+### 当前版本: 3.2.0
```
<dependency>
diff --git a/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml b/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml
index 37794b4..dc0650f 100644
--- a/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dubbo-api-docs/dubbo-api-docs-core/pom.xml b/dubbo-api-docs/dubbo-api-docs-core/pom.xml
index 4d38aec..f6386c2 100644
--- a/dubbo-api-docs/dubbo-api-docs-core/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dubbo-api-docs/dubbo-api-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java b/dubbo-api-docs/dubbo-api-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java
index 7e25b61..c8867b9 100644
--- a/dubbo-api-docs/dubbo-api-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java
+++ b/dubbo-api-docs/dubbo-api-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java
@@ -40,6 +40,7 @@
import com.alibaba.fastjson.JSON;
import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.rpc.model.FrameworkModel;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -90,14 +91,7 @@
@Autowired
private ApplicationContext applicationContext;
- @Autowired
- private ApplicationConfig application;
- @Autowired
- private RegistryConfig registry;
-
- @Autowired
- private ProtocolConfig protocol;
@Autowired(required = false)
private ProviderConfig providerConfig;
@@ -524,9 +518,13 @@
*/
private <I, T> void exportDubboService(Class<I> serviceClass, T serviceImplInstance, boolean async) {
ServiceConfig<T> service = new ServiceConfig<>();
+ ApplicationConfig application = FrameworkModel.defaultModel().defaultApplication().getCurrentConfig();
service.setApplication(application);
- service.setRegistry(registry);
- service.setProtocol(protocol);
+ List<RegistryConfig> registrys = FrameworkModel.defaultModel().defaultApplication().getApplicationConfigManager().getDefaultRegistries();
+ Collection<ProtocolConfig> protocols = FrameworkModel.defaultModel().defaultApplication().getApplicationConfigManager().getProtocols();
+
+ service.setRegistry(registrys.get(0));
+ service.setProtocol(protocols.iterator().next());
service.setInterface(serviceClass);
service.setRef(serviceImplInstance);
service.setAsync(async);
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml
index 6dbff83..a552bc5 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
index bded94e..b1ab558 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>examples-api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
index d68d910..315ce71 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>examples-api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -75,6 +75,7 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
@@ -104,6 +105,12 @@
<artifactId>dubbo-monitor-default</artifactId>
<version>${dubbo.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-dependencies-zookeeper</artifactId>
+ <type>pom</type>
+ <version>${dubbo.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java
index 8385af8..f508789 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java
@@ -17,23 +17,22 @@
package org.apache.dubbo.apidocs.examples;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-
-import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.Profile;
/**
* example dubbo provider service application.
*/
+
@SpringBootApplication
+@Profile("dev")
@EnableDubbo(scanBasePackages = {"org.apache.dubbo.apidocs.examples.api"})
public class ExampleApplication {
public static void main(String[] args) {
new SpringApplicationBuilder(ExampleApplication.class)
// Non web applications
- .web(WebApplicationType.NONE)
.run(args);
}
-
}
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml
index 77213eb..0b98802 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml
@@ -33,6 +33,8 @@
name: dubbo
application:
name: dubbo-api-docs-example-provider
+ qos-enable: true
+ qos-port: 22222
metadata-report:
address: zookeeper://127.0.0.1:2181
# group: DEFAULT_GROUP
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/pom.xml
index 9b9e226..c510f46 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dubbo-api-docs/pom.xml b/dubbo-api-docs/pom.xml
index b8288fa..566c90b 100644
--- a/dubbo-api-docs/pom.xml
+++ b/dubbo-api-docs/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>dubbo-api-docs</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@ -42,14 +42,13 @@
<maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
- <dubbo.version>2.7.18</dubbo.version>
- <dubbo_version>2.7.8</dubbo_version>
+ <dubbo.version>3.2.7</dubbo.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-collections.version>4.2</commons-collections.version>
<disruptor.version>3.4.2</disruptor.version>
<springfox.version>3.0.0</springfox.version>
<nacos.version>1.4.0</nacos.version>
-
+ <dubbo.api.docs.version>3.2.0-SNAPSHOT</dubbo.api.docs.version>
<spring-cloud.version>Hoxton.SR8</spring-cloud.version>
<spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version>
</properties>
@@ -75,12 +74,12 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs-annotations</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${dubbo.api.docs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs-core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${dubbo.api.docs.version}</version>
</dependency>
<dependency>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/README.md b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/README.md
new file mode 100644
index 0000000..e26993f
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/README.md
@@ -0,0 +1,5 @@
+
+# Dubbo Cluster BroadCast 1
+
+## Introduction
+The consumer initiates a broadcast call to all providers and obtains the call results of all providers.
diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/Readme.md b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/Readme.md
deleted file mode 100644
index 5adf0e4..0000000
--- a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/Readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dubbo Cluster BroadCast 1
-
-TBD
diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml
index 871b691..5664cec 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml
+++ b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml
@@ -27,13 +27,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-cluster-broadcast-1</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-cluster</artifactId>
+ <version>3.2.7</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1InvokerTest.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1InvokerTest.java
index 52aff89..68589ba 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1InvokerTest.java
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.support;
-import org.apache.dubbo.rpc.Invoker;
+import org.junit.jupiter.api.Test;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+class BroadcastCluster1InvokerTest {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+ @Test
+ void doInvoke() {
+ //todo
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
}
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1Test.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1Test.java
index 52aff89..559e3fa 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/src/test/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1Test.java
@@ -14,24 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.support;
-import org.apache.dubbo.rpc.Invoker;
+import org.junit.jupiter.api.Test;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+class BroadcastCluster1Test {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Test
+ void doJoin() {
}
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README.md b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README.md
new file mode 100644
index 0000000..0983ebb
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README.md
@@ -0,0 +1,13 @@
+# Introduction
+PeakEwmaLoadBalance is designed to converge quickly when encountering slow endpoints.
+
+It is quick to react to latency spikes recovering only cautiously.Peak EWMA takes history into account,so that slow behavior is penalized relative to the supplied `decayTime`.
+
+if there are multiple invokers and the same cost,then randomly called,which doesn't care about weight.
+
+Inspiration drawn from:
+
+https://github.com/twitter/finagle/blob/1bc837c4feafc0096e43c0e98516a8e1c50c4421
+
+/finagle-core/src/main/scala/com/twitter/finagle/loadbalancer/PeakEwma.scala
+
diff --git a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README_CN.md b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README_CN.md
new file mode 100644
index 0000000..ac12720
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/README_CN.md
@@ -0,0 +1,12 @@
+# 简介
+PeakEwmaLoadBalance 旨在在遇到慢速端点时快速收敛。
+
+它对延迟峰值反应很快，只是谨慎地恢复。峰值 EWMA 会考虑历史，因此相对于提供的“decayTime”，缓慢的行为会受到惩罚。
+
+如果有多个调用者且成本相同，则随机调用，不关心权重。
+
+灵感源自：
+
+https://github.com/twitter/finagle/blob/1bc837c4feafc0096e43c0e98516a8e1c50c4421
+
+/finagle-core/src/main/scala/com/twitter/finagle/loadbalancer/PeakEwma.scala
diff --git a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml
index 549cc44..58fbc18 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml
+++ b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml
@@ -27,18 +27,25 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-cluster-loadbalance-peakewma</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.dubbo</groupId>-->
+<!-- <artifactId>dubbo-cluster</artifactId>-->
+<!-- <optional>true</optional>-->
+<!-- <version>3.2.7</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-cluster</artifactId>
- <optional>true</optional>
+ <artifactId>dubbo</artifactId>
+ <version>3.2.7</version>
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-api</artifactId>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml
new file mode 100644
index 0000000..0b21901
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-cluster-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-cluster-polaris-dubbo2</artifactId>
+ <name>dubbo-cluster-polaris-dubbo2</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>Dubbo2 cluster extension for PolarisMesh, support dynamic routing capability.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>2.7.18</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.tencent.polaris</groupId>
+ <artifactId>polaris-adapter-dubbo</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/InstanceInvoker.java b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/InstanceInvoker.java
new file mode 100644
index 0000000..37b4893
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/InstanceInvoker.java
@@ -0,0 +1,233 @@
+/*
+ * 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.rpc.cluster.router;
+
+import com.tencent.polaris.api.pojo.CircuitBreakerStatus;
+import com.tencent.polaris.api.pojo.DefaultInstance;
+import com.tencent.polaris.api.pojo.Instance;
+import com.tencent.polaris.api.pojo.StatusDimension;
+import com.tencent.polaris.common.registry.Consts;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.cluster.Constants;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class InstanceInvoker<T> implements Instance, Invoker<T> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(InstanceInvoker.class);
+
+ private final Invoker<T> invoker;
+
+ private final DefaultInstance defaultInstance;
+
+ public InstanceInvoker(Invoker<T> invoker, String namespace) {
+ this.invoker = invoker;
+ defaultInstance = new DefaultInstance();
+ defaultInstance.setNamespace(namespace);
+ URL url = invoker.getUrl();
+ defaultInstance.setService(url.getServiceInterface());
+ defaultInstance.setHost(url.getHost());
+ defaultInstance.setPort(url.getPort());
+ defaultInstance.setId(url.getParameter(Consts.INSTANCE_KEY_ID));
+ defaultInstance.setHealthy(Boolean.parseBoolean(url.getParameter(Consts.INSTANCE_KEY_HEALTHY)));
+ defaultInstance.setIsolated(Boolean.parseBoolean(url.getParameter(Consts.INSTANCE_KEY_ISOLATED)));
+ defaultInstance.setVersion(url.getParameter(CommonConstants.VERSION_KEY));
+ defaultInstance.setWeight(url.getParameter(Constants.WEIGHT_KEY, 100));
+ defaultInstance.setMetadata(convertMetadata(url.getParameters()));
+ LOGGER.info(String.format("[POLARIS] construct instance from invoker, url %s, instance %s", url, defaultInstance));
+ }
+
+ private Map<String, String> convertMetadata(Map<String, String> parameters) {
+ Map<String, String> ret = new HashMap<>();
+ parameters.forEach((key, value) -> {
+ ret.put(key, value);
+ if (StringUtils.isEquals(key, CommonConstants.REMOTE_APPLICATION_KEY)) {
+ key = "application";
+ ret.put(key, value);
+ }
+ });
+ return ret;
+ }
+
+ @Override
+ public Class<T> getInterface() {
+ return invoker.getInterface();
+ }
+
+ @Override
+ public Result invoke(Invocation invocation) throws RpcException {
+ return invoker.invoke(invocation);
+ }
+
+ @Override
+ public URL getUrl() {
+ return invoker.getUrl();
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return invoker.isAvailable();
+ }
+
+ @Override
+ public void destroy() {
+ invoker.destroy();
+ }
+
+ @Override
+ public String getNamespace() {
+ return defaultInstance.getNamespace();
+ }
+
+ @Override
+ public String getService() {
+ return defaultInstance.getService();
+ }
+
+ @Override
+ public String getRevision() {
+ return defaultInstance.getRevision();
+ }
+
+ @Override
+ public CircuitBreakerStatus getCircuitBreakerStatus() {
+ return defaultInstance.getCircuitBreakerStatus();
+ }
+
+ @Override
+ public Collection<StatusDimension> getStatusDimensions() {
+ return defaultInstance.getStatusDimensions();
+ }
+
+ @Override
+ public CircuitBreakerStatus getCircuitBreakerStatus(StatusDimension statusDimension) {
+ return defaultInstance.getCircuitBreakerStatus(statusDimension);
+ }
+
+ @Override
+ public boolean isHealthy() {
+ return defaultInstance.isHealthy();
+ }
+
+ @Override
+ public boolean isIsolated() {
+ return defaultInstance.isIsolated();
+ }
+
+ @Override
+ public String getProtocol() {
+ return defaultInstance.getProtocol();
+ }
+
+ @Override
+ public String getId() {
+ return defaultInstance.getId();
+ }
+
+ @Override
+ public String getHost() {
+ return defaultInstance.getHost();
+ }
+
+ @Override
+ public int getPort() {
+ return defaultInstance.getPort();
+ }
+
+ @Override
+ public String getVersion() {
+ return defaultInstance.getVersion();
+ }
+
+ @Override
+ public Map<String, String> getMetadata() {
+ return defaultInstance.getMetadata();
+ }
+
+ @Override
+ public boolean isEnableHealthCheck() {
+ return defaultInstance.isEnableHealthCheck();
+ }
+
+ @Override
+ public String getRegion() {
+ return defaultInstance.getRegion();
+ }
+
+ @Override
+ public String getZone() {
+ return defaultInstance.getZone();
+ }
+
+ @Override
+ public String getCampus() {
+ return defaultInstance.getCampus();
+ }
+
+ @Override
+ public int getPriority() {
+ return defaultInstance.getPriority();
+ }
+
+ @Override
+ public int getWeight() {
+ return defaultInstance.getWeight();
+ }
+
+ @Override
+ public String getLogicSet() {
+ return defaultInstance.getLogicSet();
+ }
+
+ @Override
+ public int compareTo(Instance o) {
+ return defaultInstance.compareTo(o);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof InstanceInvoker)) {
+ return false;
+ }
+ InstanceInvoker<?> that = (InstanceInvoker<?>) o;
+ return Objects.equals(defaultInstance, that.defaultInstance);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(defaultInstance);
+ }
+
+ public Invoker<T> getInvoker() {
+ return invoker;
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouter.java b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouter.java
new file mode 100644
index 0000000..3642c37
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouter.java
@@ -0,0 +1,116 @@
+/*
+ * 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.rpc.cluster.router;
+
+import com.tencent.polaris.api.pojo.Instance;
+import com.tencent.polaris.api.pojo.RouteArgument;
+import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;
+import com.tencent.polaris.api.pojo.ServiceRule;
+import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.common.parser.QueryParser;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.registry.PolarisOperators;
+import com.tencent.polaris.common.router.RuleHandler;
+import com.tencent.polaris.specification.api.v1.traffic.manage.RoutingProto;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.cluster.Constants;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public class PolarisRouter extends AbstractRouter {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PolarisRouter.class);
+
+ private final RuleHandler routeRuleHandler;
+
+ private final PolarisOperator polarisOperator;
+
+ private final QueryParser parser;
+
+ public PolarisRouter(URL url) {
+ super(url);
+ LOGGER.info(String.format("[POLARIS] init service router, url is %s, parameters are %s", url,
+ url.getParameters()));
+ System.setProperty("dubbo.polaris.query_parser", System.getProperty("dubbo.polaris.query_parser", "JsonPath"));
+ this.priority = url.getParameter(Constants.PRIORITY_KEY, 0);
+ this.routeRuleHandler = new RuleHandler();
+ this.polarisOperator = PolarisOperators.INSTANCE.getPolarisOperator(url.getHost(), url.getPort());
+ this.parser = QueryParser.load();
+ }
+
+ @Override
+ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException {
+ if (null == invokers || invokers.size() == 0) {
+ return invokers;
+ }
+ if (null == polarisOperator) {
+ return invokers;
+ }
+ List<Instance> instances;
+ if (invokers.get(0) instanceof Instance) {
+ instances = (List<Instance>) ((List<?>) invokers);
+ } else {
+ instances = new ArrayList<>();
+ for (Invoker<T> invoker : invokers) {
+ instances.add(new InstanceInvoker<>(invoker, polarisOperator.getPolarisConfig().getNamespace()));
+ }
+ }
+
+ String service = url.getServiceInterface();
+ ServiceRule serviceRule = polarisOperator.getServiceRule(service, EventType.ROUTING);
+ Object ruleObject = serviceRule.getRule();
+ Set<RouteArgument> arguments = new HashSet<>();
+ if (null != ruleObject) {
+ RoutingProto.Routing routing = (RoutingProto.Routing) ruleObject;
+ Set<String> routeLabels = routeRuleHandler.getRouteLabels(routing);
+ for (String routeLabel : routeLabels) {
+ if (StringUtils.equals(RouteArgument.LABEL_KEY_PATH, routeLabel)) {
+ arguments.add(RouteArgument.buildPath(invocation.getMethodName()));
+ } else if (routeLabel.startsWith(RouteArgument.LABEL_KEY_HEADER)) {
+ String headerName = routeLabel.substring(RouteArgument.LABEL_KEY_HEADER.length());
+ String value = RpcContext.getContext().getAttachment(headerName);
+ if (!StringUtils.isBlank(value)) {
+ arguments.add(RouteArgument.buildHeader(headerName, value));
+ }
+ } else if (routeLabel.startsWith(RouteArgument.LABEL_KEY_QUERY)) {
+ String queryName = routeLabel.substring(RouteArgument.LABEL_KEY_QUERY.length());
+ if (!StringUtils.isBlank(queryName)) {
+ Optional<String> queryValue = parser.parse(queryName, invocation.getArguments());
+ queryValue.ifPresent(value -> arguments.add(RouteArgument.buildQuery(queryName, value)));
+ }
+ }
+ }
+ }
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("[POLARIS] list service %s, method %s, labels %s, url %s", service,
+ invocation.getMethodName(), arguments, url));
+ }
+ List<Instance> resultInstances = polarisOperator.route(service, invocation.getMethodName(), arguments, instances);
+ return (List<Invoker<T>>) ((List<?>) resultInstances);
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouterFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouterFactory.java
index 52aff89..88870ec 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouterFactory.java
@@ -14,24 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.rpc.cluster.router;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.cluster.Router;
+import org.apache.dubbo.rpc.cluster.RouterFactory;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+@Activate(group = CommonConstants.CONSUMER)
+public class PolarisRouterFactory implements RouterFactory {
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public Router getRouter(URL url) {
+ return new PolarisRouter(url);
}
}
+
diff --git a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.RouterFactory b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.RouterFactory
new file mode 100644
index 0000000..35830e7
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.RouterFactory
@@ -0,0 +1 @@
+polaris_router=org.apache.dubbo.rpc.cluster.router.PolarisRouterFactory
\ No newline at end of file
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml
new file mode 100644
index 0000000..6343f5b
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-cluster-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-cluster-specify-address-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
similarity index 95%
rename from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
rename to dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
index b4268bf..beff867 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
@@ -22,6 +22,9 @@
import java.util.Objects;
public class Address implements Serializable {
+
+ public static final String name = "specifyAddress";
+
// ip - priority: 3
private String ip;
@@ -38,6 +41,9 @@
this.urlAddress = null;
}
+ /**
+ * disableRetry default value is true, will disable failover
+ */
public Address(String ip, int port, boolean needToCreate) {
this.ip = ip;
this.port = port;
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
similarity index 95%
rename from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
rename to dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
index 61a6ecb..6e0c164 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
@@ -19,7 +19,7 @@
import org.apache.dubbo.common.threadlocal.InternalThreadLocal;
public class UserSpecifiedAddressUtil {
- private final static InternalThreadLocal<Address> ADDRESS = new InternalThreadLocal<>();
+ private static final InternalThreadLocal<Address> ADDRESS = new InternalThreadLocal<>();
/**
* Set specified address to next invoke
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/common/InvokerCache.java
similarity index 83%
rename from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
rename to dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/common/InvokerCache.java
index 52aff89..3a1de66 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/common/InvokerCache.java
@@ -14,15 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.specifyaddress.common;
-import org.apache.dubbo.rpc.Invoker;
public class InvokerCache<T> {
private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+ private final T invoker;
- public InvokerCache(Invoker<T> invoker) {
+ public InvokerCache(T invoker) {
this.invoker = invoker;
}
@@ -30,7 +29,7 @@
return lastAccess;
}
- public Invoker<T> getInvoker() {
+ public T getInvoker() {
lastAccess = System.currentTimeMillis();
return invoker;
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml
index 1f6598e..0d61eef 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml
@@ -27,15 +27,20 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-cluster-specify-address-dubbo2</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>2.7.18</version>
+ <version>3.2.7</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-cluster-specify-address-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterInterceptor.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterInterceptor.java
new file mode 100644
index 0000000..a3da3ba
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterInterceptor.java
@@ -0,0 +1,44 @@
+/*
+ * 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.rpc.cluster.specifyaddress;
+
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor;
+import org.apache.dubbo.rpc.cluster.support.AbstractClusterInvoker;
+
+/**
+ * The SPECIFY ADDRESS field is handed over to the attachment by the thread
+ */
+@Activate(group = CommonConstants.CONSUMER)
+public class AddressSpecifyClusterInterceptor implements ClusterInterceptor {
+
+ @Override
+ public void before(AbstractClusterInvoker<?> clusterInvoker, Invocation invocation) {
+ Address current = UserSpecifiedAddressUtil.getAddress();
+ if (current != null) {
+ invocation.put(Address.name, current);
+ }
+ }
+
+
+ @Override
+ public void after(AbstractClusterInvoker<?> clusterInvoker, Invocation invocation) {
+
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
index 7c8bd6e..1f4cb37 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
@@ -17,37 +17,57 @@
package org.apache.dubbo.rpc.cluster.specifyaddress;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.URLBuilder;
+import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.cluster.router.AbstractRouter;
+import org.apache.dubbo.rpc.cluster.specifyaddress.common.InvokerCache;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-public class UserSpecifiedAddressRouter extends AbstractRouter {
- private final static Logger logger = LoggerFactory.getLogger(UserSpecifiedAddressRouter.class);
+import static org.apache.dubbo.common.constants.CommonConstants.DUBBO;
+import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
+
+
+public class UserSpecifiedAddressRouter<T> extends AbstractRouter {
+ private static final Logger logger = LoggerFactory.getLogger(UserSpecifiedAddressRouter.class);
// protected for ut purpose
protected static int EXPIRE_TIME = 10 * 60 * 1000;
-
- private volatile List<Invoker<?>> invokers = Collections.emptyList();
- private volatile Map<String, Invoker<?>> ip2Invoker;
- private volatile Map<String, Invoker<?>> address2Invoker;
-
+ private volatile List<Invoker<T>> invokers = Collections.emptyList();
+ private volatile Map<String, Invoker<T>> ip2Invoker;
+ private volatile Map<String, Invoker<T>> address2Invoker;
+ private final Protocol protocol;
private final Lock cacheLock = new ReentrantLock();
+ private final ScheduledExecutorService scheduledExecutorService;
+ private final AtomicBoolean launchRemovalTask = new AtomicBoolean(false);
+ private final Map<URL, InvokerCache<Invoker<T>>> newInvokerCache = new LinkedHashMap<>(16, 0.75f, true);
public UserSpecifiedAddressRouter(URL referenceUrl) {
super(referenceUrl);
+ this.protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
+ this.scheduledExecutorService = ExtensionLoader.getExtensionLoader(ExecutorRepository.class).getDefaultExtension().nextScheduledExecutor();
}
@Override
@@ -61,26 +81,30 @@
}
@Override
+ @SuppressWarnings("unchecked")
public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException {
- Address address = UserSpecifiedAddressUtil.getAddress();
+
+ Object addressObj = invocation.get(Address.name);
// 1. check if set address in ThreadLocal
- if (address == null) {
+ if (addressObj == null) {
return invokers;
}
+ Address address = (Address) addressObj;
+
List<Invoker<T>> result = new LinkedList<>();
// 2. check if set address url
if (address.getUrlAddress() != null) {
- Invoker<?> invoker = getInvokerByURL(address, invocation);
+ Invoker<?> invoker = getInvokerByURL(address);
result.add((Invoker) invoker);
return result;
}
// 3. check if set ip and port
if (StringUtils.isNotEmpty(address.getIp())) {
- Invoker<?> invoker = getInvokerByIp(address, invocation);
+ Invoker<?> invoker = getInvokerByIp(address);
result.add((Invoker) invoker);
return result;
}
@@ -88,7 +112,7 @@
return invokers;
}
- private Invoker<?> getInvokerByURL(Address address, Invocation invocation) {
+ private Invoker<?> getInvokerByURL(Address address) {
tryLoadSpecifiedMap();
// try to find in directory
@@ -112,11 +136,11 @@
}
}
- // create new one
- throw new RpcException("User specified server address not support refer new url in Dubbo 2.x. Please upgrade to Dubbo 3.x and use dubbo-cluster-specify-address-dubbo3.");
+ URL newUrl = rebuildAddress(address, getUrl());
+ return getOrBuildInvokerCache(newUrl);
}
- public Invoker<?> getInvokerByIp(Address address, Invocation invocation) {
+ public Invoker<?> getInvokerByIp(Address address) {
tryLoadSpecifiedMap();
String ip = address.getIp();
@@ -136,29 +160,31 @@
}
if (!address.isNeedToCreate()) {
- throwException(invocation, address);
+ throwException(address);
}
- throw new RpcException("User specified server address not support refer new url in Dubbo 2.x. Please upgrade to Dubbo 3.x and use dubbo-cluster-specify-address-dubbo3.");
+ URL newUrl = buildAddress(invokers, address, getUrl());
+ return getOrBuildInvokerCache(newUrl);
}
- private void throwException(Invocation invocation, Address address) {
+
+ private void throwException(Address address) {
throw new RpcException("user specified server address : [" + address + "] is not a valid provider for service: ["
+ getUrl().getServiceKey() + "]");
}
- private Map<String, Invoker<?>> processIp(List<Invoker<?>> invokerList) {
- Map<String, Invoker<?>> ip2Invoker = new HashMap<>();
- for (Invoker<?> invoker : invokerList) {
+ private Map<String, Invoker<T>> processIp(List<Invoker<T>> invokerList) {
+ Map<String, Invoker<T>> ip2Invoker = new HashMap<>();
+ for (Invoker<T> invoker : invokerList) {
ip2Invoker.put(invoker.getUrl().getHost(), invoker);
}
return Collections.unmodifiableMap(ip2Invoker);
}
- private Map<String, Invoker<?>> processAddress(List<Invoker<?>> addresses) {
- Map<String, Invoker<?>> address2Invoker = new HashMap<>();
- for (Invoker<?> invoker : addresses) {
+ private Map<String, Invoker<T>> processAddress(List<Invoker<T>> addresses) {
+ Map<String, Invoker<T>> address2Invoker = new HashMap<>();
+ for (Invoker<T> invoker : addresses) {
address2Invoker.put(invoker.getUrl().getHost() + ":" + invoker.getUrl().getPort(), invoker);
}
return Collections.unmodifiableMap(address2Invoker);
@@ -166,19 +192,19 @@
// For ut only
@Deprecated
- protected Map<String, Invoker<?>> getIp2Invoker() {
+ protected Map<String, Invoker<T>> getIp2Invoker() {
return ip2Invoker;
}
// For ut only
@Deprecated
- protected Map<String, Invoker<?>> getAddress2Invoker() {
+ protected Map<String, Invoker<T>> getAddress2Invoker() {
return address2Invoker;
}
// For ut only
@Deprecated
- protected List<Invoker<?>> getInvokers() {
+ protected List<Invoker<T>> getInvokers() {
return invokers;
}
@@ -190,7 +216,7 @@
if (ip2Invoker != null) {
return;
}
- List<Invoker<?>> invokers = this.invokers;
+ List<Invoker<T>> invokers = this.invokers;
if (CollectionUtils.isEmpty(invokers)) {
address2Invoker = Collections.unmodifiableMap(new HashMap<>());
ip2Invoker = Collections.unmodifiableMap(new HashMap<>());
@@ -200,4 +226,109 @@
ip2Invoker = processIp(invokers);
}
}
+
+
+ public <T> URL buildAddress(List<Invoker<T>> invokers, Address address, URL consumerUrl) {
+ if (!invokers.isEmpty()) {
+ URL template = invokers.iterator().next().getUrl();
+ template = template.setHost(address.getIp());
+ if (address.getPort() != 0) {
+ template = template.setPort(address.getPort());
+ }
+ return template;
+ } else {
+ String ip = address.getIp();
+ int port = address.getPort();
+ if (port == 0) {
+ port = ExtensionLoader.getExtensionLoader(Protocol.class).getDefaultExtension().getDefaultPort();
+ }
+ return copyConsumerUrl(consumerUrl, ip, port, new HashMap<>());
+ }
+ }
+
+ private URL copyConsumerUrl(URL url, String ip, int port, Map<String, String> parameters) {
+ return URLBuilder.from(url)
+ .setHost(ip)
+ .setPort(port)
+ .setProtocol(url.getProtocol() == null ? DUBBO : url.getProtocol())
+ .setPath(url.getPath())
+ .clearParameters()
+ .addParameters(parameters)
+ .removeParameter(MONITOR_KEY)
+ .build();
+ }
+
+ public URL rebuildAddress(Address address, URL consumerUrl) {
+ URL url = (URL) address.getUrlAddress();
+ Map<String, String> parameters = new HashMap<>(url.getParameters());
+ parameters.put(VERSION_KEY, consumerUrl.getParameter(VERSION_KEY, "0.0.0"));
+ parameters.put(GROUP_KEY, consumerUrl.getParameter(GROUP_KEY));
+ parameters.putAll(consumerUrl.getParameters());
+ return copyConsumerUrl(consumerUrl, url.getHost(), url.getPort(),parameters);
+ }
+
+ private Invoker<T> getOrBuildInvokerCache(URL url) {
+ logger.info("Unable to find a proper invoker from directory. Try to create new invoker. New URL: " + url);
+
+ InvokerCache<Invoker<T>> cache;
+ cacheLock.lock();
+ try {
+ cache = newInvokerCache.get(url);
+ } finally {
+ cacheLock.unlock();
+ }
+ if (cache == null) {
+ Invoker<T> invoker = refer(url);
+ cacheLock.lock();
+ try {
+ cache = newInvokerCache.get(url);
+ if (cache == null) {
+ cache = new InvokerCache<>(invoker);
+ newInvokerCache.put(url, cache);
+ if (launchRemovalTask.compareAndSet(false, true)) {
+ scheduledExecutorService.scheduleAtFixedRate(new RemovalTask(), EXPIRE_TIME / 2, EXPIRE_TIME / 2, TimeUnit.MILLISECONDS);
+ }
+ } else {
+ invoker.destroy();
+ }
+ } finally {
+ cacheLock.unlock();
+ }
+ }
+ return cache.getInvoker();
+ }
+
+ private Invoker<T> refer(URL url) {
+
+ try {
+ Class interfaceClass = Class.forName(getUrl().getServiceInterface(), true, ClassUtils.getClassLoader());
+ return this.protocol.refer(interfaceClass, url);
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ private class RemovalTask implements Runnable {
+ @Override
+ public void run() {
+ cacheLock.lock();
+ try {
+ if (CollectionUtils.isEmptyMap(newInvokerCache)) {
+ return;
+ }
+ Iterator<Map.Entry<URL, InvokerCache<Invoker<T>>>> iterator = newInvokerCache.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<URL, InvokerCache<Invoker<T>>> entry = iterator.next();
+ if (System.currentTimeMillis() - entry.getValue().getLastAccess() > EXPIRE_TIME) {
+ iterator.remove();
+ entry.getValue().getInvoker().destroy();
+ } else {
+ break;
+ }
+ }
+ } finally {
+ cacheLock.unlock();
+ }
+ }
+ }
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.manager.ExecutorRepository b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.manager.ExecutorRepository
new file mode 100644
index 0000000..44199b0
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.common.threadpool.manager.ExecutorRepository
@@ -0,0 +1 @@
+default=org.apache.dubbo.common.threadpool.manager.DefaultExecutorRepository
\ No newline at end of file
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor
new file mode 100644
index 0000000..0ae64ac
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor
@@ -0,0 +1 @@
+disableRetry=org.apache.dubbo.rpc.cluster.specifyaddress.AddressSpecifyClusterInterceptor
\ No newline at end of file
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
index 47fc38d..fad7cfa 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
@@ -18,14 +18,16 @@
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.specifyaddress.common.InvokerCache;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-public class InvokerCacheTest {
+class InvokerCacheTest {
+
@Test
- public void test() throws InterruptedException {
- InvokerCache<Object> cache = new InvokerCache<>(Mockito.mock(Invoker.class));
+ void test() throws InterruptedException {
+ InvokerCache<Invoker<Object>> cache = new InvokerCache<>(Mockito.mock(Invoker.class));
long originTime = cache.getLastAccess();
Thread.sleep(5);
cache.getInvoker();
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
index f3cbc88..8b3447a 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
@@ -23,9 +23,9 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class UserSpecifiedAddressRouterFactoryTest {
+class UserSpecifiedAddressRouterFactoryTest {
@Test
- public void test() {
+ void test() {
RouterFactory stateRouterFactory = ExtensionLoader.getExtensionLoader(RouterFactory.class).getExtension("user-specified-address");
Assertions.assertEquals(UserSpecifiedAddressRouterFactory.class, stateRouterFactory.getClass());
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
index 372eb0f..2390735 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
@@ -20,8 +20,9 @@
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.cluster.support.FailoverClusterInvoker;
import org.apache.dubbo.rpc.model.ApplicationModel;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -31,18 +32,18 @@
import java.util.LinkedList;
import java.util.List;
-public class UserSpecifiedAddressRouterTest {
+class UserSpecifiedAddressRouterTest {
private ApplicationModel applicationModel;
private URL consumerUrl;
@BeforeEach
public void setup() {
- consumerUrl = URL.valueOf("127.0.0.2:20880").addParameter("Test", "Value").addParameter("check", "false")
- .addParameter("version", "1.0.0").addParameter("group", "Dubbo");
+ consumerUrl = URL.valueOf("127.0.0.2:20880").addParameter("Test", "Value").addParameter("check", "false").addParameter("lazy","true")
+ .addParameter("version", "1.0.0").addParameter("group", "Dubbo").addParameter("interface", DemoService.class.getName());
}
@Test
- public void testNotify() {
+ void testNotify() {
UserSpecifiedAddressRouter userSpecifiedAddressRouter = new UserSpecifiedAddressRouter(consumerUrl);
Assertions.assertEquals(Collections.emptyList(), userSpecifiedAddressRouter.getInvokers());
Assertions.assertNull(userSpecifiedAddressRouter.getAddress2Invoker());
@@ -53,10 +54,16 @@
Assertions.assertNull(userSpecifiedAddressRouter.getIp2Invoker());
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 0));
+ FailoverClusterInvoker<Object> mockInvoker = Mockito.mock(FailoverClusterInvoker.class);
+ AddressSpecifyClusterInterceptor interceptor = new AddressSpecifyClusterInterceptor();
+
+ UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 0));
+ Invocation invocation = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation);
// no address
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
+ userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, invocation));
Assertions.assertNotNull(userSpecifiedAddressRouter.getAddress2Invoker());
Assertions.assertNotNull(userSpecifiedAddressRouter.getIp2Invoker());
@@ -68,74 +75,116 @@
}
@Test
- public void testGetInvokerByURL() {
+ void testGetInvokerByURL() {
UserSpecifiedAddressRouter userSpecifiedAddressRouter = new UserSpecifiedAddressRouter(consumerUrl);
Assertions.assertEquals(Collections.emptyList(),
userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
- UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880")));
- Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
+ FailoverClusterInvoker<Object> mockInvoker = Mockito.mock(FailoverClusterInvoker.class);
- Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
+ AddressSpecifyClusterInterceptor interceptor = new AddressSpecifyClusterInterceptor();
+
+ UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880?lazy=true")));
+ Invocation invocation = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation);
+
+ List<Invoker<Object>> invokers = userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, invocation);
+ Assertions.assertEquals(1, invokers.size());
+ Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
+ Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
+ Assertions.assertEquals("Value", invokers.get(0).getUrl().getParameter("Test"));
+ Assertions.assertEquals(consumerUrl.getParameter("version"), invokers.get(0).getUrl().getParameter("version"));
+ Assertions.assertEquals(consumerUrl.getParameter("group"), invokers.get(0).getUrl().getParameter("group"));
+
Mockito.when(mockInvoker.getUrl()).thenReturn(URL.valueOf("simple://127.0.0.1:20880?Test1=Value"));
userSpecifiedAddressRouter.notify(new LinkedList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880")));
- List<Invoker<Object>> invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class));
+ Invocation invocation1 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation1);
+ invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation1);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
userSpecifiedAddressRouter.notify(new LinkedList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880?Test1=Value")));
- invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class));
+ Invocation invocation2 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation2);
+ invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation2);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
userSpecifiedAddressRouter.notify(new LinkedList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("simple://127.0.0.1:20880")));
- invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class));
+ Invocation invocation3 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation3);
+ invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation3);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880?Test1=Value&Test2=Value&Test3=Value")));
- Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
+ Invocation invocation4 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation4);
+ invokers = userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, invocation4);
+ Assertions.assertEquals(1, invokers.size());
+ Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
+ Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
+ Assertions.assertEquals("Value", invokers.get(0).getUrl().getParameter("Test1"));
+ Assertions.assertEquals("Value", invokers.get(0).getUrl().getParameter("Test2"));
+ Assertions.assertEquals("Value", invokers.get(0).getUrl().getParameter("Test3"));
+ Assertions.assertEquals(consumerUrl.getParameter("version"), invokers.get(0).getUrl().getParameter("version"));
+ Assertions.assertEquals(consumerUrl.getParameter("group"), invokers.get(0).getUrl().getParameter("group"));
}
@Test
- public void testGetInvokerByIp() {
+ void testGetInvokerByIp() {
UserSpecifiedAddressRouter userSpecifiedAddressRouter = new UserSpecifiedAddressRouter(consumerUrl);
Assertions.assertEquals(Collections.emptyList(),
userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
+ AddressSpecifyClusterInterceptor interceptor = new AddressSpecifyClusterInterceptor();
- Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
+ FailoverClusterInvoker<Object> mockInvoker = Mockito.mock(FailoverClusterInvoker.class);
Mockito.when(mockInvoker.getUrl()).thenReturn(consumerUrl);
userSpecifiedAddressRouter.notify(new LinkedList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 0));
+ Invocation invocation = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation);
List<Invoker<Object>> invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class));
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20880));
- invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class));
+ Invocation invocation1 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation1);
+ invokers = userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation1);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770));
+ Invocation invocation2 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation2);
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class)));
+ userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation2));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.3", 20880));
+ Invocation invocation3 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation3);
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class)));
+ userSpecifiedAddressRouter.route(new LinkedList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation3));
- UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770, true));
- Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, Mockito.mock(Invocation.class)));
+ UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770,true));
+ Invocation invocation4 = new RpcInvocation();
+ interceptor.before(mockInvoker,invocation4);
+ invokers = userSpecifiedAddressRouter.route(Collections.emptyList(), consumerUrl, invocation4);
+ Assertions.assertEquals(1, invokers.size());
+ Assertions.assertEquals("127.0.0.2", invokers.get(0).getUrl().getHost());
+ Assertions.assertEquals(20770, invokers.get(0).getUrl().getPort());
+ Assertions.assertEquals("Value", invokers.get(0).getUrl().getParameter("Test"));
+ Assertions.assertEquals(consumerUrl.getParameter("version"), invokers.get(0).getUrl().getParameter("version"));
+ Assertions.assertEquals(consumerUrl.getParameter("group"), invokers.get(0).getUrl().getParameter("group"));
}
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
index 0dc1c16..6126a97 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
@@ -19,9 +19,9 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class UserSpecifiedAddressUtilTest {
+class UserSpecifiedAddressUtilTest {
@Test
- public void test() {
+ void test() {
Assertions.assertNull(UserSpecifiedAddressUtil.getAddress());
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 0));
Assertions.assertEquals(new Address("127.0.0.1", 0), UserSpecifiedAddressUtil.getAddress());
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml
index 1ad174f..1d9f791 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml
@@ -27,14 +27,21 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-cluster-specify-address-dubbo3</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <version>3.2.7</version>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-cluster-specify-address-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
deleted file mode 100644
index b4268bf..0000000
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/Address.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.rpc.cluster.specifyaddress;
-
-import org.apache.dubbo.common.URL;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class Address implements Serializable {
- // ip - priority: 3
- private String ip;
-
- // ip+port - priority: 2
- private int port;
-
- // address - priority: 1
- private URL urlAddress;
- private boolean needToCreate = false;
-
- public Address(String ip, int port) {
- this.ip = ip;
- this.port = port;
- this.urlAddress = null;
- }
-
- public Address(String ip, int port, boolean needToCreate) {
- this.ip = ip;
- this.port = port;
- this.needToCreate = needToCreate;
- }
-
- public Address(URL address) {
- this.ip = null;
- this.port = 0;
- this.urlAddress = address;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public URL getUrlAddress() {
- return urlAddress;
- }
-
- public void setUrlAddress(URL urlAddress) {
- this.urlAddress = urlAddress;
- }
-
- public boolean isNeedToCreate() {
- return needToCreate;
- }
-
- public void setNeedToCreate(boolean needToCreate) {
- this.needToCreate = needToCreate;
- }
-
- @Override
- public String toString() {
- return "Address{" +
- "ip='" + ip + '\'' +
- ", port=" + port +
- ", address=" + urlAddress +
- ", needToCreate=" + needToCreate +
- '}';
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- Address address = (Address) o;
- return port == address.port && needToCreate == address.needToCreate && Objects.equals(ip, address.ip) && Objects.equals(urlAddress, address.urlAddress);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(ip, port, urlAddress, needToCreate);
- }
-}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterFilter.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterFilter.java
new file mode 100644
index 0000000..8bce882
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/AddressSpecifyClusterFilter.java
@@ -0,0 +1,41 @@
+/*
+ * 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.rpc.cluster.specifyaddress;
+
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.cluster.filter.ClusterFilter;
+
+/**
+ * The SPECIFY ADDRESS field is handed over to the attachment by the thread
+ */
+@Activate(group = {"consumer"})
+public class AddressSpecifyClusterFilter implements ClusterFilter {
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
+ Address current = UserSpecifiedAddressUtil.getAddress();
+ if (current != null) {
+ invocation.put(Address.name, current);
+ }
+ return invoker.invoke(invocation);
+ }
+
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilder.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilder.java
index 7274311..48bde88 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilder.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilder.java
@@ -39,7 +39,7 @@
import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
public class DefaultUserSpecifiedServiceAddressBuilder implements UserSpecifiedServiceAddressBuilder {
- public final static String NAME = "default";
+ public static final String NAME = "default";
private final ExtensionLoader<Protocol> protocolExtensionLoader;
@@ -49,47 +49,33 @@
@Override
public <T> URL buildAddress(List<Invoker<T>> invokers, Address address, Invocation invocation, URL consumerUrl) {
-
- boolean useFixed = false;
- URL template = null;
- if (!invokers.isEmpty()) {
- template = invokers.iterator().next().getUrl();
- if (template instanceof InstanceAddressURL) {
- useFixed = true;
- } else {
- if (template.getUrlAddress() == null) {
- PathURLAddress urlAddress = new PathURLAddress(template.getProtocol(), template.getUsername(), template.getPassword(), template.getPath(), address.getIp(), address.getPort());
- template = new ServiceConfigURL(urlAddress, template.getUrlParam(), template.getAttributes());
- } else {
- template = template.setHost(address.getIp());
- if (address.getPort() != 0) {
- template = template.setPort(address.getPort());
- }
- }
- }
-
- } else {
- useFixed = true;
- }
-
- if (useFixed) {
+ URL template;
+ if (invokers.isEmpty() || (template = invokers.get(0).getUrl()) instanceof InstanceAddressURL) {
String ip = address.getIp();
int port = address.getPort();
String protocol = consumerUrl.getParameter(PROTOCOL_KEY, DUBBO);
if (port == 0) {
port = protocolExtensionLoader.getExtension(protocol).getDefaultPort();
}
- template = new DubboServiceAddressURL(
- new PathURLAddress(protocol, null, null, consumerUrl.getPath(), ip, port),
- URLParam.parse(""), consumerUrl, null);
+ return new DubboServiceAddressURL(
+ new PathURLAddress(protocol, null, null, consumerUrl.getPath(), ip, port),
+ consumerUrl.getUrlParam(), consumerUrl, null);
}
-
+ if (template.getUrlAddress() == null) {
+ PathURLAddress urlAddress = new PathURLAddress(template.getProtocol(), template.getUsername(),
+ template.getPassword(), template.getPath(), address.getIp(), address.getPort());
+ return new ServiceConfigURL(urlAddress, template.getUrlParam(), template.getAttributes());
+ }
+ template = template.setHost(address.getIp());
+ if (address.getPort() != 0) {
+ template = template.setPort(address.getPort());
+ }
return template;
}
@Override
public <T> URL rebuildAddress(List<Invoker<T>> invokers, Address address, Invocation invocation, URL consumerUrl) {
- URL url = address.getUrlAddress();
+ URL url = (URL) address.getUrlAddress();
Map<String, String> parameters = new HashMap<>(url.getParameters());
parameters.put(VERSION_KEY, consumerUrl.getVersion());
parameters.put(GROUP_KEY, consumerUrl.getGroup());
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
deleted file mode 100644
index 52aff89..0000000
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.rpc.cluster.specifyaddress;
-
-import org.apache.dubbo.rpc.Invoker;
-
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
-}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
index a8faeb2..84048d5 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouter.java
@@ -30,6 +30,7 @@
import org.apache.dubbo.rpc.cluster.router.RouterSnapshotNode;
import org.apache.dubbo.rpc.cluster.router.state.AbstractStateRouter;
import org.apache.dubbo.rpc.cluster.router.state.BitList;
+import org.apache.dubbo.rpc.cluster.specifyaddress.common.InvokerCache;
import java.util.Collections;
import java.util.HashMap;
@@ -45,20 +46,16 @@
import java.util.concurrent.locks.ReentrantLock;
public class UserSpecifiedAddressRouter<T> extends AbstractStateRouter<T> {
- private final static Logger logger = LoggerFactory.getLogger(UserSpecifiedAddressRouter.class);
+ private static final Logger logger = LoggerFactory.getLogger(UserSpecifiedAddressRouter.class);
// protected for ut purpose
protected static int EXPIRE_TIME = 10 * 60 * 1000;
- private final static String USER_SPECIFIED_SERVICE_ADDRESS_BUILDER_KEY = "userSpecifiedServiceAddressBuilder";
-
+ private static final String USER_SPECIFIED_SERVICE_ADDRESS_BUILDER_KEY = "userSpecifiedServiceAddressBuilder";
private volatile BitList<Invoker<T>> invokers = BitList.emptyList();
private volatile Map<String, Invoker<T>> ip2Invoker;
private volatile Map<String, Invoker<T>> address2Invoker;
-
private final Lock cacheLock = new ReentrantLock();
- private final Map<URL, InvokerCache<T>> newInvokerCache = new LinkedHashMap<>(16, 0.75f, true);
-
+ private final Map<URL, InvokerCache<Invoker<T>>> newInvokerCache = new LinkedHashMap<>(16, 0.75f, true);
private final UserSpecifiedServiceAddressBuilder userSpecifiedServiceAddressBuilder;
-
private final Protocol protocol;
private final ScheduledExecutorService scheduledExecutorService;
private final AtomicBoolean launchRemovalTask = new AtomicBoolean(false);
@@ -83,19 +80,22 @@
}
@Override
+ @SuppressWarnings("unchecked")
protected BitList<Invoker<T>> doRoute(BitList<Invoker<T>> invokers, URL url, Invocation invocation,
boolean needToPrintMessage, Holder<RouterSnapshotNode<T>> nodeHolder,
Holder<String> messageHolder) throws RpcException {
- Address address = UserSpecifiedAddressUtil.getAddress();
+ Object addressObj = invocation.get(Address.name);
// 1. check if set address in ThreadLocal
- if (address == null) {
+ if (addressObj == null) {
if (needToPrintMessage) {
messageHolder.set("No address specified, continue.");
}
return continueRoute(invokers, url, invocation, needToPrintMessage, nodeHolder);
}
+ Address address = (Address) addressObj;
+
BitList<Invoker<T>> result = new BitList<>(invokers, true);
// 2. check if set address url
@@ -110,7 +110,7 @@
// 3. check if set ip and port
if (StringUtils.isNotEmpty(address.getIp())) {
- Invoker<T> invoker = getInvokerByIp(address, invocation);
+ Invoker<T> invoker = getInvokerByIp(address);
if (invoker != null) {
result.add(invoker);
if (needToPrintMessage) {
@@ -172,7 +172,7 @@
private Invoker<T> getOrBuildInvokerCache(URL url) {
logger.info("Unable to find a proper invoker from directory. Try to create new invoker. New URL: " + url);
- InvokerCache<T> cache;
+ InvokerCache<Invoker<T>> cache;
cacheLock.lock();
try {
cache = newInvokerCache.get(url);
@@ -200,7 +200,7 @@
return cache.getInvoker();
}
- public Invoker<T> getInvokerByIp(Address address, Invocation invocation) {
+ public Invoker<T> getInvokerByIp(Address address) {
tryLoadSpecifiedMap();
String ip = address.getIp();
@@ -209,18 +209,15 @@
Invoker<T> targetInvoker;
if (port != 0) {
targetInvoker = address2Invoker.get(ip + ":" + port);
- if (targetInvoker != null) {
- return targetInvoker;
- }
} else {
targetInvoker = ip2Invoker.get(ip);
- if (targetInvoker != null) {
- return targetInvoker;
- }
+ }
+ if (targetInvoker != null) {
+ return targetInvoker;
}
if (!address.isNeedToCreate()) {
- throwException(invocation, address);
+ throwException(address);
}
return null;
@@ -234,7 +231,7 @@
return (Invoker<T>) protocol.refer(getUrl().getServiceModel().getServiceInterfaceClass(), url);
}
- private void throwException(Invocation invocation, Address address) {
+ private void throwException(Address address) {
throw new RpcException("user specified server address : [" + address + "] is not a valid provider for service: ["
+ getUrl().getServiceKey() + "]");
}
@@ -275,7 +272,7 @@
// For ut only
@Deprecated
- protected Map<URL, InvokerCache<T>> getNewInvokerCache() {
+ protected Map<URL, InvokerCache<Invoker<T>>> getNewInvokerCache() {
return newInvokerCache;
}
@@ -310,16 +307,17 @@
public void run() {
cacheLock.lock();
try {
- if (newInvokerCache.size() > 0) {
- Iterator<Map.Entry<URL, InvokerCache<T>>> iterator = newInvokerCache.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry<URL, InvokerCache<T>> entry = iterator.next();
- if (System.currentTimeMillis() - entry.getValue().getLastAccess() > EXPIRE_TIME) {
- iterator.remove();
- entry.getValue().getInvoker().destroy();
- } else {
- break;
- }
+ if (CollectionUtils.isEmptyMap(newInvokerCache)) {
+ return;
+ }
+ Iterator<Map.Entry<URL, InvokerCache<Invoker<T>>>> iterator = newInvokerCache.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<URL, InvokerCache<Invoker<T>>> entry = iterator.next();
+ if (System.currentTimeMillis() - entry.getValue().getLastAccess() > EXPIRE_TIME) {
+ iterator.remove();
+ entry.getValue().getInvoker().destroy();
+ } else {
+ break;
}
}
} finally {
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
deleted file mode 100644
index 61a6ecb..0000000
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtil.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.rpc.cluster.specifyaddress;
-
-import org.apache.dubbo.common.threadlocal.InternalThreadLocal;
-
-public class UserSpecifiedAddressUtil {
- private final static InternalThreadLocal<Address> ADDRESS = new InternalThreadLocal<>();
-
- /**
- * Set specified address to next invoke
- *
- * @param address specified address
- */
- public static void setAddress(Address address) {
- ADDRESS.set(address);
- }
-
- public static Address getAddress() {
- try {
- return ADDRESS.get();
- } finally {
- // work once
- ADDRESS.remove();
- }
- }
-}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.filter.ClusterFilter b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
new file mode 100644
index 0000000..151cb37
--- /dev/null
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
@@ -0,0 +1 @@
+disableRetry=org.apache.dubbo.rpc.cluster.specifyaddress.AddressSpecifyClusterFilter
\ No newline at end of file
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilderTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilderTest.java
index 4d46f52..b2aaf7c 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilderTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/DefaultUserSpecifiedServiceAddressBuilderTest.java
@@ -28,9 +28,9 @@
import java.util.Collections;
-public class DefaultUserSpecifiedServiceAddressBuilderTest {
+class DefaultUserSpecifiedServiceAddressBuilderTest {
@Test
- public void testBuild() {
+ void testBuild() {
ApplicationModel applicationModel = ApplicationModel.defaultModel();
DefaultUserSpecifiedServiceAddressBuilder defaultUserSpecifiedServiceAddressBuilder = new DefaultUserSpecifiedServiceAddressBuilder(applicationModel);
@@ -79,7 +79,7 @@
}
@Test
- public void testReBuild() {
+ void testReBuild() {
ApplicationModel applicationModel = ApplicationModel.defaultModel();
DefaultUserSpecifiedServiceAddressBuilder defaultUserSpecifiedServiceAddressBuilder = new DefaultUserSpecifiedServiceAddressBuilder(applicationModel);
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
index 47fc38d..fe7fdbb 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCacheTest.java
@@ -18,14 +18,15 @@
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.specifyaddress.common.InvokerCache;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-public class InvokerCacheTest {
+class InvokerCacheTest {
@Test
- public void test() throws InterruptedException {
- InvokerCache<Object> cache = new InvokerCache<>(Mockito.mock(Invoker.class));
+ void test() throws InterruptedException {
+ InvokerCache<Invoker<Object>> cache = new InvokerCache<>(Mockito.mock(Invoker.class));
long originTime = cache.getLastAccess();
Thread.sleep(5);
cache.getInvoker();
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
index 5276f74..255d371 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterFactoryTest.java
@@ -23,9 +23,9 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class UserSpecifiedAddressRouterFactoryTest {
+class UserSpecifiedAddressRouterFactoryTest {
@Test
- public void test() {
+ void test() {
ApplicationModel applicationModel = ApplicationModel.defaultModel();
StateRouterFactory stateRouterFactory = applicationModel.getExtensionLoader(StateRouterFactory.class).getExtension("user-specified-address");
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
index 4cc09c6..f874e52 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressRouterTest.java
@@ -20,6 +20,7 @@
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.cluster.router.state.BitList;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ServiceModel;
@@ -32,7 +33,7 @@
import java.util.Collections;
-public class UserSpecifiedAddressRouterTest {
+class UserSpecifiedAddressRouterTest {
private ApplicationModel applicationModel;
private URL consumerUrl;
@@ -52,12 +53,12 @@
}
@Test
- public void test() {
+ void test() {
Assertions.assertTrue(new UserSpecifiedAddressRouter<>(URL.valueOf("").setScopeModel(applicationModel.newModule())).supportContinueRoute());
}
@Test
- public void testNotify() {
+ void testNotify() {
UserSpecifiedAddressRouter<Object> userSpecifiedAddressRouter = new UserSpecifiedAddressRouter<>(consumerUrl);
Assertions.assertEquals(BitList.emptyList(), userSpecifiedAddressRouter.getInvokers());
Assertions.assertNull(userSpecifiedAddressRouter.getAddress2Invoker());
@@ -67,11 +68,15 @@
Assertions.assertNull(userSpecifiedAddressRouter.getAddress2Invoker());
Assertions.assertNull(userSpecifiedAddressRouter.getIp2Invoker());
+ Invocation invocation = new RpcInvocation();
+ Invoker mockInvoker = Mockito.mock(Invoker.class);
+ AddressSpecifyClusterFilter clusterFilter = new AddressSpecifyClusterFilter();
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 0));
+ clusterFilter.invoke(mockInvoker,invocation);
// no address
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null));
+ userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation, false, null, null));
Assertions.assertNotNull(userSpecifiedAddressRouter.getAddress2Invoker());
Assertions.assertNotNull(userSpecifiedAddressRouter.getIp2Invoker());
@@ -83,14 +88,19 @@
}
@Test
- public void testGetInvokerByURL() {
+ void testGetInvokerByURL() {
UserSpecifiedAddressRouter<Object> userSpecifiedAddressRouter = new UserSpecifiedAddressRouter<>(consumerUrl);
Assertions.assertEquals(BitList.emptyList(),
userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null));
+ Invocation invocation = new RpcInvocation();
+ Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
+ AddressSpecifyClusterFilter clusterFilter = new AddressSpecifyClusterFilter();
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880")));
- BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ clusterFilter.invoke(mockInvoker,invocation);
+
+ BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
@@ -98,29 +108,37 @@
Assertions.assertEquals(consumerUrl.getVersion(), invokers.get(0).getUrl().getVersion());
Assertions.assertEquals(consumerUrl.getGroup(), invokers.get(0).getUrl().getGroup());
- Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
Mockito.when(mockInvoker.getUrl()).thenReturn(URL.valueOf("simple://127.0.0.1:20880?Test1=Value"));
userSpecifiedAddressRouter.notify(new BitList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880")));
- invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation1 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation1);
+
+ invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation1, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
userSpecifiedAddressRouter.notify(new BitList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880?Test1=Value")));
- invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation2 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation2);
+ invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation2, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
userSpecifiedAddressRouter.notify(new BitList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("simple://127.0.0.1:20880")));
- invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation3 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation3);
+ invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation3, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("dubbo://127.0.0.1:20880")));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation4 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation4);
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation4, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
@@ -129,7 +147,10 @@
Assertions.assertEquals(consumerUrl.getGroup(), invokers.get(0).getUrl().getGroup());
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20770")));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation5 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation5);
+
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation5, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20770, invokers.get(0).getUrl().getPort());
@@ -138,7 +159,9 @@
Assertions.assertEquals(consumerUrl.getGroup(), invokers.get(0).getUrl().getGroup());
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20770?Test1=Value1")));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation6 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation6);
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation6, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20770, invokers.get(0).getUrl().getPort());
@@ -147,7 +170,9 @@
Assertions.assertEquals(consumerUrl.getGroup(), invokers.get(0).getUrl().getGroup());
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.2:20770?Test1=Value1")));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation7 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation7);
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation7, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.2", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20770, invokers.get(0).getUrl().getPort());
@@ -156,7 +181,9 @@
Assertions.assertEquals(consumerUrl.getGroup(), invokers.get(0).getUrl().getGroup());
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880?Test1=Value&Test2=Value&Test3=Value")));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation8 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation8);
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation8, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
@@ -168,37 +195,48 @@
}
@Test
- public void testGetInvokerByIp() {
+ void testGetInvokerByIp() {
UserSpecifiedAddressRouter<Object> userSpecifiedAddressRouter = new UserSpecifiedAddressRouter<>(consumerUrl);
Assertions.assertEquals(BitList.emptyList(),
userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null));
Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
+ AddressSpecifyClusterFilter clusterFilter = new AddressSpecifyClusterFilter();
Mockito.when(mockInvoker.getUrl()).thenReturn(consumerUrl);
userSpecifiedAddressRouter.notify(new BitList<>(Collections.singletonList(mockInvoker)));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 0));
- BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation);
+ BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20880));
- invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation1 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation1);
+ invokers = userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation1, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals(mockInvoker, invokers.get(0));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770));
+ Invocation invocation2 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation2);
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null));
+ userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation2, false, null, null));
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.3", 20880));
+ Invocation invocation3 = new RpcInvocation();
+ clusterFilter.invoke(mockInvoker,invocation3);
Assertions.assertThrows(RpcException.class, () ->
- userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, Mockito.mock(Invocation.class), false, null, null));
+ userSpecifiedAddressRouter.doRoute(new BitList<>(Collections.singletonList(mockInvoker)), consumerUrl, invocation3, false, null, null));
- UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770, true));
- invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation4 = new RpcInvocation();
+ UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.2", 20770,true));
+ clusterFilter.invoke(mockInvoker,invocation4);
+ invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation4, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.2", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20770, invokers.get(0).getUrl().getPort());
@@ -208,12 +246,17 @@
}
@Test
- public void testRemovalTask() throws InterruptedException {
+ @SuppressWarnings("unchecked")
+ void testRemovalTask() throws InterruptedException {
UserSpecifiedAddressRouter.EXPIRE_TIME = 10;
UserSpecifiedAddressRouter<Object> userSpecifiedAddressRouter = new UserSpecifiedAddressRouter<>(consumerUrl);
UserSpecifiedAddressUtil.setAddress(new Address(URL.valueOf("127.0.0.1:20880")));
- BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, Mockito.mock(Invocation.class), false, null, null);
+ Invocation invocation = new RpcInvocation();
+ Invoker<Object> mockInvoker = Mockito.mock(Invoker.class);
+ AddressSpecifyClusterFilter clusterFilter = new AddressSpecifyClusterFilter();
+ clusterFilter.invoke(mockInvoker,invocation);
+ BitList<Invoker<Object>> invokers = userSpecifiedAddressRouter.doRoute(BitList.emptyList(), consumerUrl, invocation, false, null, null);
Assertions.assertEquals(1, invokers.size());
Assertions.assertEquals("127.0.0.1", invokers.get(0).getUrl().getHost());
Assertions.assertEquals(20880, invokers.get(0).getUrl().getPort());
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
index 0dc1c16..c546623 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
+++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/src/test/java/org/apache/dubbo/rpc/cluster/specifyaddress/UserSpecifiedAddressUtilTest.java
@@ -19,15 +19,13 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class UserSpecifiedAddressUtilTest {
+class UserSpecifiedAddressUtilTest {
@Test
- public void test() {
+ void test() {
Assertions.assertNull(UserSpecifiedAddressUtil.getAddress());
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 0));
Assertions.assertEquals(new Address("127.0.0.1", 0), UserSpecifiedAddressUtil.getAddress());
- Assertions.assertNull(UserSpecifiedAddressUtil.getAddress());
UserSpecifiedAddressUtil.setAddress(new Address("127.0.0.1", 12345));
Assertions.assertNotEquals(new Address("127.0.0.1", 0), UserSpecifiedAddressUtil.getAddress());
- Assertions.assertNull(UserSpecifiedAddressUtil.getAddress());
}
}
diff --git a/dubbo-cluster-extensions/pom.xml b/dubbo-cluster-extensions/pom.xml
index c9afcaa..fff3b5f 100644
--- a/dubbo-cluster-extensions/pom.xml
+++ b/dubbo-cluster-extensions/pom.xml
@@ -35,7 +35,8 @@
<module>dubbo-cluster-loadbalance-peakewma</module>
<module>dubbo-cluster-specify-address-dubbo3</module>
<module>dubbo-cluster-specify-address-dubbo2</module>
+ <module>dubbo-cluster-specify-address-common</module>
+ <module>dubbo-cluster-polaris-dubbo2</module>
</modules>
-
</project>
diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml
index 2ca3f50..bf18367 100644
--- a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml
+++ b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml
@@ -26,12 +26,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-configcenter-consul</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
+ <version>3.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java b/dubbo-configcenter-extensions/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
index 60112b9..4f38fa0 100644
--- a/dubbo-configcenter-extensions/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
+++ b/dubbo-configcenter-extensions/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
@@ -1,123 +1,116 @@
-///*
-// * 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.configcenter.consul;
-//
-//import org.apache.dubbo.common.URL;
-//
-//import com.google.common.net.HostAndPort;
-//import com.orbitz.consul.Consul;
-//import com.orbitz.consul.KeyValueClient;
-//import com.orbitz.consul.cache.KVCache;
-//import com.orbitz.consul.model.kv.Value;
-//import com.pszymczyk.consul.ConsulProcess;
-//import com.pszymczyk.consul.ConsulStarterBuilder;
-//import org.junit.jupiter.api.AfterAll;
-//import org.junit.jupiter.api.Assertions;
-//import org.junit.jupiter.api.BeforeAll;
-//import org.junit.jupiter.api.Test;
-//
-//import java.util.Arrays;
-//import java.util.Optional;
-//import java.util.TreeSet;
-//
-//import static org.junit.jupiter.api.Assertions.assertEquals;
-//
-///**
-// *
-// */
-//public class ConsulDynamicConfigurationTest {
-//
-// private static ConsulProcess consul;
-// private static URL configCenterUrl;
-// private static ConsulDynamicConfiguration configuration;
-//
-// private static Consul client;
-// private static KeyValueClient kvClient;
-//
-// @BeforeAll
-// public static void setUp() throws Exception {
-// consul = ConsulStarterBuilder.consulStarter()
-// .build()
-// .start();
-// configCenterUrl = URL.valueOf("consul://127.0.0.1:" + consul.getHttpPort());
-//
-// configuration = new ConsulDynamicConfiguration(configCenterUrl);
-// client = Consul.builder().withHostAndPort(HostAndPort.fromParts("127.0.0.1", consul.getHttpPort())).build();
-// kvClient = client.keyValueClient();
-// }
-//
-// @AfterAll
-// public static void tearDown() throws Exception {
-// consul.close();
-// configuration.close();
-// }
-//
-// @Test
-// public void testGetConfig() {
-// kvClient.putValue("/dubbo/config/dubbo/foo", "bar");
-// // test equals
-// assertEquals("bar", configuration.getConfig("foo", "dubbo"));
-// // test does not block
-// assertEquals("bar", configuration.getConfig("foo", "dubbo"));
-// Assertions.assertNull(configuration.getConfig("not-exist", "dubbo"));
-// }
-//
-// @Test
-// public void testPublishConfig() {
-// configuration.publishConfig("value", "metadata", "1");
-// // test equals
-// assertEquals("1", configuration.getConfig("value", "/metadata"));
-// assertEquals("1", kvClient.getValueAsString("/dubbo/config/metadata/value").get());
-// }
-//
-// @Test
-// public void testAddListener() {
-// KVCache cache = KVCache.newCache(kvClient, "/dubbo/config/dubbo/foo");
-// cache.addListener(newValues -> {
-// // Cache notifies all paths with "foo" the root path
-// // If you want to watch only "foo" value, you must filter other paths
-// Optional<Value> newValue = newValues.values().stream()
-// .filter(value -> value.getKey().equals("foo"))
-// .findAny();
-//
-// newValue.ifPresent(value -> {
-// // Values are encoded in key/value store, decode it if needed
-// Optional<String> decodedValue = newValue.get().getValueAsString();
-// decodedValue.ifPresent(v -> System.out.println(String.format("Value is: %s", v))); //prints "bar"
-// });
-// });
-// cache.start();
-//
-// kvClient.putValue("/dubbo/config/dubbo/foo", "new-value");
-// kvClient.putValue("/dubbo/config/dubbo/foo/sub", "sub-value");
-// kvClient.putValue("/dubbo/config/dubbo/foo/sub2", "sub-value2");
-// kvClient.putValue("/dubbo/config/foo", "parent-value");
-//
-// System.out.println(kvClient.getKeys("/dubbo/config/dubbo/foo"));
-// System.out.println(kvClient.getKeys("/dubbo/config"));
-// System.out.println(kvClient.getValues("/dubbo/config/dubbo/foo"));
-// }
-//
-// @Test
-// public void testGetConfigKeys() {
-// configuration.publishConfig("v1", "metadata", "1");
-// configuration.publishConfig("v2", "metadata", "2");
-// configuration.publishConfig("v3", "metadata", "3");
-// // test equals
-// assertEquals(new TreeSet(Arrays.asList("v1", "v2", "v3")), configuration.getConfigKeys("metadata"));
-// }
-//}
+/*
+ * 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.configcenter.consul;
+import org.apache.dubbo.common.URL;
+import com.google.common.net.HostAndPort;
+import com.orbitz.consul.Consul;
+import com.orbitz.consul.KeyValueClient;
+import com.orbitz.consul.cache.KVCache;
+import com.orbitz.consul.model.kv.Value;
+import com.pszymczyk.consul.ConsulProcess;
+import com.pszymczyk.consul.ConsulStarterBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import java.util.Arrays;
+import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ConsulDynamicConfigurationTest {
+
+ private static ConsulProcess consul;
+ private static URL configCenterUrl;
+ private static ConsulDynamicConfiguration configuration;
+
+ private static Consul client;
+ private static KeyValueClient kvClient;
+
+ @BeforeAll
+ public static void setUp() throws Exception {
+ consul = ConsulStarterBuilder.consulStarter()
+ .build()
+ .start();
+ configCenterUrl = URL.valueOf("consul://127.0.0.1:" + consul.getHttpPort());
+
+ configuration = new ConsulDynamicConfiguration(configCenterUrl);
+ client = Consul.builder().withHostAndPort(HostAndPort.fromParts("127.0.0.1", consul.getHttpPort())).build();
+ kvClient = client.keyValueClient();
+ }
+
+ @AfterAll
+ public static void tearDown() throws Exception {
+ consul.close();
+ configuration.close();
+ }
+
+ @Test
+ public void testGetConfig() {
+ kvClient.putValue("/dubbo/config/dubbo/foo", "bar");
+ // test equals
+ assertEquals("bar", configuration.getConfig("foo", "dubbo"));
+ // test does not block
+ assertEquals("bar", configuration.getConfig("foo", "dubbo"));
+ Assertions.assertNull(configuration.getConfig("not-exist", "dubbo"));
+ }
+
+ @Test
+ public void testPublishConfig() {
+ configuration.publishConfig("value", "metadata", "1");
+ // test equals
+ assertEquals("1", configuration.getConfig("value", "/metadata"));
+ assertEquals("1", kvClient.getValueAsString("/dubbo/config/metadata/value").get());
+ }
+
+ @Test
+ public void testAddListener() {
+ KVCache cache = KVCache.newCache(kvClient, "/dubbo/config/dubbo/foo");
+ cache.addListener(newValues -> {
+ // Cache notifies all paths with "foo" the root path
+ // If you want to watch only "foo" value, you must filter other paths
+ Optional<Value> newValue = newValues.values().stream()
+ .filter(value -> value.getKey().equals("foo"))
+ .findAny();
+
+ newValue.ifPresent(value -> {
+ // Values are encoded in key/value store, decode it if needed
+ Optional<String> decodedValue = newValue.get().getValueAsString();
+ decodedValue.ifPresent(v -> System.out.println(String.format("Value is: %s", v))); //prints "bar"
+ });
+ });
+ cache.start();
+
+ kvClient.putValue("/dubbo/config/dubbo/foo", "new-value");
+ kvClient.putValue("/dubbo/config/dubbo/foo/sub", "sub-value");
+ kvClient.putValue("/dubbo/config/dubbo/foo/sub2", "sub-value2");
+ kvClient.putValue("/dubbo/config/foo", "parent-value");
+
+ System.out.println(kvClient.getKeys("/dubbo/config/dubbo/foo"));
+ System.out.println(kvClient.getKeys("/dubbo/config"));
+ System.out.println(kvClient.getValues("/dubbo/config/dubbo/foo"));
+ }
+
+ @Test
+ public void testGetConfigKeys() {
+ configuration.publishConfig("v1", "metadata", "1");
+ configuration.publishConfig("v2", "metadata", "2");
+ configuration.publishConfig("v3", "metadata", "3");
+ // test equals
+ assertEquals(Arrays.asList("v1", "v2", "v3"), configuration.doGetConfigKeys("/dubbo/config/metadata"));
+
+ }
+}
diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml
index 3362673..38511ea 100644
--- a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml
+++ b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-configcenter-etcd</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The etcd implementation of the config-center api</description>
@@ -43,6 +43,16 @@
<artifactId>jetcd-launcher</artifactId>
<scope>test</scope>
</dependency>
+
+ <!--
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>1.19.1</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
@@ -52,13 +62,15 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
+ <version>3.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-remoting-etcd3</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
+
</dependencies>
<build>
@@ -66,6 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.1</version>
<configuration>
<skipTests>${skipIntegrationTests}</skipTests>
</configuration>
diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java
index e6ed4b5..d944c00 100644
--- a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java
+++ b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java
@@ -16,12 +16,10 @@
*/
package org.apache.dubbo.configcenter.support.etcd;
-
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent;
import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
-
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.launcher.EtcdCluster;
@@ -30,7 +28,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
+import org.junit.jupiter.api.Disabled;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
@@ -45,55 +43,63 @@
* Unit test for etcd config center support
* Integrate with https://github.com/etcd-io/jetcd#launcher
*/
+@Disabled
public class EtcdDynamicConfigurationTest {
private static EtcdDynamicConfiguration config;
public EtcdCluster etcdCluster = EtcdClusterFactory.buildCluster(getClass().getSimpleName(), 3, false);
+ //public EtcdCluster etcdCluster= new Etcd.Builder().withClusterName(getClass().getSimpleName()).withNodes(3).withSsl(false).build();
+
private static Client client;
- @Test
- public void testGetConfig() {
- put("/dubbo/config/org.apache.dubbo.etcd.testService/configurators", "hello");
+ @Test
+ public void testGetConfig() {
+ put("/dubbo/config/dubbo/org.apache.dubbo.etcd.testService/configurators", "hello");
put("/dubbo/config/test/dubbo.properties", "aaa=bbb");
- Assert.assertEquals("hello", config.getConfig("org.apache.dubbo.etcd.testService.configurators", DynamicConfiguration.DEFAULT_GROUP));
+ Assert.assertEquals("hello", config.getConfig("org.apache.dubbo.etcd.testService/configurators", DynamicConfiguration.DEFAULT_GROUP));
Assert.assertEquals("aaa=bbb", config.getConfig("dubbo.properties", "test"));
}
+
@Test
- public void testAddListener() throws Exception {
+ public void testAddListener1() throws Exception {
+
CountDownLatch latch = new CountDownLatch(4);
TestListener listener1 = new TestListener(latch);
TestListener listener2 = new TestListener(latch);
TestListener listener3 = new TestListener(latch);
TestListener listener4 = new TestListener(latch);
- config.addListener("AService.configurators", listener1);
- config.addListener("AService.configurators", listener2);
- config.addListener("testapp.tagrouters", listener3);
- config.addListener("testapp.tagrouters", listener4);
- put("/dubbo/config/AService/configurators", "new value1");
- Thread.sleep(200);
- put("/dubbo/config/testapp/tagrouters", "new value2");
- Thread.sleep(200);
- put("/dubbo/config/testapp", "new value3");
+ config.addListener("AService/configurators", listener1);
+ config.addListener("AService/configurators", listener2);
+ config.addListener("testapp/tagrouters", listener3);
+ config.addListener("testapp/tagrouters", listener4);
+ //全路径
+ put("/dubbo/config/dubbo/AService/configurators", "new value1");
+ Thread.sleep(200);
+
+ put("/dubbo/config/dubbo/testapp/tagrouters", "new value2");
Thread.sleep(1000);
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
- Assert.assertEquals(1, listener1.getCount("/dubbo/config/AService/configurators"));
- Assert.assertEquals(1, listener2.getCount("/dubbo/config/AService/configurators"));
- Assert.assertEquals(1, listener3.getCount("/dubbo/config/testapp/tagrouters"));
- Assert.assertEquals(1, listener4.getCount("/dubbo/config/testapp/tagrouters"));
+ Assert.assertEquals(1, listener1.getCount("AService/configurators"));
+ Assert.assertEquals(1, listener2.getCount("AService/configurators"));
+ Assert.assertEquals(1, listener3.getCount("testapp/tagrouters"));
+ Assert.assertEquals(1, listener4.getCount("testapp/tagrouters"));
Assert.assertEquals("new value1", listener1.getValue());
Assert.assertEquals("new value1", listener2.getValue());
Assert.assertEquals("new value2", listener3.getValue());
Assert.assertEquals("new value2", listener4.getValue());
+
}
+
+
private class TestListener implements ConfigurationListener {
private CountDownLatch latch;
private String value;
@@ -128,6 +134,7 @@
}
}
+ //这里会涉及到docker拉取镜像很慢
@Before
public void setUp() {
@@ -137,18 +144,19 @@
List<URI> clientEndPoints = etcdCluster.getClientEndpoints();
- String ipAddress = clientEndPoints.get(0).getHost() + ":" + clientEndPoints.get(0).getPort();
+ String ipAddress =clientEndPoints.get(0).getHost() + ":" + clientEndPoints.get(0).getPort(); //"127.0.0.1:2379";
+
String urlForDubbo = "etcd3://" + ipAddress + "/org.apache.dubbo.etcd.testService";
// timeout in 15 seconds.
- URL url = URL.valueOf(urlForDubbo)
- .addParameter(SESSION_TIMEOUT_KEY, 15000);
+ URL url = URL.valueOf(urlForDubbo).addParameter(SESSION_TIMEOUT_KEY, 15000);
config = new EtcdDynamicConfiguration(url);
}
@After
public void tearDown() {
etcdCluster.close();
+ client.close();
}
}
diff --git a/dubbo-cross-thread-extensions/README.md b/dubbo-cross-thread-extensions/README.md
new file mode 100644
index 0000000..98ceb2a
--- /dev/null
+++ b/dubbo-cross-thread-extensions/README.md
@@ -0,0 +1,141 @@
+# Dubbo Cross Thread Extensions
+
+`dubbo-cross-thread-extensions` copy dubbo.tag cross thread lightly .
+it can run with skywalking and ttl .
+
+## Integrate example
+### scan annotation by byte-buddy
+(you can install with ByteBuddyAgent or use it with `-javaagent=<agentjar>`)
+```
+ Instrumentation instrumentation = ByteBuddyAgent.install();
+ RunnableOrCallableActivation.install(instrumentation);
+ RpcContext.getClientAttachment().setAttachment(CommonConstants.TAG_KEY, tag);
+ Callable<String> callable = CallableWrapper.of(new Callable<String>() {
+ @Override
+ public String call() throws Exception {
+ return RpcContext.getClientAttachment().getAttachment(CommonConstants.TAG_KEY);
+ }
+ });
+ ExecutorService threadPool = Executors.newSingleThreadExecutor();
+ Future<String> result = threadPool.submit(callable);
+```
+### add annotation @DubboCrossThread
+
+```
+@DubboCrossThread
+public class TargetClass implements Runnable{
+ @Override
+ public void run() {
+ // ...
+ }
+}
+```
+### wrap Callable or Runnable
+```
+Callable<String> callable = CallableWrapper.of(new Callable<String>() {
+ @Override
+ public String call() throws Exception {
+ return null;
+ }
+});
+```
+```
+Runnable runnable = RunnableWrapper.of(new Runnable() {
+ @Override
+ public void run() {
+ // ...
+ }
+});
+```
+## Integrate with spring boot
+
+### add a listener
+```
+public class DubboCrossThreadAnnotationListener implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
+ private Logger logger = LoggerFactory.getLogger(DubboCrossThreadAnnotationListener.class);
+ private Instrumentation instrumentation;
+
+ @Override
+ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {
+ RunnableOrCallableActivation.install(this.instrumentation);
+ logger.info("finished byte buddy installation.");
+ }
+
+ public DubboCrossThreadAnnotationListener(Instrumentation instrumentation) {
+ this.instrumentation = instrumentation;
+ }
+
+ private DubboCrossThreadAnnotationListener() {
+
+ }
+}
+
+```
+### install ByteBuddyAgent
+```
+@SpringBootApplication
+@ComponentScan(basePackages = "org.apache.your-package")
+public class SpringBootDemoApplication {
+
+ public static void main(String[] args) {
+ SpringApplication application = new SpringApplication(SpringBootDemoApplication.class);
+ application.addListeners(new DubboCrossThreadAnnotationListener(ByteBuddyAgent.install()));
+ application.run(args);
+ }
+}
+```
+
+## run with wkywalking and ttl
+jvm arguments:
+```
+-javaagent:transmittable-thread-local-2.14.2.jar
+-Dskywalking.agent.application_code=tracecallable-ltf1
+-Dskywalking.agent.service_name=test12
+-Dskywalking.collector.backend_service=172.37.66.195:11800
+-javaagent:skywalking-agent.jar
+```
+example code:
+```
+public class MultiAnnotationWithSwTtl {
+ private static TransmittableThreadLocal<String> context = new TransmittableThreadLocal<>();
+
+ public static void main(String[] args) {
+ Instrumentation instrumentation = ByteBuddyAgent.install();
+ RunnableOrCallableActivation.install(instrumentation);
+ context.set("value-set-in-parent with ttl");
+ RunnableWrapper runnable = RunnableWrapper.of(new Runnable() {
+ @Override
+ public void run() {
+ System.out.println("parent thread traceId=" + TraceContext.traceId());
+ RpcContext.getClientAttachment().setAttachment("dubbo.tag", "tagValue");
+ MyRunnable task = new MyRunnable();
+ ExecutorService executorService = Executors.newSingleThreadExecutor();
+ executorService.submit(task);
+ }
+ });
+ runnable.run();
+ }
+
+ @TraceCrossThread // copy traceContext (include traceId)
+ @DubboCrossThread
+ public static class MyRunnable implements Runnable {
+
+ @Override
+ public void run() {
+ System.out.println("dubbo.tag=" + RpcContext.getClientAttachment().getAttachment("dubbo.tag"));
+ System.out.println("children thread traceId=" + TraceContext.traceId());
+ System.out.println("ttl context.get()="+context.get());
+ }
+
+ }
+}
+
+```
+output:
+```
+parent thread traceId=60cfc24e245d4389b9f40b5b38c33ef6.1.16910355654660001
+dubbo.tag=tagValue
+children thread traceId=60cfc24e245d4389b9f40b5b38c33ef6.1.16910355654660001
+ttl context.get()=value-set-in-parent with ttl
+```
+
diff --git a/dubbo-cross-thread-extensions/pom.xml b/dubbo-cross-thread-extensions/pom.xml
new file mode 100644
index 0000000..0d3b659
--- /dev/null
+++ b/dubbo-cross-thread-extensions/pom.xml
@@ -0,0 +1,55 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-cross-thread-extensions</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableActivation.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableActivation.java
new file mode 100644
index 0000000..c1fec87
--- /dev/null
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableActivation.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.crossthread.interceptor;
+
+import org.apache.dubbo.crossthread.toolkit.DubboCrossThread;
+
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.modifier.Visibility;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.matcher.ElementMatchers;
+import net.bytebuddy.utility.JavaModule;
+
+import java.lang.instrument.Instrumentation;
+import java.security.ProtectionDomain;
+
+import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+public class RunnableOrCallableActivation {
+ // add '_' before dubboTag to avoid conflict field name
+ public static final String FIELD_NAME_DUBBO_TAG = "_dubboTag";
+ private static final String CALL_METHOD_NAME = "call";
+ private static final String RUN_METHOD_NAME = "run";
+ private static final String APPLY_METHOD_NAME = "apply";
+ private static final String ACCEPT_METHOD_NAME = "accept";
+
+ public static void install(Instrumentation instrumentation) {
+ new AgentBuilder.Default()
+ .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+ .with(AgentBuilder.TypeStrategy.Default.REBASE)
+ .with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
+ .type(isAnnotatedWith(DubboCrossThread.class))
+ .transform(new AgentBuilder.Transformer() {
+ @Override
+ public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription,
+ ClassLoader classLoader, JavaModule module,
+ ProtectionDomain protectionDomain) {
+ return builder
+ .defineField(FIELD_NAME_DUBBO_TAG, String.class, Visibility.PUBLIC)
+ .visit(Advice.to(RunnableOrCallableMethodInterceptor.class).on(
+ ElementMatchers.isMethod().and(
+ ElementMatchers.named(RUN_METHOD_NAME).and(takesArguments(0))
+ .or(ElementMatchers.named(CALL_METHOD_NAME).and(takesArguments(0)))
+ .or(ElementMatchers.named(APPLY_METHOD_NAME).and(takesArguments(0)))
+ .or(ElementMatchers.named(ACCEPT_METHOD_NAME).and(takesArguments(0)))
+ )
+ ))
+ .visit(Advice.to(RunnableOrCallableConstructInterceptor.class).on(
+ ElementMatchers.isConstructor()
+ ));
+ }
+ })
+ .installOn(instrumentation);
+ }
+}
diff --git a/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableConstructInterceptor.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableConstructInterceptor.java
new file mode 100644
index 0000000..03a8ecf
--- /dev/null
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableConstructInterceptor.java
@@ -0,0 +1,41 @@
+/*
+ * 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.crossthread.interceptor;
+
+import java.lang.reflect.Field;
+
+import net.bytebuddy.asm.Advice;
+
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.rpc.RpcContext;
+
+public class RunnableOrCallableConstructInterceptor {
+
+ @Advice.OnMethodEnter
+ public static void onMethodEnter() {
+
+ }
+
+ @Advice.OnMethodExit
+ public static void onMethodExit(@Advice.This Object thiz) throws IllegalAccessException, NoSuchFieldException {
+ Field tag = thiz.getClass().getDeclaredField(RunnableOrCallableActivation.FIELD_NAME_DUBBO_TAG);
+ // copy tag to RunnableOrCallable's field from RpcContext
+ String dubboTag = RpcContext.getClientAttachment().getAttachment(CommonConstants.TAG_KEY);
+ tag.set(thiz, dubboTag);
+ }
+
+}
diff --git a/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableMethodInterceptor.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableMethodInterceptor.java
new file mode 100644
index 0000000..5d4fbf2
--- /dev/null
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/interceptor/RunnableOrCallableMethodInterceptor.java
@@ -0,0 +1,39 @@
+/*
+ * 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.crossthread.interceptor;
+
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.rpc.RpcContext;
+
+import net.bytebuddy.asm.Advice;
+
+public class RunnableOrCallableMethodInterceptor {
+
+ @Advice.OnMethodEnter
+ public static void onMethodEnter(
+ @Advice.FieldValue(value = RunnableOrCallableActivation.FIELD_NAME_DUBBO_TAG, readOnly = false) String dubboTag) {
+ // copy tag to RpcContext from RunnableOrCallable's field value
+ RpcContext.getClientAttachment().setAttachment(CommonConstants.TAG_KEY, dubboTag);
+ }
+
+ @Advice.OnMethodExit(onThrowable = Throwable.class)
+ public static void onMethodExit() {
+ // clear tag in RpcContext
+ RpcContext.getClientAttachment().removeAttachment(CommonConstants.TAG_KEY);
+ }
+
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/CallableWrapper.java
similarity index 63%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/CallableWrapper.java
index 52aff89..7f71fbf 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/CallableWrapper.java
@@ -14,24 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.crossthread.toolkit;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import java.util.concurrent.Callable;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+@DubboCrossThread
+public class CallableWrapper<V> implements Callable<V> {
+ final Callable<V> callable;
+
+ public static <V> CallableWrapper<V> of(Callable<V> r) {
+ return new CallableWrapper<>(r);
}
- public long getLastAccess() {
- return lastAccess;
+ public CallableWrapper(Callable<V> callable) {
+ this.callable = callable;
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public V call() throws Exception {
+ return callable.call();
}
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/ConsumerWrapper.java
similarity index 63%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/ConsumerWrapper.java
index 52aff89..65c53a4 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/ConsumerWrapper.java
@@ -14,24 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.crossthread.toolkit;
-import org.apache.dubbo.rpc.Invoker;
+import java.util.function.Consumer;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+@DubboCrossThread
+public class ConsumerWrapper<V> implements Consumer<V> {
+ final Consumer<V> consumer;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ public ConsumerWrapper(Consumer<V> consumer) {
+ this.consumer = consumer;
}
- public long getLastAccess() {
- return lastAccess;
+ public static <V> ConsumerWrapper<V> of(Consumer<V> consumer) {
+ return new ConsumerWrapper(consumer);
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public void accept(V v) {
+ this.consumer.accept(v);
}
+
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/DubboCrossThread.java
similarity index 61%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/DubboCrossThread.java
index 52aff89..246fa7c 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/DubboCrossThread.java
@@ -14,24 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.crossthread.toolkit;
-import org.apache.dubbo.rpc.Invoker;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DubboCrossThread {
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/FunctionWrapper.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/FunctionWrapper.java
index 52aff89..e053b21 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/FunctionWrapper.java
@@ -14,24 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.crossthread.toolkit;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import java.util.function.Function;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+@DubboCrossThread
+public class FunctionWrapper<T, R> implements Function<T, R> {
+ final Function<T, R> function;
+
+ public FunctionWrapper(Function<T, R> function) {
+ this.function = function;
}
- public long getLastAccess() {
- return lastAccess;
+ public static <T, R> FunctionWrapper<T, R> of(Function<T, R> function) {
+ return new FunctionWrapper(function);
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public R apply(T t) {
+ return this.function.apply(t);
}
+
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/RunnableWrapper.java
similarity index 63%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/RunnableWrapper.java
index 52aff89..da46519 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-cross-thread-extensions/src/main/java/org/apache/dubbo/crossthread/toolkit/RunnableWrapper.java
@@ -14,24 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.crossthread.toolkit;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+@DubboCrossThread
+public class RunnableWrapper implements Runnable {
+ final Runnable runnable;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ public RunnableWrapper(Runnable runnable) {
+ this.runnable = runnable;
}
- public long getLastAccess() {
- return lastAccess;
+ public static RunnableWrapper of(Runnable r) {
+ return new RunnableWrapper(r);
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public void run() {
+ this.runnable.run();
}
}
diff --git a/dubbo-cross-thread-extensions/src/test/java/org/apache/dubbo/crossthread/DubboCrossThreadTest.java b/dubbo-cross-thread-extensions/src/test/java/org/apache/dubbo/crossthread/DubboCrossThreadTest.java
new file mode 100644
index 0000000..ca43052
--- /dev/null
+++ b/dubbo-cross-thread-extensions/src/test/java/org/apache/dubbo/crossthread/DubboCrossThreadTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.crossthread;
+
+import java.lang.instrument.Instrumentation;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import net.bytebuddy.agent.ByteBuddyAgent;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.crossthread.interceptor.RunnableOrCallableActivation;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.crossthread.toolkit.CallableWrapper;
+import org.apache.dubbo.crossthread.toolkit.RunnableWrapper;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DubboCrossThreadTest {
+ @Test
+ public void crossThreadCallableTest() throws ExecutionException, InterruptedException, TimeoutException {
+ Instrumentation instrumentation = ByteBuddyAgent.install();
+ RunnableOrCallableActivation.install(instrumentation);
+ String tag = "beta";
+ RpcContext.getClientAttachment().setAttachment(CommonConstants.TAG_KEY, tag);
+ Callable<String> callable = CallableWrapper.of(new Callable<String>() {
+ @Override
+ public String call() throws Exception {
+ return RpcContext.getClientAttachment().getAttachment(CommonConstants.TAG_KEY);
+ }
+ });
+ ExecutorService threadPool = Executors.newSingleThreadExecutor();
+ Future<String> submit = threadPool.submit(callable);
+ assertEquals(tag, submit.get(1, TimeUnit.SECONDS));
+ threadPool.shutdown();
+ }
+
+ private volatile String tagCrossThread = null;
+
+ @Test
+ public void crossThreadRunnableTest() throws ExecutionException, InterruptedException {
+ Instrumentation instrumentation = ByteBuddyAgent.install();
+ RunnableOrCallableActivation.install(instrumentation);
+ String tag = "beta";
+ RpcContext.getClientAttachment().setAttachment(CommonConstants.TAG_KEY, tag);
+ final CountDownLatch latch = new CountDownLatch(1);
+ Runnable runnable = RunnableWrapper.of(new Runnable() {
+ @Override
+ public void run() {
+ String tag = RpcContext.getClientAttachment().getAttachment(CommonConstants.TAG_KEY);
+ tagCrossThread = tag;
+ latch.countDown();
+ }
+ });
+ ExecutorService threadPool = Executors.newSingleThreadExecutor();
+ threadPool.submit(runnable);
+ latch.await(1, TimeUnit.SECONDS);
+ assertEquals(tag, tagCrossThread);
+ threadPool.shutdown();
+ }
+
+}
diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml
index 089e6e3..6baf554 100644
--- a/dubbo-extensions-dependencies-bom/pom.xml
+++ b/dubbo-extensions-dependencies-bom/pom.xml
@@ -89,13 +89,13 @@
</issueManagement>
<properties>
- <revision>1.0.3-SNAPSHOT</revision>
+ <revision>1.0.5-SNAPSHOT</revision>
<dubbo.version>3.1.2</dubbo.version>
<spring.version>5.2.9.RELEASE</spring.version>
<spring-boot.version>2.4.1</spring-boot.version>
<!-- Fabric8 for Kubernetes -->
- <fabric8_kubernetes_version>5.3.2</fabric8_kubernetes_version>
+ <fabric8_kubernetes_version>6.9.2</fabric8_kubernetes_version>
<hessian_version>4.0.51</hessian_version>
<httpclient_version>4.5.13</httpclient_version>
<jsonrpc_version>1.2.0</jsonrpc_version>
@@ -108,11 +108,13 @@
<jaxb_version>2.2.7</jaxb_version>
<activation_version>1.2.0</activation_version>
<cxf_version>3.1.15</cxf_version>
- <avro_version>1.8.2</avro_version>
+ <avro_version>1.11.3</avro_version>
<fastjson_version>1.2.83</fastjson_version>
<fst_version>2.48-jdk-6</fst_version>
+ <fury_version>0.2.0</fury_version>
+ <jackson_version>2.15.3</jackson_version>
<gson_version>2.8.9</gson_version>
- <kryo_version>5.3.0</kryo_version>
+ <kryo_version>5.4.0</kryo_version>
<kryo_serializers_version>0.45</kryo_serializers_version>
<msgpack_version>0.8.22</msgpack_version>
<protostuff_version>1.5.9</protostuff_version>
@@ -120,7 +122,7 @@
<slf4j_version>1.7.25</slf4j_version>
<grizzly_version>2.4.4</grizzly_version>
<jetcd_version>0.5.7</jetcd_version>
- <grpc.version>1.31.1</grpc.version>
+ <grpc.version>1.53.0</grpc.version>
<etcd_launcher_version>0.5.7</etcd_launcher_version>
<netty4_version>4.1.66.Final</netty4_version>
<consul_process_version>2.2.1</consul_process_version>
@@ -130,11 +132,17 @@
<seata_version>1.5.2</seata_version>
<eureka.version>1.9.12</eureka.version>
<sofa_registry_version>5.2.0</sofa_registry_version>
- <logback_version>1.2.11</logback_version>
+ <logback_version>1.3.12</logback_version>
<rs_api_version>2.0</rs_api_version>
<resteasy_version>3.0.20.Final</resteasy_version>
-
+ <polaris_adapter_version>0.2.1</polaris_adapter_version>
<maven_flatten_version>1.2.5</maven_flatten_version>
+ <byte-buddy.version>1.14.5</byte-buddy.version>
+ <commons_net_version>3.9.0</commons_net_version>
+ <snakeyaml_version>2.0</snakeyaml_version>
+ <protobuf-java_version>3.25.1</protobuf-java_version>
+ <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
+ <envoy_api_version>0.1.35</envoy_api_version>
</properties>
<dependencyManagement>
@@ -296,6 +304,31 @@
<version>${fst_version}</version>
</dependency>
<dependency>
+ <groupId>org.furyio</groupId>
+ <artifactId>fury-core</artifactId>
+ <version>${fury_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson_version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson_version}</version>
@@ -484,6 +517,61 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.tencent.polaris</groupId>
+ <artifactId>polaris-adapter-dubbo</artifactId>
+ <version>${polaris_adapter_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${byte-buddy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>${byte-buddy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons_net_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <version>${protobuf-java_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle-bcprov_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle-bcprov_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ <version>${bouncycastle-bcprov_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.envoyproxy.controlplane</groupId>
+ <artifactId>api</artifactId>
+ <version>${envoy_api_version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml
new file mode 100644
index 0000000..4abcc6d
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-filter-polaris-dubbo2</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-filter-polaris-circuitbreaker-dubbo2</artifactId>
+
+</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CallAbortCallback.java
similarity index 64%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CallAbortCallback.java
index 52aff89..9d3243e 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CallAbortCallback.java
@@ -14,24 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.filter.dubbo2;
+
+import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;
+import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+public interface CallAbortCallback {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+ Result handle(Invoker<?> invoker, Invocation invocation, CallAbortedException ex);
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
}
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CircuitBreakerFilter.java b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CircuitBreakerFilter.java
new file mode 100644
index 0000000..57a60c0
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/CircuitBreakerFilter.java
@@ -0,0 +1,179 @@
+/*
+ * 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.filter.dubbo2;
+
+import com.tencent.polaris.api.plugin.circuitbreaker.ResourceStat;
+import com.tencent.polaris.api.plugin.circuitbreaker.entity.InstanceResource;
+import com.tencent.polaris.api.plugin.circuitbreaker.entity.Resource;
+import com.tencent.polaris.api.pojo.RetStatus;
+import com.tencent.polaris.api.pojo.ServiceKey;
+import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
+import com.tencent.polaris.circuitbreak.api.InvokeHandler;
+import com.tencent.polaris.circuitbreak.api.pojo.InvokeContext;
+import com.tencent.polaris.circuitbreak.api.pojo.ResultToErrorCode;
+import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;
+import com.tencent.polaris.common.exception.PolarisBlockException;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.registry.PolarisOperatorDelegate;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.AsyncRpcResult;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcException;
+
+import java.util.Objects;
+import java.util.ServiceLoader;
+import java.util.concurrent.TimeUnit;
+
+@Activate(group = CommonConstants.CONSUMER)
+public class CircuitBreakerFilter extends PolarisOperatorDelegate implements Filter, ResultToErrorCode {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CircuitBreakerFilter.class);
+
+ private final CallAbortCallback callback;
+
+ public CircuitBreakerFilter() {
+ ServiceLoader<CallAbortCallback> loader = ServiceLoader.load(CallAbortCallback.class);
+ CallAbortCallback instance = loader.iterator().next();
+ if (Objects.nonNull(instance)) {
+ this.callback = instance;
+ } else {
+ this.callback = new DefaultCallAbortCallback();
+ }
+
+ LOGGER.info("[POLARIS] init polaris circuitbreaker");
+ }
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
+ PolarisOperator polarisOperator = getPolarisOperator();
+ if (null == polarisOperator) {
+ return invoker.invoke(invocation);
+ }
+
+ CircuitBreakAPI circuitBreakAPI = getPolarisOperator().getCircuitBreakAPI();
+ InvokeContext.RequestContext context = new InvokeContext.RequestContext(createCalleeService(invoker),
+ invocation.getMethodName());
+ context.setResultToErrorCode(this);
+ InvokeHandler handler = circuitBreakAPI.makeInvokeHandler(context);
+ try {
+ long startTimeMilli = System.currentTimeMillis();
+ InvokeContext.ResponseContext responseContext = new InvokeContext.ResponseContext();
+ responseContext.setDurationUnit(TimeUnit.MILLISECONDS);
+ Result result = null;
+ RpcException exception = null;
+ handler.acquirePermission();
+ try {
+ result = invoker.invoke(invocation);
+ responseContext.setDuration(System.currentTimeMillis() - startTimeMilli);
+ if (result.hasException()) {
+ responseContext.setError(result.getException());
+ handler.onError(responseContext);
+ } else {
+ responseContext.setResult(result);
+ handler.onSuccess(responseContext);
+ }
+ } catch (RpcException e) {
+ exception = e;
+ responseContext.setError(e);
+ responseContext.setDuration(System.currentTimeMillis() - startTimeMilli);
+ handler.onError(responseContext);
+ }
+ ResourceStat resourceStat = createInstanceResourceStat(invoker, invocation, responseContext,
+ responseContext.getDuration());
+ circuitBreakAPI.report(resourceStat);
+ if (result != null) {
+ return result;
+ }
+ throw exception;
+ } catch (CallAbortedException abortedException) {
+ return callback.handle(invoker, invocation, abortedException);
+ }
+ }
+
+ private ResourceStat createInstanceResourceStat(Invoker<?> invoker, Invocation invocation,
+ InvokeContext.ResponseContext context, long delay) {
+ URL url = invoker.getUrl();
+ Throwable exception = context.getError();
+ RetStatus retStatus = RetStatus.RetSuccess;
+ int code = 0;
+ if (null != exception) {
+ retStatus = RetStatus.RetFail;
+ if (exception instanceof RpcException) {
+ RpcException rpcException = (RpcException) exception;
+ code = rpcException.getCode();
+ if (StringUtils.isNotBlank(rpcException.getMessage()) && rpcException.getMessage()
+ .contains(PolarisBlockException.PREFIX)) {
+ // 限流异常不进行熔断
+ retStatus = RetStatus.RetFlowControl;
+ }
+ if (rpcException.isTimeout()) {
+ retStatus = RetStatus.RetTimeout;
+ }
+ } else {
+ code = -1;
+ }
+ }
+
+ ServiceKey calleeServiceKey = createCalleeService(invoker);
+ Resource resource = new InstanceResource(
+ calleeServiceKey,
+ url.getHost(),
+ url.getPort(),
+ new ServiceKey()
+ );
+ return new ResourceStat(resource, code, delay, retStatus);
+ }
+
+ private ServiceKey createCalleeService(Invoker<?> invoker) {
+ URL url = invoker.getUrl();
+ return new ServiceKey(getPolarisOperator().getPolarisConfig().getNamespace(), url.getServiceInterface());
+ }
+
+ @Override
+ public int onSuccess(Object value) {
+ return 0;
+ }
+
+ @Override
+ public int onError(Throwable throwable) {
+ int code = 0;
+ if (throwable instanceof RpcException) {
+ RpcException rpcException = (RpcException) throwable;
+ code = rpcException.getCode();
+ } else {
+ code = -1;
+ }
+ return code;
+ }
+
+ private static final class DefaultCallAbortCallback implements CallAbortCallback {
+
+ @Override
+ public Result handle(Invoker<?> invoker, Invocation invocation, CallAbortedException ex) {
+ return AsyncRpcResult.newDefaultAsyncResult(ex, invocation);
+ }
+ }
+}
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
new file mode 100644
index 0000000..6af9e48
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
@@ -0,0 +1 @@
+polaris_circuitbreaker=org.apache.dubbo.filter.dubbo2.CircuitBreakerFilter
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml
new file mode 100644
index 0000000..88669eb
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-filter-polaris-dubbo2</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-filter-polaris-ratelimit-dubbo2</artifactId>
+
+</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitCallback.java
similarity index 64%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitCallback.java
index 52aff89..b8a9526 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitCallback.java
@@ -14,24 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.filter.dubbo2;
+
+import com.tencent.polaris.common.exception.PolarisBlockException;
+import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+public interface RateLimitCallback {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+ Result handle(Invoker<?> invoker, Invocation invocation, PolarisBlockException ex);
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
}
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitFilter.java b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitFilter.java
new file mode 100644
index 0000000..00af325
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/java/org/apache/dubbo/filter/dubbo2/RateLimitFilter.java
@@ -0,0 +1,130 @@
+/*
+ * 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.filter.dubbo2;
+
+import com.tencent.polaris.api.exception.PolarisException;
+import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;
+import com.tencent.polaris.api.pojo.ServiceRule;
+import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.common.exception.PolarisBlockException;
+import com.tencent.polaris.common.parser.QueryParser;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.registry.PolarisOperatorDelegate;
+import com.tencent.polaris.common.router.RuleHandler;
+import com.tencent.polaris.ratelimit.api.rpc.Argument;
+import com.tencent.polaris.ratelimit.api.rpc.QuotaResponse;
+import com.tencent.polaris.ratelimit.api.rpc.QuotaResultCode;
+import com.tencent.polaris.specification.api.v1.traffic.manage.RateLimitProto;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+@Activate(group = CommonConstants.PROVIDER)
+public class RateLimitFilter extends PolarisOperatorDelegate implements Filter {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(RateLimitFilter.class);
+
+ private final RuleHandler ruleHandler;
+
+ private final QueryParser parser;
+
+ private final RateLimitCallback callback;
+
+ public RateLimitFilter() {
+ LOGGER.info("[POLARIS] init polaris ratelimit");
+ System.setProperty("dubbo.polaris.query_parser", System.getProperty("dubbo.polaris.query_parser", "JsonPath"));
+ this.ruleHandler = new RuleHandler();
+ this.parser = QueryParser.load();
+
+ ServiceLoader<RateLimitCallback> loader = ServiceLoader.load(RateLimitCallback.class);
+ RateLimitCallback instance = loader.iterator().next();
+ if (Objects.nonNull(instance)) {
+ this.callback = instance;
+ } else {
+ this.callback = new DefaultRateLimitCallback();
+ }
+ }
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
+ String service = invoker.getInterface().getName();
+ PolarisOperator polarisOperator = getPolarisOperator();
+ if (null == polarisOperator) {
+ return invoker.invoke(invocation);
+ }
+ ServiceRule serviceRule = polarisOperator.getServiceRule(service, EventType.RATE_LIMITING);
+ Object ruleObject = serviceRule.getRule();
+ if (null == ruleObject) {
+ return invoker.invoke(invocation);
+ }
+ RateLimitProto.RateLimit rateLimit = (RateLimitProto.RateLimit) ruleObject;
+ Set<RateLimitProto.MatchArgument> ratelimitLabels = ruleHandler.getRatelimitLabels(rateLimit);
+ String method = invocation.getMethodName();
+ Set<Argument> arguments = new HashSet<>();
+ for (RateLimitProto.MatchArgument matchArgument : ratelimitLabels) {
+ switch (matchArgument.getType()) {
+ case HEADER:
+ String attachmentValue = RpcContext.getContext().getAttachment(matchArgument.getKey());
+ if (!StringUtils.isBlank(attachmentValue)) {
+ arguments.add(Argument.buildHeader(matchArgument.getKey(), attachmentValue));
+ }
+ break;
+ case QUERY:
+ Optional<String> queryValue = parser.parse(matchArgument.getKey(), invocation.getArguments());
+ queryValue.ifPresent(value -> arguments.add(Argument.buildQuery(matchArgument.getKey(), value)));
+ break;
+ default:
+ break;
+ }
+ }
+ QuotaResponse quotaResponse = null;
+ try {
+ quotaResponse = polarisOperator.getQuota(service, method, arguments);
+ } catch (PolarisException e) {
+ LOGGER.error("[POLARIS] get quota fail, {}", e);
+ }
+ if (null != quotaResponse && quotaResponse.getCode() == QuotaResultCode.QuotaResultLimited) {
+ // throw block exception when ratelimit occurs
+ return callback.handle(invoker, invocation, new PolarisBlockException(
+ String.format("url=%s, info=%s", invoker.getUrl(), quotaResponse.getInfo())));
+ }
+ return invoker.invoke(invocation);
+ }
+
+ private static final class DefaultRateLimitCallback implements RateLimitCallback {
+
+ @Override
+ public Result handle(Invoker<?> invoker, Invocation invocation, PolarisBlockException ex) {
+ // throw block exception when ratelimit occurs
+ throw new RpcException(RpcException.LIMIT_EXCEEDED_EXCEPTION, ex);
+ }
+ }
+}
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
new file mode 100644
index 0000000..b4ea5c2
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
@@ -0,0 +1 @@
+polaris_ratelimit=org.apache.dubbo.filter.dubbo2.RateLimitFilter
diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml
new file mode 100644
index 0000000..bb845ac
--- /dev/null
+++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-filter-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-filter-polaris-dubbo2</artifactId>
+ <packaging>pom</packaging>
+ <name>dubbo-filter-polaris-dubbo2</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>Dubbo2 filter extension for PolarisMesh, support circuitbreaking, ratelimit, metric capabilities.</description>
+ <modules>
+ <module>dubbo-filter-polaris-circuitbreaker-dubbo2</module>
+ <module>dubbo-filter-polaris-ratelimit-dubbo2</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>2.7.18</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.tencent.polaris</groupId>
+ <artifactId>polaris-adapter-dubbo</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
index f6f95da..71380f1 100644
--- a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
+++ b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
@@ -28,12 +28,13 @@
<artifactId>dubbo-filter-seata</artifactId>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-filter-extensions/pom.xml b/dubbo-filter-extensions/pom.xml
index 29ee705..d52d741 100644
--- a/dubbo-filter-extensions/pom.xml
+++ b/dubbo-filter-extensions/pom.xml
@@ -31,5 +31,6 @@
<version>${revision}</version>
<modules>
<module>dubbo-filter-seata</module>
+ <module>dubbo-filter-polaris-dubbo2</module>
</modules>
</project>
diff --git a/dubbo-gateway-extensions/dubbo-gateway-common/pom.xml b/dubbo-gateway-extensions/dubbo-gateway-common/pom.xml
new file mode 100644
index 0000000..7c401d8
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-common/pom.xml
@@ -0,0 +1,29 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>dubbo-gateway-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-gateway-common</artifactId>
+
+</project>
diff --git a/dubbo-gateway-extensions/dubbo-gateway-common/src/main/java/org/apache/dubbo/gateway/common/OmnipotentCommonConstants.java b/dubbo-gateway-extensions/dubbo-gateway-common/src/main/java/org/apache/dubbo/gateway/common/OmnipotentCommonConstants.java
new file mode 100644
index 0000000..314bcf3
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-common/src/main/java/org/apache/dubbo/gateway/common/OmnipotentCommonConstants.java
@@ -0,0 +1,40 @@
+/*
+ * 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.gateway.common;
+
+public interface OmnipotentCommonConstants {
+
+ //save origin group when service is omn
+ String ORIGIN_GROUP_KEY = "originGroup";
+
+ String ORIGIN_GENERIC_PARAMETER_TYPES = "originGenericParameterTypes";
+
+ String ORIGIN_PARAMETER_TYPES_DESC = "originParameterTypesDesc";
+
+ String $INVOKE_OMN = "$invokeOmn";
+
+ String ORIGIN_PATH_KEY = "originPath";
+
+ String ORIGIN_METHOD_KEY = "originMethod";
+
+ String ORIGIN_VERSION_KEY = "originVersion";
+
+ String SPECIFY_ADDRESS = "specifyAddress";
+ String GATEWAY_MODE = "gatewayMode";
+
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-consumer/pom.xml b/dubbo-gateway-extensions/dubbo-gateway-consumer/pom.xml
new file mode 100644
index 0000000..2d1ead7
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-consumer/pom.xml
@@ -0,0 +1,42 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>dubbo-gateway-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-gateway-consumer</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-gateway-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/config/InjvmConfigPostProcessor.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/config/InjvmConfigPostProcessor.java
index 52aff89..0212bd3 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/config/InjvmConfigPostProcessor.java
@@ -14,24 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.gateway.consumer.config;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.config.ConfigPostProcessor;
+import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.rpc.Constants;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+@Activate
+public class InjvmConfigPostProcessor implements ConfigPostProcessor {
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public void postProcessReferConfig(ReferenceConfig referenceConfig) {
+ referenceConfig.setScope(Constants.SCOPE_REMOTE);
}
}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/filter/OmnSerFilter.java b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/filter/OmnSerFilter.java
new file mode 100644
index 0000000..49f3b8f
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/java/org/apache/dubbo/gateway/consumer/filter/OmnSerFilter.java
@@ -0,0 +1,166 @@
+/*
+ * 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.gateway.consumer.filter;
+
+import org.apache.dubbo.common.beanutil.JavaBeanDescriptor;
+import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.ReflectUtils;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.RpcInvocation;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.GATEWAY_MODE;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.ORIGIN_GENERIC_PARAMETER_TYPES;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.ORIGIN_PARAMETER_TYPES_DESC;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.SPECIFY_ADDRESS;
+
+
+@Activate(group = CommonConstants.CONSUMER)
+public class OmnSerFilter implements Filter, Filter.Listener {
+
+ private final static Logger logger = LoggerFactory.getLogger(OmnSerFilter.class);
+
+ public static final String name = "specifyAddress";
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
+
+ Object address = invocation.get(SPECIFY_ADDRESS);
+ if (address != null) {
+ RpcContext.getClientAttachment().setAttachment(GATEWAY_MODE, "omn");
+ convertParameterTypeToJavaBeanDescriptor(invocation);
+ }
+ return invoker.invoke(invocation);
+ }
+
+
+ @Override
+ public void onResponse(Result appResponse, Invoker<?> invoker, Invocation inv) {
+
+ Object resData = appResponse.getValue();
+ if (resData == null) {
+ return;
+ }
+
+ if (ReflectUtils.isPrimitives(resData.getClass())) {
+ return;
+ }
+ generalizeJbdParameter(appResponse.getValue());
+ }
+
+ @Override
+ public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {
+
+ }
+
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ private void generalizeJbdParameter(Object pojo) {
+ if (pojo instanceof Collection) {
+
+ Collection collection = (Collection) pojo;
+ List list = new ArrayList();
+ for (Object obj : collection) {
+ if (obj instanceof JavaBeanDescriptor) {
+ list.add(JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor) obj));
+ } else {
+ list.add(obj);
+ }
+ }
+ collection.clear();
+ collection.addAll(list);
+ }
+
+ if (pojo instanceof Map) {
+
+ Map map = (Map) pojo;
+ Map newMap = new HashMap();
+ for (Object key : map.keySet()) {
+
+ Object value = map.get(key);
+ if (key instanceof JavaBeanDescriptor) {
+ key = JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor) key);
+ }
+ if (value instanceof JavaBeanDescriptor) {
+ value = JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor) value);
+ }
+ newMap.put(key, value);
+
+ }
+ map.clear();
+ map.putAll(newMap);
+ }
+
+ // public field
+ for (Field field : pojo.getClass().getDeclaredFields()) {
+ try {
+ field.setAccessible(true);
+ Object fieldValue = field.get(pojo);
+ if (fieldValue instanceof JavaBeanDescriptor) {
+ field.set(pojo, JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor) fieldValue));
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+ }
+
+ public static void convertParameterTypeToJavaBeanDescriptor(Invocation invocation) {
+ if (!(invocation instanceof RpcInvocation)) {
+ logger.warn("Non-RpcInvocation type, gateway mode does not take effect, type:" + invocation.getClass().getName());
+ return;
+ }
+ Class<?>[] parameterTypes = invocation.getParameterTypes();
+ boolean reqFirst = Arrays.stream(parameterTypes).noneMatch(param -> param == JavaBeanDescriptor.class);
+ if (reqFirst) {
+ invocation.setObjectAttachment(ORIGIN_GENERIC_PARAMETER_TYPES, getDesc(parameterTypes));
+ invocation.setObjectAttachment(ORIGIN_PARAMETER_TYPES_DESC, ((RpcInvocation) invocation).getParameterTypesDesc());
+ Arrays.fill(parameterTypes, JavaBeanDescriptor.class);
+
+ Object[] arguments = invocation.getArguments();
+ for (int i = 0; i < arguments.length; i++) {
+ JavaBeanDescriptor jbdArg = JavaBeanSerializeUtil.serialize(arguments[i]);
+ arguments[i] = jbdArg;
+ }
+
+ ((RpcInvocation) invocation).setParameterTypesDesc(ReflectUtils.getDesc(parameterTypes));
+ ((RpcInvocation) invocation).setCompatibleParamSignatures(Stream.of(parameterTypes).map(Class::getName).toArray(String[]::new));
+ }
+
+ }
+
+ private static String[] getDesc(Class<?>[] parameterTypes) {
+ return Arrays.stream(parameterTypes).map(Class::getName).toArray(String[]::new);
+ }
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor
new file mode 100644
index 0000000..058a13e
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.config.ConfigPostProcessor
@@ -0,0 +1 @@
+injvm-initial=org.apache.dubbo.gateway.consumer.config.InjvmConfigPostProcessor
diff --git a/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
new file mode 100644
index 0000000..319ef6f
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
@@ -0,0 +1 @@
+omnSer=org.apache.dubbo.gateway.consumer.filter.OmnSerFilter
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml b/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
new file mode 100644
index 0000000..c673308
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
@@ -0,0 +1,50 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>dubbo-gateway-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-gateway-provider</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>3.2.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-gateway-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
+</project>
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/ConfigDeployListener.java b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/ConfigDeployListener.java
new file mode 100644
index 0000000..788d8c0
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/ConfigDeployListener.java
@@ -0,0 +1,55 @@
+/*
+ * 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.gateway.provider;
+
+import org.apache.dubbo.common.deploy.ApplicationDeployListener;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+
+import static org.apache.dubbo.common.constants.CommonConstants.BYTE_ACCESSOR_KEY;
+
+public class ConfigDeployListener implements ApplicationDeployListener {
+
+ @Override
+ public void onInitialize(ApplicationModel scopeModel) {
+ System.setProperty(BYTE_ACCESSOR_KEY, "snf");
+ }
+
+ @Override
+ public void onStarting(ApplicationModel scopeModel) {
+
+ }
+
+ @Override
+ public void onStarted(ApplicationModel scopeModel) {
+ }
+
+ @Override
+ public void onStopping(ApplicationModel scopeModel) {
+
+ }
+
+ @Override
+ public void onStopped(ApplicationModel scopeModel) {
+
+ }
+
+ @Override
+ public void onFailure(ApplicationModel scopeModel, Throwable cause) {
+
+ }
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/OmnipotentService.java b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/OmnipotentService.java
new file mode 100644
index 0000000..07a8ae3
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/OmnipotentService.java
@@ -0,0 +1,42 @@
+/*
+ * 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.gateway.provider;
+
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.service.GenericException;
+import org.apache.dubbo.rpc.service.GenericService;
+
+/**
+ * A more general server-side generalization service than {@link GenericService}
+ * Any type of interface can be accepted
+ *
+ * @since 3.2.0
+ */
+public interface OmnipotentService {
+
+ /**
+ * Generic invocation
+ *
+ * @param invocation New construction point invocation, including original service, method and other information
+ * @return Custom object
+ * @throws GenericException potential exception thrown from the invocation
+ */
+ Object $invokeOmn(Invocation invocation) throws GenericException;
+
+
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfByteAccessor.java b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfByteAccessor.java
new file mode 100644
index 0000000..9adf602
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfByteAccessor.java
@@ -0,0 +1,46 @@
+/*
+ * 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.gateway.provider;
+
+import org.apache.dubbo.remoting.Channel;
+import org.apache.dubbo.remoting.exchange.Request;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.protocol.dubbo.ByteAccessor;
+import org.apache.dubbo.rpc.protocol.dubbo.DecodeableRpcInvocation;
+
+import java.io.InputStream;
+
+/**
+ * Customize byte parsing so that execution can continue when the service does not exist
+ *
+ * @since 3.2.0
+ */
+public class SnfByteAccessor implements ByteAccessor {
+
+ private final FrameworkModel frameworkModel;
+
+ public SnfByteAccessor(FrameworkModel frameworkModel) {
+ this.frameworkModel = frameworkModel;
+ }
+
+ @Override
+ public DecodeableRpcInvocation getRpcInvocation(Channel channel, Request req, InputStream is, byte proto) {
+
+ return new SnfDecodeableRpcInvocation(frameworkModel, channel, req, is, proto);
+ }
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfDecodeableRpcInvocation.java b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfDecodeableRpcInvocation.java
new file mode 100644
index 0000000..8999397
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/SnfDecodeableRpcInvocation.java
@@ -0,0 +1,168 @@
+/*
+ * 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.gateway.provider;
+
+import org.apache.dubbo.common.beanutil.JavaBeanDescriptor;
+import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil;
+import org.apache.dubbo.common.serialize.Cleanable;
+import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.ReflectUtils;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.gateway.common.OmnipotentCommonConstants;
+import org.apache.dubbo.remoting.Channel;
+import org.apache.dubbo.remoting.exchange.Request;
+import org.apache.dubbo.remoting.transport.CodecSupport;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.protocol.dubbo.DecodeableRpcInvocation;
+import org.apache.dubbo.rpc.protocol.dubbo.DubboCodec;
+import org.apache.dubbo.rpc.support.RpcUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_VERSION;
+import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_VERSION_KEY;
+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.METHOD_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.$INVOKE_OMN;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.ORIGIN_GENERIC_PARAMETER_TYPES;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.ORIGIN_GROUP_KEY;
+import static org.apache.dubbo.gateway.common.OmnipotentCommonConstants.ORIGIN_PARAMETER_TYPES_DESC;
+import static org.apache.dubbo.rpc.Constants.SERIALIZATION_ID_KEY;
+
+public class SnfDecodeableRpcInvocation extends DecodeableRpcInvocation {
+
+ private static final String DEFAULT_OMNIPOTENT_SERVICE = OmnipotentService.class.getName();
+
+
+ public SnfDecodeableRpcInvocation(FrameworkModel frameworkModel, Channel channel, Request request, InputStream is, byte id) {
+ super(frameworkModel, channel, request, is, id);
+ }
+
+ @Override
+ public Object decode(Channel channel, InputStream input) throws IOException {
+ ObjectInput in = CodecSupport.getSerialization(serializationType)
+ .deserialize(channel.getUrl(), input);
+ this.put(SERIALIZATION_ID_KEY, serializationType);
+
+ String dubboVersion = in.readUTF();
+ request.setVersion(dubboVersion);
+ setAttachment(DUBBO_VERSION_KEY, dubboVersion);
+
+ String path = in.readUTF();
+ setAttachment(PATH_KEY, path);
+ String version = in.readUTF();
+ setAttachment(VERSION_KEY, version);
+
+ setMethodName(in.readUTF());
+
+ String desc = in.readUTF();
+ setParameterTypesDesc(desc);
+
+ ClassLoader originClassLoader = Thread.currentThread().getContextClassLoader();
+
+ try {
+ Object[] args = DubboCodec.EMPTY_OBJECT_ARRAY;
+ Class<?>[] pts = DubboCodec.EMPTY_CLASS_ARRAY;
+ if (desc.length() > 0) {
+ pts = drawPts(path, version, desc, pts);
+ if (pts == DubboCodec.EMPTY_CLASS_ARRAY) {
+ // Service not found ,pts = JavaBeanDescriptor
+ pts = ReflectUtils.desc2classArray(desc);
+ }
+ args = drawArgs(in, pts);
+ }
+ setParameterTypes(pts);
+ setAttachment(ORIGIN_GENERIC_PARAMETER_TYPES, pts);
+
+ Map<String, Object> map = in.readAttachments();
+ Class<?>[] retryPts = null;
+ if (CollectionUtils.isNotEmptyMap(map)) {
+ if (map.containsKey(ORIGIN_PARAMETER_TYPES_DESC)) {
+ String originParameterTypesDesc = map.get(ORIGIN_PARAMETER_TYPES_DESC).toString();
+ retryPts = drawPts(path, version, originParameterTypesDesc, DubboCodec.EMPTY_CLASS_ARRAY);
+ boolean snf = (retryPts == DubboCodec.EMPTY_CLASS_ARRAY) && !RpcUtils.isGenericCall(originParameterTypesDesc, getMethodName()) && !RpcUtils.isEcho(originParameterTypesDesc, getMethodName());
+ if (snf) {
+ setAttachment(OmnipotentCommonConstants.ORIGIN_PATH_KEY, getAttachment(PATH_KEY));
+ // Replace serviceName in req with omn
+ setAttachment(PATH_KEY, DEFAULT_OMNIPOTENT_SERVICE);
+ setAttachment(INTERFACE_KEY, DEFAULT_OMNIPOTENT_SERVICE);
+
+ // version
+ setAttachment(OmnipotentCommonConstants.ORIGIN_VERSION_KEY, getAttachment(VERSION_KEY));
+ setAttachment(VERSION_KEY, DEFAULT_VERSION);
+
+ // method
+ setAttachment(OmnipotentCommonConstants.ORIGIN_METHOD_KEY, getMethodName());
+ setAttachment(METHOD_KEY, $INVOKE_OMN);
+ setMethodName($INVOKE_OMN);
+ setParameterTypes(new Class<?>[]{Invocation.class});
+
+ // Omn needs to use the default path, version and group,
+ // and the original value starts with origin to save the variable
+ map.remove(PATH_KEY);
+ map.remove(VERSION_KEY);
+ if (map.containsKey(GROUP_KEY)) {
+ map.put(ORIGIN_GROUP_KEY, map.get(GROUP_KEY));
+ map.remove(GROUP_KEY);
+ }
+ retryPts = (Class<?>[]) getObjectAttachments().get(ORIGIN_GENERIC_PARAMETER_TYPES);
+ }
+ }
+
+ addObjectAttachments(map);
+ }
+
+ boolean isConvert = false;
+ for (Class<?> clazz : pts) {
+ if (clazz == JavaBeanDescriptor.class) {
+ isConvert = true;
+ break;
+ }
+ }
+ // isConvert = snf
+ if (isConvert) {
+ setParameterTypes(retryPts);
+ pts = retryPts;
+ Object[] newArgs = new Object[args.length];
+ for (int i = 0; i < args.length; i++) {
+ if (args[i] instanceof JavaBeanDescriptor) {
+ newArgs[i] = JavaBeanSerializeUtil.deserialize((JavaBeanDescriptor) args[i]);
+ }
+ }
+ args = newArgs;
+ }
+ decodeArgument(channel, pts, args);
+ } catch (ClassNotFoundException e) {
+ throw new IOException(StringUtils.toString("Read invocation data failed.", e));
+ } finally {
+ Thread.currentThread().setContextClassLoader(originClassLoader);
+ if (in instanceof Cleanable) {
+ ((Cleanable) in).cleanup();
+ }
+ }
+ return this;
+ }
+
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/filter/OmnipotentFilter.java b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/filter/OmnipotentFilter.java
new file mode 100644
index 0000000..3357a6d
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/java/org/apache/dubbo/gateway/provider/filter/OmnipotentFilter.java
@@ -0,0 +1,91 @@
+/*
+ * 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.gateway.provider.filter;
+
+import org.apache.dubbo.common.beanutil.JavaBeanAccessor;
+import org.apache.dubbo.common.beanutil.JavaBeanDescriptor;
+import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.gateway.common.OmnipotentCommonConstants;
+import org.apache.dubbo.gateway.provider.OmnipotentService;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.RpcInvocation;
+
+import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
+
+/**
+ * Set the method name, formal parameters, and actual parameters for
+ * the invokeOmn method of the Omnipotent generalized service
+ */
+@Activate(group = CommonConstants.PROVIDER, order = -21000)
+public class OmnipotentFilter implements Filter {
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation inv) throws RpcException {
+
+ if (isOmnipotent(invoker.getInterface())) {
+ setOmnArgs(inv);
+ inv.getObjectAttachments().remove(OmnipotentCommonConstants.ORIGIN_GENERIC_PARAMETER_TYPES);
+ RpcContext.getServerAttachment().removeAttachment(OmnipotentCommonConstants.ORIGIN_GENERIC_PARAMETER_TYPES);
+ }
+
+ return invoker.invoke(inv);
+ }
+
+ private boolean isOmnipotent(Class<?> interfaceClass) {
+ return OmnipotentService.class.isAssignableFrom(interfaceClass);
+ }
+
+ // Restore method information before actual call
+ private void setOmnArgs(Invocation inv) {
+ Class<?>[] parameterTypes = (Class<?>[]) inv.getObjectAttachment(OmnipotentCommonConstants.ORIGIN_GENERIC_PARAMETER_TYPES, new Class<?>[]{Invocation.class});
+ Object[] arguments = inv.getArguments();
+
+ Object[] args = new Object[arguments.length];
+ for (int i = 0; i < arguments.length; i++) {
+ // In gateway mode, consumer has used JavaBeanDescriptor as parameter
+ if (arguments[i] instanceof JavaBeanDescriptor) {
+ args[i] = arguments[i];
+ } else {
+ args[i] = JavaBeanSerializeUtil.serialize(arguments[i], JavaBeanAccessor.METHOD);
+ }
+ }
+
+ RpcInvocation rpcInvocation = new RpcInvocation(inv);
+ // method
+ rpcInvocation.setMethodName(inv.getAttachment(OmnipotentCommonConstants.ORIGIN_METHOD_KEY));
+ rpcInvocation.setParameterTypes(parameterTypes);
+ rpcInvocation.setArguments(args);
+ rpcInvocation.setParameterTypesDesc(inv.getAttachment(OmnipotentCommonConstants.ORIGIN_PARAMETER_TYPES_DESC));
+
+ // attachment
+ rpcInvocation.setAttachment(PATH_KEY, inv.getAttachment(OmnipotentCommonConstants.ORIGIN_PATH_KEY));
+ rpcInvocation.setAttachment(VERSION_KEY, inv.getAttachment(OmnipotentCommonConstants.ORIGIN_VERSION_KEY));
+ rpcInvocation.setAttachment(GROUP_KEY, inv.getAttachment(OmnipotentCommonConstants.ORIGIN_GROUP_KEY));
+ ((RpcInvocation) inv).setArguments(new Object[]{rpcInvocation});
+
+ }
+
+}
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.deploy.ApplicationDeployListener b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.deploy.ApplicationDeployListener
new file mode 100644
index 0000000..04ede7f
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.deploy.ApplicationDeployListener
@@ -0,0 +1 @@
+snfConfig=org.apache.dubbo.gateway.provider.ConfigDeployListener
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
new file mode 100644
index 0000000..9247c64
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
@@ -0,0 +1 @@
+omnipotent=org.apache.dubbo.gateway.provider.filter.OmnipotentFilter
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.dubbo.ByteAccessor b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.dubbo.ByteAccessor
new file mode 100644
index 0000000..7e33fa6
--- /dev/null
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.dubbo.ByteAccessor
@@ -0,0 +1 @@
+snf=org.apache.dubbo.gateway.provider.SnfByteAccessor
diff --git a/dubbo-gateway-extensions/pom.xml b/dubbo-gateway-extensions/pom.xml
new file mode 100644
index 0000000..3a41e5a
--- /dev/null
+++ b/dubbo-gateway-extensions/pom.xml
@@ -0,0 +1,37 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-gateway-extensions</artifactId>
+ <version>${revision}</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>dubbo-gateway-common</module>
+ <module>dubbo-gateway-provider</module>
+ <module>dubbo-gateway-consumer</module>
+ </modules>
+
+</project>
diff --git a/dubbo-kubernetes/pom.xml b/dubbo-kubernetes/pom.xml
new file mode 100644
index 0000000..9450722
--- /dev/null
+++ b/dubbo-kubernetes/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dubbo-kubernetes</artifactId>
+ <name>${project.artifactId}</name>
+ <description>The Kubernetes Integration</description>
+ <properties>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>3.2.9</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-metadata-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-server-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>3.12.4</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java
new file mode 100644
index 0000000..476ba22
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java
@@ -0,0 +1,207 @@
+/*
+ * 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.kubernetes;
+
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshAppRuleListener;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListener;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_LISTEN_KUBERNETES;
+
+public class KubernetesMeshEnvListener implements MeshEnvListener {
+ public static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(KubernetesMeshEnvListener.class);
+ private static volatile boolean usingApiServer = false;
+ private static volatile KubernetesClient kubernetesClient;
+ private static volatile String namespace;
+
+ private final Map<String, MeshAppRuleListener> appRuleListenerMap = new ConcurrentHashMap<>();
+
+ private final Map<String, Watch> vsAppWatch = new ConcurrentHashMap<>();
+ private final Map<String, Watch> drAppWatch = new ConcurrentHashMap<>();
+
+ private final Map<String, String> vsAppCache = new ConcurrentHashMap<>();
+ private final Map<String, String> drAppCache = new ConcurrentHashMap<>();
+
+ public static void injectKubernetesEnv(KubernetesClient client, String configuredNamespace) {
+ usingApiServer = true;
+ kubernetesClient = client;
+ namespace = configuredNamespace;
+ }
+
+ @Override
+ public boolean isEnable() {
+ return usingApiServer;
+ }
+
+ @Override
+ public void onSubscribe(String appName, MeshAppRuleListener listener) {
+ appRuleListenerMap.put(appName, listener);
+ logger.info("Subscribe Mesh Rule in Kubernetes. AppName: " + appName);
+
+ // subscribe VisualService
+ subscribeVs(appName);
+
+ // subscribe DestinationRule
+ subscribeDr(appName);
+
+ // notify for start
+ notifyOnce(appName);
+ }
+
+ private void subscribeVs(String appName) {
+ if (vsAppWatch.containsKey(appName)) {
+ return;
+ }
+
+ try {
+ Watch watch = kubernetesClient
+ .genericKubernetesResources(MeshConstant.getVsDefinition())
+ .inNamespace(namespace)
+ .withName(appName)
+ .watch(new Watcher<GenericKubernetesResource>() {
+ @Override
+ public void eventReceived(Action action, GenericKubernetesResource resource) {
+ if (logger.isInfoEnabled()) {
+ logger.info("Received VS Rule notification. AppName: " + appName + " Action:" + action
+ + " Resource:" + resource);
+ }
+
+ if (action == Action.ADDED || action == Action.MODIFIED) {
+ String vsRule = new Yaml(new SafeConstructor(new LoaderOptions())).dump(resource);
+ vsAppCache.put(appName, vsRule);
+ if (drAppCache.containsKey(appName)) {
+ notifyListener(vsRule, appName, drAppCache.get(appName));
+ }
+ } else {
+ appRuleListenerMap.get(appName).receiveConfigInfo("");
+ }
+ }
+
+ @Override
+ public void onClose(WatcherException cause) {
+ // ignore
+ }
+ });
+ vsAppWatch.put(appName, watch);
+ try {
+ GenericKubernetesResource vsRule = kubernetesClient
+ .genericKubernetesResources(MeshConstant.getVsDefinition())
+ .inNamespace(namespace)
+ .withName(appName)
+ .get();
+ vsAppCache.put(appName, new Yaml(new SafeConstructor(new LoaderOptions())).dump(vsRule));
+ } catch (Throwable ignore) {
+
+ }
+ } catch (Exception e) {
+ logger.error(REGISTRY_ERROR_LISTEN_KUBERNETES, "", "", "Error occurred when listen kubernetes crd.", e);
+ }
+ }
+
+ private void notifyListener(String vsRule, String appName, String drRule) {
+ String rule = vsRule + "\n---\n" + drRule;
+ logger.info("Notify App Rule Listener. AppName: " + appName + " Rule:" + rule);
+
+ appRuleListenerMap.get(appName).receiveConfigInfo(rule);
+ }
+
+ private void subscribeDr(String appName) {
+ if (drAppWatch.containsKey(appName)) {
+ return;
+ }
+
+ try {
+ Watch watch = kubernetesClient
+ .genericKubernetesResources(MeshConstant.getDrDefinition())
+ .inNamespace(namespace)
+ .withName(appName)
+ .watch(new Watcher<GenericKubernetesResource>() {
+ @Override
+ public void eventReceived(Action action, GenericKubernetesResource resource) {
+ if (logger.isInfoEnabled()) {
+ logger.info("Received VS Rule notification. AppName: " + appName + " Action:" + action
+ + " Resource:" + resource);
+ }
+
+ if (action == Action.ADDED || action == Action.MODIFIED) {
+ String drRule = new Yaml(new SafeConstructor(new LoaderOptions())).dump(resource);
+
+ drAppCache.put(appName, drRule);
+ if (vsAppCache.containsKey(appName)) {
+ notifyListener(vsAppCache.get(appName), appName, drRule);
+ }
+ } else {
+ appRuleListenerMap.get(appName).receiveConfigInfo("");
+ }
+ }
+
+ @Override
+ public void onClose(WatcherException cause) {
+ // ignore
+ }
+ });
+ drAppWatch.put(appName, watch);
+ try {
+ GenericKubernetesResource drRule = kubernetesClient
+ .genericKubernetesResources(MeshConstant.getDrDefinition())
+ .inNamespace(namespace)
+ .withName(appName)
+ .get();
+ drAppCache.put(appName, new Yaml(new SafeConstructor(new LoaderOptions())).dump(drRule));
+ } catch (Throwable ignore) {
+
+ }
+ } catch (Exception e) {
+ logger.error(REGISTRY_ERROR_LISTEN_KUBERNETES, "", "", "Error occurred when listen kubernetes crd.", e);
+ }
+ }
+
+ private void notifyOnce(String appName) {
+ if (vsAppCache.containsKey(appName) && drAppCache.containsKey(appName)) {
+ notifyListener(vsAppCache.get(appName), appName, drAppCache.get(appName));
+ }
+ }
+
+ @Override
+ public void onUnSubscribe(String appName) {
+ appRuleListenerMap.remove(appName);
+
+ if (vsAppWatch.containsKey(appName)) {
+ vsAppWatch.remove(appName).close();
+ }
+ vsAppCache.remove(appName);
+
+ if (drAppWatch.containsKey(appName)) {
+ drAppWatch.remove(appName).close();
+ }
+ drAppCache.remove(appName);
+ }
+}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListenerFactory.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListenerFactory.java
new file mode 100644
index 0000000..9d1c6d0
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListenerFactory.java
@@ -0,0 +1,42 @@
+/*
+ * 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.kubernetes;
+
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListener;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class KubernetesMeshEnvListenerFactory implements MeshEnvListenerFactory {
+ public static final Logger logger = LoggerFactory.getLogger(KubernetesMeshEnvListenerFactory.class);
+ private final AtomicBoolean initialized = new AtomicBoolean(false);
+ private MeshEnvListener listener = null;
+
+ @Override
+ public MeshEnvListener getListener() {
+ try {
+ if (initialized.compareAndSet(false, true)) {
+ listener = new NopKubernetesMeshEnvListener();
+ }
+ } catch (Throwable t) {
+ logger.info("Current Env not support Kubernetes.");
+ }
+ return listener;
+ }
+}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistry.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistry.java
new file mode 100644
index 0000000..2d51c1b
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistry.java
@@ -0,0 +1,50 @@
+/*
+ * 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.kubernetes;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.support.FailbackRegistry;
+
+/**
+ * Empty implements for Kubernetes <br/>
+ * Kubernetes only support `Service Discovery` mode register <br/>
+ * Used to compat past version like 2.6.x, 2.7.x with interface level register <br/>
+ * {@link KubernetesServiceDiscovery} is the real implementation of Kubernetes
+ */
+public class KubernetesRegistry extends FailbackRegistry {
+ public KubernetesRegistry(URL url) {
+ super(url);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public void doRegister(URL url) {}
+
+ @Override
+ public void doUnregister(URL url) {}
+
+ @Override
+ public void doSubscribe(URL url, NotifyListener listener) {}
+
+ @Override
+ public void doUnsubscribe(URL url, NotifyListener listener) {}
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistryFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistryFactory.java
index 52aff89..fe0e047 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistryFactory.java
@@ -14,24 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.kubernetes;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.Registry;
+import org.apache.dubbo.registry.support.AbstractRegistryFactory;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+public class KubernetesRegistryFactory extends AbstractRegistryFactory {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ @Override
+ protected String createRegistryCacheKey(URL url) {
+ return url.toFullString();
}
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ protected Registry createRegistry(URL url) {
+ return new KubernetesRegistry(url);
}
}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java
new file mode 100644
index 0000000..396ef4b
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java
@@ -0,0 +1,451 @@
+/*
+ * 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.kubernetes;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.JsonUtils;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.client.AbstractServiceDiscovery;
+import org.apache.dubbo.registry.client.DefaultServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
+import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
+import org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst;
+import org.apache.dubbo.registry.kubernetes.util.KubernetesConfigUtils;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ScopeModelUtil;
+
+import io.fabric8.kubernetes.api.model.EndpointAddress;
+import io.fabric8.kubernetes.api.model.EndpointPort;
+import io.fabric8.kubernetes.api.model.EndpointSubset;
+import io.fabric8.kubernetes.api.model.Endpoints;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
+import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_UNABLE_ACCESS_KUBERNETES;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_UNABLE_FIND_SERVICE_KUBERNETES;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_UNABLE_MATCH_KUBERNETES;
+
+public class KubernetesServiceDiscovery extends AbstractServiceDiscovery {
+ private final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass());
+
+ private KubernetesClient kubernetesClient;
+
+ private String currentHostname;
+
+ private final URL registryURL;
+
+ private final String namespace;
+
+ private final boolean enableRegister;
+
+ public static final String KUBERNETES_PROPERTIES_KEY = "io.dubbo/metadata";
+
+ private static final ConcurrentHashMap<String, AtomicLong> SERVICE_UPDATE_TIME = new ConcurrentHashMap<>(64);
+
+ private static final ConcurrentHashMap<String, SharedIndexInformer<Service>> SERVICE_INFORMER =
+ new ConcurrentHashMap<>(64);
+
+ private static final ConcurrentHashMap<String, SharedIndexInformer<Pod>> PODS_INFORMER =
+ new ConcurrentHashMap<>(64);
+
+ private static final ConcurrentHashMap<String, SharedIndexInformer<Endpoints>> ENDPOINTS_INFORMER =
+ new ConcurrentHashMap<>(64);
+
+ public KubernetesServiceDiscovery(ApplicationModel applicationModel, URL registryURL) {
+ super(applicationModel, registryURL);
+ Config config = KubernetesConfigUtils.createKubernetesConfig(registryURL);
+ this.kubernetesClient = new KubernetesClientBuilder().withConfig(config).build();
+ this.currentHostname = System.getenv("HOSTNAME");
+ this.registryURL = registryURL;
+ this.namespace = config.getNamespace();
+ this.enableRegister = registryURL.getParameter(KubernetesClientConst.ENABLE_REGISTER, true);
+
+ boolean availableAccess;
+ try {
+ availableAccess = kubernetesClient.pods().withName(currentHostname).get() != null;
+ } catch (Throwable e) {
+ availableAccess = false;
+ }
+ if (!availableAccess) {
+ String message = "Unable to access api server. " + "Please check your url config."
+ + " Master URL: "
+ + config.getMasterUrl() + " Hostname: "
+ + currentHostname;
+ logger.error(REGISTRY_UNABLE_ACCESS_KUBERNETES, "", "", message);
+ } else {
+ KubernetesMeshEnvListener.injectKubernetesEnv(kubernetesClient, namespace);
+ }
+ }
+
+ @Override
+ public void doDestroy() {
+ SERVICE_INFORMER.forEach((k, v) -> v.close());
+ SERVICE_INFORMER.clear();
+
+ PODS_INFORMER.forEach((k, v) -> v.close());
+ PODS_INFORMER.clear();
+
+ ENDPOINTS_INFORMER.forEach((k, v) -> v.close());
+ ENDPOINTS_INFORMER.clear();
+
+ kubernetesClient.close();
+ }
+
+ @Override
+ public void doRegister(ServiceInstance serviceInstance) throws RuntimeException {
+ if (enableRegister) {
+ kubernetesClient
+ .pods()
+ .inNamespace(namespace)
+ .withName(currentHostname)
+ .edit(pod -> new PodBuilder(pod)
+ .editOrNewMetadata()
+ .addToAnnotations(
+ KUBERNETES_PROPERTIES_KEY, JsonUtils.toJson(serviceInstance.getMetadata()))
+ .endMetadata()
+ .build());
+ if (logger.isInfoEnabled()) {
+ logger.info("Write Current Service Instance Metadata to Kubernetes pod. " + "Current pod name: "
+ + currentHostname);
+ }
+ }
+ }
+
+ /**
+ * Comparing to {@link AbstractServiceDiscovery#doUpdate(ServiceInstance, ServiceInstance)}, unregister() is unnecessary here.
+ */
+ @Override
+ public void doUpdate(ServiceInstance oldServiceInstance, ServiceInstance newServiceInstance)
+ throws RuntimeException {
+ reportMetadata(newServiceInstance.getServiceMetadata());
+ this.doRegister(newServiceInstance);
+ }
+
+ @Override
+ public void doUnregister(ServiceInstance serviceInstance) throws RuntimeException {
+ if (enableRegister) {
+ kubernetesClient
+ .pods()
+ .inNamespace(namespace)
+ .withName(currentHostname)
+ .edit(pod -> new PodBuilder(pod)
+ .editOrNewMetadata()
+ .removeFromAnnotations(KUBERNETES_PROPERTIES_KEY)
+ .endMetadata()
+ .build());
+ if (logger.isInfoEnabled()) {
+ logger.info(
+ "Remove Current Service Instance from Kubernetes pod. Current pod name: " + currentHostname);
+ }
+ }
+ }
+
+ @Override
+ public Set<String> getServices() {
+ return kubernetesClient.services().inNamespace(namespace).list().getItems().stream()
+ .map(service -> service.getMetadata().getName())
+ .collect(Collectors.toSet());
+ }
+
+ @Override
+ public List<ServiceInstance> getInstances(String serviceName) throws NullPointerException {
+ Endpoints endpoints = null;
+ SharedIndexInformer<Endpoints> endInformer = ENDPOINTS_INFORMER.get(serviceName);
+ if (endInformer != null) {
+ // get endpoints directly from informer local store
+ List<Endpoints> endpointsList = endInformer.getStore().list();
+ if (endpointsList.size() > 0) {
+ endpoints = endpointsList.get(0);
+ }
+ }
+ if (endpoints == null) {
+ endpoints = kubernetesClient
+ .endpoints()
+ .inNamespace(namespace)
+ .withName(serviceName)
+ .get();
+ }
+
+ return toServiceInstance(endpoints, serviceName);
+ }
+
+ @Override
+ public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener)
+ throws NullPointerException, IllegalArgumentException {
+ listener.getServiceNames().forEach(serviceName -> {
+ SERVICE_UPDATE_TIME.put(serviceName, new AtomicLong(0L));
+
+ // Watch Service Endpoint Modification
+ watchEndpoints(listener, serviceName);
+
+ // Watch Pods Modification, happens when ServiceInstance updated
+ watchPods(listener, serviceName);
+
+ // Watch Service Modification, happens when Service Selector updated, used to update pods watcher
+ watchService(listener, serviceName);
+ });
+ }
+
+ private void watchEndpoints(ServiceInstancesChangedListener listener, String serviceName) {
+ SharedIndexInformer<Endpoints> endInformer = kubernetesClient
+ .endpoints()
+ .inNamespace(namespace)
+ .withName(serviceName)
+ .inform(new ResourceEventHandler<Endpoints>() {
+ @Override
+ public void onAdd(Endpoints endpoints) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Endpoint Event. Event type: added. Current pod name: "
+ + currentHostname + ". Endpoints is: " + endpoints);
+ }
+ notifyServiceChanged(serviceName, listener, toServiceInstance(endpoints, serviceName));
+ }
+
+ @Override
+ public void onUpdate(Endpoints oldEndpoints, Endpoints newEndpoints) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Endpoint Event. Event type: updated. Current pod name: "
+ + currentHostname + ". The new Endpoints is: " + newEndpoints);
+ }
+ notifyServiceChanged(serviceName, listener, toServiceInstance(newEndpoints, serviceName));
+ }
+
+ @Override
+ public void onDelete(Endpoints endpoints, boolean deletedFinalStateUnknown) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Endpoint Event. Event type: deleted. Current pod name: "
+ + currentHostname + ". Endpoints is: " + endpoints);
+ }
+ notifyServiceChanged(serviceName, listener, toServiceInstance(endpoints, serviceName));
+ }
+ });
+
+ ENDPOINTS_INFORMER.put(serviceName, endInformer);
+ }
+
+ private void watchPods(ServiceInstancesChangedListener listener, String serviceName) {
+ Map<String, String> serviceSelector = getServiceSelector(serviceName);
+ if (serviceSelector == null) {
+ return;
+ }
+
+ SharedIndexInformer<Pod> podInformer = kubernetesClient
+ .pods()
+ .inNamespace(namespace)
+ .withLabels(serviceSelector)
+ .inform(new ResourceEventHandler<Pod>() {
+ @Override
+ public void onAdd(Pod pod) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Pods Event. Event type: added. Current pod name: " + currentHostname
+ + ". Pod is: " + pod);
+ }
+ }
+
+ @Override
+ public void onUpdate(Pod oldPod, Pod newPod) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Pods Event. Event type: updated. Current pod name: "
+ + currentHostname + ". new Pod is: " + newPod);
+ }
+
+ notifyServiceChanged(serviceName, listener, getInstances(serviceName));
+ }
+
+ @Override
+ public void onDelete(Pod pod, boolean deletedFinalStateUnknown) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Pods Event. Event type: deleted. Current pod name: "
+ + currentHostname + ". Pod is: " + pod);
+ }
+ }
+ });
+
+ PODS_INFORMER.put(serviceName, podInformer);
+ }
+
+ private void watchService(ServiceInstancesChangedListener listener, String serviceName) {
+ SharedIndexInformer<Service> serviceInformer = kubernetesClient
+ .services()
+ .inNamespace(namespace)
+ .withName(serviceName)
+ .inform(new ResourceEventHandler<Service>() {
+ @Override
+ public void onAdd(Service service) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Service Added Event. " + "Current pod name: " + currentHostname);
+ }
+ }
+
+ @Override
+ public void onUpdate(Service oldService, Service newService) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Service Update Event. Update Pods Watcher. Current pod name: "
+ + currentHostname + ". The new Service is: " + newService);
+ }
+ if (PODS_INFORMER.containsKey(serviceName)) {
+ PODS_INFORMER.get(serviceName).close();
+ PODS_INFORMER.remove(serviceName);
+ }
+ watchPods(listener, serviceName);
+ }
+
+ @Override
+ public void onDelete(Service service, boolean deletedFinalStateUnknown) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received Service Delete Event. " + "Current pod name: " + currentHostname);
+ }
+ }
+ });
+
+ SERVICE_INFORMER.put(serviceName, serviceInformer);
+ }
+
+ private void notifyServiceChanged(
+ String serviceName, ServiceInstancesChangedListener listener, List<ServiceInstance> serviceInstanceList) {
+ long receivedTime = System.nanoTime();
+
+ ServiceInstancesChangedEvent event;
+
+ event = new ServiceInstancesChangedEvent(serviceName, serviceInstanceList);
+
+ AtomicLong updateTime = SERVICE_UPDATE_TIME.get(serviceName);
+ long lastUpdateTime = updateTime.get();
+
+ if (lastUpdateTime <= receivedTime) {
+ if (updateTime.compareAndSet(lastUpdateTime, receivedTime)) {
+ listener.onEvent(event);
+ return;
+ }
+ }
+
+ if (logger.isInfoEnabled()) {
+ logger.info("Discard Service Instance Data. "
+ + "Possible Cause: Newer message has been processed or Failed to update time record by CAS. "
+ + "Current Data received time: "
+ + receivedTime + ". " + "Newer Data received time: "
+ + lastUpdateTime + ".");
+ }
+ }
+
+ @Override
+ public URL getUrl() {
+ return registryURL;
+ }
+
+ private Map<String, String> getServiceSelector(String serviceName) {
+ Service service = kubernetesClient
+ .services()
+ .inNamespace(namespace)
+ .withName(serviceName)
+ .get();
+ if (service == null) {
+ return null;
+ }
+ return service.getSpec().getSelector();
+ }
+
+ private List<ServiceInstance> toServiceInstance(Endpoints endpoints, String serviceName) {
+ Map<String, String> serviceSelector = getServiceSelector(serviceName);
+ if (serviceSelector == null) {
+ return new LinkedList<>();
+ }
+ Map<String, Pod> pods =
+ kubernetesClient.pods().inNamespace(namespace).withLabels(serviceSelector).list().getItems().stream()
+ .collect(Collectors.toMap(pod -> pod.getMetadata().getName(), pod -> pod));
+
+ List<ServiceInstance> instances = new LinkedList<>();
+ Set<Integer> instancePorts = new HashSet<>();
+
+ for (EndpointSubset endpointSubset : endpoints.getSubsets()) {
+ instancePorts.addAll(endpointSubset.getPorts().stream()
+ .map(EndpointPort::getPort)
+ .collect(Collectors.toSet()));
+ }
+
+ for (EndpointSubset endpointSubset : endpoints.getSubsets()) {
+ for (EndpointAddress address : endpointSubset.getAddresses()) {
+ Pod pod = pods.get(address.getTargetRef().getName());
+ String ip = address.getIp();
+ if (pod == null) {
+ logger.warn(
+ REGISTRY_UNABLE_MATCH_KUBERNETES,
+ "",
+ "",
+ "Unable to match Kubernetes Endpoint address with Pod. " + "EndpointAddress Hostname: "
+ + address.getTargetRef().getName());
+ continue;
+ }
+ instancePorts.forEach(port -> {
+ ServiceInstance serviceInstance = new DefaultServiceInstance(
+ serviceName, ip, port, ScopeModelUtil.getApplicationModel(getUrl().getScopeModel()));
+
+ String properties = pod.getMetadata().getAnnotations().get(KUBERNETES_PROPERTIES_KEY);
+ if (StringUtils.isNotEmpty(properties)) {
+ serviceInstance.getMetadata().putAll(JsonUtils.toJavaObject(properties, Map.class));
+ instances.add(serviceInstance);
+ } else {
+ logger.warn(
+ REGISTRY_UNABLE_FIND_SERVICE_KUBERNETES,
+ "",
+ "",
+ "Unable to find Service Instance metadata in Pod Annotations. "
+ + "Possibly cause: provider has not been initialized successfully. "
+ + "EndpointAddress Hostname: "
+ + address.getTargetRef().getName());
+ }
+ });
+ }
+ }
+
+ return instances;
+ }
+
+ /**
+ * UT used only
+ */
+ @Deprecated
+ public void setCurrentHostname(String currentHostname) {
+ this.currentHostname = currentHostname;
+ }
+
+ /**
+ * UT used only
+ */
+ @Deprecated
+ public void setKubernetesClient(KubernetesClient kubernetesClient) {
+ this.kubernetesClient = kubernetesClient;
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryFactory.java
index 52aff89..7d11dfa 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryFactory.java
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.kubernetes;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.client.AbstractServiceDiscoveryFactory;
+import org.apache.dubbo.registry.client.ServiceDiscovery;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+public class KubernetesServiceDiscoveryFactory extends AbstractServiceDiscoveryFactory {
+ @Override
+ protected ServiceDiscovery createDiscovery(URL registryURL) {
+ return new KubernetesServiceDiscovery(applicationModel, registryURL);
}
}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/MeshConstant.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/MeshConstant.java
new file mode 100644
index 0000000..e8b8f84
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/MeshConstant.java
@@ -0,0 +1,45 @@
+/*
+ * 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.kubernetes;
+
+import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
+
+public class MeshConstant {
+ public static CustomResourceDefinitionContext getVsDefinition() {
+ // TODO cache
+ return new CustomResourceDefinitionContext.Builder()
+ .withGroup("service.dubbo.apache.org")
+ .withVersion("v1alpha1")
+ .withScope("Namespaced")
+ .withName("virtualservices.service.dubbo.apache.org")
+ .withPlural("virtualservices")
+ .withKind("VirtualService")
+ .build();
+ }
+
+ public static CustomResourceDefinitionContext getDrDefinition() {
+ // TODO cache
+ return new CustomResourceDefinitionContext.Builder()
+ .withGroup("service.dubbo.apache.org")
+ .withVersion("v1alpha1")
+ .withScope("Namespaced")
+ .withName("destinationrules.service.dubbo.apache.org")
+ .withPlural("destinationrules")
+ .withKind("DestinationRule")
+ .build();
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/NopKubernetesMeshEnvListener.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/NopKubernetesMeshEnvListener.java
index 52aff89..818b8df 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/NopKubernetesMeshEnvListener.java
@@ -14,24 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.kubernetes;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshAppRuleListener;
+import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListener;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+public class NopKubernetesMeshEnvListener implements MeshEnvListener {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ @Override
+ public boolean isEnable() {
+ return false;
}
- public long getLastAccess() {
- return lastAccess;
- }
+ @Override
+ public void onSubscribe(String appName, MeshAppRuleListener listener) {}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+ @Override
+ public void onUnSubscribe(String appName) {}
}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesClientConst.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesClientConst.java
new file mode 100644
index 0000000..b7ace53
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesClientConst.java
@@ -0,0 +1,78 @@
+/*
+ * 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.kubernetes.util;
+
+public class KubernetesClientConst {
+ public static final String DEFAULT_MASTER_PLACEHOLDER = "DEFAULT_MASTER_HOST";
+ public static final String DEFAULT_MASTER_URL = "https://kubernetes.default.svc";
+
+ public static final String ENABLE_REGISTER = "enableRegister";
+
+ public static final String TRUST_CERTS = "trustCerts";
+
+ public static final String USE_HTTPS = "useHttps";
+
+ public static final String HTTP2_DISABLE = "http2Disable";
+
+ public static final String NAMESPACE = "namespace";
+
+ public static final String API_VERSION = "apiVersion";
+
+ public static final String CA_CERT_FILE = "caCertFile";
+
+ public static final String CA_CERT_DATA = "caCertData";
+
+ public static final String CLIENT_CERT_FILE = "clientCertFile";
+
+ public static final String CLIENT_CERT_DATA = "clientCertData";
+
+ public static final String CLIENT_KEY_FILE = "clientKeyFile";
+
+ public static final String CLIENT_KEY_DATA = "clientKeyData";
+
+ public static final String CLIENT_KEY_ALGO = "clientKeyAlgo";
+
+ public static final String CLIENT_KEY_PASSPHRASE = "clientKeyPassphrase";
+
+ public static final String OAUTH_TOKEN = "oauthToken";
+
+ public static final String USERNAME = "username";
+
+ public static final String PASSWORD = "password";
+
+ public static final String WATCH_RECONNECT_INTERVAL = "watchReconnectInterval";
+
+ public static final String WATCH_RECONNECT_LIMIT = "watchReconnectLimit";
+
+ public static final String CONNECTION_TIMEOUT = "connectionTimeout";
+
+ public static final String REQUEST_TIMEOUT = "requestTimeout";
+
+ public static final String ROLLING_TIMEOUT = "rollingTimeout";
+
+ public static final String LOGGING_INTERVAL = "loggingInterval";
+
+ public static final String HTTP_PROXY = "httpProxy";
+
+ public static final String HTTPS_PROXY = "httpsProxy";
+
+ public static final String PROXY_USERNAME = "proxyUsername";
+
+ public static final String PROXY_PASSWORD = "proxyPassword";
+
+ public static final String NO_PROXY = "noProxy";
+}
diff --git a/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesConfigUtils.java b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesConfigUtils.java
new file mode 100644
index 0000000..1d29884
--- /dev/null
+++ b/dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesConfigUtils.java
@@ -0,0 +1,104 @@
+/*
+ * 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.kubernetes.util;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
+
+import java.util.Base64;
+
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.API_VERSION;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CA_CERT_DATA;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CA_CERT_FILE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_CERT_DATA;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_CERT_FILE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_KEY_ALGO;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_KEY_DATA;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_KEY_FILE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CLIENT_KEY_PASSPHRASE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.CONNECTION_TIMEOUT;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.DEFAULT_MASTER_PLACEHOLDER;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.DEFAULT_MASTER_URL;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.HTTP2_DISABLE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.HTTPS_PROXY;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.HTTP_PROXY;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.LOGGING_INTERVAL;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.NAMESPACE;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.NO_PROXY;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.OAUTH_TOKEN;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PASSWORD;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PROXY_PASSWORD;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.PROXY_USERNAME;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.REQUEST_TIMEOUT;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.TRUST_CERTS;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.USERNAME;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.USE_HTTPS;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.WATCH_RECONNECT_INTERVAL;
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.WATCH_RECONNECT_LIMIT;
+
+public class KubernetesConfigUtils {
+
+ public static Config createKubernetesConfig(URL url) {
+ // Init default config
+ Config base = Config.autoConfigure(null);
+
+ // replace config with parameters if presents
+ return new ConfigBuilder(base) //
+ .withMasterUrl(buildMasterUrl(url)) //
+ .withApiVersion(url.getParameter(API_VERSION, base.getApiVersion())) //
+ .withNamespace(url.getParameter(NAMESPACE, base.getNamespace())) //
+ .withUsername(url.getParameter(USERNAME, base.getUsername())) //
+ .withPassword(url.getParameter(PASSWORD, base.getPassword())) //
+ .withOauthToken(url.getParameter(OAUTH_TOKEN, base.getOauthToken())) //
+ .withCaCertFile(url.getParameter(CA_CERT_FILE, base.getCaCertFile())) //
+ .withCaCertData(url.getParameter(CA_CERT_DATA, decodeBase64(base.getCaCertData()))) //
+ .withClientKeyFile(url.getParameter(CLIENT_KEY_FILE, base.getClientKeyFile())) //
+ .withClientKeyData(url.getParameter(CLIENT_KEY_DATA, decodeBase64(base.getClientKeyData()))) //
+ .withClientCertFile(url.getParameter(CLIENT_CERT_FILE, base.getClientCertFile())) //
+ .withClientCertData(url.getParameter(CLIENT_CERT_DATA, decodeBase64(base.getClientCertData()))) //
+ .withClientKeyAlgo(url.getParameter(CLIENT_KEY_ALGO, base.getClientKeyAlgo())) //
+ .withClientKeyPassphrase(url.getParameter(CLIENT_KEY_PASSPHRASE, base.getClientKeyPassphrase())) //
+ .withConnectionTimeout(url.getParameter(CONNECTION_TIMEOUT, base.getConnectionTimeout())) //
+ .withRequestTimeout(url.getParameter(REQUEST_TIMEOUT, base.getRequestTimeout())) //
+ .withWatchReconnectInterval(
+ url.getParameter(WATCH_RECONNECT_INTERVAL, base.getWatchReconnectInterval())) //
+ .withWatchReconnectLimit(url.getParameter(WATCH_RECONNECT_LIMIT, base.getWatchReconnectLimit())) //
+ .withLoggingInterval(url.getParameter(LOGGING_INTERVAL, base.getLoggingInterval())) //
+ .withTrustCerts(url.getParameter(TRUST_CERTS, base.isTrustCerts())) //
+ .withHttp2Disable(url.getParameter(HTTP2_DISABLE, base.isHttp2Disable())) //
+ .withHttpProxy(url.getParameter(HTTP_PROXY, base.getHttpProxy())) //
+ .withHttpsProxy(url.getParameter(HTTPS_PROXY, base.getHttpsProxy())) //
+ .withProxyUsername(url.getParameter(PROXY_USERNAME, base.getProxyUsername())) //
+ .withProxyPassword(url.getParameter(PROXY_PASSWORD, base.getProxyPassword())) //
+ .withNoProxy(url.getParameter(NO_PROXY, base.getNoProxy())) //
+ .build();
+ }
+
+ private static String buildMasterUrl(URL url) {
+ if (DEFAULT_MASTER_PLACEHOLDER.equalsIgnoreCase(url.getHost())) {
+ return DEFAULT_MASTER_URL;
+ }
+ return (url.getParameter(USE_HTTPS, true) ? "https://" : "http://") + url.getHost() + ":" + url.getPort();
+ }
+
+ private static String decodeBase64(String str) {
+ return StringUtils.isNotEmpty(str) ? new String(Base64.getDecoder().decode(str)) : null;
+ }
+}
diff --git a/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
new file mode 100644
index 0000000..94177d8
--- /dev/null
+++ b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
@@ -0,0 +1 @@
+kubernetes=org.apache.dubbo.registry.kubernetes.KubernetesRegistryFactory
\ No newline at end of file
diff --git a/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
new file mode 100644
index 0000000..4301ab8
--- /dev/null
+++ b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
@@ -0,0 +1 @@
+kubernetes=org.apache.dubbo.registry.kubernetes.KubernetesServiceDiscoveryFactory
\ No newline at end of file
diff --git a/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory
new file mode 100644
index 0000000..4dfae84
--- /dev/null
+++ b/dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory
@@ -0,0 +1 @@
+kubernetes=org.apache.dubbo.registry.kubernetes.KubernetesMeshEnvListenerFactory
diff --git a/dubbo-kubernetes/src/test/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryTest.java b/dubbo-kubernetes/src/test/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryTest.java
new file mode 100644
index 0000000..5f69134
--- /dev/null
+++ b/dubbo-kubernetes/src/test/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryTest.java
@@ -0,0 +1,289 @@
+/*
+ * 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.kubernetes;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.registry.client.DefaultServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent;
+import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
+import org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ScopeModelUtil;
+
+import io.fabric8.kubernetes.api.model.Endpoints;
+import io.fabric8.kubernetes.api.model.EndpointsBuilder;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServiceBuilder;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import static org.apache.dubbo.registry.kubernetes.util.KubernetesClientConst.NAMESPACE;
+import static org.awaitility.Awaitility.await;
+
+@ExtendWith({MockitoExtension.class})
+class KubernetesServiceDiscoveryTest {
+
+ private static final String SERVICE_NAME = "TestService";
+
+ private static final String POD_NAME = "TestServer";
+
+ public KubernetesServer mockServer = new KubernetesServer(false, true);
+
+ private NamespacedKubernetesClient mockClient;
+
+ private ServiceInstancesChangedListener mockListener = Mockito.mock(ServiceInstancesChangedListener.class);
+
+ private URL serverUrl;
+
+ private Map<String, String> selector;
+
+ private KubernetesServiceDiscovery serviceDiscovery;
+
+ @BeforeEach
+ public void setUp() {
+ mockServer.before();
+ mockClient = mockServer.getClient().inNamespace("dubbo-demo");
+
+ ApplicationModel applicationModel = ApplicationModel.defaultModel();
+ applicationModel.getApplicationConfigManager().setApplication(new ApplicationConfig());
+
+ serverUrl = URL.valueOf(mockClient.getConfiguration().getMasterUrl())
+ .setProtocol("kubernetes")
+ .addParameter(NAMESPACE, "dubbo-demo")
+ .addParameter(KubernetesClientConst.USE_HTTPS, "false")
+ .addParameter(KubernetesClientConst.HTTP2_DISABLE, "true");
+ serverUrl.setScopeModel(applicationModel);
+
+ this.serviceDiscovery = new KubernetesServiceDiscovery(applicationModel, serverUrl);
+
+ System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
+ System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false");
+
+ selector = new HashMap<>(4);
+ selector.put("l", "v");
+ Pod pod = new PodBuilder()
+ .withNewMetadata()
+ .withName(POD_NAME)
+ .withLabels(selector)
+ .endMetadata()
+ .build();
+
+ Service service = new ServiceBuilder()
+ .withNewMetadata()
+ .withName(SERVICE_NAME)
+ .endMetadata()
+ .withNewSpec()
+ .withSelector(selector)
+ .endSpec()
+ .build();
+
+ Endpoints endPoints = new EndpointsBuilder()
+ .withNewMetadata()
+ .withName(SERVICE_NAME)
+ .endMetadata()
+ .addNewSubset()
+ .addNewAddress()
+ .withIp("ip1")
+ .withNewTargetRef()
+ .withUid("uid1")
+ .withName(POD_NAME)
+ .endTargetRef()
+ .endAddress()
+ .addNewPort("Test", "Test", 12345, "TCP")
+ .endSubset()
+ .build();
+
+ mockClient.pods().resource(pod).create();
+ mockClient.services().resource(service).create();
+ mockClient.endpoints().resource(endPoints).create();
+ }
+
+ @AfterEach
+ public void destroy() throws Exception {
+ serviceDiscovery.destroy();
+ mockClient.close();
+ mockServer.after();
+ }
+
+ @Test
+ void testEndpointsUpdate() {
+ serviceDiscovery.setCurrentHostname(POD_NAME);
+ serviceDiscovery.setKubernetesClient(mockClient);
+
+ ServiceInstance serviceInstance = new DefaultServiceInstance(
+ SERVICE_NAME,
+ "Test",
+ 12345,
+ ScopeModelUtil.getApplicationModel(serviceDiscovery.getUrl().getScopeModel()));
+
+ serviceDiscovery.doRegister(serviceInstance);
+
+ HashSet<String> serviceList = new HashSet<>(4);
+ serviceList.add(SERVICE_NAME);
+ Mockito.when(mockListener.getServiceNames()).thenReturn(serviceList);
+ Mockito.doNothing().when(mockListener).onEvent(Mockito.any());
+
+ serviceDiscovery.addServiceInstancesChangedListener(mockListener);
+ mockClient.endpoints().withName(SERVICE_NAME).edit(endpoints -> new EndpointsBuilder(endpoints)
+ .editFirstSubset()
+ .addNewAddress()
+ .withIp("ip2")
+ .withNewTargetRef()
+ .withUid("uid2")
+ .withName(POD_NAME)
+ .endTargetRef()
+ .endAddress()
+ .endSubset()
+ .build());
+
+ await().until(() -> {
+ ArgumentCaptor<ServiceInstancesChangedEvent> captor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.atLeast(0)).onEvent(captor.capture());
+ return captor.getValue().getServiceInstances().size() == 2;
+ });
+ ArgumentCaptor<ServiceInstancesChangedEvent> eventArgumentCaptor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.times(2)).onEvent(eventArgumentCaptor.capture());
+ Assertions.assertEquals(
+ 2, eventArgumentCaptor.getValue().getServiceInstances().size());
+
+ serviceDiscovery.doUnregister(serviceInstance);
+ }
+
+ @Test
+ void testPodsUpdate() throws Exception {
+ serviceDiscovery.setCurrentHostname(POD_NAME);
+ serviceDiscovery.setKubernetesClient(mockClient);
+
+ ServiceInstance serviceInstance = new DefaultServiceInstance(
+ SERVICE_NAME,
+ "Test",
+ 12345,
+ ScopeModelUtil.getApplicationModel(serviceDiscovery.getUrl().getScopeModel()));
+
+ serviceDiscovery.doRegister(serviceInstance);
+
+ HashSet<String> serviceList = new HashSet<>(4);
+ serviceList.add(SERVICE_NAME);
+ Mockito.when(mockListener.getServiceNames()).thenReturn(serviceList);
+ Mockito.doNothing().when(mockListener).onEvent(Mockito.any());
+
+ serviceDiscovery.addServiceInstancesChangedListener(mockListener);
+
+ serviceInstance = new DefaultServiceInstance(
+ SERVICE_NAME,
+ "Test12345",
+ 12345,
+ ScopeModelUtil.getApplicationModel(serviceDiscovery.getUrl().getScopeModel()));
+ serviceDiscovery.doUpdate(serviceInstance, serviceInstance);
+
+ await().until(() -> {
+ ArgumentCaptor<ServiceInstancesChangedEvent> captor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.atLeast(0)).onEvent(captor.capture());
+ return captor.getValue().getServiceInstances().size() == 1;
+ });
+ ArgumentCaptor<ServiceInstancesChangedEvent> eventArgumentCaptor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.times(1)).onEvent(eventArgumentCaptor.capture());
+ Assertions.assertEquals(
+ 1, eventArgumentCaptor.getValue().getServiceInstances().size());
+
+ serviceDiscovery.doUnregister(serviceInstance);
+ }
+
+ @Test
+ void testServiceUpdate() {
+ serviceDiscovery.setCurrentHostname(POD_NAME);
+ serviceDiscovery.setKubernetesClient(mockClient);
+
+ ServiceInstance serviceInstance = new DefaultServiceInstance(
+ SERVICE_NAME,
+ "Test",
+ 12345,
+ ScopeModelUtil.getApplicationModel(serviceDiscovery.getUrl().getScopeModel()));
+
+ serviceDiscovery.doRegister(serviceInstance);
+
+ HashSet<String> serviceList = new HashSet<>(4);
+ serviceList.add(SERVICE_NAME);
+ Mockito.when(mockListener.getServiceNames()).thenReturn(serviceList);
+ Mockito.doNothing().when(mockListener).onEvent(Mockito.any());
+
+ serviceDiscovery.addServiceInstancesChangedListener(mockListener);
+
+ selector.put("app", "test");
+ mockClient.services().withName(SERVICE_NAME).edit(service -> new ServiceBuilder(service)
+ .editSpec()
+ .addToSelector(selector)
+ .endSpec()
+ .build());
+
+ await().until(() -> {
+ ArgumentCaptor<ServiceInstancesChangedEvent> captor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.atLeast(0)).onEvent(captor.capture());
+ return captor.getValue().getServiceInstances().size() == 1;
+ });
+ ArgumentCaptor<ServiceInstancesChangedEvent> eventArgumentCaptor =
+ ArgumentCaptor.forClass(ServiceInstancesChangedEvent.class);
+ Mockito.verify(mockListener, Mockito.times(1)).onEvent(eventArgumentCaptor.capture());
+ Assertions.assertEquals(
+ 1, eventArgumentCaptor.getValue().getServiceInstances().size());
+
+ serviceDiscovery.doUnregister(serviceInstance);
+ }
+
+ @Test
+ void testGetInstance() {
+ serviceDiscovery.setCurrentHostname(POD_NAME);
+ serviceDiscovery.setKubernetesClient(mockClient);
+
+ ServiceInstance serviceInstance = new DefaultServiceInstance(
+ SERVICE_NAME,
+ "Test",
+ 12345,
+ ScopeModelUtil.getApplicationModel(serviceDiscovery.getUrl().getScopeModel()));
+
+ serviceDiscovery.doRegister(serviceInstance);
+
+ serviceDiscovery.doUpdate(serviceInstance, serviceInstance);
+
+ Assertions.assertEquals(1, serviceDiscovery.getServices().size());
+ Assertions.assertEquals(1, serviceDiscovery.getInstances(SERVICE_NAME).size());
+
+ serviceDiscovery.doUnregister(serviceInstance);
+ }
+}
diff --git a/dubbo-kubernetes/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/dubbo-kubernetes/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000..ca6ee9c
--- /dev/null
+++ b/dubbo-kubernetes/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml
index 0496883..d1cb758 100644
--- a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml
+++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-metadata-report-consul</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-configcenter-consul</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ecwid.consul</groupId>
diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml
index 315fc3e..8b2415a 100644
--- a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml
+++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml
@@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-metadata-report-etcd</artifactId>
@@ -39,12 +39,61 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-api</artifactId>
+ <version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dubbo-rpc-api</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dubbo-common</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dubbo-cluster</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ </exclusions>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-rpc-api</artifactId>
+ <version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dubbo-common</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-cluster</artifactId>
+ <version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dubbo-rpc-api</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-remoting-etcd3</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.etcd</groupId>
diff --git a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml
index abcb3c9..cd38639 100644
--- a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-registry-consul</artifactId>
<properties>
@@ -36,6 +36,13 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-api</artifactId>
+ <version>${dubbo3.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>${dubbo3.version}</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/dubbo-registry-extensions/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java b/dubbo-registry-extensions/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java
index f6e468f..8198742 100644
--- a/dubbo-registry-extensions/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java
+++ b/dubbo-registry-extensions/dubbo-registry-consul/src/test/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryTest.java
@@ -29,6 +29,7 @@
import com.pszymczyk.consul.ConsulStarterBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
@@ -39,6 +40,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled
public class ConsulServiceDiscoveryTest {
private URL url;
@@ -124,8 +127,8 @@
serviceInstance2.getMetadata().put("test", "test");
serviceInstance2.getMetadata().put("test123", "test");
consulServiceDiscovery.doRegister(serviceInstance2);
-
Thread.sleep(3000);
+
Mockito.verify(serviceInstancesChangedListener1, Mockito.atLeast(2)).onEvent(eventArgumentCaptor.capture());
serviceInstances = eventArgumentCaptor.getValue().getServiceInstances();
assertEquals(2, serviceInstances.size());
diff --git a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml
index 4219046..afa6592 100644
--- a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml
@@ -29,15 +29,15 @@
<artifactId>dubbo-registry-dns</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The DNS registry module of Dubbo project</description>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
@@ -46,7 +46,5 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
-
-
</dependencies>
</project>
diff --git a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml
index e2df5e5..2aefc98 100644
--- a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml
@@ -25,27 +25,38 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-registry-etcd3</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The etcd3 registry module of Dubbo project</description>
<dependencies>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-api</artifactId>
+ <version>3.2.7</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-remoting-etcd3</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/dubbo-registry-extensions/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscoveryTest.java b/dubbo-registry-extensions/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscoveryTest.java
index 50f66e6..a841048 100644
--- a/dubbo-registry-extensions/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscoveryTest.java
+++ b/dubbo-registry-extensions/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdServiceDiscoveryTest.java
@@ -1,124 +1,125 @@
-///*
-// * 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.etcd;
-//
-//import org.apache.dubbo.common.URL;
-//import org.apache.dubbo.registry.client.DefaultServiceInstance;
-//import org.apache.dubbo.registry.client.ServiceInstance;
-//
-//import com.google.gson.Gson;
-//import org.junit.jupiter.api.AfterAll;
-//import org.junit.jupiter.api.Assertions;
-//import org.junit.jupiter.api.BeforeAll;
-//import org.junit.jupiter.api.Disabled;
-//import org.junit.jupiter.api.Test;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//import static java.lang.String.valueOf;
-//
-///**
-// * 2019-08-30
-// * <p>
-// * There is no embedded server. so it works depend on etcd local server.
-// */
-//@Disabled
-//public class EtcdServiceDiscoveryTest {
-//
-// static EtcdServiceDiscovery etcdServiceDiscovery;
-//
-// @BeforeAll
-// public static void setUp() throws Exception {
-// URL url = URL.valueOf("etcd3://127.0.0.1:2379/org.apache.dubbo.registry.RegistryService");
-// etcdServiceDiscovery = new EtcdServiceDiscovery();
-// Assertions.assertNull(etcdServiceDiscovery.etcdClient);
-// etcdServiceDiscovery.initialize(url);
-// }
-//
-// @AfterAll
-// public static void destroy() throws Exception {
-//// etcdServiceDiscovery.destroy();
-// }
-//
-//
-// @Test
-// public void testLifecycle() throws Exception {
-// URL url = URL.valueOf("etcd3://127.0.0.1:2233/org.apache.dubbo.registry.RegistryService");
-// EtcdServiceDiscovery etcdServiceDiscoveryTmp = new EtcdServiceDiscovery();
-// Assertions.assertNull(etcdServiceDiscoveryTmp.etcdClient);
-// etcdServiceDiscoveryTmp.initialize(url);
-// Assertions.assertNotNull(etcdServiceDiscoveryTmp.etcdClient);
-// Assertions.assertTrue(etcdServiceDiscoveryTmp.etcdClient.isConnected());
-// etcdServiceDiscoveryTmp.destroy();
-// Assertions.assertFalse(etcdServiceDiscoveryTmp.etcdClient.isConnected());
-// }
-//
-// @Test
-// public void testRegistry() throws Exception {
-// ServiceInstance serviceInstance = new DefaultServiceInstance(valueOf(System.nanoTime()), "EtcdTestService", "127.0.0.1", 8080);
-// Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// etcdServiceDiscovery.register(serviceInstance);
-// Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// }
-//
-// @Test
-// public void testUnRegistry() throws Exception {
-// ServiceInstance serviceInstance = new DefaultServiceInstance(valueOf(System.nanoTime()), "EtcdTest2Service", "127.0.0.1", 8080);
-// Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// etcdServiceDiscovery.register(serviceInstance);
-// Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// etcdServiceDiscovery.unregister(serviceInstance);
-// Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// }
-//
-// @Test
-// public void testUpdate() throws Exception {
-// DefaultServiceInstance serviceInstance = new DefaultServiceInstance(valueOf(System.nanoTime()), "EtcdTest34Service", "127.0.0.1", 8080);
-// Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// etcdServiceDiscovery.register(serviceInstance);
-// Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// Assertions.assertEquals(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)),
-// new Gson().toJson(serviceInstance));
-// serviceInstance.setPort(9999);
-// etcdServiceDiscovery.update(serviceInstance);
-// Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
-// Assertions.assertEquals(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)),
-// new Gson().toJson(serviceInstance));
-// }
-//
-// @Test
-// public void testGetInstances() throws Exception {
-// String serviceName = "EtcdTest77Service";
-// Assertions.assertTrue(etcdServiceDiscovery.getInstances(serviceName).isEmpty());
-// etcdServiceDiscovery.register(new DefaultServiceInstance(valueOf(System.nanoTime()), serviceName, "127.0.0.1", 8080));
-// etcdServiceDiscovery.register(new DefaultServiceInstance(valueOf(System.nanoTime()), serviceName, "127.0.0.1", 9809));
-// Assertions.assertFalse(etcdServiceDiscovery.getInstances(serviceName).isEmpty());
-// List<String> r = convertToIpPort(etcdServiceDiscovery.getInstances(serviceName));
-// Assertions.assertTrue(r.contains("127.0.0.1:8080"));
-// Assertions.assertTrue(r.contains("127.0.0.1:9809"));
-// }
-//
-// private List<String> convertToIpPort(List<ServiceInstance> serviceInstances) {
-// List<String> result = new ArrayList<>();
-// for (ServiceInstance serviceInstance : serviceInstances) {
-// result.add(serviceInstance.getHost() + ":" + serviceInstance.getPort());
-// }
-// return result;
-// }
-//
-//}
+/*
+ * 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.etcd;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.registry.client.DefaultServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstance;
+import com.google.gson.Gson;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 2019-08-30
+ * <p>
+ * There is no embedded server. so it works depend on etcd local server.
+ */
+@Disabled
+public class EtcdServiceDiscoveryTest {
+
+ private EtcdServiceDiscovery etcdServiceDiscovery;
+
+ private ApplicationModel applicationModel;
+
+ @BeforeEach
+ public void setUp() {
+ URL url = URL.valueOf("etcd3://127.0.0.1:2379/org.apache.dubbo.registry.RegistryService");
+ FrameworkModel frameworkModel = FrameworkModel.defaultModel();
+ applicationModel = frameworkModel.newApplication();
+ ApplicationConfig config = new ApplicationConfig();
+ config.setName("MockMetrics");
+ applicationModel.getApplicationConfigManager().setApplication(config);
+ etcdServiceDiscovery = new EtcdServiceDiscovery(applicationModel,url);
+ }
+
+ @AfterEach
+ public void destroy() throws Exception {
+ etcdServiceDiscovery.destroy();
+ }
+
+
+ @Test
+ public void testLifecycle() throws Exception {
+ Assertions.assertNotNull(etcdServiceDiscovery.etcdClient);
+ Assertions.assertTrue(etcdServiceDiscovery.etcdClient.isConnected());
+ etcdServiceDiscovery.destroy();
+ Assertions.assertFalse(etcdServiceDiscovery.etcdClient.isConnected());
+ }
+
+ @Test
+ public void testRegistry(){
+ ServiceInstance serviceInstance = new DefaultServiceInstance("EtcdTestService", "127.0.0.1", 8080,applicationModel);
+ Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ etcdServiceDiscovery.doRegister(serviceInstance);
+ Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ }
+
+ @Test
+ public void testUnRegistry() {
+ ServiceInstance serviceInstance = new DefaultServiceInstance("EtcdTest2Service", "127.0.0.1", 8080,applicationModel);
+ Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ etcdServiceDiscovery.doRegister(serviceInstance);
+ Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ etcdServiceDiscovery.doUnregister(serviceInstance);
+ Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ }
+
+ @Test
+ public void testUpdate() {
+ DefaultServiceInstance serviceInstance = new DefaultServiceInstance( "EtcdTest34Service", "127.0.0.1", 8080,applicationModel);
+ Assertions.assertNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ etcdServiceDiscovery.doRegister(serviceInstance);
+
+ Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+
+ Assertions.assertEquals(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)), new Gson().toJson(serviceInstance));
+ serviceInstance.setPort(9999);
+
+ etcdServiceDiscovery.doRegister(serviceInstance);
+ Assertions.assertNotNull(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)));
+ Assertions.assertEquals(etcdServiceDiscovery.etcdClient.getKVValue(etcdServiceDiscovery.toPath(serviceInstance)), new Gson().toJson(serviceInstance));
+ }
+
+ @Test
+ public void testGetInstances() {
+ String serviceName = "EtcdTest77Service";
+ Assertions.assertTrue(etcdServiceDiscovery.getInstances(serviceName).isEmpty());
+ etcdServiceDiscovery.doRegister(new DefaultServiceInstance(serviceName, "127.0.0.1", 8080,applicationModel));
+ etcdServiceDiscovery.doRegister(new DefaultServiceInstance(serviceName, "127.0.0.1", 9809,applicationModel));
+ Assertions.assertFalse(etcdServiceDiscovery.getInstances(serviceName).isEmpty());
+ List<String> r = convertToIpPort(etcdServiceDiscovery.getInstances(serviceName));
+ Assertions.assertTrue(r.contains("127.0.0.1:8080"));
+ Assertions.assertTrue(r.contains("127.0.0.1:9809"));
+ }
+
+ private List<String> convertToIpPort(List<ServiceInstance> serviceInstances) {
+ List<String> result = new ArrayList<>();
+ for (ServiceInstance serviceInstance : serviceInstances) {
+ result.add(serviceInstance.getHost() + ":" + serviceInstance.getPort());
+ }
+ return result;
+ }
+
+}
diff --git a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
index 9981a55..deeaa90 100644
--- a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
@@ -25,6 +25,7 @@
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <version>1.0.1-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-registry-nameservice</artifactId>
<name>dubbo-registry-nameservice</name>
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml b/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml
new file mode 100644
index 0000000..ab37000
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml
@@ -0,0 +1,48 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>dubbo-registry-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dubbo-registry-polaris</artifactId>
+ <name>dubbo-registry-polaris</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>Dubbo registry extension for PolarisMesh, support instance register, discover, health-check capabilities.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.tencent.polaris</groupId>
+ <artifactId>polaris-adapter-dubbo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.25</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistry.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistry.java
new file mode 100644
index 0000000..8b021e9
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistry.java
@@ -0,0 +1,263 @@
+/*
+ * 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.polaris;
+
+import com.tencent.polaris.api.listener.ServiceListener;
+import com.tencent.polaris.api.pojo.Instance;
+import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.common.registry.Consts;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.utils.ExtensionConsts;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.constants.RegistryConstants;
+import org.apache.dubbo.common.extension.ExtensionLoader;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.polaris.task.FetchTask;
+import org.apache.dubbo.registry.polaris.task.InstancesHandler;
+import org.apache.dubbo.registry.polaris.task.TaskScheduler;
+import org.apache.dubbo.registry.polaris.task.WatchTask;
+import org.apache.dubbo.registry.support.FailbackRegistry;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.cluster.Constants;
+import org.apache.dubbo.rpc.cluster.RouterFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class PolarisRegistry extends FailbackRegistry {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PolarisRegistry.class);
+
+ private static final TaskScheduler taskScheduler = new TaskScheduler();
+
+ private final Set<URL> registeredInstances = new ConcurrentHashSet<>();
+
+ private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
+ private final Map<NotifyListener, ServiceListener> serviceListeners = new ConcurrentHashMap<>();
+
+ private final PolarisOperator polarisOperator;
+
+ private final boolean hasCircuitBreaker;
+
+ private final boolean hasRouter;
+
+ public PolarisRegistry(URL url) {
+ super(url);
+ polarisOperator = PolarisRegistryUtils.getOrCreatePolarisOperator(url);
+ ExtensionLoader<RouterFactory> routerExtensionLoader = ExtensionLoader.getExtensionLoader(RouterFactory.class);
+ hasRouter = routerExtensionLoader.hasExtension(ExtensionConsts.PLUGIN_ROUTER_NAME);
+ ExtensionLoader<Filter> filterExtensionLoader = ExtensionLoader.getExtensionLoader(Filter.class);
+ hasCircuitBreaker = filterExtensionLoader.hasExtension(ExtensionConsts.PLUGIN_CIRCUITBREAKER_NAME);
+ }
+
+ private URL buildRouterURL(URL consumerUrl) {
+ URL routerURL = null;
+ if (hasRouter) {
+ URL registryURL = getUrl();
+ routerURL = new URL(RegistryConstants.ROUTE_PROTOCOL, registryURL.getHost(), registryURL.getPort());
+ routerURL = routerURL.setServiceInterface(CommonConstants.ANY_VALUE);
+ routerURL = routerURL.addParameter(Constants.ROUTER_KEY, ExtensionConsts.PLUGIN_ROUTER_NAME);
+ String consumerGroup = consumerUrl.getParameter(CommonConstants.GROUP_KEY);
+ String consumerVersion = consumerUrl.getParameter(CommonConstants.VERSION_KEY);
+ String consumerClassifier = consumerUrl.getParameter(CommonConstants.CLASSIFIER_KEY);
+ if (null != consumerGroup) {
+ routerURL = routerURL.addParameter(CommonConstants.GROUP_KEY, consumerGroup);
+ }
+ if (null != consumerVersion) {
+ routerURL = routerURL.addParameter(CommonConstants.VERSION_KEY, consumerVersion);
+ }
+ if (null != consumerClassifier) {
+ routerURL = routerURL.addParameter(CommonConstants.CLASSIFIER_KEY, consumerClassifier);
+ }
+ }
+ return routerURL;
+ }
+
+ @Override
+ public void doRegister(URL url) {
+ if (!shouldRegister(url)) {
+ return;
+ }
+ LOGGER.info(String.format("[POLARIS] register service to polaris: %s", url.toString()));
+ Map<String, String> metadata = new HashMap<>(url.getParameters());
+ metadata.put(CommonConstants.PATH_KEY, url.getPath());
+ int port = url.getPort();
+ if (port > 0) {
+ int weight = url.getParameter(Constants.WEIGHT_KEY, Constants.DEFAULT_WEIGHT);
+ String version = url.getParameter(CommonConstants.VERSION_KEY, "");
+ polarisOperator.register(url.getServiceInterface(), url.getHost(), port, url.getProtocol(), version, weight,
+ metadata);
+ registeredInstances.add(url);
+ } else {
+ LOGGER.warn(String.format("[POLARIS] skip register url %s for zero port value", url));
+ }
+ }
+
+ private boolean shouldRegister(URL url) {
+ return !StringUtils.equals(url.getProtocol(), CommonConstants.CONSUMER);
+ }
+
+ @Override
+ public void doUnregister(URL url) {
+ if (!shouldRegister(url)) {
+ return;
+ }
+ LOGGER.info(String.format("[POLARIS] unregister service from polaris: %s", url.toString()));
+ int port = url.getPort();
+ if (port > 0) {
+ polarisOperator.deregister(url.getServiceInterface(), url.getHost(), url.getPort());
+ registeredInstances.remove(url);
+ }
+ }
+
+ @Override
+ public void destroy() {
+ if (destroyed.compareAndSet(false, true)) {
+ super.destroy();
+ Collection<URL> urls = Collections.unmodifiableCollection(registeredInstances);
+ for (URL url : urls) {
+ doUnregister(url);
+ }
+ PolarisRegistryUtils.removePolarisOperator(getUrl());
+ polarisOperator.destroy();
+ taskScheduler.destroy();
+ }
+ }
+
+ @Override
+ public void doSubscribe(URL url, NotifyListener listener) {
+ String service = url.getServiceInterface();
+ Instance[] instances = polarisOperator.getAvailableInstances(service, !hasCircuitBreaker);
+ onInstances(url, listener, instances);
+ LOGGER.info(String.format("[POLARIS] submit watch task for service %s", service));
+ PolarisInstancesHandler polarisInstancesHandler = new PolarisInstancesHandler(url, listener);
+ FetchTask fetchTask = new FetchTask(
+ url.getServiceInterface(), polarisInstancesHandler, polarisOperator, !hasCircuitBreaker);
+ taskScheduler.submitWatchTask(new WatchTask(url.getServiceInterface(), fetchTask, taskScheduler));
+ }
+
+
+ private void onInstances(URL url, NotifyListener listener, Instance[] instances) {
+ LOGGER.info(String.format("[POLARIS] update instances count: %d, service: %s", null == instances ? 0 : instances.length,
+ url.getServiceInterface()));
+ List<URL> urls = new ArrayList<>();
+ if (null != instances) {
+ for (Instance instance : instances) {
+ urls.add(instanceToURL(instance));
+ }
+ }
+ URL routerURL = buildRouterURL(url);
+ if (null != routerURL) {
+ urls.add(routerURL);
+ }
+ PolarisRegistry.this.notify(url, listener, urls);
+ }
+
+ private static URL instanceToURL(Instance instance) {
+ Map<String, String> newMetadata = new HashMap<>(instance.getMetadata());
+ boolean hasWeight = false;
+ if (newMetadata.containsKey(Constants.WEIGHT_KEY)) {
+ String weightStr = newMetadata.get(Constants.WEIGHT_KEY);
+ try {
+ int weightValue = Integer.parseInt(weightStr);
+ if (weightValue == instance.getWeight()) {
+ hasWeight = true;
+ }
+ } catch (Exception ignored) {
+ }
+ }
+ if (!hasWeight) {
+ newMetadata.put(Constants.WEIGHT_KEY, Integer.toString(instance.getWeight()));
+ }
+ newMetadata.put(Consts.INSTANCE_KEY_ID, instance.getId());
+ newMetadata.put(Consts.INSTANCE_KEY_HEALTHY, Boolean.toString(instance.isHealthy()));
+ newMetadata.put(Consts.INSTANCE_KEY_ISOLATED, Boolean.toString(instance.isIsolated()));
+ clearEmptyKeys(newMetadata, new String[]{CommonConstants.VERSION_KEY, CommonConstants.GROUP_KEY});
+ return new URL(instance.getProtocol(),
+ instance.getHost(),
+ instance.getPort(),
+ newMetadata.get(CommonConstants.PATH_KEY),
+ newMetadata);
+ }
+
+ private static void clearEmptyKeys(Map<String, String> parameters, String[] keys) {
+ for (String key : keys) {
+ String value = parameters.get(key);
+ if (null != value && StringUtils.isBlank(value)) {
+ parameters.remove(key);
+ }
+ }
+ }
+
+ @Override
+ public void doUnsubscribe(URL url, NotifyListener listener) {
+ LOGGER.info(String.format("[polaris] unsubscribe service: %s", url.toString()));
+ taskScheduler.submitWatchTask(new Runnable() {
+ @Override
+ public void run() {
+ ServiceListener serviceListener = serviceListeners.remove(listener);
+ if (null != serviceListener) {
+ polarisOperator.unwatchService(url.getServiceInterface(), serviceListener);
+ }
+ }
+ });
+ }
+
+ public PolarisOperator getPolarisOperator() {
+ return polarisOperator;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ private class PolarisInstancesHandler implements InstancesHandler {
+
+ private final URL url;
+
+ private final NotifyListener listener;
+
+ public PolarisInstancesHandler(URL url, NotifyListener listener) {
+ this.url = url;
+ this.listener = listener;
+ }
+
+ @Override
+ public void onInstances(String serviceName, Instance[] instances) {
+ PolarisRegistry.this.onInstances(url, listener, instances);
+ }
+
+ @Override
+ public void onWatchSuccess(String serviceName, ServiceListener serviceListener) {
+ serviceListeners.put(listener, serviceListener);
+ }
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryFactory.java
index 52aff89..18664c5 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryFactory.java
@@ -14,24 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.registry.polaris;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.Registry;
+import org.apache.dubbo.registry.support.AbstractRegistryFactory;
+
+public class PolarisRegistryFactory extends AbstractRegistryFactory {
+
+ @Override
+ protected Registry createRegistry(URL url) {
+ return new PolarisRegistry(url);
}
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryUtils.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryUtils.java
new file mode 100644
index 0000000..3c61982
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/PolarisRegistryUtils.java
@@ -0,0 +1,50 @@
+/*
+ * 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.polaris;
+
+import com.tencent.polaris.common.registry.BaseBootConfigHandler;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.registry.PolarisOperators;
+import org.apache.dubbo.common.URL;
+
+public class PolarisRegistryUtils {
+
+ public static PolarisOperator getOrCreatePolarisOperator(URL registryURL) {
+ synchronized (PolarisOperators.INSTANCE) {
+ String host = registryURL.getHost();
+ int port = registryURL.getPort();
+ PolarisOperator existsOperator = PolarisOperators.INSTANCE.getPolarisOperator(host, port);
+ if (null != existsOperator) {
+ return existsOperator;
+ } else {
+ PolarisOperator polarisOperator = new PolarisOperator(host, port, registryURL.getParameters(), new BaseBootConfigHandler());
+ PolarisOperators.INSTANCE.addPolarisOperator(polarisOperator);
+ return polarisOperator;
+ }
+ }
+ }
+
+ public static void removePolarisOperator(URL registryURL) {
+ synchronized (PolarisOperators.INSTANCE) {
+ String host = registryURL.getHost();
+ int port = registryURL.getPort();
+ PolarisOperators.INSTANCE.deletePolarisOperator(host, port);
+ }
+ }
+
+}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/filter/ReportFilter.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/filter/ReportFilter.java
new file mode 100644
index 0000000..9e0cb10
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/filter/ReportFilter.java
@@ -0,0 +1,114 @@
+/*
+ * 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.polaris.filter;
+
+
+import com.tencent.polaris.api.pojo.RetStatus;
+import com.tencent.polaris.api.utils.StringUtils;
+import com.tencent.polaris.circuitbreak.client.exception.CallAbortedException;
+import com.tencent.polaris.common.exception.PolarisBlockException;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import com.tencent.polaris.common.registry.PolarisOperatorDelegate;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.constants.CommonConstants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
+
+@Activate(group = CommonConstants.CONSUMER, order = Integer.MIN_VALUE)
+public class ReportFilter extends PolarisOperatorDelegate implements Filter, Filter.Listener {
+
+ private static final String LABEL_START_TIME = "reporter_filter_start_time";
+
+ private static final String LABEL_REMOTE_HOST = "reporter_remote_host_store";
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReportFilter.class);
+
+ public ReportFilter() {
+ LOGGER.info("[POLARIS] init polaris reporter");
+ }
+
+ @Override
+ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
+ invocation.put(LABEL_START_TIME, System.currentTimeMillis());
+ invocation.put(LABEL_REMOTE_HOST, RpcContext.getContext().getRemoteHost());
+ return invoker.invoke(invocation);
+ }
+
+ @Override
+ public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation) {
+ PolarisOperator polarisOperator = getPolarisOperator();
+ if (null == polarisOperator) {
+ return;
+ }
+ String callerIp = (String) invocation.get(LABEL_REMOTE_HOST);
+ Long startTimeMilli = (Long) invocation.get(LABEL_START_TIME);
+ RetStatus retStatus = RetStatus.RetSuccess;
+ int code = 0;
+ if (appResponse.hasException()) {
+ retStatus = RetStatus.RetFail;
+ code = -1;
+ }
+ URL url = invoker.getUrl();
+ long delay = System.currentTimeMillis() - startTimeMilli;
+ polarisOperator.reportInvokeResult(url.getServiceInterface(), invocation.getMethodName(), url.getHost(),
+ url.getPort(), callerIp, delay, retStatus, code);
+ }
+
+ @Override
+ public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {
+ PolarisOperator polarisOperator = getPolarisOperator();
+ if (null == polarisOperator) {
+ return;
+ }
+ String callerIp = (String) invocation.get(LABEL_REMOTE_HOST);
+ Long startTimeMilli = (Long) invocation.get(LABEL_START_TIME);
+ RetStatus retStatus = RetStatus.RetFail;
+ int code = -1;
+ if (t instanceof RpcException) {
+ RpcException rpcException = (RpcException) t;
+ code = rpcException.getCode();
+ if (isFlowControl(rpcException)) {
+ retStatus = RetStatus.RetFlowControl;
+ }
+ if (rpcException.isTimeout()) {
+ retStatus = RetStatus.RetTimeout;
+ }
+ if (rpcException.getCause() instanceof CallAbortedException) {
+ retStatus = RetStatus.RetReject;
+ }
+ }
+ URL url = invoker.getUrl();
+ long delay = System.currentTimeMillis() - startTimeMilli;
+ polarisOperator.reportInvokeResult(url.getServiceInterface(), invocation.getMethodName(), url.getHost(),
+ url.getPort(), callerIp, delay, retStatus, code);
+ }
+
+ private boolean isFlowControl(RpcException rpcException) {
+ boolean a = StringUtils.isNotBlank(rpcException.getMessage()) && rpcException.getMessage()
+ .contains(PolarisBlockException.PREFIX);
+ boolean b = rpcException.isLimitExceed();
+ return a || b;
+ }
+}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/FetchTask.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/FetchTask.java
new file mode 100644
index 0000000..7a71a09
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/FetchTask.java
@@ -0,0 +1,64 @@
+/*
+ * 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.polaris.task;
+
+import com.tencent.polaris.api.exception.PolarisException;
+import com.tencent.polaris.api.pojo.Instance;
+import com.tencent.polaris.common.registry.PolarisOperator;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+
+public class FetchTask implements Runnable {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(FetchTask.class);
+
+ private final String service;
+
+ private final InstancesHandler handler;
+
+ private final PolarisOperator polarisOperator;
+
+ private final boolean includeCircuitBreak;
+
+ public FetchTask(String service, InstancesHandler handler, PolarisOperator polarisOperator, boolean includeCircuitBreak) {
+ this.service = service;
+ this.handler = handler;
+ this.polarisOperator = polarisOperator;
+ this.includeCircuitBreak = includeCircuitBreak;
+ }
+
+ public PolarisOperator getPolarisOperator() {
+ return polarisOperator;
+ }
+
+ public InstancesHandler getHandler() {
+ return handler;
+ }
+
+ @Override
+ public void run() {
+ Instance[] instances;
+ try {
+ instances = polarisOperator.getAvailableInstances(service, includeCircuitBreak);
+ } catch (PolarisException e) {
+ LOGGER.error(String.format("[POLARIS] fail to fetch instances for service %s", service), e);
+ return;
+ }
+ handler.onInstances(service, instances);
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/InstancesHandler.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/InstancesHandler.java
index 52aff89..fc3b71a 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/InstancesHandler.java
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
-import org.apache.dubbo.rpc.Invoker;
+package org.apache.dubbo.registry.polaris.task;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import com.tencent.polaris.api.listener.ServiceListener;
+import com.tencent.polaris.api.pojo.Instance;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+public interface InstancesHandler {
- public long getLastAccess() {
- return lastAccess;
- }
+ void onInstances(String serviceName, Instance[] instances);
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+ void onWatchSuccess(String serviceName, ServiceListener serviceListener);
}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/TaskScheduler.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/TaskScheduler.java
new file mode 100644
index 0000000..ca9ec66
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/TaskScheduler.java
@@ -0,0 +1,73 @@
+/*
+ * 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.polaris.task;
+
+import com.tencent.polaris.client.util.NamedThreadFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class TaskScheduler {
+
+ private final ExecutorService fetchExecutor = Executors
+ .newSingleThreadExecutor(new NamedThreadFactory("agent-fetch"));
+
+ private final ExecutorService watchExecutor = Executors
+ .newSingleThreadExecutor(new NamedThreadFactory("agent-retry-watch"));
+
+ private final AtomicBoolean executorDestroyed = new AtomicBoolean(false);
+
+ private final Object lock = new Object();
+
+ public void submitFetchTask(Runnable fetchTask) {
+ if (executorDestroyed.get()) {
+ return;
+ }
+ synchronized (lock) {
+ if (executorDestroyed.get()) {
+ return;
+ }
+ fetchExecutor.submit(fetchTask);
+ }
+ }
+
+ public void submitWatchTask(Runnable watchTask) {
+ if (executorDestroyed.get()) {
+ return;
+ }
+ synchronized (lock) {
+ if (executorDestroyed.get()) {
+ return;
+ }
+ watchExecutor.submit(watchTask);
+ }
+ }
+
+ public boolean isDestroyed() {
+ return executorDestroyed.get();
+ }
+
+ public void destroy() {
+ synchronized (lock) {
+ if (executorDestroyed.compareAndSet(false, true)) {
+ fetchExecutor.shutdown();
+ watchExecutor.shutdown();
+ }
+ }
+ }
+}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/WatchTask.java b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/WatchTask.java
new file mode 100644
index 0000000..1774a47
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/java/org/apache/dubbo/registry/polaris/task/WatchTask.java
@@ -0,0 +1,55 @@
+/*
+ * 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.polaris.task;
+
+import com.tencent.polaris.api.listener.ServiceListener;
+import com.tencent.polaris.api.pojo.ServiceChangeEvent;
+
+public class WatchTask implements Runnable {
+
+ private final String service;
+
+ private final FetchTask fetchTask;
+
+ private final ServiceListener serviceListener;
+
+ private final TaskScheduler taskScheduler;
+
+ public WatchTask(String service, FetchTask fetchTask, TaskScheduler taskScheduler) {
+ this.service = service;
+ this.fetchTask = fetchTask;
+ this.serviceListener = new ServiceListener() {
+ @Override
+ public void onEvent(ServiceChangeEvent event) {
+ taskScheduler.submitFetchTask(fetchTask);
+ }
+ };
+ this.taskScheduler = taskScheduler;
+ }
+
+ @Override
+ public void run() {
+ boolean result = fetchTask.getPolarisOperator().watchService(service, serviceListener);
+ if (result) {
+ fetchTask.getHandler().onWatchSuccess(service, serviceListener);
+ taskScheduler.submitFetchTask(fetchTask);
+ return;
+ }
+ taskScheduler.submitWatchTask(this);
+ }
+}
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
new file mode 100644
index 0000000..bccf56e
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
@@ -0,0 +1 @@
+polaris=org.apache.dubbo.registry.polaris.PolarisRegistryFactory
\ No newline at end of file
diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
new file mode 100644
index 0000000..8169e69
--- /dev/null
+++ b/dubbo-registry-extensions/dubbo-registry-polaris/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
@@ -0,0 +1 @@
+polaris_report=org.apache.dubbo.registry.polaris.filter.ReportFilter
diff --git a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml
index c6653e2..d7095b8 100644
--- a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-registry-redis</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -35,12 +35,13 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-api</artifactId>
+ <version>${dubbo3.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-remoting-redis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
diff --git a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml
index 5d91478..5d9486b 100644
--- a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml
@@ -24,7 +24,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-registry-sofa</artifactId>
<name>${project.artifactId}</name>
<description>The SOFARegistry module of Dubbo project</description>
diff --git a/dubbo-registry-extensions/pom.xml b/dubbo-registry-extensions/pom.xml
index d870005..82c68b0 100644
--- a/dubbo-registry-extensions/pom.xml
+++ b/dubbo-registry-extensions/pom.xml
@@ -27,6 +27,14 @@
<artifactId>dubbo-registry-extensions</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <dubbo3.version>3.2.9</dubbo3.version>
+ </properties>
+
<modules>
<module>dubbo-registry-dns</module>
<module>dubbo-registry-consul</module>
@@ -34,5 +42,7 @@
<module>dubbo-registry-redis</module>
<module>dubbo-registry-sofa</module>
<module>dubbo-registry-nameservice</module>
- </modules>
+ <module>dubbo-registry-polaris</module>
+ </modules>
+
</project>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml
index 29ea2f6..ea60079 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml
@@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-remoting-etcd3</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -42,11 +42,37 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-api</artifactId>
+ <version>3.2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dubbo-common</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ </exclusions>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <version>3.2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dubbo-common</artifactId>
+ <groupId>org.apache.dubbo</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
+ <version>3.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -93,17 +119,19 @@
</dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
+ <configuration>
<skipTests>${skipIntegrationTests}</skipTests>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
+
</project>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/Constants.java b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/Constants.java
index 3450bb5..8445fd2 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/Constants.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/Constants.java
@@ -17,12 +17,10 @@
package org.apache.dubbo.remoting.etcd;
-import static org.apache.dubbo.remoting.Constants.DEFAULT_IO_THREADS;
-
public interface Constants {
String ETCD3_NOTIFY_MAXTHREADS_KEYS = "etcd3.notify.maxthreads";
- int DEFAULT_ETCD3_NOTIFY_THREADS = DEFAULT_IO_THREADS;
+ int DEFAULT_ETCD3_NOTIFY_THREADS = Math.min(Runtime.getRuntime().availableProcessors() + 1, 32);
String DEFAULT_ETCD3_NOTIFY_QUEUES_KEY = "etcd3.notify.queues";
diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
index 286586f..08796c3 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
@@ -522,6 +522,7 @@
}
try {
+
this.future = reconnectNotify.scheduleWithFixedDelay(() -> {
boolean connected = isConnected();
if (connectState != connected) {
diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java
index 15c1634..0344f90 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java
@@ -76,6 +76,7 @@
public void test_watch_when_create_path() throws InterruptedException {
String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers";
+
String child = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers/demoService1";
final CountDownLatch notNotified = new CountDownLatch(1);
@@ -89,6 +90,7 @@
client.addChildListener(path, childListener);
client.createEphemeral(child);
+
Assertions.assertTrue(notNotified.await(10, TimeUnit.SECONDS));
client.removeChildListener(path, childListener);
@@ -151,8 +153,8 @@
}
});
- WatchCreateRequest.Builder builder = WatchCreateRequest.newBuilder()
- .setKey(ByteString.copyFrom(path, UTF_8));
+
+ WatchCreateRequest.Builder builder = WatchCreateRequest.newBuilder().setKey(ByteString.copyFrom(path, UTF_8));
observer.onNext(WatchRequest.newBuilder().setCreateRequest(builder).build());
@@ -171,6 +173,7 @@
CountDownLatch updateLatch = new CountDownLatch(1);
CountDownLatch cancelLatch = new CountDownLatch(1);
final AtomicLong watchID = new AtomicLong(-1L);
+
try (Client client = Client.builder().endpoints(endpoint).build()) {
ManagedChannel channel = getChannel(client);
StreamObserver<WatchRequest> observer = WatchGrpc.newStub(channel).watch(new StreamObserver<WatchResponse>() {
@@ -232,6 +235,7 @@
public void test_watch_when_create_wrong_path() throws InterruptedException {
String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers";
+
String child = "/dubbo/com.alibaba.dubbo.demo.DemoService/routers/demoService1";
final CountDownLatch notNotified = new CountDownLatch(1);
@@ -248,7 +252,9 @@
Assertions.assertFalse(notNotified.await(1, TimeUnit.SECONDS));
client.removeChildListener(path, childListener);
+
client.delete(child);
+
}
@Test
@@ -309,6 +315,7 @@
public void test_watch_on_unrecoverable_connection() throws InterruptedException {
String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers";
+
JEtcdClient.EtcdWatcher watcher = null;
try {
ChildListener childListener = (parent, children) -> {
@@ -320,7 +327,7 @@
watcher.watchRequest.onNext(watcher.nextRequest());
} catch (Exception e) {
- Assertions.assertTrue(e.getMessage().contains("call was cancelled"));
+ Assertions.assertTrue(e.getMessage().contains("calls are allowed"));
}
}
@@ -387,8 +394,7 @@
@BeforeEach
public void setUp() {
// timeout in 15 seconds.
- URL url = URL.valueOf("etcd3://127.0.0.1:2379/com.alibaba.dubbo.registry.RegistryService")
- .addParameter(SESSION_TIMEOUT_KEY, 15000);
+ URL url = URL.valueOf("etcd3://127.0.0.1:2379/com.alibaba.dubbo.registry.RegistryService").addParameter(SESSION_TIMEOUT_KEY, 15000);
client = new JEtcdClient(url);
}
diff --git a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml
index f4dbe0e..4d0dc51 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-remoting-grizzly</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml
index ff368fb..de20a94 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-remoting-mina</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml
index b0faa8a..8961e35 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-remoting-p2p</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml
index 1c6b832..627e3d1 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-remoting-quic</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<dependencies>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml
index 5cb8d88..f8c982b 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml
+++ b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml
@@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<artifactId>dubbo-remoting-redis</artifactId>
<packaging>jar</packaging>
diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/ClusterRedisClient.java b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/ClusterRedisClient.java
index e0e4c14..fb5f4ff 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/ClusterRedisClient.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/ClusterRedisClient.java
@@ -45,12 +45,15 @@
private static final int DEFAULT_MAX_ATTEMPTS = 5;
- private JedisCluster jedisCluster;
+ private final JedisCluster jedisCluster;
private Pattern COLON_SPLIT_PATTERN = Pattern.compile("\\s*[:]+\\s*");
public ClusterRedisClient(URL url) {
super(url);
Set<HostAndPort> nodes = getNodes(url);
+ if (url.hasParameter("db.index")) {
+ logger.warn("Redis Cluster does not support multiple databases, the SELECT command is not allowed. So the setting of db.index will not be effect");
+ }
jedisCluster = new JedisCluster(nodes, url.getParameter("connection.timeout", DEFAULT_TIMEOUT),
url.getParameter("so.timeout", DEFAULT_SO_TIMEOUT), url.getParameter("max.attempts", DEFAULT_MAX_ATTEMPTS),
url.getPassword(), getConfig());
diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/MonoRedisClient.java b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/MonoRedisClient.java
index 864f18e..07cb9ed 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/MonoRedisClient.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/MonoRedisClient.java
@@ -35,14 +35,12 @@
public class MonoRedisClient extends AbstractRedisClient implements RedisClient {
private static final Logger logger = LoggerFactory.getLogger(MonoRedisClient.class);
- private static final String START_CURSOR = "0";
-
- private JedisPool jedisPool;
+ private final JedisPool jedisPool;
public MonoRedisClient(URL url) {
super(url);
jedisPool = new JedisPool(getConfig(), url.getHost(), url.getPort(),
- url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), url.getPassword());
+ url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), url.getPassword(), url.getParameter("db.index", 0));
}
@Override
diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/SentinelRedisClient.java b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/SentinelRedisClient.java
index 6a10bf9..137a379 100644
--- a/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/SentinelRedisClient.java
+++ b/dubbo-remoting-extensions/dubbo-remoting-redis/src/main/java/org/apache/dubbo/remoting/redis/jedis/SentinelRedisClient.java
@@ -32,10 +32,13 @@
import java.util.Map;
import java.util.Set;
+import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_TIMEOUT;
+import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
+
public class SentinelRedisClient extends AbstractRedisClient implements RedisClient {
private static final Logger logger = LoggerFactory.getLogger(SentinelRedisClient.class);
- private JedisSentinelPool sentinelPool;
+ private final JedisSentinelPool sentinelPool;
public SentinelRedisClient(URL url) {
super(url);
@@ -47,7 +50,8 @@
}
Set<String> sentinels = new HashSet<>(Arrays.asList(backupAddresses));
sentinels.add(address);
- sentinelPool = new JedisSentinelPool(masterName, sentinels, getConfig(), url.getPassword());
+ sentinelPool = new JedisSentinelPool(masterName, sentinels, getConfig(), url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT), url.getPassword(),
+ url.getParameter("db.index", 0));
}
@Override
diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/README.md b/dubbo-rpc-extensions/dubbo-rpc-hessian/README.md
new file mode 100644
index 0000000..e1a6465
--- /dev/null
+++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/README.md
@@ -0,0 +1,14 @@
+# dubbo-rpc-hessian
+
+## Security
+
+Warning: by default, anyone who can provide data to the Hessian deserializer
+can cause it to run arbitrary code.
+
+For that reason, if you enable the dubbo-rpc-hessian component, you must make
+sure your deployment is only reachable by trusted parties, and/or configure
+a serialization whitelist. Unfortunately we don't currently have any
+documentation on how to configure a serialization whitelist.
+
+For more general information on how to deal with deserialization security,
+see [this page](https://dubbo.apache.org/en/docs/notices/security/#some-suggestions-to-deal-with-the-security-vulnerability-of-deserialization)
diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml
index 19f115e..b37c0d2 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-rpc-hessian</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-native-hession</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml
index 43d8e0c..2aa4ca3 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-rpc-http</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The JSON-RPC module of dubbo project</description>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml
index 7d31c3e..0af66f7 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-rpc-memcached</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The memcached rpc module of dubbo project</description>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
index 284effe..42b39f1 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
@@ -27,7 +27,7 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The thrift rpc module of dubbo project</description>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml
index b4ca9e1..b0bff37 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-rpc-redis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The redis rpc module of dubbo project</description>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml
index adf09b5..c9facd7 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>dubbo-rpc-rmi</artifactId>
<packaging>jar</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The rmi rpc module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
index bccf3bd..b84c414 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
@@ -25,6 +25,7 @@
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <version>1.0.1-SNAPSHOT</version>
<artifactId>dubbo-rpc-rocketmq</artifactId>
<name>dubbo-rpc-rocketmq</name>
<properties>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
index 9798f0e..8539b04 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml
@@ -26,7 +26,7 @@
<artifactId>dubbo-rpc-webservice</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The webservice rpc module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml
index 3db4f96..e059249 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml
@@ -26,16 +26,24 @@
<artifactId>dubbo-serialization-avro</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The avro serialization module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <dubbo.version>3.2.7</dubbo.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-api</artifactId>
+ <version>${dubbo.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>${dubbo.version}</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml
new file mode 100644
index 0000000..37a53c4
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml
@@ -0,0 +1,48 @@
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-extensions</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <packaging>jar</packaging>
+ <name>${project.artifactId}</name>
+ <version>3.2.0-SNAPSHOT</version>
+ <artifactId>dubbo-serialization-common</artifactId>
+
+ <properties>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataInput.java b/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataInput.java
new file mode 100644
index 0000000..3685757
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataInput.java
@@ -0,0 +1,72 @@
+/*
+ * 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.serialize;
+
+import java.io.IOException;
+
+/**
+ * Basic default json type input interface.
+ */
+public interface DefaultJsonDataInput extends ObjectInput {
+
+ @Override
+ default boolean readBool() throws IOException {
+ return readObject(boolean.class);
+ }
+
+ @Override
+ default byte readByte() throws IOException {
+ return readObject(byte.class);
+ }
+
+ @Override
+ default short readShort() throws IOException {
+ return readObject(short.class);
+ }
+
+ @Override
+ default int readInt() throws IOException {
+ return readObject(int.class);
+ }
+
+ @Override
+ default long readLong() throws IOException {
+ return readObject(long.class);
+ }
+
+ @Override
+ default float readFloat() throws IOException {
+ return readObject(float.class);
+ }
+
+ @Override
+ default double readDouble() throws IOException {
+ return readObject(double.class);
+ }
+
+ @Override
+ default String readUTF() throws IOException {
+ return readObject(String.class);
+ }
+
+ <T> T readObject(Class<T> cls) throws IOException;
+
+ @Override
+ default Object readObject() throws IOException {
+ return readObject(Object.class);
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataOutput.java b/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataOutput.java
new file mode 100644
index 0000000..64c36d7
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-common/src/main/java/org/apache/dubbo/common/serialize/DefaultJsonDataOutput.java
@@ -0,0 +1,65 @@
+/*
+ * 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.serialize;
+
+import java.io.IOException;
+
+/**
+ * Basic default json type input interface.
+ */
+public interface DefaultJsonDataOutput extends ObjectOutput {
+
+ @Override
+ default void writeBool(boolean v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeByte(byte v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeShort(short v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeInt(int v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeLong(long v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeFloat(float v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeDouble(double v) throws IOException {
+ writeObject(v);
+ }
+
+ @Override
+ default void writeUTF(String v) throws IOException {
+ writeObject(v);
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/README.md b/dubbo-serialization-extensions/dubbo-serialization-fastjson/README.md
new file mode 100644
index 0000000..46063c8
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/README.md
@@ -0,0 +1 @@
+dubbo.protocol.serialization=fastjson
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml
index 36b62ae..e84c7ad 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml
@@ -27,20 +27,37 @@
<artifactId>dubbo-serialization-fastjson</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<description>The fastjson serialization module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <dubbo.version>3.2.7</dubbo.version>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-common</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-api</artifactId>
- <optional>true</optional>
+ <version>${dubbo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.9.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
index ccf6a2b..0a65525 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
@@ -16,106 +16,82 @@
*/
package org.apache.dubbo.common.serialize.fastjson;
-import org.apache.dubbo.common.serialize.ObjectInput;
+import com.alibaba.fastjson.parser.Feature;
+import com.alibaba.fastjson.parser.ParserConfig;
+import org.apache.dubbo.common.serialize.DefaultJsonDataInput;
import com.alibaba.fastjson.JSON;
+import org.apache.dubbo.common.utils.ClassUtils;
-import java.io.BufferedReader;
-import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.lang.reflect.Type;
/**
* FastJson object input implementation
*/
-public class FastJsonObjectInput implements ObjectInput {
+public class FastJsonObjectInput implements DefaultJsonDataInput {
- private final BufferedReader reader;
+ private InputStream is;
public FastJsonObjectInput(InputStream in) {
- this(new InputStreamReader(in));
- }
-
- public FastJsonObjectInput(Reader reader) {
- this.reader = new BufferedReader(reader);
+ this.is = in;
}
@Override
- public boolean readBool() throws IOException {
- return read(boolean.class);
- }
-
- @Override
- public byte readByte() throws IOException {
- return read(byte.class);
- }
-
- @Override
- public short readShort() throws IOException {
- return read(short.class);
- }
-
- @Override
- public int readInt() throws IOException {
- return read(int.class);
- }
-
- @Override
- public long readLong() throws IOException {
- return read(long.class);
- }
-
- @Override
- public float readFloat() throws IOException {
- return read(float.class);
- }
-
- @Override
- public double readDouble() throws IOException {
- return read(double.class);
- }
-
- @Override
- public String readUTF() throws IOException {
- return read(String.class);
- }
-
- @Override
- public byte[] readBytes() throws IOException {
- return readLine().getBytes();
- }
-
- @Override
- public Object readObject() throws IOException, ClassNotFoundException {
- String json = readLine();
- return JSON.parse(json);
- }
-
- @Override
- public <T> T readObject(Class<T> cls) throws IOException, ClassNotFoundException {
- return read(cls);
+ public <T> T readObject(Class<T> cls) throws IOException {
+ return readObject(cls, null);
}
@Override
@SuppressWarnings("unchecked")
- public <T> T readObject(Class<T> cls, Type type) throws IOException, ClassNotFoundException {
- String json = readLine();
- return (T) JSON.parseObject(json, type);
- }
-
- private String readLine() throws IOException, EOFException {
- String line = reader.readLine();
- if (line == null || line.trim().length() == 0) {
- throw new EOFException();
+ public <T> T readObject(Class<T> cls, Type type) throws IOException {
+ int length = readLength();
+ byte[] bytes = new byte[length];
+ int read = is.read(bytes, 0, length);
+ if (read != length) {
+ throw new IllegalArgumentException(
+ "deserialize failed. expected read length: " + length + " but actual read: " + read);
}
- return line;
+ ParserConfig parserConfig = new ParserConfig();
+ parserConfig.setAutoTypeSupport(true);
+
+ Object result = JSON.parseObject(new String(bytes), cls,
+ parserConfig,
+ Feature.SupportNonPublicField,
+ Feature.SupportAutoType
+ );
+ if (result != null && cls != null && !ClassUtils.isMatch(result.getClass(), cls)) {
+ throw new IllegalArgumentException(
+ "deserialize failed. expected class: " + cls + " but actual class: " + result.getClass());
+ }
+ return (T) result;
+
}
- private <T> T read(Class<T> cls) throws IOException {
- String json = readLine();
- return JSON.parseObject(json, cls);
+ @Override
+ public byte[] readBytes() throws IOException {
+ int length = is.read();
+ byte[] bytes = new byte[length];
+ int read = is.read(bytes, 0, length);
+ if (read != length) {
+ throw new IllegalArgumentException(
+ "deserialize failed. expected read length: " + length + " but actual read: " + read);
+ }
+ return bytes;
+ }
+
+ private int readLength() throws IOException {
+ byte[] bytes = new byte[Integer.BYTES];
+ int read = is.read(bytes, 0, Integer.BYTES);
+ if (read != Integer.BYTES) {
+ throw new IllegalArgumentException(
+ "deserialize failed. expected read length: " + Integer.BYTES + " but actual read: " + read);
+ }
+ int value = 0;
+ for (byte b : bytes) {
+ value = (value << 8) + (b & 0xFF);
+ }
+ return value;
}
}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java
index 3f9ec20..524aded 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java
@@ -16,98 +16,66 @@
*/
package org.apache.dubbo.common.serialize.fastjson;
-import org.apache.dubbo.common.serialize.ObjectOutput;
-
-import com.alibaba.fastjson.serializer.JSONSerializer;
-import com.alibaba.fastjson.serializer.SerializeWriter;
+import com.alibaba.fastjson.JSON;
+import org.apache.dubbo.common.serialize.DefaultJsonDataOutput;
import com.alibaba.fastjson.serializer.SerializerFeature;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
/**
* FastJson object output implementation
*/
-public class FastJsonObjectOutput implements ObjectOutput {
+public class FastJsonObjectOutput implements DefaultJsonDataOutput {
- private final PrintWriter writer;
+
+ private OutputStream os;
public FastJsonObjectOutput(OutputStream out) {
- this(new OutputStreamWriter(out));
- }
-
- public FastJsonObjectOutput(Writer writer) {
- this.writer = new PrintWriter(writer);
- }
-
- @Override
- public void writeBool(boolean v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeByte(byte v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeShort(short v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeInt(int v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeLong(long v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeFloat(float v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeDouble(double v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeUTF(String v) throws IOException {
- writeObject(v);
+ this.os = out;
}
@Override
public void writeBytes(byte[] b) throws IOException {
- writer.println(new String(b));
+ os.write(b.length);
+ os.write(b);
}
@Override
public void writeBytes(byte[] b, int off, int len) throws IOException {
- writer.println(new String(b, off, len));
+ os.write(len);
+ os.write(b, off, len);
}
@Override
public void writeObject(Object obj) throws IOException {
- SerializeWriter out = new SerializeWriter();
- JSONSerializer serializer = new JSONSerializer(out);
- serializer.config(SerializerFeature.WriteEnumUsingToString, true);
- serializer.write(obj);
- out.writeTo(writer);
- out.close(); // for reuse SerializeWriter buf
- writer.println();
- writer.flush();
+ byte[] bytes = JSON.toJSONBytes(obj,
+ SerializerFeature.WriteMapNullValue,
+ SerializerFeature.WriteClassName,
+ SerializerFeature.NotWriteDefaultValue,
+ SerializerFeature.WriteNullStringAsEmpty,
+ SerializerFeature.WriteClassName,
+ SerializerFeature.WriteNullNumberAsZero,
+ SerializerFeature.WriteNullBooleanAsFalse
+ );
+ writeLength(bytes.length);
+ os.write(bytes);
+ os.flush();
+ }
+
+ private void writeLength(int value) throws IOException {
+ byte[] bytes = new byte[Integer.BYTES];
+ int length = bytes.length;
+ for (int i = 0; i < length; i++) {
+ bytes[length - i - 1] = (byte) (value & 0xFF);
+ value >>= 8;
+ }
+ os.write(bytes);
}
@Override
public void flushBuffer() throws IOException {
- writer.flush();
+ os.flush();
}
}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSecurityManager.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSecurityManager.java
new file mode 100644
index 0000000..9b7fa3f
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSecurityManager.java
@@ -0,0 +1,48 @@
+/*
+ * 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.serialize.fastjson;
+
+import org.apache.dubbo.common.utils.AllowClassNotifyListener;
+import org.apache.dubbo.common.utils.SerializeCheckStatus;
+
+import java.util.Set;
+
+/**
+ * FastJsonSecurityManager
+ */
+public class FastJsonSecurityManager implements AllowClassNotifyListener {
+
+
+ @Override
+ public void notifyPrefix(Set<String> allowedList, Set<String> disAllowedList) {
+
+ }
+
+ @Override
+ public void notifyCheckStatus(SerializeCheckStatus status) {
+
+ }
+
+ @Override
+ public void notifyCheckSerializable(boolean checkSerializable) {
+
+ }
+
+ public static class Handler {
+
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/com/example/test/TestPojo.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/com/example/test/TestPojo.java
new file mode 100644
index 0000000..394bab6
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/com/example/test/TestPojo.java
@@ -0,0 +1,55 @@
+/*
+ * 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 com.example.test;
+
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class TestPojo implements Serializable {
+ private String data;
+
+ public TestPojo() {
+
+ }
+
+ public String getData() {
+ return this.data;
+ }
+
+ public TestPojo(String data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ throw new IllegalAccessError();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TestPojo testPojo = (TestPojo) o;
+ return Objects.equals(data, testPojo.data);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(data);
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
new file mode 100644
index 0000000..a5deab0
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
@@ -0,0 +1,509 @@
+/*
+ * 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.serialize.fastjson;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.serialize.ObjectOutput;
+import org.apache.dubbo.common.serialize.Serialization;
+import org.apache.dubbo.common.utils.SerializeCheckStatus;
+import org.apache.dubbo.common.utils.SerializeSecurityManager;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
+
+class FastJsonSerializationTest {
+
+
+ @Test
+ void testReadString() throws IOException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write string, read string
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject("hello");
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals("hello", objectInput.readUTF());
+ }
+
+ // write string, read string
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(null);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertNull(objectInput.readUTF());
+ }
+
+ // write map, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new HashMap<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ // this will not throw exception
+ // Assertions.assertThrows(IOException.class, objectInput::readUTF);
+ }
+
+ // write pojo, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new TrustedPojo(ThreadLocalRandom.current().nextDouble()));
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertInstanceOf(String.class, objectInput.readUTF());
+ }
+
+ // write list, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new LinkedList<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertInstanceOf(String.class, objectInput.readUTF());
+ }
+
+ frameworkModel.destroy();
+
+ }
+
+ @Test
+ void testReadEvent() throws IOException, ClassNotFoundException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write string, read event
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject("hello");
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals("hello", objectInput.readEvent());
+ }
+
+ // write pojo, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new TrustedPojo(ThreadLocalRandom.current().nextDouble()));
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertInstanceOf(String.class, objectInput.readEvent());
+ }
+
+ // write map, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new HashMap<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ // @Todo this not pass
+ // Assertions.assertThrows(IOException.class, objectInput::readEvent);
+ }
+
+ // write list, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new LinkedList<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertInstanceOf(String.class, objectInput.readEvent());
+ }
+
+ frameworkModel.destroy();
+ }
+
+ @Test
+ void testReadByte() throws IOException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write byte, read byte
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject((byte) 11);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals((byte) 11, objectInput.readByte());
+ }
+
+ // write date, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new Date());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, objectInput::readByte);
+ }
+
+ // write pojo, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new TrustedPojo(ThreadLocalRandom.current().nextDouble()));
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, objectInput::readByte);
+ }
+
+ // write map, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new HashMap<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, objectInput::readByte);
+ }
+
+ // write list, read failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(new LinkedList<>());
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, objectInput::readByte);
+ }
+
+ frameworkModel.destroy();
+ }
+
+ @Test
+ void testReadObject() throws IOException, ClassNotFoundException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write pojo, read pojo
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(trustedPojo, objectInput.readObject());
+ }
+
+ // write list, read list
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ LinkedList<TrustedPojo> pojos = new LinkedList<>();
+ pojos.add(trustedPojo);
+
+ objectOutput.writeObject(pojos);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(pojos, objectInput.readObject());
+ }
+
+ // write pojo, read pojo
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(trustedPojo, objectInput.readObject());
+ }
+
+ // write list, read list
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ LinkedList<TrustedPojo> pojos = new LinkedList<>();
+ pojos.add(trustedPojo);
+
+ objectOutput.writeObject(pojos);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(pojos, objectInput.readObject(List.class));
+ }
+
+ // write list, read list
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ LinkedList<TrustedPojo> pojos = new LinkedList<>();
+ pojos.add(trustedPojo);
+
+ objectOutput.writeObject(pojos);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(pojos, objectInput.readObject(LinkedList.class));
+ }
+
+ frameworkModel.destroy();
+ }
+
+ @Test
+ void testReadObjectNotMatched() throws IOException, ClassNotFoundException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ frameworkModel
+ .getBeanFactory()
+ .getBean(SerializeSecurityManager.class)
+ .setCheckStatus(SerializeCheckStatus.STRICT);
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write pojo, read list failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(List.class));
+ }
+
+ // write pojo, read list failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(LinkedList.class));
+ }
+
+ // write pojo, read string failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertInstanceOf(String.class, objectInput.readObject(String.class));
+ }
+
+ // write pojo, read other failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(TrustedNotSerializable.class));
+ }
+
+ // write pojo, read same field failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(TrustedPojo2.class));
+ }
+
+ // write pojo, read map failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(Map.class));
+ }
+
+ // write list, read pojo failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ LinkedList<TrustedPojo> pojos = new LinkedList<>();
+ pojos.add(trustedPojo);
+
+ objectOutput.writeObject(pojos);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(TrustedPojo.class));
+ }
+
+ // write list, read map failed
+ {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ TrustedPojo trustedPojo =
+ new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+ LinkedList<TrustedPojo> pojos = new LinkedList<>();
+ pojos.add(trustedPojo);
+
+ objectOutput.writeObject(pojos);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertThrows(IOException.class, () -> objectInput.readObject(Map.class));
+ }
+
+ frameworkModel.destroy();
+ }
+
+ @Test
+ void testLimit1() throws IOException, ClassNotFoundException {
+ FrameworkModel frameworkModel = new FrameworkModel();
+ Serialization serialization =
+ frameworkModel.getExtensionLoader(Serialization.class).getExtension("fastjson");
+ URL url = URL.valueOf("").setScopeModel(frameworkModel);
+
+ // write trusted, read trusted
+ TrustedPojo trustedPojo = new TrustedPojo(ThreadLocalRandom.current().nextDouble());
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ ObjectOutput objectOutput = serialization.serialize(url, outputStream);
+ objectOutput.writeObject(trustedPojo);
+ objectOutput.flushBuffer();
+
+ byte[] bytes = outputStream.toByteArray();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
+ ObjectInput objectInput = serialization.deserialize(url, inputStream);
+ Assertions.assertEquals(trustedPojo, objectInput.readObject());
+
+ frameworkModel.destroy();
+ }
+}
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedNotSerializable.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedNotSerializable.java
new file mode 100644
index 0000000..f13e5a3
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedNotSerializable.java
@@ -0,0 +1,48 @@
+/*
+ * 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.serialize.fastjson;
+
+import java.util.Objects;
+
+public class TrustedNotSerializable {
+ private double data;
+
+ public TrustedNotSerializable() {
+
+ }
+
+ public TrustedNotSerializable(double data) {
+ this.data = data;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TrustedNotSerializable that = (TrustedNotSerializable) o;
+ return Objects.equals(data, that.data);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(data);
+ }
+
+ public double getData() {
+ return this.data;
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo.java
new file mode 100644
index 0000000..dab0f87
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo.java
@@ -0,0 +1,53 @@
+/*
+ * 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.serialize.fastjson;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class TrustedPojo implements Serializable {
+
+ private double data;
+
+ public TrustedPojo() {
+
+ }
+
+ public TrustedPojo(double data) {
+ this.data = data;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TrustedPojo that = (TrustedPojo) o;
+ return Objects.equals(data, that.data);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(data);
+ }
+
+ /**
+ * if not have getter,fastjson will not work
+ */
+ public double getData() {
+ return this.data;
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo2.java b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo2.java
new file mode 100644
index 0000000..cdff1a3
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/TrustedPojo2.java
@@ -0,0 +1,52 @@
+/*
+ * 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.serialize.fastjson;
+
+import java.util.Objects;
+
+public class TrustedPojo2 {
+
+ private double data;
+
+ public TrustedPojo2() {
+
+ }
+
+ public TrustedPojo2(double data) {
+ this.data = data;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TrustedPojo2 that = (TrustedPojo2) o;
+ return Objects.equals(data, that.data);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(data);
+ }
+
+ /**
+ * if not have getter,fastjson will not work
+ */
+ public double getData() {
+ return this.data;
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml
index ad6c7ad..f8a60ac 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml
@@ -26,7 +26,7 @@
<artifactId>dubbo-serialization-fst</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The fst serialization module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml
new file mode 100644
index 0000000..fb7b98d
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-extensions</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dubbo-serialization-fury</artifactId>
+
+ <properties>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <dubbo.version>3.2.1</dubbo.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <version>${dubbo.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ <version>${dubbo.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.furyio</groupId>
+ <artifactId>fury-core</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/BaseFurySerialization.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/BaseFurySerialization.java
new file mode 100644
index 0000000..2b1243a
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/BaseFurySerialization.java
@@ -0,0 +1,68 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.collection.Tuple2;
+import io.fury.memory.MemoryBuffer;
+import io.fury.util.LoaderBinding;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Optional;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.serialize.ObjectOutput;
+import org.apache.dubbo.common.serialize.Serialization;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+
+/**
+ * Fury serialization framework integration with dubbo.
+ *
+ * @author chaokunyang
+ */
+public abstract class BaseFurySerialization implements Serialization {
+ protected abstract Tuple2<LoaderBinding, MemoryBuffer> getFury();
+
+ public ObjectOutput serialize(URL url, OutputStream output) throws IOException {
+ Tuple2<LoaderBinding, MemoryBuffer> tuple2 = getFury();
+ tuple2.f0.setClassLoader(Thread.currentThread().getContextClassLoader());
+ Fury fury = tuple2.f0.get();
+ FuryCheckerListener checkerListener = getCheckerListener(url);
+ fury.getClassResolver().setClassChecker(checkerListener.getChecker());
+ fury.getClassResolver().setSerializerFactory(checkerListener);
+ return new FuryObjectOutput(fury, tuple2.f1, output);
+ }
+
+ public ObjectInput deserialize(URL url, InputStream input) throws IOException {
+ Tuple2<LoaderBinding, MemoryBuffer> tuple2 = getFury();
+ tuple2.f0.setClassLoader(Thread.currentThread().getContextClassLoader());
+ Fury fury = tuple2.f0.get();
+ FuryCheckerListener checkerListener = getCheckerListener(url);
+ fury.getClassResolver().setClassChecker(checkerListener.getChecker());
+ return new FuryObjectInput(fury, tuple2.f1, input);
+ }
+
+ private static FuryCheckerListener getCheckerListener(URL url) {
+ return Optional.ofNullable(url)
+ .map(URL::getOrDefaultFrameworkModel)
+ .orElseGet(FrameworkModel::defaultModel)
+ .getBeanFactory()
+ .getBean(FuryCheckerListener.class);
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCheckerListener.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCheckerListener.java
new file mode 100644
index 0000000..18100e2
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCheckerListener.java
@@ -0,0 +1,92 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.exception.InsecureException;
+import io.fury.resolver.AllowListChecker;
+import io.fury.serializer.Serializer;
+import io.fury.serializer.SerializerFactory;
+import java.io.Serializable;
+import java.util.Set;
+import org.apache.dubbo.common.utils.AllowClassNotifyListener;
+import org.apache.dubbo.common.utils.SerializeCheckStatus;
+import org.apache.dubbo.common.utils.SerializeSecurityManager;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+
+@SuppressWarnings("rawtypes")
+public class FuryCheckerListener implements AllowClassNotifyListener, SerializerFactory {
+ private final SerializeSecurityManager securityManager;
+ private final AllowListChecker checker;
+ private volatile boolean checkSerializable;
+
+ public FuryCheckerListener(FrameworkModel frameworkModel) {
+ checker = new AllowListChecker();
+ securityManager =
+ frameworkModel.getBeanFactory().getOrRegisterBean(SerializeSecurityManager.class);
+ securityManager.registerListener(this);
+ }
+
+ @Override
+ public void notifyPrefix(Set<String> allowedList, Set<String> disAllowedList) {
+ for (String prefix : allowedList) {
+ checker.allowClass(prefix);
+ }
+ for (String prefix : disAllowedList) {
+ checker.disallowClass(prefix);
+ }
+ }
+
+ @Override
+ public void notifyCheckStatus(SerializeCheckStatus status) {
+ switch (status) {
+ case DISABLE:
+ checker.setCheckLevel(AllowListChecker.CheckLevel.DISABLE);
+ return;
+ case WARN:
+ checker.setCheckLevel(AllowListChecker.CheckLevel.WARN);
+ return;
+ case STRICT:
+ checker.setCheckLevel(AllowListChecker.CheckLevel.STRICT);
+ return;
+ default:
+ throw new UnsupportedOperationException("Unsupported check level " + status);
+ }
+ }
+
+ @Override
+ public void notifyCheckSerializable(boolean checkSerializable) {
+ this.checkSerializable = checkSerializable;
+ }
+
+ public AllowListChecker getChecker() {
+ return checker;
+ }
+
+ public boolean isCheckSerializable() {
+ return checkSerializable;
+ }
+
+ @Override
+ public Serializer createSerializer(Fury fury, Class<?> cls) {
+ if (checkSerializable && !Serializable.class.isAssignableFrom(cls)) {
+ throw new InsecureException(String.format("%s is not Serializable", cls));
+ }
+ return null;
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCompatibleSerialization.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCompatibleSerialization.java
new file mode 100644
index 0000000..b853e43
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryCompatibleSerialization.java
@@ -0,0 +1,62 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.collection.Tuple2;
+import io.fury.config.CompatibleMode;
+import io.fury.memory.MemoryBuffer;
+import io.fury.memory.MemoryUtils;
+import io.fury.util.LoaderBinding;
+
+/**
+ * Fury serialization for dubbo. This integration support type forward/backward compatibility.
+ *
+ * @author chaokunyang
+ */
+public class FuryCompatibleSerialization extends BaseFurySerialization {
+ public static final byte FURY_SERIALIZATION_ID = 29;
+ private static final ThreadLocal<Tuple2<LoaderBinding, MemoryBuffer>> furyFactory =
+ ThreadLocal.withInitial(
+ () -> {
+ LoaderBinding binding =
+ new LoaderBinding(
+ classLoader ->
+ Fury.builder()
+ .withRefTracking(true)
+ .requireClassRegistration(false)
+ .withCompatibleMode(CompatibleMode.COMPATIBLE)
+ .withClassLoader(classLoader)
+ .build());
+ MemoryBuffer buffer = MemoryUtils.buffer(32);
+ return Tuple2.of(binding, buffer);
+ });
+
+ public byte getContentTypeId() {
+ return FURY_SERIALIZATION_ID;
+ }
+
+ public String getContentType() {
+ return "fury/compatible";
+ }
+
+ @Override
+ protected Tuple2<LoaderBinding, MemoryBuffer> getFury() {
+ return furyFactory.get();
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectInput.java
new file mode 100644
index 0000000..3f3971e
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectInput.java
@@ -0,0 +1,123 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.memory.MemoryBuffer;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import org.apache.dubbo.common.serialize.ObjectInput;
+
+@SuppressWarnings("unchecked")
+public class FuryObjectInput implements ObjectInput {
+ private final Fury fury;
+ private final MemoryBuffer buffer;
+ private final InputStream input;
+
+ public FuryObjectInput(Fury fury, MemoryBuffer buffer, InputStream input) {
+ this.fury = fury;
+ this.buffer = buffer;
+ this.input = input;
+ }
+
+ @Override
+ public Object readObject() {
+ return fury.deserializeJavaObjectAndClass(input);
+ }
+
+ @Override
+ public <T> T readObject(Class<T> cls) {
+ return (T) readObject();
+ }
+
+ @Override
+ public <T> T readObject(Class<T> cls, Type type) {
+ return (T) readObject();
+ }
+
+ @Override
+ public boolean readBool() throws IOException {
+ readBytes(buffer.getHeapMemory(), 1);
+ return buffer.getBoolean(0);
+ }
+
+ @Override
+ public byte readByte() throws IOException {
+ readBytes(buffer.getHeapMemory(), 1);
+ return buffer.get(0);
+ }
+
+ @Override
+ public short readShort() throws IOException {
+ readBytes(buffer.getHeapMemory(), 2);
+ return buffer.getShort(0);
+ }
+
+ @Override
+ public int readInt() throws IOException {
+ readBytes(buffer.getHeapMemory(), 4);
+ return buffer.getInt(0);
+ }
+
+ @Override
+ public long readLong() throws IOException {
+ readBytes(buffer.getHeapMemory(), 8);
+ return buffer.getLong(0);
+ }
+
+ @Override
+ public float readFloat() throws IOException {
+ readBytes(buffer.getHeapMemory(), 4);
+ return buffer.getFloat(0);
+ }
+
+ @Override
+ public double readDouble() throws IOException {
+ readBytes(buffer.getHeapMemory(), 8);
+ return buffer.getDouble(0);
+ }
+
+ @Override
+ public String readUTF() throws IOException {
+ int size = readInt();
+ buffer.readerIndex(0);
+ buffer.ensure(size);
+ readBytes(buffer.getHeapMemory(), size);
+ if (buffer.readBoolean()) {
+ return fury.readJavaString(buffer);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public byte[] readBytes() throws IOException {
+ int size = readInt();
+ byte[] bytes = new byte[size];
+ readBytes(bytes, size);
+ return bytes;
+ }
+
+ private void readBytes(byte[] bytes, int size) throws IOException {
+ int off = 0;
+ while (off != size) {
+ off += input.read(bytes, off, size - off);
+ }
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectOutput.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectOutput.java
new file mode 100644
index 0000000..ac97899
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryObjectOutput.java
@@ -0,0 +1,108 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.memory.MemoryBuffer;
+import java.io.IOException;
+import java.io.OutputStream;
+import org.apache.dubbo.common.serialize.ObjectOutput;
+
+/**
+ * Fury implementation for {@link ObjectOutput}.
+ *
+ * @author chaokunyang
+ */
+public class FuryObjectOutput implements ObjectOutput {
+ private final Fury fury;
+ private final MemoryBuffer buffer;
+ private final OutputStream output;
+
+ public FuryObjectOutput(Fury fury, MemoryBuffer buffer, OutputStream output) {
+ this.fury = fury;
+ this.buffer = buffer;
+ this.output = output;
+ }
+
+ public void writeObject(Object obj) {
+ fury.serializeJavaObjectAndClass(output, obj);
+ }
+
+ public void writeBool(boolean v) throws IOException {
+ buffer.unsafePutBoolean(0, v);
+ output.write(buffer.getHeapMemory(), 0, 1);
+ }
+
+ public void writeByte(byte v) throws IOException {
+ buffer.unsafePut(0, v);
+ output.write(buffer.getHeapMemory(), 0, 1);
+ }
+
+ public void writeShort(short v) throws IOException {
+ buffer.unsafePutShort(0, v);
+ output.write(buffer.getHeapMemory(), 0, 2);
+ }
+
+ public void writeInt(int v) throws IOException {
+ buffer.unsafePutInt(0, v);
+ output.write(buffer.getHeapMemory(), 0, 4);
+ }
+
+ public void writeLong(long v) throws IOException {
+ buffer.unsafePutLong(0, v);
+ output.write(buffer.getHeapMemory(), 0, 8);
+ }
+
+ public void writeFloat(float v) throws IOException {
+ buffer.unsafePutFloat(0, v);
+ output.write(buffer.getHeapMemory(), 0, 4);
+ }
+
+ public void writeDouble(double v) throws IOException {
+ buffer.unsafePutDouble(0, v);
+ output.write(buffer.getHeapMemory(), 0, 8);
+ }
+
+ public void writeUTF(String v) throws IOException {
+ // avoid `writeInt` overwrite sting data.
+ buffer.writerIndex(4);
+ if (v != null) {
+ buffer.writeBoolean(true);
+ fury.writeJavaString(buffer, v);
+ } else {
+ buffer.writeBoolean(false);
+ }
+ int size = buffer.writerIndex() - 4;
+ writeInt(size);
+ output.write(buffer.getHeapMemory(), 4, size);
+ }
+
+ public void writeBytes(byte[] v) throws IOException {
+ writeInt(v.length);
+ output.write(v);
+ }
+
+ public void writeBytes(byte[] v, int off, int len) throws IOException {
+ writeInt(len);
+ output.write(v, off, len);
+ }
+
+ public void flushBuffer() throws IOException {
+ output.flush();
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryScopeModelInitializer.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryScopeModelInitializer.java
new file mode 100644
index 0000000..5129e12
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FuryScopeModelInitializer.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.common.serialize.fury.dubbo;
+
+import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.model.ModuleModel;
+import org.apache.dubbo.rpc.model.ScopeModelInitializer;
+
+public class FuryScopeModelInitializer implements ScopeModelInitializer {
+ @Override
+ public void initializeFrameworkModel(FrameworkModel frameworkModel) {
+ ScopeBeanFactory beanFactory = frameworkModel.getBeanFactory();
+ beanFactory.registerBean(FuryCheckerListener.class);
+ }
+
+ @Override
+ public void initializeApplicationModel(ApplicationModel applicationModel) {}
+
+ @Override
+ public void initializeModuleModel(ModuleModel moduleModel) {}
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FurySerialization.java b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FurySerialization.java
new file mode 100644
index 0000000..7c8fc9e
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/java/org/apache/dubbo/common/serialize/fury/dubbo/FurySerialization.java
@@ -0,0 +1,61 @@
+/*
+ * 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.serialize.fury.dubbo;
+
+import io.fury.Fury;
+import io.fury.collection.Tuple2;
+import io.fury.memory.MemoryBuffer;
+import io.fury.memory.MemoryUtils;
+import io.fury.util.LoaderBinding;
+
+/**
+ * Fury serialization for dubbo. This integration doesn't allow type inconsistency between
+ * serialization and deserialization peer.
+ *
+ * @author chaokunyang
+ */
+public class FurySerialization extends BaseFurySerialization {
+ public static final byte FURY_SERIALIZATION_ID = 28;
+ private static final ThreadLocal<Tuple2<LoaderBinding, MemoryBuffer>> furyFactory =
+ ThreadLocal.withInitial(
+ () -> {
+ LoaderBinding binding =
+ new LoaderBinding(
+ classLoader ->
+ Fury.builder()
+ .withRefTracking(true)
+ .requireClassRegistration(false)
+ .withClassLoader(classLoader)
+ .build());
+ MemoryBuffer buffer = MemoryUtils.buffer(32);
+ return Tuple2.of(binding, buffer);
+ });
+
+ public byte getContentTypeId() {
+ return FURY_SERIALIZATION_ID;
+ }
+
+ public String getContentType() {
+ return "fury/consistent";
+ }
+
+ @Override
+ protected Tuple2<LoaderBinding, MemoryBuffer> getFury() {
+ return furyFactory.get();
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
new file mode 100644
index 0000000..c73b34b
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
@@ -0,0 +1,2 @@
+fury=org.apache.dubbo.common.serialize.fury.dubbo.FurySerialization
+fury-compatible=org.apache.dubbo.common.serialize.fury.dubbo.FuryCompatibleSerialization
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
new file mode 100644
index 0000000..3dd3650
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-fury/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
@@ -0,0 +1,2 @@
+fury=org.apache.dubbo.common.serialize.fury.dubbo.FuryScopeModelInitializer
+fury-compatible=org.apache.dubbo.common.serialize.fury.dubbo.FuryScopeModelInitializer
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml
index 041b526..2a7b0b1 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml
@@ -26,7 +26,7 @@
<artifactId>dubbo-serialization-gson</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<description>The GSON serialization implement for dubbo</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
@@ -38,6 +38,21 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-common</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
index cdf0b6a..3ffb1bd 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.common.serialize.gson;
-import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.serialize.DefaultJsonDataInput;
import org.apache.dubbo.common.utils.PojoUtils;
import com.google.gson.Gson;
@@ -30,7 +30,7 @@
import java.io.Reader;
import java.lang.reflect.Type;
-public class GsonJsonObjectInput implements ObjectInput {
+public class GsonJsonObjectInput implements DefaultJsonDataInput {
private final BufferedReader reader;
private Gson gson;
@@ -89,14 +89,14 @@
}
@Override
- public Object readObject() throws IOException, ClassNotFoundException {
- String json = readLine();
- return gson.fromJson(json, Object.class);
+ public Object readObject() throws IOException {
+ return readObject(Object.class);
}
@Override
- public <T> T readObject(Class<T> cls) throws IOException, ClassNotFoundException {
- return read(cls);
+ public <T> T readObject(Class<T> cls) throws IOException {
+ String json = readLine();
+ return gson.fromJson(json, cls);
}
@Override
diff --git a/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutput.java b/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutput.java
index 763dd13..4c0d3ea 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectOutput.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.common.serialize.gson;
-import org.apache.dubbo.common.serialize.ObjectOutput;
+import org.apache.dubbo.common.serialize.DefaultJsonDataOutput;
import com.google.gson.Gson;
@@ -28,7 +28,7 @@
import java.io.Writer;
-public class GsonJsonObjectOutput implements ObjectOutput {
+public class GsonJsonObjectOutput implements DefaultJsonDataOutput {
private final PrintWriter writer;
private Gson gson = null;
@@ -43,46 +43,6 @@
}
@Override
- public void writeBool(boolean v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeByte(byte v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeShort(short v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeInt(int v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeLong(long v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeFloat(float v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeDouble(double v) throws IOException {
- writeObject(v);
- }
-
- @Override
- public void writeUTF(String v) throws IOException {
- writeObject(v);
- }
-
- @Override
public void writeBytes(byte[] b) throws IOException {
writer.println(new String(b));
}
@@ -101,9 +61,8 @@
json = null;
}
-
@Override
- public void writeThrowable(Object obj) throws IOException {
+ public void writeThrowable(Throwable obj) throws IOException {
String clazz = obj.getClass().getName();
ExceptionWrapper bo = new ExceptionWrapper(obj, clazz);
this.writeObject(bo);
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
new file mode 100644
index 0000000..a4ea97d
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
@@ -0,0 +1,72 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-extensions</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dubbo-serialization-jackson</artifactId>
+ <description>The jackson serialization module of dubbo project</description>
+
+ <properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ <optional>true</optional>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-common</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>3.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInput.java
new file mode 100644
index 0000000..95fa2d0
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInput.java
@@ -0,0 +1,93 @@
+/*
+ * 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.serialize.jackson;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.apache.dubbo.common.serialize.DefaultJsonDataInput;
+
+import java.io.BufferedReader;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.reflect.Type;
+
+/**
+ * Jackson object input implementation
+ */
+public class JacksonObjectInput implements DefaultJsonDataInput {
+
+ private final ObjectMapper MAPPER;
+
+ private final BufferedReader READER;
+
+ public JacksonObjectInput(InputStream inputStream) {
+ this(new InputStreamReader(inputStream));
+ }
+
+ public JacksonObjectInput(Reader reader) {
+ this.READER = new BufferedReader(reader);
+ this.MAPPER = new ObjectMapper()
+ .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+ .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+ .registerModule(new JavaTimeModule())
+ ;
+ }
+
+ @Override
+ public Object readObject() throws IOException {
+ return readObject(Object.class);
+ }
+
+ @Override
+ public <T> T readObject(Class<T> cls) throws IOException {
+ String json = readLine();
+ return MAPPER.readValue(json, cls);
+ }
+
+ @Override
+ public <T> T readObject(Class<T> cls, Type type) throws IOException, ClassNotFoundException {
+ String json = readLine();
+ return MAPPER.readValue(json, new TypeReference<T>() {
+ @Override
+ public Type getType() {
+ return type;
+ }
+ });
+ }
+
+ @Override
+ public byte[] readBytes() throws IOException {
+ return readLine().getBytes();
+ }
+
+ private String readLine() throws IOException {
+ String line = READER.readLine();
+ if (line == null || line.trim().isEmpty()) {
+ throw new EOFException();
+ }
+ return line;
+ }
+
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutput.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutput.java
new file mode 100644
index 0000000..fc97983
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutput.java
@@ -0,0 +1,82 @@
+/*
+ * 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.serialize.jackson;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.apache.dubbo.common.serialize.DefaultJsonDataOutput;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+
+/**
+ * Jackson object output implementation
+ */
+public class JacksonObjectOutput implements DefaultJsonDataOutput {
+
+ private final ObjectMapper MAPPER;
+
+ private final PrintWriter WRITER;
+
+ public JacksonObjectOutput(OutputStream outputStream) {
+ this(new OutputStreamWriter(outputStream));
+ }
+
+ public JacksonObjectOutput(Writer writer) {
+ this.WRITER = new PrintWriter(writer);
+ this.MAPPER = new ObjectMapper()
+ .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+ .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+ .registerModule(new JavaTimeModule())
+ ;
+ }
+
+ @Override
+ public void writeObject(Object obj) throws IOException {
+ char[] jsonChars = convertJsonToCharArray(MAPPER.writeValueAsString(obj));
+ WRITER.write(jsonChars, 0, jsonChars.length);
+ WRITER.println();
+ WRITER.flush();
+ }
+
+ @Override
+ public void writeBytes(byte[] v) throws IOException {
+ WRITER.println(new String(v));
+ }
+
+ @Override
+ public void writeBytes(byte[] v, int off, int len) throws IOException {
+ WRITER.println(new String(v, off, len));
+ }
+
+ @Override
+ public void flushBuffer() throws IOException {
+ WRITER.flush();
+ }
+
+ private char[] convertJsonToCharArray(String json) {
+ return json.toCharArray();
+ }
+
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonSerialization.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonSerialization.java
new file mode 100644
index 0000000..8d6d455
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/java/org/apache/dubbo/common/serialize/jackson/JacksonSerialization.java
@@ -0,0 +1,61 @@
+/*
+ * 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.serialize.jackson;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.serialize.ObjectInput;
+import org.apache.dubbo.common.serialize.ObjectOutput;
+import org.apache.dubbo.common.serialize.Serialization;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Jackson serialization implementation
+ *
+ * <pre>
+ * e.g. <dubbo:protocol serialization="jackson" />
+ * </pre>
+ */
+public class JacksonSerialization implements Serialization {
+
+ private static final byte JACKSON_SERIALIZATION_ID = 18;
+
+ private static final String JSON_CONTENT_TYPE = "application/json";
+
+ @Override
+ public byte getContentTypeId() {
+ return JACKSON_SERIALIZATION_ID;
+ }
+
+ @Override
+ public String getContentType() {
+ return JSON_CONTENT_TYPE;
+ }
+
+ @Override
+ public ObjectOutput serialize(URL url, OutputStream output) throws IOException {
+ return new JacksonObjectOutput(output);
+ }
+
+ @Override
+ public ObjectInput deserialize(URL url, InputStream input) throws IOException {
+ return new JacksonObjectInput(input);
+ }
+
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
new file mode 100644
index 0000000..b229ca0
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
@@ -0,0 +1 @@
+jackson=org.apache.dubbo.common.serialize.jackson.JacksonSerialization
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Image.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Image.java
new file mode 100644
index 0000000..c9d0d7b
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Image.java
@@ -0,0 +1,120 @@
+/*
+ * 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.serialize.jackson;
+
+
+public class Image implements java.io.Serializable {
+ private static final long serialVersionUID = 1L;
+ public String uri;
+ public String title; // Can be null
+ public int width;
+ public int height;
+ public Size size;
+
+ public Image() {
+ }
+
+ public Image(String uri, String title, int width, int height, Size size) {
+ this.height = height;
+ this.title = title;
+ this.uri = uri;
+ this.width = width;
+ this.size = size;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Image image = (Image) o;
+
+ if (height != image.height) return false;
+ if (width != image.width) return false;
+ if (size != image.size) return false;
+ if (title != null ? !title.equals(image.title) : image.title != null) return false;
+ if (uri != null ? !uri.equals(image.uri) : image.uri != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = uri != null ? uri.hashCode() : 0;
+ result = 31 * result + (title != null ? title.hashCode() : 0);
+ result = 31 * result + width;
+ result = 31 * result + height;
+ result = 31 * result + (size != null ? size.hashCode() : 0);
+ return result;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[Image ");
+ sb.append("uri=").append(uri);
+ sb.append(", title=").append(title);
+ sb.append(", width=").append(width);
+ sb.append(", height=").append(height);
+ sb.append(", size=").append(size);
+ sb.append("]");
+ return sb.toString();
+ }
+
+ public String getUri() {
+ return uri;
+ }
+
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public Size getSize() {
+ return size;
+ }
+
+ public void setSize(Size size) {
+ this.size = size;
+ }
+
+ public enum Size {
+ SMALL, LARGE
+ }
+}
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java
new file mode 100644
index 0000000..f6ba0d7
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java
@@ -0,0 +1,202 @@
+/*
+ * 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.serialize.jackson;
+
+import org.apache.dubbo.common.serialize.jackson.Organization;
+import org.apache.dubbo.common.serialize.jackson.Person;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * {@link JacksonObjectInput} Unit Test
+ */
+public class JacksonObjectInputTest {
+
+ private JacksonObjectInput jacksonObjectInput;
+
+ @Test
+ public void testReadBool() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("true".getBytes()));
+ boolean result = jacksonObjectInput.readBool();
+
+ assertThat(result, is(true));
+
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("false"));
+ result = jacksonObjectInput.readBool();
+
+ assertThat(result, is(false));
+ }
+
+ @Test
+ public void testReadByte() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("123".getBytes()));
+ Byte result = jacksonObjectInput.readByte();
+
+ assertThat(result, is(Byte.parseByte("123")));
+ }
+
+ @Test
+ public void testReadBytes() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("123456".getBytes()));
+ byte[] result = jacksonObjectInput.readBytes();
+
+ assertThat(result, is("123456".getBytes()));
+ }
+
+ @Test
+ public void testReadShort() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1"));
+ short result = jacksonObjectInput.readShort();
+
+ assertThat(result, is((short) 1));
+ }
+
+ @Test
+ public void testReadInt() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1"));
+ Integer result = jacksonObjectInput.readInt();
+
+ assertThat(result, is(1));
+ }
+
+ @Test
+ public void testReadDouble() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1.88"));
+ Double result = jacksonObjectInput.readDouble();
+
+ assertThat(result, is(1.88d));
+ }
+
+ @Test
+ public void testReadLong() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("10"));
+ Long result = jacksonObjectInput.readLong();
+
+ assertThat(result, is(10L));
+ }
+
+ @Test
+ public void testReadFloat() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1.66"));
+ Float result = jacksonObjectInput.readFloat();
+
+ assertThat(result, is(1.66F));
+ }
+
+ @Test
+ public void testReadUTF() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("\"wording\""));
+ String result = jacksonObjectInput.readUTF();
+
+ assertThat(result, is("wording"));
+ }
+
+ @Test
+ public void testReadObject() throws IOException, ClassNotFoundException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
+ Person result = jacksonObjectInput.readObject(Person.class);
+
+ assertThat(result, not(nullValue()));
+ assertThat(result.getName(), is("John"));
+ assertThat(result.getAge(), is(30));
+ }
+
+ @Test
+ public void testEmptyLine() throws IOException, ClassNotFoundException {
+ Assertions.assertThrows(EOFException.class, () -> {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader(""));
+
+ jacksonObjectInput.readObject();
+ });
+ }
+
+ @Test
+ public void testEmptySpace() throws IOException, ClassNotFoundException {
+ Assertions.assertThrows(EOFException.class, () -> {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader(" "));
+
+ jacksonObjectInput.readObject();
+ });
+ }
+
+ @Test
+ public void testReadObjectWithoutClass() throws IOException, ClassNotFoundException, NoSuchFieldException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
+
+ Map map = jacksonObjectInput.readObject(Map.class);
+
+ assertThat(map, not(nullValue()));
+ assertThat(map.get("name"), is("John"));
+ assertThat(map.get("age"), is(30));
+ }
+
+
+ @Test
+ public void testReadObjectWithTowType() throws Exception {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));
+
+ Method methodReturnType = getClass().getMethod("towLayer");
+ Type type = methodReturnType.getGenericReturnType();
+ List<Person> o = jacksonObjectInput.readObject(List.class, type);
+
+ assertTrue(o instanceof List);
+ assertTrue(o.get(0) instanceof Person);
+
+ assertThat(o.size(), is(2));
+ assertThat(o.get(1).getName(), is("Born"));
+ }
+
+ @Test
+ public void testReadObjectWithThreeType() throws Exception {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{\"data\":[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]}"));
+
+ Method methodReturnType = getClass().getMethod("threeLayer");
+ Type type = methodReturnType.getGenericReturnType();
+ Organization<List<Person>> o = jacksonObjectInput.readObject(Organization.class, type);
+
+ assertTrue(o instanceof Organization);
+ assertTrue(o.getData() instanceof List);
+ assertTrue(o.getData().get(0) instanceof Person);
+
+ assertThat(o.getData().size(), is(2));
+ assertThat(o.getData().get(1).getName(), is("Born"));
+ }
+
+ public List<Person> towLayer() {
+ return null;
+ }
+
+ public Organization<List<Person>> threeLayer() {
+ return null;
+ }
+
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
similarity index 60%
copy from dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
copy to dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
index 48fb1ce..b7ec214 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.serialize.fastjson;
+package org.apache.dubbo.common.serialize.jackson;
-import org.apache.dubbo.common.serialize.model.media.Image;
-
+import org.apache.dubbo.common.serialize.jackson.Image;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -30,113 +29,117 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-public class FastJsonObjectOutputTest {
- private FastJsonObjectOutput fastJsonObjectOutput;
- private FastJsonObjectInput fastJsonObjectInput;
+/**
+ * {@link JacksonObjectOutput} Unit Test
+ */
+public class JacksonObjectOutputTest {
+
+ private JacksonObjectOutput jacksonObjectOutput;
+ private JacksonObjectInput jacksonObjectInput;
private ByteArrayOutputStream byteArrayOutputStream;
private ByteArrayInputStream byteArrayInputStream;
@BeforeEach
public void setUp() throws Exception {
this.byteArrayOutputStream = new ByteArrayOutputStream();
- this.fastJsonObjectOutput = new FastJsonObjectOutput(byteArrayOutputStream);
+ this.jacksonObjectOutput = new JacksonObjectOutput(byteArrayOutputStream);
}
@Test
public void testWriteBool() throws IOException {
- this.fastJsonObjectOutput.writeBool(true);
+ this.jacksonObjectOutput.writeBool(true);
this.flushToInput();
- assertThat(fastJsonObjectInput.readBool(), is(true));
+ assertThat(jacksonObjectInput.readBool(), is(true));
}
@Test
public void testWriteShort() throws IOException {
- this.fastJsonObjectOutput.writeShort((short) 2);
+ this.jacksonObjectOutput.writeShort((short) 2);
this.flushToInput();
- assertThat(fastJsonObjectInput.readShort(), is((short) 2));
+ assertThat(jacksonObjectInput.readShort(), is((short) 2));
}
@Test
public void testWriteInt() throws IOException {
- this.fastJsonObjectOutput.writeInt(1);
+ this.jacksonObjectOutput.writeInt(1);
this.flushToInput();
- assertThat(fastJsonObjectInput.readInt(), is(1));
+ assertThat(jacksonObjectInput.readInt(), is(1));
}
@Test
public void testWriteLong() throws IOException {
- this.fastJsonObjectOutput.writeLong(1000L);
+ this.jacksonObjectOutput.writeLong(1000L);
this.flushToInput();
- assertThat(fastJsonObjectInput.readLong(), is(1000L));
+ assertThat(jacksonObjectInput.readLong(), is(1000L));
}
@Test
public void testWriteUTF() throws IOException {
- this.fastJsonObjectOutput.writeUTF("Pace Hasîtî 和平 Мир");
+ this.jacksonObjectOutput.writeUTF("Pace Hasîtî 和平 Мир");
this.flushToInput();
- assertThat(fastJsonObjectInput.readUTF(), is("Pace Hasîtî 和平 Мир"));
+ assertThat(jacksonObjectInput.readUTF(), is("Pace Hasîtî 和平 Мир"));
}
@Test
public void testWriteFloat() throws IOException {
- this.fastJsonObjectOutput.writeFloat(1.88f);
+ this.jacksonObjectOutput.writeFloat(1.88f);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readFloat(), is(1.88f));
+ assertThat(this.jacksonObjectInput.readFloat(), is(1.88f));
}
@Test
public void testWriteDouble() throws IOException {
- this.fastJsonObjectOutput.writeDouble(1.66d);
+ this.jacksonObjectOutput.writeDouble(1.66d);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readDouble(), is(1.66d));
+ assertThat(this.jacksonObjectInput.readDouble(), is(1.66d));
}
@Test
public void testWriteBytes() throws IOException {
- this.fastJsonObjectOutput.writeBytes("hello".getBytes());
+ this.jacksonObjectOutput.writeBytes("hello".getBytes());
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readBytes(), is("hello".getBytes()));
+ assertThat(this.jacksonObjectInput.readBytes(), is("hello".getBytes()));
}
@Test
public void testWriteBytesWithSubLength() throws IOException {
- this.fastJsonObjectOutput.writeBytes("hello".getBytes(), 2, 2);
+ this.jacksonObjectOutput.writeBytes("hello".getBytes(), 2, 2);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readBytes(), is("ll".getBytes()));
+ assertThat(this.jacksonObjectInput.readBytes(), is("ll".getBytes()));
}
@Test
public void testWriteByte() throws IOException {
- this.fastJsonObjectOutput.writeByte((byte) 123);
+ this.jacksonObjectOutput.writeByte((byte) 123);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readByte(), is((byte) 123));
+ assertThat(this.jacksonObjectInput.readByte(), is((byte) 123));
}
@Test
public void testWriteObject() throws IOException, ClassNotFoundException {
Image image = new Image("http://dubbo.apache.org/img/dubbo_white.png", "logo", 300, 480, Image.Size.SMALL);
- this.fastJsonObjectOutput.writeObject(image);
+ this.jacksonObjectOutput.writeObject(image);
this.flushToInput();
- Image readObjectForImage = fastJsonObjectInput.readObject(Image.class);
+ Image readObjectForImage = jacksonObjectInput.readObject(Image.class);
assertThat(readObjectForImage, not(nullValue()));
assertThat(readObjectForImage, is(image));
}
private void flushToInput() throws IOException {
- this.fastJsonObjectOutput.flushBuffer();
+ this.jacksonObjectOutput.flushBuffer();
this.byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
- this.fastJsonObjectInput = new FastJsonObjectInput(byteArrayInputStream);
+ this.jacksonObjectInput = new JacksonObjectInput(byteArrayInputStream);
}
-}
\ No newline at end of file
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
similarity index 64%
rename from dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
rename to dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
index 624d9cc..4d13d19 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.serialize.fastjson;
+package org.apache.dubbo.common.serialize.jackson;
import org.apache.dubbo.common.serialize.ObjectInput;
import org.apache.dubbo.common.serialize.ObjectOutput;
-
+import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -31,33 +31,38 @@
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
-public class FastJsonSerializationTest {
- private FastJsonSerialization fastJsonSerialization;
+/**
+ * {@link JacksonSerialization} Unit Test
+ */
+public class JacksonSerializationTest {
+
+ private JacksonSerialization jacksonSerialization;
@BeforeEach
public void setUp() {
- this.fastJsonSerialization = new FastJsonSerialization();
- }
-
- @Test
- public void testContentType() {
- assertThat(fastJsonSerialization.getContentType(), is("text/json"));
+ this.jacksonSerialization = new JacksonSerialization();
}
@Test
public void testContentTypeId() {
- assertThat(fastJsonSerialization.getContentTypeId(), is((byte) 6));
+ MatcherAssert.assertThat(jacksonSerialization.getContentTypeId(), is((byte) 18));
+ }
+
+ @Test
+ public void testContentType() {
+ MatcherAssert.assertThat(jacksonSerialization.getContentType(), is("application/json"));
}
@Test
public void testObjectOutput() throws IOException {
- ObjectOutput objectOutput = fastJsonSerialization.serialize(null, mock(OutputStream.class));
- assertThat(objectOutput, Matchers.<ObjectOutput>instanceOf(FastJsonObjectOutput.class));
+ ObjectOutput objectOutput = jacksonSerialization.serialize(null, mock(OutputStream.class));
+ assertThat(objectOutput, Matchers.instanceOf(JacksonObjectOutput.class));
}
@Test
public void testObjectInput() throws IOException {
- ObjectInput objectInput = fastJsonSerialization.deserialize(null, mock(InputStream.class));
- assertThat(objectInput, Matchers.<ObjectInput>instanceOf(FastJsonObjectInput.class));
+ ObjectInput objectInput = jacksonSerialization.deserialize(null, mock(InputStream.class));
+ assertThat(objectInput, Matchers.instanceOf(JacksonObjectInput.class));
}
+
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Organization.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Organization.java
index 52aff89..b15cd38 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Organization.java
@@ -14,24 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.common.serialize.jackson;
-import org.apache.dubbo.rpc.Invoker;
+public class Organization<T> {
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+ private T data;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ public T getData() {
+ return data;
}
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ public void setData(T data) {
+ this.data = data;
}
}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Person.java b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Person.java
new file mode 100644
index 0000000..33b3b8e
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/src/test/java/org/apache/dubbo/common/serialize/jackson/Person.java
@@ -0,0 +1,95 @@
+/*
+ * 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.serialize.jackson;
+
+import java.util.Arrays;
+
+public class Person {
+ byte oneByte = 123;
+ private String name = "name1";
+ private int age = 11;
+
+ private String[] value = {"value1", "value2"};
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public byte getOneByte() {
+ return oneByte;
+ }
+
+ public void setOneByte(byte b) {
+ this.oneByte = b;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
+ public String[] getValue() {
+ return value;
+ }
+
+ public void setValue(String[] value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("Person name(%s) age(%d) byte(%s) [value=%s]", name, age, oneByte, Arrays.toString(value));
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + age;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + Arrays.hashCode(value);
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Person other = (Person) obj;
+ if (age != other.age)
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (!Arrays.equals(value, other.value))
+ return false;
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml
index 2377877..fb887df 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml
@@ -27,7 +27,7 @@
<artifactId>dubbo-serialization-kryo</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The kryo serialization module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java b/dubbo-serialization-extensions/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java
index 6bc7387..648557a 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/optimized/KryoObjectInput2.java
@@ -146,7 +146,7 @@
}
@Override
- public Object readEvent() throws IOException, ClassNotFoundException {
+ public String readEvent() throws IOException, ClassNotFoundException {
try {
return kryo.readObjectOrNull(input, String.class);
} catch (KryoException e) {
diff --git a/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml
index a8520c8..960ba07 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml
@@ -25,7 +25,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>dubbo-serialization-msgpack</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The Msgpack serialization implement for dubbo</description>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml
index 5134ccb..0a1157e 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>dubbo-serialization-native-hession</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<description>The native-hession serialization module of dubbo project</description>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml
index 86000be..438132c 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml
@@ -26,16 +26,24 @@
<artifactId>dubbo-serialization-protobuf</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The protobuf serialization module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
<dubbo.compiler.version>0.0.1-SNAPSHOT</dubbo.compiler.version>
+ <dubbo.version>2.7.23</dubbo.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-serialization-api</artifactId>
+ <version>2.7.23</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <version>2.7.23</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufJsonObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufJsonObjectInput.java
index 5f5da17..d910717 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufJsonObjectInput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufJsonObjectInput.java
@@ -149,7 +149,7 @@
}
@Override
- public Object readEvent() throws IOException, ClassNotFoundException {
+ public String readEvent() throws IOException, ClassNotFoundException {
String eventData = readUTF();
if (eventData.equals(MOCK_HEARTBEAT_EVENT)) {
eventData = HEARTBEAT_EVENT;
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java
index e1a851d..a22b5e4 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/GenericProtobufObjectInput.java
@@ -124,7 +124,7 @@
}
@Override
- public Object readEvent() throws IOException {
+ public String readEvent() throws IOException {
String eventData = readUTF();
if (eventData.equals(MOCK_HEARTBEAT_EVENT)) {
eventData = HEARTBEAT_EVENT;
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml
index 5518f87..4fc39f8 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml
@@ -28,7 +28,7 @@
<artifactId>dubbo-serialization-protostuff</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<description>The protostuff serialization module of dubbo project</description>
<properties>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/delegate/ServiceConfigURLDelegate.java b/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/delegate/ServiceConfigURLDelegate.java
new file mode 100644
index 0000000..6ea8b3b
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/delegate/ServiceConfigURLDelegate.java
@@ -0,0 +1,57 @@
+/*
+ * 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.serialize.protostuff.delegate;
+
+import io.protostuff.Input;
+import io.protostuff.Output;
+import io.protostuff.Pipe;
+import io.protostuff.WireFormat;
+import io.protostuff.runtime.Delegate;
+
+import java.io.IOException;
+
+import org.apache.dubbo.common.url.component.ServiceConfigURL;
+
+/**
+ * Custom {@link org.apache.dubbo.common.url.component.ServiceConfigURL} delegate
+ */
+public class ServiceConfigURLDelegate implements Delegate<ServiceConfigURL> {
+ @Override
+ public WireFormat.FieldType getFieldType() {
+ return WireFormat.FieldType.STRING;
+ }
+
+ @Override
+ public ServiceConfigURL readFrom(Input input) throws IOException {
+ return (ServiceConfigURL) org.apache.dubbo.common.URL.valueOf(input.readString());
+ }
+
+ @Override
+ public void writeTo(Output output, int number, ServiceConfigURL value, boolean repeated) throws IOException {
+ output.writeString(number, value.toFullString(), repeated);
+ }
+
+ @Override
+ public void transfer(Pipe pipe, Input input, Output output, int number, boolean repeated) throws IOException {
+ output.writeString(number, input.readString(), repeated);
+ }
+
+ @Override
+ public Class<?> typeClass() {
+ return ServiceConfigURL.class;
+ }
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/utils/WrapperUtils.java b/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/utils/WrapperUtils.java
index 321ed0d..4cd3809 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/utils/WrapperUtils.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/utils/WrapperUtils.java
@@ -21,6 +21,7 @@
import org.apache.dubbo.common.serialize.protostuff.delegate.SqlDateDelegate;
import org.apache.dubbo.common.serialize.protostuff.delegate.TimeDelegate;
import org.apache.dubbo.common.serialize.protostuff.delegate.TimestampDelegate;
+import org.apache.dubbo.common.serialize.protostuff.delegate.ServiceConfigURLDelegate;
import io.protostuff.runtime.DefaultIdStrategy;
import io.protostuff.runtime.RuntimeEnv;
@@ -56,6 +57,7 @@
if (RuntimeEnv.ID_STRATEGY instanceof DefaultIdStrategy) {
((DefaultIdStrategy) RuntimeEnv.ID_STRATEGY).registerDelegate(new TimeDelegate());
((DefaultIdStrategy) RuntimeEnv.ID_STRATEGY).registerDelegate(new TimestampDelegate());
+ ((DefaultIdStrategy) RuntimeEnv.ID_STRATEGY).registerDelegate(new ServiceConfigURLDelegate());
((DefaultIdStrategy) RuntimeEnv.ID_STRATEGY).registerDelegate(new SqlDateDelegate());
}
@@ -87,6 +89,7 @@
WRAPPER_SET.add(Time.class);
WRAPPER_SET.add(Timestamp.class);
WRAPPER_SET.add(java.sql.Date.class);
+ WRAPPER_SET.add(org.apache.dubbo.common.url.component.ServiceConfigURL.class);
WRAPPER_SET.add(Wrapper.class);
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml
index d705f70..35412c4 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-protostuff</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>gson</artifactId>
@@ -47,8 +47,13 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-serialization-jackson</artifactId>
+ <version>${revision}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-protobuf</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>gson</artifactId>
@@ -59,22 +64,17 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-kryo</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-avro</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo.extensions</groupId>
- <artifactId>dubbo-serialization-fastjson</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-serialization-fst</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
index fabe08e..02afaea 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
@@ -68,7 +68,7 @@
protected URL url = new URL("protocol", "1.1.1.1", 1234);
protected ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- // ================ Primitive Type ================
+ // ================ Primitive Type ================
protected BigPerson bigPerson;
protected MediaContent mediaContent;
@@ -383,7 +383,7 @@
}
}
- // ================ Array Type ================
+ // ================ Array Type ================
<T> void assertObjectArray(T[] data, Class<T[]> clazz) throws Exception {
ObjectOutput objectOutput = serialization.serialize(url, byteArrayOutputStream);
@@ -762,7 +762,7 @@
assertObjectArrayWithType(new String[]{"1", "b"}, String[].class);
}
- // ================ Simple Type ================
+ // ================ Simple Type ================
@Test
public void test_IntegerArray() throws Exception {
@@ -979,7 +979,7 @@
}
}
- // ================ Complex Collection Type ================
+ // ================ Complex Collection Type ================
@Test
public void test_SPersonList() throws Exception {
@@ -1111,7 +1111,7 @@
}
- // abnormal case
+ // abnormal case
@Test
public void test_MediaContent_badStream() throws Exception {
@@ -1188,7 +1188,6 @@
// ================ final field test ================
@Test
- @Disabled
public void test_URL_mutable_withType() throws Exception {
URL data = URL.valueOf("dubbo://admin:hello1234@10.20.130.230:20880/context/path?version=1.0.0&application=morgan&noValue");
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
deleted file mode 100644
index af0868e..0000000
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.serialize.fastjson;
-
-import org.apache.dubbo.common.serialize.model.Organization;
-import org.apache.dubbo.common.serialize.model.Person;
-
-import com.alibaba.fastjson.JSONObject;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.StringReader;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class FastJsonObjectInputTest {
- private FastJsonObjectInput fastJsonObjectInput;
-
- @Test
- public void testReadBool() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new ByteArrayInputStream("true".getBytes()));
- boolean result = fastJsonObjectInput.readBool();
-
- assertThat(result, is(true));
-
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("false"));
- result = fastJsonObjectInput.readBool();
-
- assertThat(result, is(false));
- }
-
- @Test
- public void testReadByte() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new ByteArrayInputStream("123".getBytes()));
- Byte result = fastJsonObjectInput.readByte();
-
- assertThat(result, is(Byte.parseByte("123")));
- }
-
- @Test
- public void testReadBytes() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new ByteArrayInputStream("123456".getBytes()));
- byte[] result = fastJsonObjectInput.readBytes();
-
- assertThat(result, is("123456".getBytes()));
- }
-
- @Test
- public void testReadShort() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("1"));
- short result = fastJsonObjectInput.readShort();
-
- assertThat(result, is((short) 1));
- }
-
- @Test
- public void testReadInt() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("1"));
- Integer result = fastJsonObjectInput.readInt();
-
- assertThat(result, is(1));
- }
-
- @Test
- public void testReadDouble() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("1.88"));
- Double result = fastJsonObjectInput.readDouble();
-
- assertThat(result, is(1.88d));
- }
-
- @Test
- public void testReadLong() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("10"));
- Long result = fastJsonObjectInput.readLong();
-
- assertThat(result, is(10L));
- }
-
- @Test
- public void testReadFloat() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("1.66"));
- Float result = fastJsonObjectInput.readFloat();
-
- assertThat(result, is(1.66F));
- }
-
- @Test
- public void testReadUTF() throws IOException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("\"wording\""));
- String result = fastJsonObjectInput.readUTF();
-
- assertThat(result, is("wording"));
- }
-
- @Test
- public void testReadObject() throws IOException, ClassNotFoundException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
- Person result = fastJsonObjectInput.readObject(Person.class);
-
- assertThat(result, not(nullValue()));
- assertThat(result.getName(), is("John"));
- assertThat(result.getAge(), is(30));
- }
-
- @Test
- public void testEmptyLine() throws IOException, ClassNotFoundException {
- Assertions.assertThrows(EOFException.class, () -> {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader(""));
-
- fastJsonObjectInput.readObject();
- });
- }
-
- @Test
- public void testEmptySpace() throws IOException, ClassNotFoundException {
- Assertions.assertThrows(EOFException.class, () -> {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader(" "));
-
- fastJsonObjectInput.readObject();
- });
- }
-
- @Test
- public void testReadObjectWithoutClass() throws IOException, ClassNotFoundException {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
-
- JSONObject readObject = (JSONObject) fastJsonObjectInput.readObject();
-
- assertThat(readObject, not(nullValue()));
- assertThat(readObject.getString("name"), is("John"));
- assertThat(readObject.getInteger("age"), is(30));
- }
-
-
- @Test
- public void testReadObjectWithTowType() throws Exception {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));
-
- Method methodReturnType = getClass().getMethod("towLayer");
- Type type = methodReturnType.getGenericReturnType();
- List<Person> o = fastJsonObjectInput.readObject(List.class, type);
-
- assertTrue(o instanceof List);
- assertTrue(o.get(0) instanceof Person);
-
- assertThat(o.size(), is(2));
- assertThat(o.get(1).getName(), is("Born"));
- }
-
- @Test
- public void testReadObjectWithThreeType() throws Exception {
- fastJsonObjectInput = new FastJsonObjectInput(new StringReader("{\"data\":[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]}"));
-
- Method methodReturnType = getClass().getMethod("threeLayer");
- Type type = methodReturnType.getGenericReturnType();
- Organization<List<Person>> o = fastJsonObjectInput.readObject(Organization.class, type);
-
- assertTrue(o instanceof Organization);
- assertTrue(o.getData() instanceof List);
- assertTrue(o.getData().get(0) instanceof Person);
-
- assertThat(o.getData().size(), is(2));
- assertThat(o.getData().get(1).getName(), is("Born"));
- }
-
- public List<Person> towLayer() {
- return null;
- }
-
- public Organization<List<Person>> threeLayer() {
- return null;
- }
-}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java
new file mode 100644
index 0000000..bb6912d
--- /dev/null
+++ b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectInputTest.java
@@ -0,0 +1,202 @@
+/*
+ * 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.serialize.jackson;
+
+import org.apache.dubbo.common.serialize.model.Organization;
+import org.apache.dubbo.common.serialize.model.Person;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * {@link JacksonObjectInput} Unit Test
+ */
+public class JacksonObjectInputTest {
+
+ private JacksonObjectInput jacksonObjectInput;
+
+ @Test
+ public void testReadBool() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("true".getBytes()));
+ boolean result = jacksonObjectInput.readBool();
+
+ assertThat(result, is(true));
+
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("false"));
+ result = jacksonObjectInput.readBool();
+
+ assertThat(result, is(false));
+ }
+
+ @Test
+ public void testReadByte() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("123".getBytes()));
+ Byte result = jacksonObjectInput.readByte();
+
+ assertThat(result, is(Byte.parseByte("123")));
+ }
+
+ @Test
+ public void testReadBytes() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new ByteArrayInputStream("123456".getBytes()));
+ byte[] result = jacksonObjectInput.readBytes();
+
+ assertThat(result, is("123456".getBytes()));
+ }
+
+ @Test
+ public void testReadShort() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1"));
+ short result = jacksonObjectInput.readShort();
+
+ assertThat(result, is((short) 1));
+ }
+
+ @Test
+ public void testReadInt() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1"));
+ Integer result = jacksonObjectInput.readInt();
+
+ assertThat(result, is(1));
+ }
+
+ @Test
+ public void testReadDouble() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1.88"));
+ Double result = jacksonObjectInput.readDouble();
+
+ assertThat(result, is(1.88d));
+ }
+
+ @Test
+ public void testReadLong() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("10"));
+ Long result = jacksonObjectInput.readLong();
+
+ assertThat(result, is(10L));
+ }
+
+ @Test
+ public void testReadFloat() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("1.66"));
+ Float result = jacksonObjectInput.readFloat();
+
+ assertThat(result, is(1.66F));
+ }
+
+ @Test
+ public void testReadUTF() throws IOException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("\"wording\""));
+ String result = jacksonObjectInput.readUTF();
+
+ assertThat(result, is("wording"));
+ }
+
+ @Test
+ public void testReadObject() throws IOException, ClassNotFoundException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
+ Person result = jacksonObjectInput.readObject(Person.class);
+
+ assertThat(result, not(nullValue()));
+ assertThat(result.getName(), is("John"));
+ assertThat(result.getAge(), is(30));
+ }
+
+ @Test
+ public void testEmptyLine() throws IOException, ClassNotFoundException {
+ Assertions.assertThrows(EOFException.class, () -> {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader(""));
+
+ jacksonObjectInput.readObject();
+ });
+ }
+
+ @Test
+ public void testEmptySpace() throws IOException, ClassNotFoundException {
+ Assertions.assertThrows(EOFException.class, () -> {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader(" "));
+
+ jacksonObjectInput.readObject();
+ });
+ }
+
+ @Test
+ public void testReadObjectWithoutClass() throws IOException, ClassNotFoundException, NoSuchFieldException {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{ \"name\":\"John\", \"age\":30 }"));
+
+ Map map = jacksonObjectInput.readObject(Map.class);
+
+ assertThat(map, not(nullValue()));
+ assertThat(map.get("name"), is("John"));
+ assertThat(map.get("age"), is(30));
+ }
+
+
+ @Test
+ public void testReadObjectWithTowType() throws Exception {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));
+
+ Method methodReturnType = getClass().getMethod("towLayer");
+ Type type = methodReturnType.getGenericReturnType();
+ List<Person> o = jacksonObjectInput.readObject(List.class, type);
+
+ assertTrue(o instanceof List);
+ assertTrue(o.get(0) instanceof Person);
+
+ assertThat(o.size(), is(2));
+ assertThat(o.get(1).getName(), is("Born"));
+ }
+
+ @Test
+ public void testReadObjectWithThreeType() throws Exception {
+ jacksonObjectInput = new JacksonObjectInput(new StringReader("{\"data\":[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]}"));
+
+ Method methodReturnType = getClass().getMethod("threeLayer");
+ Type type = methodReturnType.getGenericReturnType();
+ Organization<List<Person>> o = jacksonObjectInput.readObject(Organization.class, type);
+
+ assertTrue(o instanceof Organization);
+ assertTrue(o.getData() instanceof List);
+ assertTrue(o.getData().get(0) instanceof Person);
+
+ assertThat(o.getData().size(), is(2));
+ assertThat(o.getData().get(1).getName(), is("Born"));
+ }
+
+ public List<Person> towLayer() {
+ return null;
+ }
+
+ public Organization<List<Person>> threeLayer() {
+ return null;
+ }
+
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
similarity index 61%
rename from dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
rename to dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
index 48fb1ce..52f5f01 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonObjectOutputTest.java
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.serialize.fastjson;
+package org.apache.dubbo.common.serialize.jackson;
import org.apache.dubbo.common.serialize.model.media.Image;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -30,113 +29,117 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-public class FastJsonObjectOutputTest {
- private FastJsonObjectOutput fastJsonObjectOutput;
- private FastJsonObjectInput fastJsonObjectInput;
+/**
+ * {@link JacksonObjectOutput} Unit Test
+ */
+public class JacksonObjectOutputTest {
+
+ private JacksonObjectOutput jacksonObjectOutput;
+ private JacksonObjectInput jacksonObjectInput;
private ByteArrayOutputStream byteArrayOutputStream;
private ByteArrayInputStream byteArrayInputStream;
@BeforeEach
public void setUp() throws Exception {
this.byteArrayOutputStream = new ByteArrayOutputStream();
- this.fastJsonObjectOutput = new FastJsonObjectOutput(byteArrayOutputStream);
+ this.jacksonObjectOutput = new JacksonObjectOutput(byteArrayOutputStream);
}
@Test
public void testWriteBool() throws IOException {
- this.fastJsonObjectOutput.writeBool(true);
+ this.jacksonObjectOutput.writeBool(true);
this.flushToInput();
- assertThat(fastJsonObjectInput.readBool(), is(true));
+ assertThat(jacksonObjectInput.readBool(), is(true));
}
@Test
public void testWriteShort() throws IOException {
- this.fastJsonObjectOutput.writeShort((short) 2);
+ this.jacksonObjectOutput.writeShort((short) 2);
this.flushToInput();
- assertThat(fastJsonObjectInput.readShort(), is((short) 2));
+ assertThat(jacksonObjectInput.readShort(), is((short) 2));
}
@Test
public void testWriteInt() throws IOException {
- this.fastJsonObjectOutput.writeInt(1);
+ this.jacksonObjectOutput.writeInt(1);
this.flushToInput();
- assertThat(fastJsonObjectInput.readInt(), is(1));
+ assertThat(jacksonObjectInput.readInt(), is(1));
}
@Test
public void testWriteLong() throws IOException {
- this.fastJsonObjectOutput.writeLong(1000L);
+ this.jacksonObjectOutput.writeLong(1000L);
this.flushToInput();
- assertThat(fastJsonObjectInput.readLong(), is(1000L));
+ assertThat(jacksonObjectInput.readLong(), is(1000L));
}
@Test
public void testWriteUTF() throws IOException {
- this.fastJsonObjectOutput.writeUTF("Pace Hasîtî 和平 Мир");
+ this.jacksonObjectOutput.writeUTF("Pace Hasîtî 和平 Мир");
this.flushToInput();
- assertThat(fastJsonObjectInput.readUTF(), is("Pace Hasîtî 和平 Мир"));
+ assertThat(jacksonObjectInput.readUTF(), is("Pace Hasîtî 和平 Мир"));
}
@Test
public void testWriteFloat() throws IOException {
- this.fastJsonObjectOutput.writeFloat(1.88f);
+ this.jacksonObjectOutput.writeFloat(1.88f);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readFloat(), is(1.88f));
+ assertThat(this.jacksonObjectInput.readFloat(), is(1.88f));
}
@Test
public void testWriteDouble() throws IOException {
- this.fastJsonObjectOutput.writeDouble(1.66d);
+ this.jacksonObjectOutput.writeDouble(1.66d);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readDouble(), is(1.66d));
+ assertThat(this.jacksonObjectInput.readDouble(), is(1.66d));
}
@Test
public void testWriteBytes() throws IOException {
- this.fastJsonObjectOutput.writeBytes("hello".getBytes());
+ this.jacksonObjectOutput.writeBytes("hello".getBytes());
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readBytes(), is("hello".getBytes()));
+ assertThat(this.jacksonObjectInput.readBytes(), is("hello".getBytes()));
}
@Test
public void testWriteBytesWithSubLength() throws IOException {
- this.fastJsonObjectOutput.writeBytes("hello".getBytes(), 2, 2);
+ this.jacksonObjectOutput.writeBytes("hello".getBytes(), 2, 2);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readBytes(), is("ll".getBytes()));
+ assertThat(this.jacksonObjectInput.readBytes(), is("ll".getBytes()));
}
@Test
public void testWriteByte() throws IOException {
- this.fastJsonObjectOutput.writeByte((byte) 123);
+ this.jacksonObjectOutput.writeByte((byte) 123);
this.flushToInput();
- assertThat(this.fastJsonObjectInput.readByte(), is((byte) 123));
+ assertThat(this.jacksonObjectInput.readByte(), is((byte) 123));
}
@Test
public void testWriteObject() throws IOException, ClassNotFoundException {
Image image = new Image("http://dubbo.apache.org/img/dubbo_white.png", "logo", 300, 480, Image.Size.SMALL);
- this.fastJsonObjectOutput.writeObject(image);
+ this.jacksonObjectOutput.writeObject(image);
this.flushToInput();
- Image readObjectForImage = fastJsonObjectInput.readObject(Image.class);
+ Image readObjectForImage = jacksonObjectInput.readObject(Image.class);
assertThat(readObjectForImage, not(nullValue()));
assertThat(readObjectForImage, is(image));
}
private void flushToInput() throws IOException {
- this.fastJsonObjectOutput.flushBuffer();
+ this.jacksonObjectOutput.flushBuffer();
this.byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
- this.fastJsonObjectInput = new FastJsonObjectInput(byteArrayInputStream);
+ this.jacksonObjectInput = new JacksonObjectInput(byteArrayInputStream);
}
-}
\ No newline at end of file
+}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
similarity index 64%
copy from dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
copy to dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
index 624d9cc..4d13d19 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java
+++ b/dubbo-serialization-extensions/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/jackson/JacksonSerializationTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.serialize.fastjson;
+package org.apache.dubbo.common.serialize.jackson;
import org.apache.dubbo.common.serialize.ObjectInput;
import org.apache.dubbo.common.serialize.ObjectOutput;
-
+import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -31,33 +31,38 @@
import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
-public class FastJsonSerializationTest {
- private FastJsonSerialization fastJsonSerialization;
+/**
+ * {@link JacksonSerialization} Unit Test
+ */
+public class JacksonSerializationTest {
+
+ private JacksonSerialization jacksonSerialization;
@BeforeEach
public void setUp() {
- this.fastJsonSerialization = new FastJsonSerialization();
- }
-
- @Test
- public void testContentType() {
- assertThat(fastJsonSerialization.getContentType(), is("text/json"));
+ this.jacksonSerialization = new JacksonSerialization();
}
@Test
public void testContentTypeId() {
- assertThat(fastJsonSerialization.getContentTypeId(), is((byte) 6));
+ MatcherAssert.assertThat(jacksonSerialization.getContentTypeId(), is((byte) 18));
+ }
+
+ @Test
+ public void testContentType() {
+ MatcherAssert.assertThat(jacksonSerialization.getContentType(), is("application/json"));
}
@Test
public void testObjectOutput() throws IOException {
- ObjectOutput objectOutput = fastJsonSerialization.serialize(null, mock(OutputStream.class));
- assertThat(objectOutput, Matchers.<ObjectOutput>instanceOf(FastJsonObjectOutput.class));
+ ObjectOutput objectOutput = jacksonSerialization.serialize(null, mock(OutputStream.class));
+ assertThat(objectOutput, Matchers.instanceOf(JacksonObjectOutput.class));
}
@Test
public void testObjectInput() throws IOException {
- ObjectInput objectInput = fastJsonSerialization.deserialize(null, mock(InputStream.class));
- assertThat(objectInput, Matchers.<ObjectInput>instanceOf(FastJsonObjectInput.class));
+ ObjectInput objectInput = jacksonSerialization.deserialize(null, mock(InputStream.class));
+ assertThat(objectInput, Matchers.instanceOf(JacksonObjectInput.class));
}
+
}
diff --git a/dubbo-serialization-extensions/pom.xml b/dubbo-serialization-extensions/pom.xml
index 2367e62..442cd91 100644
--- a/dubbo-serialization-extensions/pom.xml
+++ b/dubbo-serialization-extensions/pom.xml
@@ -28,6 +28,9 @@
<version>${revision}</version>
<packaging>pom</packaging>
<artifactId>dubbo-serialization-extensions</artifactId>
+ <properties>
+ <dubbo.version>3.2.7</dubbo.version>
+ </properties>
<modules>
<module>dubbo-serialization-protostuff</module>
@@ -36,9 +39,12 @@
<module>dubbo-serialization-gson</module>
<module>dubbo-serialization-fst</module>
<module>dubbo-serialization-fastjson</module>
+ <module>dubbo-serialization-fury</module>
<module>dubbo-serialization-avro</module>
<module>dubbo-serialization-msgpack</module>
<module>dubbo-serialization-native-hession</module>
+ <module>dubbo-serialization-jackson</module>
<module>dubbo-serialization-test</module>
+ <module>dubbo-serialization-common</module>
</modules>
</project>
diff --git a/dubbo-tag-extensions/README.md b/dubbo-tag-extensions/README.md
new file mode 100644
index 0000000..8051960
--- /dev/null
+++ b/dubbo-tag-extensions/README.md
@@ -0,0 +1,65 @@
+# dubbo tag subnets
+
+[中文](./README.md)
+
+dubbo-tag-subnets will generate a tag by subnets, then consumer will prefer rpc provider in the same subnets.
+
+- example1: there are 3 zone(cn-shanghai-a/cn-shanghai-b/cn-shanghai-c) in aliyun-VPC, service rpc in the same zone
+```
+cn|shanghai|a:
+- 172.37.66.0/24 #zone=cn-shanghai-a
+cn|shanghai|b:
+- 172.37.68.0/24 #zone=cn-shanghai-b
+cn|shanghai|c:
+- 172.37.69.0/24 #zone=cn-shanghai-c
+```
+- example2: there is a big zone and there are 3 cells in it , service rpc in the same cell
+```
+cn|shanghai|a|cell-1:
+- 172.31.35.0/24 #zone=cn-shanghai-a
+cn|shanghai|a|cell-2:
+- 172.31.36.0/24 #zone=cn-shanghai-a
+cn|shanghai|a|cell-3:
+- 172.31.37.0/24 #zone=cn-shanghai-a
+```
+- example3: there 3 seperate zones(a/b/c) and a common zone(d), consumer prefer rpc in near zones(a/b/c), and then rpc common zone(d).
+```
+cn|shanghai|a:
+- 172.37.66.0/24 #zone=cn-shanghai-a
+cn|hangzhou|b:
+- 172.37.67.0/24 #zone=cn-hangzhou-b
+cn|shenzhen|c:
+- 172.37.68.0/24 #zone=cn-shenzhen-c
+"":
+- 172.37.69.0/24 #zone=cn-shanghai-d, as common service
+```
+
+## How to use?
+
+1. import dependency
+
+```
+<dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-tag-subnets</artifactId>
+ <version>${dubbo-tag-subnets-version}</version>
+</dependency>
+
+```
+
+2. set tag-subnets in config-center path=/dubbo/config/tag.subnets, zookeeper example:
+```
+echo 'cn|cn-northwest|cell-1:
+- 172.37.66.0/24 #cn-northwest-1a
+cn|cn-north|cell-2:
+- 172.37.67.0/24 #cn-northwest-1b
+cn|cn-north:
+- 192.168.1.0/24 #cn-north-1a
+' | tee tag.subnets.yaml
+./zkCli.sh create /dubbo/config/tag.subnets ""
+./zkCli.sh set /dubbo/config/tag.subnets "$(cat tag.subnets.yaml)"
+./zkCli.sh get /dubbo/config/tag.subnets
+```
+
+
+3. start your provider, you will see tag generate by subnets in registry.
diff --git a/dubbo-tag-extensions/README_zh.md b/dubbo-tag-extensions/README_zh.md
new file mode 100644
index 0000000..e3c31db
--- /dev/null
+++ b/dubbo-tag-extensions/README_zh.md
@@ -0,0 +1,65 @@
+# dubbo tag subnets
+
+[中文](./README.md)
+
+dubbo-tag-subnets 会根据子网生成tag, 然后同子网内的tag相同, 服务调用会优先发生在同子网中.
+
+- 示例1: 在阿里云VPC, 有三个可用区(cn-shanghai-a/cn-shanghai-b/cn-shanghai-c) , 服务在同一可用区中调用
+```
+cn|shanghai|a:
+- 172.37.66.0/24 #zone=cn-shanghai-a
+cn|shanghai|b:
+- 172.37.68.0/24 #zone=cn-shanghai-b
+cn|shanghai|c:
+- 172.37.69.0/24 #zone=cn-shanghai-c
+```
+- 示例2: 有三个单元在一个大的可用区cn-shanghai-a , 服务在同单元中调用
+```
+cn|shanghai|a|cell-1:
+- 172.31.35.0/24 #zone=cn-shanghai-a
+cn|shanghai|a|cell-2:
+- 172.31.36.0/24 #zone=cn-shanghai-a
+cn|shanghai|a|cell-3:
+- 172.31.37.0/24 #zone=cn-shanghai-a
+```
+- 示例3: 有三个"独立的可用区"(a/b/c) ,有一个"公共的可用区"(d), 服务消费方优先在自己"独立可用区"中调用, 然后调用"公共的可用区".
+```
+cn|shanghai|a:
+- 172.37.66.0/24 #zone=cn-shanghai-a
+cn|hangzhou|b:
+- 172.37.67.0/24 #zone=cn-hangzhou-b
+cn|shenzhen|c:
+- 172.37.68.0/24 #zone=cn-shenzhen-c
+"":
+- 172.37.69.0/24 #zone=cn-shanghai-d, as common service
+```
+
+## 如何使用?
+
+1. 引入依赖
+
+```
+<dependency>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>dubbo-tag-subnets</artifactId>
+ <version>${dubbo-tag-subnets-version}</version>
+</dependency>
+
+```
+
+2. 在配置中心设置 tag-subnets ,路径为/dubbo/config/tag.subnets, zookeeper 配置示例:
+```
+echo 'cn|cn-northwest|cell-1:
+- 172.37.66.0/24 #cn-northwest-1a
+cn|cn-north|cell-2:
+- 172.37.67.0/24 #cn-northwest-1b
+cn|cn-north:
+- 192.168.1.0/24 #cn-north-1a
+' | tee tag.subnets.yaml
+./zkCli.sh create /dubbo/config/tag.subnets ""
+./zkCli.sh set /dubbo/config/tag.subnets "$(cat tag.subnets.yaml)"
+./zkCli.sh get /dubbo/config/tag.subnets
+```
+
+
+3. 启动服务提供方, 您将在注册中心看到根据子网生成的服务标签.
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml b/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml
new file mode 100644
index 0000000..99b6b31
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml
@@ -0,0 +1,63 @@
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dubbo-tag-extensions</artifactId>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <version>1.0.2-SNAPSHOT</version>
+ <artifactId>dubbo-tag-subnets</artifactId>
+ <name>${project.artifactId}</name>
+ <description>The tag subnets module of dubbo project</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-config-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit_jupiter_version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/config/SubnetTagConfigPostProcessor.java b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/config/SubnetTagConfigPostProcessor.java
new file mode 100644
index 0000000..003b7e6
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/config/SubnetTagConfigPostProcessor.java
@@ -0,0 +1,61 @@
+/*
+ * 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.tag.subnets.config;
+
+import org.apache.dubbo.common.config.ConfigurationUtils;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.config.ConfigPostProcessor;
+import org.apache.dubbo.config.ServiceConfig;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ScopeModelAware;
+import org.apache.dubbo.tag.subnets.utils.SubnetUtil;
+
+import static org.apache.dubbo.common.utils.NetUtils.getLocalHost;
+
+
+@Activate
+public class SubnetTagConfigPostProcessor implements ConfigPostProcessor, ScopeModelAware {
+ private ApplicationModel applicationModel;
+
+ @Override
+ public void setApplicationModel(ApplicationModel applicationModel) {
+ this.applicationModel = applicationModel;
+ }
+
+ @Override
+ public void postProcessServiceConfig(ServiceConfig serviceConfig) {
+ if (StringUtils.isNotBlank(serviceConfig.getTag())) {
+ return;
+ }
+ if (SubnetUtil.isEmpty()) {
+ String content = ConfigurationUtils.getCachedDynamicProperty(applicationModel.getDefaultModule(), SubnetUtil.TAG_SUBNETS_KEY, null);
+ SubnetUtil.init(content);
+ }
+ if (SubnetUtil.isEmpty()) {
+ return;
+ }
+ String providerHost = serviceConfig.getProvider().getHost();
+ if (StringUtils.isBlank(providerHost)) {
+ providerHost = getLocalHost();
+ }
+ String tagLevel = SubnetUtil.getTagLevelByHost(providerHost);
+ serviceConfig.setTag(tagLevel);
+ }
+
+
+}
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/utils/SubnetUtil.java b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/utils/SubnetUtil.java
new file mode 100644
index 0000000..7d74b79
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/java/org/apache/dubbo/tag/subnets/utils/SubnetUtil.java
@@ -0,0 +1,84 @@
+/*
+ * 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.tag.subnets.utils;
+
+import org.apache.dubbo.common.utils.StringUtils;
+
+import org.apache.commons.net.util.SubnetUtils;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+
+public class SubnetUtil {
+ public static final String TAG_SUBNETS_KEY = "tag.subnets";
+
+ private static final Map<String, List<SubnetUtils.SubnetInfo>> cellSubnets = new ConcurrentHashMap<>();
+ private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+ private static final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
+ private static final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
+
+ public static boolean isEmpty() {
+ try {
+ readLock.lock();
+ return cellSubnets.isEmpty();
+ } finally {
+ readLock.unlock();
+ }
+ }
+
+ public static void init(String content) {
+ if (StringUtils.isBlank(content)) {
+ return;
+ }
+ try {
+ writeLock.lock();
+ Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
+ cellSubnets.clear();
+ Map<String, List<String>> tmpPathSubnet = (Map<String, List<String>>) yaml.load(content);
+ for (Map.Entry<String, List<String>> entry : tmpPathSubnet.entrySet()) {
+ String path = entry.getKey();
+ List<SubnetUtils.SubnetInfo> subnetInfos = cellSubnets.computeIfAbsent(path, f -> new ArrayList<SubnetUtils.SubnetInfo>());
+ entry.getValue().forEach(e -> subnetInfos.add(new SubnetUtils(e.trim()).getInfo()));
+ }
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ public static String getTagLevelByHost(String host) {
+ try {
+ readLock.lock();
+ for (Map.Entry<String, List<SubnetUtils.SubnetInfo>> entry : cellSubnets.entrySet()) {
+ for (SubnetUtils.SubnetInfo subnetInfo : entry.getValue()) {
+ if (subnetInfo.isInRange(host)) {
+ return entry.getKey();
+ }
+ }
+ }
+ return null;
+ } finally {
+ readLock.unlock();
+ }
+ }
+}
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/src/main/resources/META-INF/dubbo/org.apache.dubbo.config.ConfigPostProcessor b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/resources/META-INF/dubbo/org.apache.dubbo.config.ConfigPostProcessor
new file mode 100644
index 0000000..f37740a
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/src/main/resources/META-INF/dubbo/org.apache.dubbo.config.ConfigPostProcessor
@@ -0,0 +1 @@
+tag-subnets=org.apache.dubbo.tag.subnets.config.SubnetTagConfigPostProcessor
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/src/test/java/org/apache/dubbo/tag/subnets/utils/SubnetUtilTest.java b/dubbo-tag-extensions/dubbo-tag-subnets/src/test/java/org/apache/dubbo/tag/subnets/utils/SubnetUtilTest.java
new file mode 100644
index 0000000..0446d36
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/src/test/java/org/apache/dubbo/tag/subnets/utils/SubnetUtilTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.tag.subnets.utils;
+
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class SubnetUtilTest {
+ @Test
+ public void testLoadContent() {
+ String content = "" +//
+ "cn|cn-northwest|cell-1: \n" +
+ "- 172.37.66.0/24 #cn-northwest-1a\n" +
+ "cn|cn-north|cell-2: \n" +
+ "- 172.37.67.0/24 #cn-northwest-1b\n" +
+ "\"\": \n" +
+ "- 172.37.33.0/24 #cn-north-1a\n";
+ SubnetUtil.init(content);
+ Assertions.assertEquals(SubnetUtil.getTagLevelByHost("172.37.66.1"),"cn|cn-northwest|cell-1");
+ Assertions.assertEquals(SubnetUtil.getTagLevelByHost("172.37.33.1"),"");
+ }
+}
diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/src/test/resources/log4j.properties b/dubbo-tag-extensions/dubbo-tag-subnets/src/test/resources/log4j.properties
new file mode 100644
index 0000000..8de4c4f
--- /dev/null
+++ b/dubbo-tag-extensions/dubbo-tag-subnets/src/test/resources/log4j.properties
@@ -0,0 +1,7 @@
+###set log levels###
+log4j.rootLogger=info, stdout
+###output to the console###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n
diff --git a/dubbo-tag-extensions/pom.xml b/dubbo-tag-extensions/pom.xml
new file mode 100644
index 0000000..1c62919
--- /dev/null
+++ b/dubbo-tag-extensions/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <version>${revision}</version>
+ <packaging>pom</packaging>
+ <artifactId>dubbo-tag-extensions</artifactId>
+
+ <modules>
+ <module>dubbo-tag-subnets</module>
+ </modules>
+</project>
diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml
new file mode 100644
index 0000000..def5fbb
--- /dev/null
+++ b/dubbo-xds/pom.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dubbo.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dubbo-xds</artifactId>
+ <name>${project.artifactId}</name>
+ <description>The xDS Integration</description>
+ <properties>
+ <skip_maven_deploy>false</skip_maven_deploy>
+ <protobuf-java_version>3.25.1</protobuf-java_version>
+ <grpc_version>1.54.0</grpc_version>
+ <maven_os_plugin_version>1.7.1</maven_os_plugin_version>
+ <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>3.2.9</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-common</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty-shaded</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.envoyproxy.controlplane</groupId>
+ <artifactId>api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${maven_protobuf_plugin_version}</version>
+ <configuration>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf-java_version}:exe:${os.detected.classifier}
+ </protocArtifact>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc_version}:exe:${os.detected.classifier}
+ </pluginArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>compile-custom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>${maven_os_plugin_version}</version>
+ </extension>
+ </extensions>
+ </build>
+
+</project>
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsCertificateSigner.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsCertificateSigner.java
new file mode 100644
index 0000000..1ef1a8b
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsCertificateSigner.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.registry.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Adaptive;
+import org.apache.dubbo.common.extension.SPI;
+
+@SPI
+public interface XdsCertificateSigner {
+
+ @Adaptive(value = "signer")
+ CertPair GenerateCert(URL url);
+
+ class CertPair {
+ private final String privateKey;
+ private final String publicKey;
+ private final long createTime;
+ private final long expireTime;
+
+ public CertPair(String privateKey, String publicKey, long createTime, long expireTime) {
+ this.privateKey = privateKey;
+ this.publicKey = publicKey;
+ this.createTime = createTime;
+ this.expireTime = expireTime;
+ }
+
+ public String getPrivateKey() {
+ return privateKey;
+ }
+
+ public String getPublicKey() {
+ return publicKey;
+ }
+
+ public long getCreateTime() {
+ return createTime;
+ }
+
+ public boolean isExpire() {
+ return System.currentTimeMillis() < expireTime;
+ }
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsEnv.java
similarity index 61%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsEnv.java
index 52aff89..c09ea80 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsEnv.java
@@ -14,24 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.xds;
-import org.apache.dubbo.rpc.Invoker;
+public interface XdsEnv {
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+ String getCluster();
}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsInitializationException.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsInitializationException.java
index 52aff89..9a9b9a3 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsInitializationException.java
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.xds;
-import org.apache.dubbo.rpc.Invoker;
+public final class XdsInitializationException extends Exception {
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ public XdsInitializationException(String message) {
+ super(message);
}
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ public XdsInitializationException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistry.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistry.java
new file mode 100644
index 0000000..30e005f
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistry.java
@@ -0,0 +1,50 @@
+/*
+ * 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.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.NotifyListener;
+import org.apache.dubbo.registry.support.FailbackRegistry;
+
+/**
+ * Empty implements for xDS <br/>
+ * xDS only support `Service Discovery` mode register <br/>
+ * Used to compat past version like 2.6.x, 2.7.x with interface level register <br/>
+ * {@link XdsServiceDiscovery} is the real implementation of xDS
+ */
+public class XdsRegistry extends FailbackRegistry {
+ public XdsRegistry(URL url) {
+ super(url);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public void doRegister(URL url) {}
+
+ @Override
+ public void doUnregister(URL url) {}
+
+ @Override
+ public void doSubscribe(URL url, NotifyListener listener) {}
+
+ @Override
+ public void doUnsubscribe(URL url, NotifyListener listener) {}
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistryFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistryFactory.java
index 52aff89..8fa130b 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistryFactory.java
@@ -14,24 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.xds;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.registry.Registry;
+import org.apache.dubbo.registry.support.AbstractRegistryFactory;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+public class XdsRegistryFactory extends AbstractRegistryFactory {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ @Override
+ protected String createRegistryCacheKey(URL url) {
+ return url.toFullString();
}
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ protected Registry createRegistry(URL url) {
+ return new XdsRegistry(url);
}
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscovery.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscovery.java
new file mode 100644
index 0000000..3385ff9
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscovery.java
@@ -0,0 +1,117 @@
+/*
+ * 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.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.client.DefaultServiceInstance;
+import org.apache.dubbo.registry.client.ReflectionBasedServiceDiscovery;
+import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener;
+import org.apache.dubbo.registry.xds.util.PilotExchanger;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ScopeModelUtil;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_INITIALIZE_XDS;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_PARSING_XDS;
+
+public class XdsServiceDiscovery extends ReflectionBasedServiceDiscovery {
+
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(XdsServiceDiscovery.class);
+
+ private PilotExchanger exchanger;
+
+ public XdsServiceDiscovery(ApplicationModel applicationModel, URL registryURL) {
+ super(applicationModel, registryURL);
+ }
+
+ @Override
+ public void doInitialize(URL registryURL) {
+ try {
+ exchanger = PilotExchanger.initialize(registryURL);
+ } catch (Throwable t) {
+ logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
+ }
+ }
+
+ @Override
+ public void doDestroy() {
+ try {
+ if (exchanger == null) {
+ return;
+ }
+ exchanger.destroy();
+ } catch (Throwable t) {
+ logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
+ }
+ }
+
+ @Override
+ public Set<String> getServices() {
+ return exchanger.getServices();
+ }
+
+ @Override
+ public List<ServiceInstance> getInstances(String serviceName) throws NullPointerException {
+ Set<Endpoint> endpoints = exchanger.getEndpoints(serviceName);
+ return changedToInstances(serviceName, endpoints);
+ }
+
+ @Override
+ public void addServiceInstancesChangedListener(ServiceInstancesChangedListener listener)
+ throws NullPointerException, IllegalArgumentException {
+ listener.getServiceNames()
+ .forEach(serviceName -> exchanger.observeEndpoints(
+ serviceName,
+ (endpoints ->
+ notifyListener(serviceName, listener, changedToInstances(serviceName, endpoints)))));
+ }
+
+ private List<ServiceInstance> changedToInstances(String serviceName, Collection<Endpoint> endpoints) {
+ List<ServiceInstance> instances = new LinkedList<>();
+ endpoints.forEach(endpoint -> {
+ try {
+ DefaultServiceInstance serviceInstance = new DefaultServiceInstance(
+ serviceName,
+ endpoint.getAddress(),
+ endpoint.getPortValue(),
+ ScopeModelUtil.getApplicationModel(getUrl().getScopeModel()));
+ // fill metadata by SelfHostMetaServiceDiscovery, will be fetched by RPC request
+ serviceInstance.putExtendParam("clusterName", endpoint.getClusterName());
+ fillServiceInstance(serviceInstance);
+ instances.add(serviceInstance);
+ } catch (Throwable t) {
+ logger.error(
+ REGISTRY_ERROR_PARSING_XDS,
+ "",
+ "",
+ "Error occurred when parsing endpoints. Endpoints List:" + endpoints,
+ t);
+ }
+ });
+ instances.sort(Comparator.comparingInt(ServiceInstance::hashCode));
+ return instances;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscoveryFactory.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscoveryFactory.java
new file mode 100644
index 0000000..0f763c5
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscoveryFactory.java
@@ -0,0 +1,48 @@
+/*
+ * 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.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.client.AbstractServiceDiscoveryFactory;
+import org.apache.dubbo.registry.client.ServiceDiscovery;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_INITIALIZE_XDS;
+
+public class XdsServiceDiscoveryFactory extends AbstractServiceDiscoveryFactory {
+
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(XdsServiceDiscoveryFactory.class);
+
+ @Override
+ protected ServiceDiscovery createDiscovery(URL registryURL) {
+ XdsServiceDiscovery xdsServiceDiscovery = new XdsServiceDiscovery(ApplicationModel.defaultModel(), registryURL);
+ try {
+ xdsServiceDiscovery.doInitialize(registryURL);
+ } catch (Exception e) {
+ logger.error(
+ REGISTRY_ERROR_INITIALIZE_XDS,
+ "",
+ "",
+ "Error occurred when initialize xDS service discovery impl.",
+ e);
+ }
+ return xdsServiceDiscovery;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
new file mode 100644
index 0000000..95b653a
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
@@ -0,0 +1,294 @@
+/*
+ * 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.xds.istio;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.xds.XdsCertificateSigner;
+import org.apache.dubbo.rpc.RpcException;
+
+import io.grpc.ManagedChannel;
+import io.grpc.Metadata;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.grpc.stub.MetadataUtils;
+import io.grpc.stub.StreamObserver;
+import istio.v1.auth.IstioCertificateRequest;
+import istio.v1.auth.IstioCertificateResponse;
+import istio.v1.auth.IstioCertificateServiceGrpc;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.ExtensionsGenerator;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.pkcs.PKCS10CertificationRequest;
+import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
+import org.bouncycastle.util.io.pem.PemObject;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.spec.ECGenParameterSpec;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_GENERATE_CERT_ISTIO;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_GENERATE_KEY_ISTIO;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_RECEIVE_ERROR_MSG_ISTIO;
+
+public class IstioCitadelCertificateSigner implements XdsCertificateSigner {
+
+ private static final ErrorTypeAwareLogger logger =
+ LoggerFactory.getErrorTypeAwareLogger(IstioCitadelCertificateSigner.class);
+
+ private final org.apache.dubbo.registry.xds.istio.IstioEnv istioEnv;
+
+ private CertPair certPair;
+
+ public IstioCitadelCertificateSigner() {
+ // watch cert, Refresh every 30s
+ ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(1);
+ scheduledThreadPool.scheduleAtFixedRate(new GenerateCertTask(), 0, 30, TimeUnit.SECONDS);
+ istioEnv = IstioEnv.getInstance();
+ }
+
+ @Override
+ public CertPair GenerateCert(URL url) {
+
+ if (certPair != null && !certPair.isExpire()) {
+ return certPair;
+ }
+ return doGenerateCert();
+ }
+
+ private class GenerateCertTask implements Runnable {
+ @Override
+ public void run() {
+ doGenerateCert();
+ }
+ }
+
+ private CertPair doGenerateCert() {
+ synchronized (this) {
+ if (certPair == null || certPair.isExpire()) {
+ try {
+ certPair = createCert();
+ } catch (IOException e) {
+ logger.error(REGISTRY_FAILED_GENERATE_CERT_ISTIO, "", "", "Generate Cert from Istio failed.", e);
+ throw new RpcException("Generate Cert from Istio failed.", e);
+ }
+ }
+ }
+ return certPair;
+ }
+
+ public CertPair createCert() throws IOException {
+ PublicKey publicKey = null;
+ PrivateKey privateKey = null;
+ ContentSigner signer = null;
+
+ if (istioEnv.isECCFirst()) {
+ try {
+ ECGenParameterSpec ecSpec = new ECGenParameterSpec("secp256r1");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("EC");
+ g.initialize(ecSpec, new SecureRandom());
+ KeyPair keypair = g.generateKeyPair();
+ publicKey = keypair.getPublic();
+ privateKey = keypair.getPrivate();
+ signer = new JcaContentSignerBuilder("SHA256withECDSA").build(keypair.getPrivate());
+ } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | OperatorCreationException e) {
+ logger.error(
+ REGISTRY_FAILED_GENERATE_KEY_ISTIO,
+ "",
+ "",
+ "Generate Key with secp256r1 algorithm failed. Please check if your system support. "
+ + "Will attempt to generate with RSA2048.",
+ e);
+ }
+ }
+
+ if (publicKey == null) {
+ try {
+ KeyPairGenerator kpGenerator = KeyPairGenerator.getInstance("RSA");
+ kpGenerator.initialize(istioEnv.getRasKeySize());
+ KeyPair keypair = kpGenerator.generateKeyPair();
+ publicKey = keypair.getPublic();
+ privateKey = keypair.getPrivate();
+ signer = new JcaContentSignerBuilder("SHA256WithRSA").build(keypair.getPrivate());
+ } catch (NoSuchAlgorithmException | OperatorCreationException e) {
+ logger.error(
+ REGISTRY_FAILED_GENERATE_KEY_ISTIO,
+ "",
+ "",
+ "Generate Key with SHA256WithRSA algorithm failed. Please check if your system support.",
+ e);
+ throw new RpcException(e);
+ }
+ }
+
+ String csr = generateCsr(publicKey, signer);
+ String caCert = istioEnv.getCaCert();
+ ManagedChannel channel;
+ if (StringUtils.isNotEmpty(caCert)) {
+ channel = NettyChannelBuilder.forTarget(istioEnv.getCaAddr())
+ .sslContext(GrpcSslContexts.forClient()
+ .trustManager(new ByteArrayInputStream(caCert.getBytes(StandardCharsets.UTF_8)))
+ .build())
+ .build();
+ } else {
+ channel = NettyChannelBuilder.forTarget(istioEnv.getCaAddr())
+ .sslContext(GrpcSslContexts.forClient()
+ .trustManager(InsecureTrustManagerFactory.INSTANCE)
+ .build())
+ .build();
+ }
+
+ Metadata header = new Metadata();
+ Metadata.Key<String> key = Metadata.Key.of("authorization", Metadata.ASCII_STRING_MARSHALLER);
+ header.put(key, "Bearer " + istioEnv.getServiceAccount());
+
+ key = Metadata.Key.of("ClusterID", Metadata.ASCII_STRING_MARSHALLER);
+ header.put(key, istioEnv.getIstioMetaClusterId());
+
+ IstioCertificateServiceGrpc.IstioCertificateServiceStub stub = IstioCertificateServiceGrpc.newStub(channel);
+
+ stub = stub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(header));
+
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+ StringBuffer publicKeyBuilder = new StringBuffer();
+ AtomicBoolean failed = new AtomicBoolean(false);
+ stub.createCertificate(
+ generateRequest(csr), generateResponseObserver(countDownLatch, publicKeyBuilder, failed));
+
+ long expireTime =
+ System.currentTimeMillis() + (long) (istioEnv.getSecretTTL() * istioEnv.getSecretGracePeriodRatio());
+
+ try {
+ countDownLatch.await();
+ } catch (InterruptedException e) {
+ throw new RpcException("Generate Cert Failed. Wait for cert failed.", e);
+ }
+
+ if (failed.get()) {
+ throw new RpcException("Generate Cert Failed. Send csr request failed. Please check log above.");
+ }
+
+ String privateKeyPem = generatePrivatePemKey(privateKey);
+ CertPair certPair =
+ new CertPair(privateKeyPem, publicKeyBuilder.toString(), System.currentTimeMillis(), expireTime);
+
+ channel.shutdown();
+ return certPair;
+ }
+
+ private IstioCertificateRequest generateRequest(String csr) {
+ return IstioCertificateRequest.newBuilder()
+ .setCsr(csr)
+ .setValidityDuration(istioEnv.getSecretTTL())
+ .build();
+ }
+
+ private StreamObserver<IstioCertificateResponse> generateResponseObserver(
+ CountDownLatch countDownLatch, StringBuffer publicKeyBuilder, AtomicBoolean failed) {
+ return new StreamObserver<IstioCertificateResponse>() {
+ @Override
+ public void onNext(IstioCertificateResponse istioCertificateResponse) {
+ for (int i = 0; i < istioCertificateResponse.getCertChainCount(); i++) {
+ publicKeyBuilder.append(
+ istioCertificateResponse.getCertChainBytes(i).toStringUtf8());
+ }
+ if (logger.isDebugEnabled()) {
+ logger.debug("Receive Cert chain from Istio Citadel. \n" + publicKeyBuilder);
+ }
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ failed.set(true);
+ logger.error(
+ REGISTRY_RECEIVE_ERROR_MSG_ISTIO,
+ "",
+ "",
+ "Receive error message from Istio Citadel grpc stub.",
+ throwable);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onCompleted() {
+ countDownLatch.countDown();
+ }
+ };
+ }
+
+ private String generatePrivatePemKey(PrivateKey privateKey) throws IOException {
+ String key = generatePemKey("RSA PRIVATE KEY", privateKey.getEncoded());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Generated Private Key. \n" + key);
+ }
+ return key;
+ }
+
+ private String generatePemKey(String type, byte[] content) throws IOException {
+ PemObject pemObject = new PemObject(type, content);
+ StringWriter str = new StringWriter();
+ JcaPEMWriter jcaPEMWriter = new JcaPEMWriter(str);
+ jcaPEMWriter.writeObject(pemObject);
+ jcaPEMWriter.close();
+ str.close();
+ return str.toString();
+ }
+
+ private String generateCsr(PublicKey publicKey, ContentSigner signer) throws IOException {
+ GeneralNames subjectAltNames = new GeneralNames(new GeneralName[] {new GeneralName(6, istioEnv.getCsrHost())});
+
+ ExtensionsGenerator extGen = new ExtensionsGenerator();
+ extGen.addExtension(Extension.subjectAlternativeName, true, subjectAltNames);
+
+ PKCS10CertificationRequest request = new JcaPKCS10CertificationRequestBuilder(
+ new X500Name("O=" + istioEnv.getTrustDomain()), publicKey)
+ .addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, extGen.generate())
+ .build(signer);
+
+ String csr = generatePemKey("CERTIFICATE REQUEST", request.getEncoded());
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("CSR Request to Istio Citadel. \n" + csr);
+ }
+ return csr;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioConstant.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioConstant.java
new file mode 100644
index 0000000..018fa3a
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioConstant.java
@@ -0,0 +1,109 @@
+/*
+ * 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.xds.istio;
+
+public class IstioConstant {
+ /**
+ * Address of the spiffe certificate provider. Defaults to discoveryAddress
+ */
+ public static final String CA_ADDR_KEY = "CA_ADDR";
+
+ /**
+ * CA and xDS services
+ */
+ public static final String DEFAULT_CA_ADDR = "istiod.istio-system.svc:15012";
+
+ /**
+ * The trust domain for spiffe certificates
+ */
+ public static final String TRUST_DOMAIN_KEY = "TRUST_DOMAIN";
+
+ /**
+ * The trust domain for spiffe certificates default value
+ */
+ public static final String DEFAULT_TRUST_DOMAIN = "cluster.local";
+
+ public static final String WORKLOAD_NAMESPACE_KEY = "WORKLOAD_NAMESPACE";
+
+ public static final String DEFAULT_WORKLOAD_NAMESPACE = "default";
+
+ /**
+ * k8s jwt token
+ */
+ public static final String KUBERNETES_SA_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
+ public static final String KUBERNETES_CA_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
+
+ public static final String ISTIO_SA_PATH = "/var/run/secrets/tokens/istio-token";
+
+ public static final String ISTIO_CA_PATH = "/var/run/secrets/istio/root-cert.pem";
+
+ public static final String KUBERNETES_NAMESPACE_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/namespace";
+
+ public static final String RSA_KEY_SIZE_KEY = "RSA_KEY_SIZE";
+
+ public static final String DEFAULT_RSA_KEY_SIZE = "2048";
+
+ /**
+ * The type of ECC signature algorithm to use when generating private keys
+ */
+ public static final String ECC_SIG_ALG_KEY = "ECC_SIGNATURE_ALGORITHM";
+
+ public static final String DEFAULT_ECC_SIG_ALG = "ECDSA";
+
+ /**
+ * The cert lifetime requested by istio agent
+ */
+ public static final String SECRET_TTL_KEY = "SECRET_TTL";
+
+ /**
+ * The cert lifetime default value 24h0m0s
+ */
+ public static final String DEFAULT_SECRET_TTL = "86400"; // 24 * 60 * 60
+
+ /**
+ * The grace period ratio for the cert rotation
+ */
+ public static final String SECRET_GRACE_PERIOD_RATIO_KEY = "SECRET_GRACE_PERIOD_RATIO";
+
+ /**
+ * The grace period ratio for the cert rotation, by default 0.5
+ */
+ public static final String DEFAULT_SECRET_GRACE_PERIOD_RATIO = "0.5";
+
+ public static final String ISTIO_META_CLUSTER_ID_KEY = "ISTIO_META_CLUSTER_ID";
+
+ public static final String PILOT_CERT_PROVIDER_KEY = "PILOT_CERT_PROVIDER";
+
+ public static final String ISTIO_PILOT_CERT_PROVIDER = "istiod";
+
+ public static final String DEFAULT_ISTIO_META_CLUSTER_ID = "Kubernetes";
+
+ public static final String SPIFFE = "spiffe://";
+
+ public static final String NS = "/ns/";
+
+ public static final String SA = "/sa/";
+
+ public static final String JWT_POLICY = "JWT_POLICY";
+
+ public static final String DEFAULT_JWT_POLICY = "first-party-jwt";
+
+ public static final String FIRST_PARTY_JWT = "first-party-jwt";
+
+ public static final String THIRD_PARTY_JWT = "third-party-jwt";
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioEnv.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioEnv.java
new file mode 100644
index 0000000..43b454b
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioEnv.java
@@ -0,0 +1,195 @@
+/*
+ * 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.xds.istio;
+
+import org.apache.dubbo.common.constants.LoggerCodeConstants;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.xds.XdsEnv;
+
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_READ_FILE_ISTIO;
+import static org.apache.dubbo.registry.xds.istio.IstioConstant.NS;
+import static org.apache.dubbo.registry.xds.istio.IstioConstant.SA;
+import static org.apache.dubbo.registry.xds.istio.IstioConstant.SPIFFE;
+
+public class IstioEnv implements XdsEnv {
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(IstioEnv.class);
+
+ private static final IstioEnv INSTANCE = new IstioEnv();
+
+ private String podName;
+
+ private String caAddr;
+
+ private String jwtPolicy;
+
+ private String trustDomain;
+
+ private String workloadNameSpace;
+
+ private int rasKeySize;
+
+ private String eccSigAlg;
+
+ private int secretTTL;
+
+ private float secretGracePeriodRatio;
+
+ private String istioMetaClusterId;
+
+ private String pilotCertProvider;
+
+ private IstioEnv() {
+ jwtPolicy =
+ Optional.ofNullable(System.getenv(IstioConstant.JWT_POLICY)).orElse(IstioConstant.DEFAULT_JWT_POLICY);
+ podName = Optional.ofNullable(System.getenv("POD_NAME")).orElse(System.getenv("HOSTNAME"));
+ trustDomain = Optional.ofNullable(System.getenv(IstioConstant.TRUST_DOMAIN_KEY))
+ .orElse(IstioConstant.DEFAULT_TRUST_DOMAIN);
+ workloadNameSpace = Optional.ofNullable(System.getenv(IstioConstant.WORKLOAD_NAMESPACE_KEY))
+ .orElseGet(() -> {
+ File namespaceFile = new File(IstioConstant.KUBERNETES_NAMESPACE_PATH);
+ if (namespaceFile.canRead()) {
+ try {
+ return FileUtils.readFileToString(namespaceFile, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ logger.error(REGISTRY_ERROR_READ_FILE_ISTIO, "", "", "read namespace file error", e);
+ }
+ }
+ return IstioConstant.DEFAULT_WORKLOAD_NAMESPACE;
+ });
+ caAddr = Optional.ofNullable(System.getenv(IstioConstant.CA_ADDR_KEY)).orElse(IstioConstant.DEFAULT_CA_ADDR);
+ rasKeySize = Integer.parseInt(Optional.ofNullable(System.getenv(IstioConstant.RSA_KEY_SIZE_KEY))
+ .orElse(IstioConstant.DEFAULT_RSA_KEY_SIZE));
+ eccSigAlg = Optional.ofNullable(System.getenv(IstioConstant.ECC_SIG_ALG_KEY))
+ .orElse(IstioConstant.DEFAULT_ECC_SIG_ALG);
+ secretTTL = Integer.parseInt(Optional.ofNullable(System.getenv(IstioConstant.SECRET_TTL_KEY))
+ .orElse(IstioConstant.DEFAULT_SECRET_TTL));
+ secretGracePeriodRatio =
+ Float.parseFloat(Optional.ofNullable(System.getenv(IstioConstant.SECRET_GRACE_PERIOD_RATIO_KEY))
+ .orElse(IstioConstant.DEFAULT_SECRET_GRACE_PERIOD_RATIO));
+ istioMetaClusterId = Optional.ofNullable(System.getenv(IstioConstant.ISTIO_META_CLUSTER_ID_KEY))
+ .orElse(IstioConstant.DEFAULT_ISTIO_META_CLUSTER_ID);
+ pilotCertProvider = Optional.ofNullable(System.getenv(IstioConstant.PILOT_CERT_PROVIDER_KEY))
+ .orElse("");
+
+ if (getServiceAccount() == null) {
+ throw new UnsupportedOperationException("Unable to found kubernetes service account token file. "
+ + "Please check if work in Kubernetes and mount service account token file correctly.");
+ }
+ }
+
+ public static IstioEnv getInstance() {
+ return INSTANCE;
+ }
+
+ public String getPodName() {
+ return podName;
+ }
+
+ public String getCaAddr() {
+ return caAddr;
+ }
+
+ public String getServiceAccount() {
+ File saFile;
+ switch (jwtPolicy) {
+ case IstioConstant.FIRST_PARTY_JWT:
+ saFile = new File(IstioConstant.KUBERNETES_SA_PATH);
+ break;
+ case IstioConstant.THIRD_PARTY_JWT:
+ default:
+ saFile = new File(IstioConstant.ISTIO_SA_PATH);
+ }
+ if (saFile.canRead()) {
+ try {
+ return FileUtils.readFileToString(saFile, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ logger.error(
+ LoggerCodeConstants.REGISTRY_ISTIO_EXCEPTION,
+ "File Read Failed",
+ "",
+ "Unable to read token file.",
+ e);
+ }
+ }
+
+ return null;
+ }
+
+ public String getCsrHost() {
+ // spiffe://<trust_domain>/ns/<namespace>/sa/<service_account>
+ return SPIFFE + trustDomain + NS + workloadNameSpace + SA + getServiceAccount();
+ }
+
+ public String getTrustDomain() {
+ return trustDomain;
+ }
+
+ public String getWorkloadNameSpace() {
+ return workloadNameSpace;
+ }
+
+ @Override
+ public String getCluster() {
+ return null;
+ }
+
+ public int getRasKeySize() {
+ return rasKeySize;
+ }
+
+ public boolean isECCFirst() {
+ return IstioConstant.DEFAULT_ECC_SIG_ALG.equals(eccSigAlg);
+ }
+
+ public int getSecretTTL() {
+ return secretTTL;
+ }
+
+ public float getSecretGracePeriodRatio() {
+ return secretGracePeriodRatio;
+ }
+
+ public String getIstioMetaClusterId() {
+ return istioMetaClusterId;
+ }
+
+ public String getCaCert() {
+ File caFile;
+ if (IstioConstant.ISTIO_PILOT_CERT_PROVIDER.equals(pilotCertProvider)) {
+ caFile = new File(IstioConstant.ISTIO_CA_PATH);
+ } else {
+ return null;
+ }
+ if (caFile.canRead()) {
+ try {
+ return FileUtils.readFileToString(caFile, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ logger.error(
+ LoggerCodeConstants.REGISTRY_ISTIO_EXCEPTION, "File Read Failed", "", "read ca file error", e);
+ }
+ }
+ return null;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/AdsObserver.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/AdsObserver.java
new file mode 100644
index 0000000..39eee66
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/AdsObserver.java
@@ -0,0 +1,140 @@
+/*
+ * 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.xds.util;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
+import org.apache.dubbo.registry.xds.util.protocol.AbstractProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.DeltaResource;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+import io.grpc.stub.StreamObserver;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_REQUEST_XDS;
+
+public class AdsObserver {
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(AdsObserver.class);
+ private final ApplicationModel applicationModel;
+ private final URL url;
+ private final Node node;
+ private volatile XdsChannel xdsChannel;
+
+ private final Map<String, XdsListener> listeners = new ConcurrentHashMap<>();
+
+ protected StreamObserver<DiscoveryRequest> requestObserver;
+
+ private final Map<String, DiscoveryRequest> observedResources = new ConcurrentHashMap<>();
+
+ public AdsObserver(URL url, Node node) {
+ this.url = url;
+ this.node = node;
+ this.xdsChannel = new XdsChannel(url);
+ this.applicationModel = url.getOrDefaultApplicationModel();
+ }
+
+ public <T, S extends DeltaResource<T>> void addListener(AbstractProtocol<T, S> protocol) {
+ listeners.put(protocol.getTypeUrl(), protocol);
+ }
+
+ public void request(DiscoveryRequest discoveryRequest) {
+ if (requestObserver == null) {
+ requestObserver = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(this));
+ }
+ requestObserver.onNext(discoveryRequest);
+ observedResources.put(discoveryRequest.getTypeUrl(), discoveryRequest);
+ }
+
+ private static class ResponseObserver implements StreamObserver<DiscoveryResponse> {
+ private AdsObserver adsObserver;
+
+ public ResponseObserver(AdsObserver adsObserver) {
+ this.adsObserver = adsObserver;
+ }
+
+ @Override
+ public void onNext(DiscoveryResponse discoveryResponse) {
+ XdsListener xdsListener = adsObserver.listeners.get(discoveryResponse.getTypeUrl());
+ xdsListener.process(discoveryResponse);
+ adsObserver.requestObserver.onNext(buildAck(discoveryResponse));
+ }
+
+ protected DiscoveryRequest buildAck(DiscoveryResponse response) {
+ // for ACK
+ return DiscoveryRequest.newBuilder()
+ .setNode(adsObserver.node)
+ .setTypeUrl(response.getTypeUrl())
+ .setVersionInfo(response.getVersionInfo())
+ .setResponseNonce(response.getNonce())
+ .addAllResourceNames(adsObserver
+ .observedResources
+ .get(response.getTypeUrl())
+ .getResourceNamesList())
+ .build();
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ logger.error(REGISTRY_ERROR_REQUEST_XDS, "", "", "xDS Client received error message! detail:", throwable);
+ adsObserver.triggerReConnectTask();
+ }
+
+ @Override
+ public void onCompleted() {
+ logger.info("xDS Client completed");
+ adsObserver.triggerReConnectTask();
+ }
+ }
+
+ private void triggerReConnectTask() {
+ ScheduledExecutorService scheduledFuture = applicationModel
+ .getFrameworkModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getSharedScheduledExecutor();
+ scheduledFuture.schedule(this::recover, 3, TimeUnit.SECONDS);
+ }
+
+ private void recover() {
+ try {
+ xdsChannel = new XdsChannel(url);
+ if (xdsChannel.getChannel() != null) {
+ requestObserver = xdsChannel.createDeltaDiscoveryRequest(new ResponseObserver(this));
+ observedResources.values().forEach(requestObserver::onNext);
+ return;
+ } else {
+ logger.error(
+ REGISTRY_ERROR_REQUEST_XDS,
+ "",
+ "",
+ "Recover failed for xDS connection. Will retry. Create channel failed.");
+ }
+ } catch (Exception e) {
+ logger.error(REGISTRY_ERROR_REQUEST_XDS, "", "", "Recover failed for xDS connection. Will retry.", e);
+ }
+ triggerReConnectTask();
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/NodeBuilder.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/NodeBuilder.java
new file mode 100644
index 0000000..eaa88f3
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/NodeBuilder.java
@@ -0,0 +1,43 @@
+/*
+ * 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.xds.util;
+
+import org.apache.dubbo.common.utils.NetUtils;
+import org.apache.dubbo.registry.xds.istio.IstioEnv;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+
+public class NodeBuilder {
+
+ private static final String SVC_CLUSTER_LOCAL = ".svc.cluster.local";
+
+ public static Node build() {
+ // String podName = System.getenv("metadata.name");
+ // String podNamespace = System.getenv("metadata.namespace");
+
+ String podName = IstioEnv.getInstance().getPodName();
+ String podNamespace = IstioEnv.getInstance().getWorkloadNameSpace();
+ String svcName = IstioEnv.getInstance().getIstioMetaClusterId();
+
+ // id -> sidecar~ip~{POD_NAME}~{NAMESPACE_NAME}.svc.cluster.local
+ // cluster -> {SVC_NAME}
+ return Node.newBuilder()
+ .setId("sidecar~" + NetUtils.getLocalHost() + "~" + podName + "~" + podNamespace + SVC_CLUSTER_LOCAL)
+ .setCluster(svcName)
+ .build();
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/PilotExchanger.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/PilotExchanger.java
new file mode 100644
index 0000000..87fa810
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/PilotExchanger.java
@@ -0,0 +1,250 @@
+/*
+ * 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.xds.util;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+import org.apache.dubbo.registry.xds.util.protocol.AbstractProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.impl.EdsProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.impl.LdsProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.impl.RdsProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.registry.xds.util.protocol.message.EndpointResult;
+import org.apache.dubbo.registry.xds.util.protocol.message.ListenerResult;
+import org.apache.dubbo.registry.xds.util.protocol.message.RouteResult;
+import org.apache.dubbo.rpc.cluster.router.xds.RdsVirtualHostListener;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public class PilotExchanger {
+
+ protected final XdsChannel xdsChannel;
+
+ protected final LdsProtocol ldsProtocol;
+
+ protected final RdsProtocol rdsProtocol;
+
+ protected final EdsProtocol edsProtocol;
+
+ protected Map<String, ListenerResult> listenerResult;
+
+ protected Map<String, RouteResult> routeResult;
+
+ private final AtomicBoolean isRdsObserve = new AtomicBoolean(false);
+ private final Set<String> domainObserveRequest = new ConcurrentHashSet<String>();
+
+ private final Map<String, Set<Consumer<Set<Endpoint>>>> domainObserveConsumer = new ConcurrentHashMap<>();
+
+ private final Map<String, Consumer<RdsVirtualHostListener>> rdsObserveConsumer = new ConcurrentHashMap<>();
+
+ private static PilotExchanger GLOBAL_PILOT_EXCHANGER = null;
+
+ private final ApplicationModel applicationModel;
+
+ protected PilotExchanger(URL url) {
+ xdsChannel = new XdsChannel(url);
+ int pollingTimeout = url.getParameter("pollingTimeout", 10);
+ this.applicationModel = url.getOrDefaultApplicationModel();
+ AdsObserver adsObserver = new AdsObserver(url, NodeBuilder.build());
+ this.ldsProtocol = new LdsProtocol(adsObserver, NodeBuilder.build(), pollingTimeout);
+ this.rdsProtocol = new RdsProtocol(adsObserver, NodeBuilder.build(), pollingTimeout);
+ this.edsProtocol = new EdsProtocol(adsObserver, NodeBuilder.build(), pollingTimeout);
+
+ this.listenerResult = ldsProtocol.getListeners();
+ this.routeResult = rdsProtocol.getResource(
+ listenerResult.values().iterator().next().getRouteConfigNames());
+ Set<String> ldsResourcesName = new HashSet<>();
+ ldsResourcesName.add(AbstractProtocol.emptyResourceName);
+ // Observer RDS update
+ if (CollectionUtils.isNotEmpty(listenerResult.values().iterator().next().getRouteConfigNames())) {
+ createRouteObserve();
+ isRdsObserve.set(true);
+ }
+ // Observe LDS updated
+ ldsProtocol.observeResource(
+ ldsResourcesName,
+ (newListener) -> {
+ // update local cache
+ if (!newListener.equals(listenerResult)) {
+ this.listenerResult = newListener;
+ // update RDS observation
+ if (isRdsObserve.get()) {
+ createRouteObserve();
+ }
+ }
+ },
+ false);
+ }
+
+ private void createRouteObserve() {
+ rdsProtocol.observeResource(
+ listenerResult.values().iterator().next().getRouteConfigNames(),
+ (newResult) -> {
+ // check if observed domain update ( will update endpoint observation )
+ List<String> domainsToUpdate = new LinkedList<>();
+ domainObserveConsumer.forEach((domain, consumer) -> {
+ newResult.values().forEach(o -> {
+ Set<String> newRoute = o.searchDomain(domain);
+ for (Map.Entry<String, RouteResult> entry : routeResult.entrySet()) {
+ if (!entry.getValue().searchDomain(domain).equals(newRoute)) {
+ // routers in observed domain has been updated
+ // Long domainRequest = domainObserveRequest.get(domain);
+ // router list is empty when observeEndpoints() called and domainRequest has not
+ // been created yet
+ // create new observation
+ domainsToUpdate.add(domain);
+ // doObserveEndpoints(domain);
+ }
+ }
+ });
+ });
+ routeResult = newResult;
+ ExecutorService executorService = applicationModel
+ .getFrameworkModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getSharedExecutor();
+ executorService.submit(() -> domainsToUpdate.forEach(this::doObserveEndpoints));
+ },
+ false);
+ }
+
+ public static PilotExchanger initialize(URL url) {
+ synchronized (PilotExchanger.class) {
+ if (GLOBAL_PILOT_EXCHANGER != null) {
+ return GLOBAL_PILOT_EXCHANGER;
+ }
+ return (GLOBAL_PILOT_EXCHANGER = new PilotExchanger(url));
+ }
+ }
+
+ public static PilotExchanger getInstance() {
+ synchronized (PilotExchanger.class) {
+ return GLOBAL_PILOT_EXCHANGER;
+ }
+ }
+
+ public static boolean isEnabled() {
+ return GLOBAL_PILOT_EXCHANGER != null;
+ }
+
+ public void destroy() {
+ xdsChannel.destroy();
+ }
+
+ public Set<String> getServices() {
+ Set<String> domains = new HashSet<>();
+ for (Map.Entry<String, RouteResult> entry : routeResult.entrySet()) {
+ domains.addAll(entry.getValue().getDomains());
+ }
+ return domains;
+ }
+
+ public Set<Endpoint> getEndpoints(String domain) {
+ Set<Endpoint> endpoints = new HashSet<>();
+ for (Map.Entry<String, RouteResult> entry : routeResult.entrySet()) {
+ Set<String> cluster = entry.getValue().searchDomain(domain);
+ if (CollectionUtils.isNotEmpty(cluster)) {
+ Map<String, EndpointResult> endpointResultList = edsProtocol.getResource(cluster);
+ endpointResultList.forEach((k, v) -> endpoints.addAll(v.getEndpoints()));
+ } else {
+ return Collections.emptySet();
+ }
+ }
+ return endpoints;
+ }
+
+ public void observeEndpoints(String domain, Consumer<Set<Endpoint>> consumer) {
+ // store Consumer
+ domainObserveConsumer.compute(domain, (k, v) -> {
+ if (v == null) {
+ v = new ConcurrentHashSet<>();
+ }
+ // support multi-consumer
+ v.add(consumer);
+ return v;
+ });
+ if (!domainObserveRequest.contains(domain)) {
+ doObserveEndpoints(domain);
+ }
+ }
+
+ private void doObserveEndpoints(String domain) {
+ for (Map.Entry<String, RouteResult> entry : routeResult.entrySet()) {
+ Set<String> router = entry.getValue().searchDomain(domain);
+ // if router is empty, do nothing
+ // observation will be created when RDS updates
+ if (CollectionUtils.isNotEmpty(router)) {
+ edsProtocol.observeResource(
+ router,
+ (endpointResultMap) -> {
+ Set<Endpoint> endpoints = endpointResultMap.values().stream()
+ .map(EndpointResult::getEndpoints)
+ .flatMap(Set::stream)
+ .collect(Collectors.toSet());
+ for (Consumer<Set<Endpoint>> consumer : domainObserveConsumer.get(domain)) {
+ consumer.accept(endpoints);
+ }
+ },
+ false);
+ domainObserveRequest.add(domain);
+ }
+ }
+ }
+
+ public void unObserveEndpoints(String domain, Consumer<Set<Endpoint>> consumer) {
+ domainObserveConsumer.get(domain).remove(consumer);
+ domainObserveRequest.remove(domain);
+ }
+
+ public void observeEds(Set<String> clusterNames, Consumer<Map<String, EndpointResult>> consumer) {
+ edsProtocol.observeResource(clusterNames, consumer, false);
+ }
+
+ public void unObserveEds(Set<String> clusterNames, Consumer<Map<String, EndpointResult>> consumer) {
+ edsProtocol.unobserveResource(clusterNames, consumer);
+ }
+
+ public void observeRds(Set<String> clusterNames, Consumer<Map<String, RouteResult>> consumer) {
+ rdsProtocol.observeResource(clusterNames, consumer, false);
+ }
+
+ public void unObserveRds(Set<String> clusterNames, Consumer<Map<String, RouteResult>> consumer) {
+ rdsProtocol.unobserveResource(clusterNames, consumer);
+ }
+
+ public void observeLds(Consumer<Map<String, ListenerResult>> consumer) {
+ ldsProtocol.observeResource(Collections.singleton(AbstractProtocol.emptyResourceName), consumer, false);
+ }
+
+ public void unObserveLds(Consumer<Map<String, ListenerResult>> consumer) {
+ ldsProtocol.unobserveResource(Collections.singleton(AbstractProtocol.emptyResourceName), consumer);
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsChannel.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsChannel.java
new file mode 100644
index 0000000..94ba125
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsChannel.java
@@ -0,0 +1,142 @@
+/*
+ * 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.xds.util;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.url.component.URLAddress;
+import org.apache.dubbo.registry.xds.XdsCertificateSigner;
+import org.apache.dubbo.registry.xds.util.bootstrap.Bootstrapper;
+import org.apache.dubbo.registry.xds.util.bootstrap.BootstrapperImpl;
+
+import io.envoyproxy.envoy.service.discovery.v3.AggregatedDiscoveryServiceGrpc;
+import io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryRequest;
+import io.envoyproxy.envoy.service.discovery.v3.DeltaDiscoveryResponse;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+import io.grpc.ManagedChannel;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.grpc.netty.shaded.io.netty.channel.epoll.EpollEventLoopGroup;
+import io.grpc.netty.shaded.io.netty.channel.unix.DomainSocketAddress;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.shaded.io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.grpc.stub.StreamObserver;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_CREATE_CHANNEL_XDS;
+
+public class XdsChannel {
+
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(XdsChannel.class);
+
+ private static final String USE_AGENT = "use-agent";
+
+ private URL url;
+
+ private static final String SECURE = "secure";
+
+ private static final String PLAINTEXT = "plaintext";
+
+ private final ManagedChannel channel;
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public ManagedChannel getChannel() {
+ return channel;
+ }
+
+ public XdsChannel(URL url) {
+ ManagedChannel managedChannel = null;
+ this.url = url;
+ try {
+ if (!url.getParameter(USE_AGENT, false)) {
+ if (PLAINTEXT.equals(url.getParameter(SECURE))) {
+ managedChannel = NettyChannelBuilder.forAddress(url.getHost(), url.getPort())
+ .usePlaintext()
+ .build();
+ } else {
+ XdsCertificateSigner signer = url.getOrDefaultApplicationModel()
+ .getExtensionLoader(XdsCertificateSigner.class)
+ .getExtension(url.getParameter("signer", "istio"));
+ XdsCertificateSigner.CertPair certPair = signer.GenerateCert(url);
+ SslContext context = GrpcSslContexts.forClient()
+ .trustManager(InsecureTrustManagerFactory.INSTANCE)
+ .keyManager(
+ new ByteArrayInputStream(
+ certPair.getPublicKey().getBytes(StandardCharsets.UTF_8)),
+ new ByteArrayInputStream(
+ certPair.getPrivateKey().getBytes(StandardCharsets.UTF_8)))
+ .build();
+ managedChannel = NettyChannelBuilder.forAddress(url.getHost(), url.getPort())
+ .sslContext(context)
+ .build();
+ }
+ } else {
+ BootstrapperImpl bootstrapper = new BootstrapperImpl();
+ Bootstrapper.BootstrapInfo bootstrapInfo = bootstrapper.bootstrap();
+ URLAddress address =
+ URLAddress.parse(bootstrapInfo.servers().get(0).target(), null, false);
+ EpollEventLoopGroup elg = new EpollEventLoopGroup();
+ managedChannel = NettyChannelBuilder.forAddress(new DomainSocketAddress("/" + address.getPath()))
+ .eventLoopGroup(elg)
+ .channelType(EpollDomainSocketChannel.class)
+ .usePlaintext()
+ .build();
+ }
+ } catch (Exception e) {
+ logger.error(
+ REGISTRY_ERROR_CREATE_CHANNEL_XDS,
+ "",
+ "",
+ "Error occurred when creating gRPC channel to control panel.",
+ e);
+ }
+ channel = managedChannel;
+ }
+
+ public StreamObserver<DeltaDiscoveryRequest> observeDeltaDiscoveryRequest(
+ StreamObserver<DeltaDiscoveryResponse> observer) {
+ return AggregatedDiscoveryServiceGrpc.newStub(channel).deltaAggregatedResources(observer);
+ }
+
+ public StreamObserver<DiscoveryRequest> createDeltaDiscoveryRequest(StreamObserver<DiscoveryResponse> observer) {
+ return AggregatedDiscoveryServiceGrpc.newStub(channel).streamAggregatedResources(observer);
+ }
+
+ public StreamObserver<io.envoyproxy.envoy.api.v2.DeltaDiscoveryRequest> observeDeltaDiscoveryRequestV2(
+ StreamObserver<io.envoyproxy.envoy.api.v2.DeltaDiscoveryResponse> observer) {
+ return io.envoyproxy.envoy.service.discovery.v2.AggregatedDiscoveryServiceGrpc.newStub(channel)
+ .deltaAggregatedResources(observer);
+ }
+
+ public StreamObserver<io.envoyproxy.envoy.api.v2.DiscoveryRequest> createDeltaDiscoveryRequestV2(
+ StreamObserver<io.envoyproxy.envoy.api.v2.DiscoveryResponse> observer) {
+ return io.envoyproxy.envoy.service.discovery.v2.AggregatedDiscoveryServiceGrpc.newStub(channel)
+ .streamAggregatedResources(observer);
+ }
+
+ public void destroy() {
+ channel.shutdown();
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsListener.java
similarity index 61%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsListener.java
index 52aff89..233d921 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsListener.java
@@ -14,24 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.xds.util;
-import org.apache.dubbo.rpc.Invoker;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+public interface XdsListener {
+ void process(DiscoveryResponse discoveryResponse);
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapInfoImpl.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapInfoImpl.java
new file mode 100644
index 0000000..dad3b6d
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapInfoImpl.java
@@ -0,0 +1,130 @@
+/*
+ * 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.xds.util.bootstrap;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+
+import javax.annotation.Nullable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public final class BootstrapInfoImpl extends Bootstrapper.BootstrapInfo {
+
+ private final List<Bootstrapper.ServerInfo> servers;
+
+ private final String serverListenerResourceNameTemplate;
+
+ private final Map<String, Bootstrapper.CertificateProviderInfo> certProviders;
+
+ private final Node node;
+
+ BootstrapInfoImpl(
+ List<Bootstrapper.ServerInfo> servers,
+ String serverListenerResourceNameTemplate,
+ Map<String, Bootstrapper.CertificateProviderInfo> certProviders,
+ Node node) {
+ this.servers = servers;
+ this.serverListenerResourceNameTemplate = serverListenerResourceNameTemplate;
+ this.certProviders = certProviders;
+ this.node = node;
+ }
+
+ @Override
+ public List<Bootstrapper.ServerInfo> servers() {
+ return servers;
+ }
+
+ public Map<String, Bootstrapper.CertificateProviderInfo> certProviders() {
+ return certProviders;
+ }
+
+ @Override
+ public Node node() {
+ return node;
+ }
+
+ @Override
+ public String serverListenerResourceNameTemplate() {
+ return serverListenerResourceNameTemplate;
+ }
+
+ @Override
+ public String toString() {
+ return "BootstrapInfo{"
+ + "servers=" + servers + ", "
+ + "serverListenerResourceNameTemplate=" + serverListenerResourceNameTemplate + ", "
+ + "node=" + node + ", "
+ + "}";
+ }
+
+ public static final class Builder extends Bootstrapper.BootstrapInfo.Builder {
+ private List<Bootstrapper.ServerInfo> servers;
+ private Node node;
+
+ private Map<String, Bootstrapper.CertificateProviderInfo> certProviders;
+
+ private String serverListenerResourceNameTemplate;
+
+ Builder() {}
+
+ @Override
+ Bootstrapper.BootstrapInfo.Builder servers(List<Bootstrapper.ServerInfo> servers) {
+ this.servers = new LinkedList<>(servers);
+ return this;
+ }
+
+ @Override
+ Bootstrapper.BootstrapInfo.Builder node(Node node) {
+ if (node == null) {
+ throw new NullPointerException("Null node");
+ }
+ this.node = node;
+ return this;
+ }
+
+ @Override
+ Bootstrapper.BootstrapInfo.Builder certProviders(
+ @Nullable Map<String, Bootstrapper.CertificateProviderInfo> certProviders) {
+ this.certProviders = certProviders;
+ return this;
+ }
+
+ @Override
+ Bootstrapper.BootstrapInfo.Builder serverListenerResourceNameTemplate(
+ @Nullable String serverListenerResourceNameTemplate) {
+ this.serverListenerResourceNameTemplate = serverListenerResourceNameTemplate;
+ return this;
+ }
+
+ @Override
+ Bootstrapper.BootstrapInfo build() {
+ if (this.servers == null || this.node == null) {
+ StringBuilder missing = new StringBuilder();
+ if (this.servers == null) {
+ missing.append(" servers");
+ }
+ if (this.node == null) {
+ missing.append(" node");
+ }
+ throw new IllegalStateException("Missing required properties:" + missing);
+ }
+ return new BootstrapInfoImpl(
+ this.servers, this.serverListenerResourceNameTemplate, this.certProviders, this.node);
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/Bootstrapper.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/Bootstrapper.java
new file mode 100644
index 0000000..b8ef44b
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/Bootstrapper.java
@@ -0,0 +1,74 @@
+/*
+ * 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.xds.util.bootstrap;
+
+import org.apache.dubbo.registry.xds.XdsInitializationException;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.grpc.ChannelCredentials;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
+public abstract class Bootstrapper {
+
+ public abstract BootstrapInfo bootstrap() throws XdsInitializationException;
+
+ BootstrapInfo bootstrap(Map<String, ?> rawData) throws XdsInitializationException {
+ throw new UnsupportedOperationException();
+ }
+
+ public abstract static class ServerInfo {
+ public abstract String target();
+
+ abstract ChannelCredentials channelCredentials();
+
+ abstract boolean useProtocolV3();
+
+ abstract boolean ignoreResourceDeletion();
+ }
+
+ public abstract static class CertificateProviderInfo {
+ public abstract String pluginName();
+
+ public abstract Map<String, ?> config();
+ }
+
+ public abstract static class BootstrapInfo {
+ public abstract List<ServerInfo> servers();
+
+ public abstract Map<String, CertificateProviderInfo> certProviders();
+
+ public abstract Node node();
+
+ public abstract String serverListenerResourceNameTemplate();
+
+ abstract static class Builder {
+
+ abstract Builder servers(List<ServerInfo> servers);
+
+ abstract Builder node(Node node);
+
+ abstract Builder certProviders(@Nullable Map<String, CertificateProviderInfo> certProviders);
+
+ abstract Builder serverListenerResourceNameTemplate(@Nullable String serverListenerResourceNameTemplate);
+
+ abstract BootstrapInfo build();
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperImpl.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperImpl.java
new file mode 100644
index 0000000..b4d913d
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperImpl.java
@@ -0,0 +1,178 @@
+/*
+ * 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.xds.util.bootstrap;
+
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.xds.XdsInitializationException;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.grpc.ChannelCredentials;
+import io.grpc.internal.JsonParser;
+import io.grpc.internal.JsonUtil;
+
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class BootstrapperImpl extends Bootstrapper {
+
+ static final String BOOTSTRAP_PATH_SYS_ENV_VAR = "GRPC_XDS_BOOTSTRAP";
+ static String bootstrapPathFromEnvVar = System.getenv(BOOTSTRAP_PATH_SYS_ENV_VAR);
+
+ private static final Logger logger = LoggerFactory.getLogger(BootstrapperImpl.class);
+ private FileReader reader = LocalFileReader.INSTANCE;
+
+ private static final String SERVER_FEATURE_XDS_V3 = "xds_v3";
+ private static final String SERVER_FEATURE_IGNORE_RESOURCE_DELETION = "ignore_resource_deletion";
+
+ public BootstrapInfo bootstrap() throws XdsInitializationException {
+ String filePath = bootstrapPathFromEnvVar;
+ String fileContent = null;
+ if (filePath != null) {
+ try {
+ fileContent = reader.readFile(filePath);
+ } catch (IOException e) {
+ throw new XdsInitializationException("Fail to read bootstrap file", e);
+ }
+ }
+ if (fileContent == null) throw new XdsInitializationException("Cannot find bootstrap configuration");
+
+ Map<String, ?> rawBootstrap;
+ try {
+ rawBootstrap = (Map<String, ?>) JsonParser.parse(fileContent);
+ } catch (IOException e) {
+ throw new XdsInitializationException("Failed to parse JSON", e);
+ }
+ return bootstrap(rawBootstrap);
+ }
+
+ @Override
+ BootstrapInfo bootstrap(Map<String, ?> rawData) throws XdsInitializationException {
+ BootstrapInfo.Builder builder = new BootstrapInfoImpl.Builder();
+
+ List<?> rawServerConfigs = JsonUtil.getList(rawData, "xds_servers");
+ if (rawServerConfigs == null) {
+ throw new XdsInitializationException("Invalid bootstrap: 'xds_servers' does not exist.");
+ }
+ List<ServerInfo> servers = parseServerInfos(rawServerConfigs);
+ builder.servers(servers);
+
+ Node.Builder nodeBuilder = Node.newBuilder();
+ Map<String, ?> rawNode = JsonUtil.getObject(rawData, "node");
+ if (rawNode != null) {
+ String id = JsonUtil.getString(rawNode, "id");
+ if (id != null) {
+ nodeBuilder.setId(id);
+ }
+ String cluster = JsonUtil.getString(rawNode, "cluster");
+ if (cluster != null) {
+ nodeBuilder.setCluster(cluster);
+ }
+ Map<String, ?> metadata = JsonUtil.getObject(rawNode, "metadata");
+ Map<String, ?> rawLocality = JsonUtil.getObject(rawNode, "locality");
+ }
+ builder.node(nodeBuilder.build());
+
+ Map<String, ?> certProvidersBlob = JsonUtil.getObject(rawData, "certificate_providers");
+ if (certProvidersBlob != null) {
+ Map<String, CertificateProviderInfo> certProviders = new HashMap<>(certProvidersBlob.size());
+ for (String name : certProvidersBlob.keySet()) {
+ Map<String, ?> valueMap = JsonUtil.getObject(certProvidersBlob, name);
+ String pluginName = checkForNull(JsonUtil.getString(valueMap, "plugin_name"), "plugin_name");
+ Map<String, ?> config = checkForNull(JsonUtil.getObject(valueMap, "config"), "config");
+ CertificateProviderInfoImpl certificateProviderInfo =
+ new CertificateProviderInfoImpl(pluginName, config);
+ certProviders.put(name, certificateProviderInfo);
+ }
+ builder.certProviders(certProviders);
+ }
+
+ return builder.build();
+ }
+
+ private static List<ServerInfo> parseServerInfos(List<?> rawServerConfigs) throws XdsInitializationException {
+ List<ServerInfo> servers = new LinkedList<>();
+ List<Map<String, ?>> serverConfigList = JsonUtil.checkObjectList(rawServerConfigs);
+ for (Map<String, ?> serverConfig : serverConfigList) {
+ String serverUri = JsonUtil.getString(serverConfig, "server_uri");
+ if (serverUri == null) {
+ throw new XdsInitializationException("Invalid bootstrap: missing 'server_uri'");
+ }
+ List<?> rawChannelCredsList = JsonUtil.getList(serverConfig, "channel_creds");
+ if (rawChannelCredsList == null || rawChannelCredsList.isEmpty()) {
+ throw new XdsInitializationException(
+ "Invalid bootstrap: server " + serverUri + " 'channel_creds' required");
+ }
+ ChannelCredentials channelCredentials =
+ parseChannelCredentials(JsonUtil.checkObjectList(rawChannelCredsList), serverUri);
+ // if (channelCredentials == null) {
+ // throw new XdsInitializationException(
+ // "Server " + serverUri + ": no supported channel credentials found");
+ // }
+
+ boolean useProtocolV3 = false;
+ boolean ignoreResourceDeletion = false;
+ List<String> serverFeatures = JsonUtil.getListOfStrings(serverConfig, "server_features");
+ if (serverFeatures != null) {
+ useProtocolV3 = serverFeatures.contains(SERVER_FEATURE_XDS_V3);
+ ignoreResourceDeletion = serverFeatures.contains(SERVER_FEATURE_IGNORE_RESOURCE_DELETION);
+ }
+ servers.add(new ServerInfoImpl(serverUri, channelCredentials, useProtocolV3, ignoreResourceDeletion));
+ }
+ return servers;
+ }
+
+ void setFileReader(FileReader reader) {
+ this.reader = reader;
+ }
+
+ /**
+ * Reads the content of the file with the given path in the file system.
+ */
+ interface FileReader {
+ String readFile(String path) throws IOException;
+ }
+
+ private enum LocalFileReader implements FileReader {
+ INSTANCE;
+
+ @Override
+ public String readFile(String path) throws IOException {
+ return new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+ }
+ }
+
+ private static <T> T checkForNull(T value, String fieldName) throws XdsInitializationException {
+ if (value == null) {
+ throw new XdsInitializationException("Invalid bootstrap: '" + fieldName + "' does not exist.");
+ }
+ return value;
+ }
+
+ @Nullable
+ private static ChannelCredentials parseChannelCredentials(List<Map<String, ?>> jsonList, String serverUri)
+ throws XdsInitializationException {
+ return null;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/CertificateProviderInfoImpl.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/CertificateProviderInfoImpl.java
new file mode 100644
index 0000000..980b6e1
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/CertificateProviderInfoImpl.java
@@ -0,0 +1,45 @@
+/*
+ * 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.xds.util.bootstrap;
+
+import java.util.Map;
+
+final class CertificateProviderInfoImpl extends Bootstrapper.CertificateProviderInfo {
+
+ private final String pluginName;
+ private final Map<String, ?> config;
+
+ CertificateProviderInfoImpl(String pluginName, Map<String, ?> config) {
+ this.pluginName = pluginName;
+ this.config = config;
+ }
+
+ @Override
+ public String pluginName() {
+ return pluginName;
+ }
+
+ @Override
+ public Map<String, ?> config() {
+ return config;
+ }
+
+ @Override
+ public String toString() {
+ return "CertificateProviderInfo{" + "pluginName=" + pluginName + ", " + "config=" + config + "}";
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/ServerInfoImpl.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/ServerInfoImpl.java
new file mode 100644
index 0000000..c15f4f2
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/ServerInfoImpl.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.registry.xds.util.bootstrap;
+
+import io.grpc.ChannelCredentials;
+
+final class ServerInfoImpl extends Bootstrapper.ServerInfo {
+
+ private final String target;
+
+ private final ChannelCredentials channelCredentials;
+
+ private final boolean useProtocolV3;
+
+ private final boolean ignoreResourceDeletion;
+
+ ServerInfoImpl(
+ String target,
+ ChannelCredentials channelCredentials,
+ boolean useProtocolV3,
+ boolean ignoreResourceDeletion) {
+ this.target = target;
+ this.channelCredentials = channelCredentials;
+ this.useProtocolV3 = useProtocolV3;
+ this.ignoreResourceDeletion = ignoreResourceDeletion;
+ }
+
+ @Override
+ public String target() {
+ return target;
+ }
+
+ @Override
+ ChannelCredentials channelCredentials() {
+ return channelCredentials;
+ }
+
+ @Override
+ boolean useProtocolV3() {
+ return useProtocolV3;
+ }
+
+ @Override
+ boolean ignoreResourceDeletion() {
+ return ignoreResourceDeletion;
+ }
+
+ @Override
+ public String toString() {
+ return "ServerInfo{"
+ + "target=" + target + ", "
+ + "channelCredentials=" + channelCredentials + ", "
+ + "useProtocolV3=" + useProtocolV3 + ", "
+ + "ignoreResourceDeletion=" + ignoreResourceDeletion
+ + "}";
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/AbstractProtocol.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/AbstractProtocol.java
new file mode 100644
index 0000000..792f202
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/AbstractProtocol.java
@@ -0,0 +1,269 @@
+/*
+ * 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.xds.util.protocol;
+
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.ConcurrentHashMapUtils;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.XdsListener;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.INTERNAL_INTERRUPTED;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_REQUEST;
+
+public abstract class AbstractProtocol<T, S extends DeltaResource<T>> implements XdsProtocol<T>, XdsListener {
+
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(AbstractProtocol.class);
+
+ protected AdsObserver adsObserver;
+
+ protected final Node node;
+
+ private final int checkInterval;
+
+ protected final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+
+ protected final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
+
+ protected final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
+
+ protected Set<String> observeResourcesName;
+
+ public static final String emptyResourceName = "emptyResourcesName";
+ private final ReentrantLock resourceLock = new ReentrantLock();
+
+ protected Map<Set<String>, List<Consumer<Map<String, T>>>> consumerObserveMap = new ConcurrentHashMap<>();
+
+ public Map<Set<String>, List<Consumer<Map<String, T>>>> getConsumerObserveMap() {
+ return consumerObserveMap;
+ }
+
+ protected Map<String, T> resourcesMap = new ConcurrentHashMap<>();
+
+ public AbstractProtocol(AdsObserver adsObserver, Node node, int checkInterval) {
+ this.adsObserver = adsObserver;
+ this.node = node;
+ this.checkInterval = checkInterval;
+ adsObserver.addListener(this);
+ }
+
+ /**
+ * Abstract method to obtain Type-URL from sub-class
+ *
+ * @return Type-URL of xDS
+ */
+ public abstract String getTypeUrl();
+
+ public boolean isCacheExistResource(Set<String> resourceNames) {
+ for (String resourceName : resourceNames) {
+ if ("".equals(resourceName)) {
+ continue;
+ }
+ if (!resourcesMap.containsKey(resourceName)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public T getCacheResource(String resourceName) {
+ if (resourceName == null || resourceName.length() == 0) {
+ return null;
+ }
+ return resourcesMap.get(resourceName);
+ }
+
+ @Override
+ public Map<String, T> getResource(Set<String> resourceNames) {
+ resourceNames = resourceNames == null ? Collections.emptySet() : resourceNames;
+
+ if (!resourceNames.isEmpty() && isCacheExistResource(resourceNames)) {
+ return getResourceFromCache(resourceNames);
+ } else {
+ return getResourceFromRemote(resourceNames);
+ }
+ }
+
+ private Map<String, T> getResourceFromCache(Set<String> resourceNames) {
+ return resourceNames.stream()
+ .filter(o -> !StringUtils.isEmpty(o))
+ .collect(Collectors.toMap(k -> k, this::getCacheResource));
+ }
+
+ public Map<String, T> getResourceFromRemote(Set<String> resourceNames) {
+ try {
+ resourceLock.lock();
+ CompletableFuture<Map<String, T>> future = new CompletableFuture<>();
+ observeResourcesName = resourceNames;
+ Set<String> consumerObserveResourceNames = new HashSet<>();
+ if (resourceNames.isEmpty()) {
+ consumerObserveResourceNames.add(emptyResourceName);
+ } else {
+ consumerObserveResourceNames = resourceNames;
+ }
+
+ Consumer<Map<String, T>> futureConsumer = future::complete;
+ try {
+ writeLock.lock();
+ ConcurrentHashMapUtils.computeIfAbsent(
+ (ConcurrentHashMap<Set<String>, List<Consumer<Map<String, T>>>>) consumerObserveMap,
+ consumerObserveResourceNames,
+ key -> new ArrayList<>())
+ .add(futureConsumer);
+ } finally {
+ writeLock.unlock();
+ }
+
+ Set<String> resourceNamesToObserve = new HashSet<>(resourceNames);
+ resourceNamesToObserve.addAll(resourcesMap.keySet());
+ adsObserver.request(buildDiscoveryRequest(resourceNamesToObserve));
+ logger.info("Send xDS Observe request to remote. Resource count: " + resourceNamesToObserve.size()
+ + ". Resource Type: " + getTypeUrl());
+
+ try {
+ Map<String, T> result = future.get();
+
+ try {
+ writeLock.lock();
+ consumerObserveMap.get(consumerObserveResourceNames).removeIf(o -> o.equals(futureConsumer));
+ } finally {
+ writeLock.unlock();
+ }
+
+ return result;
+ } catch (InterruptedException e) {
+ logger.error(
+ INTERNAL_INTERRUPTED,
+ "",
+ "",
+ "InterruptedException occur when request control panel. error=",
+ e);
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
+ logger.error(PROTOCOL_FAILED_REQUEST, "", "", "Error occur when request control panel. error=", e);
+ }
+ } finally {
+ resourceLock.unlock();
+ }
+ return Collections.emptyMap();
+ }
+
+ public void observeResource(Set<String> resourceNames, Consumer<Map<String, T>> consumer, boolean isReConnect) {
+ // call once for full data
+ if (!isReConnect) {
+ consumer.accept(getResource(resourceNames));
+ try {
+ writeLock.lock();
+ consumerObserveMap.compute(resourceNames, (k, v) -> {
+ if (v == null) {
+ v = new ArrayList<>();
+ }
+ // support multi-consumer
+ v.add(consumer);
+ return v;
+ });
+ } finally {
+ writeLock.unlock();
+ }
+ }
+ try {
+ writeLock.lock();
+ this.observeResourcesName =
+ consumerObserveMap.keySet().stream().flatMap(Set::stream).collect(Collectors.toSet());
+ } finally {
+ writeLock.unlock();
+ }
+ }
+
+ public void unobserveResource(Set<String> resourceNames, Consumer<Map<String, T>> consumer) {
+ // TODO
+ }
+
+ protected DiscoveryRequest buildDiscoveryRequest(Set<String> resourceNames) {
+ return DiscoveryRequest.newBuilder()
+ .setNode(node)
+ .setTypeUrl(getTypeUrl())
+ .addAllResourceNames(resourceNames)
+ .build();
+ }
+
+ protected abstract Map<String, T> decodeDiscoveryResponse(DiscoveryResponse response);
+
+ @Override
+ public final void process(DiscoveryResponse discoveryResponse) {
+ Map<String, T> newResult = decodeDiscoveryResponse(discoveryResponse);
+ Map<String, T> oldResource = resourcesMap;
+ discoveryResponseListener(oldResource, newResult);
+ resourcesMap = newResult;
+ }
+
+ private void discoveryResponseListener(Map<String, T> oldResult, Map<String, T> newResult) {
+ Set<String> changedResourceNames = new HashSet<>();
+ oldResult.forEach((key, origin) -> {
+ if (!Objects.equals(origin, newResult.get(key))) {
+ changedResourceNames.add(key);
+ }
+ });
+ newResult.forEach((key, origin) -> {
+ if (!Objects.equals(origin, oldResult.get(key))) {
+ changedResourceNames.add(key);
+ }
+ });
+ if (changedResourceNames.isEmpty()) {
+ return;
+ }
+
+ logger.info("Receive resource update notification from xds server. Change resource count: "
+ + changedResourceNames.stream() + ". Type: " + getTypeUrl());
+
+ // call once for full data
+ try {
+ readLock.lock();
+ for (Map.Entry<Set<String>, List<Consumer<Map<String, T>>>> entry : consumerObserveMap.entrySet()) {
+ if (entry.getKey().stream().noneMatch(changedResourceNames::contains)) {
+ // none update
+ continue;
+ }
+
+ Map<String, T> dsResultMap =
+ entry.getKey().stream().collect(Collectors.toMap(k -> k, v -> newResult.get(v)));
+ entry.getValue().forEach(o -> o.accept(dsResultMap));
+ }
+ } finally {
+ readLock.unlock();
+ }
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/DeltaResource.java
similarity index 61%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/DeltaResource.java
index 52aff89..bcae39c 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/DeltaResource.java
@@ -14,24 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.registry.xds.util.protocol;
-import org.apache.dubbo.rpc.Invoker;
-
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
-
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+/**
+ * A interface for resources in xDS, which can be updated by ADS delta stream
+ * <br/>
+ * This interface is design to unify the way of fetching data in delta stream
+ * in {@link org.apache.dubbo.registry.xds.util.PilotExchanger}
+ */
+public interface DeltaResource<T> {
+ /**
+ * Get resource from delta stream
+ *
+ * @return the newest resource from stream
+ */
+ T getResource();
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
new file mode 100644
index 0000000..ce1a088
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
@@ -0,0 +1,41 @@
+/*
+ * 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.xds.util.protocol;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public interface XdsProtocol<T> {
+ /**
+ * Gets all {@link T resource} by the specified resource name.
+ * For LDS, the {@param resourceNames} is ignored
+ *
+ * @param resourceNames specified resource name
+ * @return resources, null if request failed
+ */
+ Map<String, T> getResource(Set<String> resourceNames);
+
+ /**
+ * Add a observer resource with {@link Consumer}
+ *
+ * @param resourceNames specified resource name
+ * @param consumer resource notifier, will be called when resource updated
+ * @return requestId, used when resourceNames update with {@link XdsProtocol#updateObserve(long, Set)}
+ */
+ void observeResource(Set<String> resourceNames, Consumer<Map<String, T>> consumer, boolean isReConnect);
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaEndpoint.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaEndpoint.java
new file mode 100644
index 0000000..46988f3
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaEndpoint.java
@@ -0,0 +1,48 @@
+/*
+ * 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.xds.util.protocol.delta;
+
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.registry.xds.util.protocol.DeltaResource;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.registry.xds.util.protocol.message.EndpointResult;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+public class DeltaEndpoint implements DeltaResource<EndpointResult> {
+ private final Map<String, Set<Endpoint>> data = new ConcurrentHashMap<>();
+
+ public void addResource(String resourceName, Set<Endpoint> endpoints) {
+ data.put(resourceName, endpoints);
+ }
+
+ public void removeResource(Collection<String> resourceName) {
+ if (CollectionUtils.isNotEmpty(resourceName)) {
+ resourceName.forEach(data::remove);
+ }
+ }
+
+ @Override
+ public EndpointResult getResource() {
+ Set<Endpoint> set = data.values().stream().flatMap(Set::stream).collect(Collectors.toSet());
+ return new EndpointResult(set);
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaListener.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaListener.java
new file mode 100644
index 0000000..bca3024
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaListener.java
@@ -0,0 +1,47 @@
+/*
+ * 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.xds.util.protocol.delta;
+
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.registry.xds.util.protocol.DeltaResource;
+import org.apache.dubbo.registry.xds.util.protocol.message.ListenerResult;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+public class DeltaListener implements DeltaResource<ListenerResult> {
+ private final Map<String, Set<String>> data = new ConcurrentHashMap<>();
+
+ public void addResource(String resourceName, Set<String> listeners) {
+ data.put(resourceName, listeners);
+ }
+
+ public void removeResource(Collection<String> resourceName) {
+ if (CollectionUtils.isNotEmpty(resourceName)) {
+ resourceName.forEach(data::remove);
+ }
+ }
+
+ @Override
+ public ListenerResult getResource() {
+ Set<String> set = data.values().stream().flatMap(Set::stream).collect(Collectors.toSet());
+ return new ListenerResult(set);
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaRoute.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaRoute.java
new file mode 100644
index 0000000..71fdb47
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaRoute.java
@@ -0,0 +1,47 @@
+/*
+ * 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.xds.util.protocol.delta;
+
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.registry.xds.util.protocol.DeltaResource;
+import org.apache.dubbo.registry.xds.util.protocol.message.RouteResult;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DeltaRoute implements DeltaResource<RouteResult> {
+ private final Map<String, Map<String, Set<String>>> data = new ConcurrentHashMap<>();
+
+ public void addResource(String resourceName, Map<String, Set<String>> route) {
+ data.put(resourceName, route);
+ }
+
+ public void removeResource(Collection<String> resourceName) {
+ if (CollectionUtils.isNotEmpty(resourceName)) {
+ resourceName.forEach(data::remove);
+ }
+ }
+
+ @Override
+ public RouteResult getResource() {
+ Map<String, Set<String>> result = new ConcurrentHashMap<>();
+ data.values().forEach(result::putAll);
+ return new RouteResult(result);
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
new file mode 100644
index 0000000..987be41
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
@@ -0,0 +1,97 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.AbstractProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.delta.DeltaEndpoint;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.registry.xds.util.protocol.message.EndpointResult;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.envoyproxy.envoy.config.core.v3.HealthStatus;
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.config.core.v3.SocketAddress;
+import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment;
+import io.envoyproxy.envoy.config.endpoint.v3.LbEndpoint;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_RESPONSE_XDS;
+
+public class EdsProtocol extends AbstractProtocol<EndpointResult, DeltaEndpoint> {
+
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(EdsProtocol.class);
+
+ public EdsProtocol(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ @Override
+ public String getTypeUrl() {
+ return "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment";
+ }
+
+ @Override
+ protected Map<String, EndpointResult> decodeDiscoveryResponse(DiscoveryResponse response) {
+ if (getTypeUrl().equals(response.getTypeUrl())) {
+ return response.getResourcesList().stream()
+ .map(EdsProtocol::unpackClusterLoadAssignment)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toConcurrentMap(
+ ClusterLoadAssignment::getClusterName, this::decodeResourceToEndpoint));
+ }
+ return new HashMap<>();
+ }
+
+ private EndpointResult decodeResourceToEndpoint(ClusterLoadAssignment resource) {
+ Set<Endpoint> endpoints = resource.getEndpointsList().stream()
+ .flatMap(e -> e.getLbEndpointsList().stream())
+ .map(e -> decodeLbEndpointToEndpoint(resource.getClusterName(), e))
+ .collect(Collectors.toSet());
+ return new EndpointResult(endpoints);
+ }
+
+ private static Endpoint decodeLbEndpointToEndpoint(String clusterName, LbEndpoint lbEndpoint) {
+ Endpoint endpoint = new Endpoint();
+ SocketAddress address = lbEndpoint.getEndpoint().getAddress().getSocketAddress();
+ endpoint.setAddress(address.getAddress());
+ endpoint.setPortValue(address.getPortValue());
+ boolean healthy = HealthStatus.HEALTHY.equals(lbEndpoint.getHealthStatus())
+ || HealthStatus.UNKNOWN.equals(lbEndpoint.getHealthStatus());
+ endpoint.setHealthy(healthy);
+ endpoint.setWeight(lbEndpoint.getLoadBalancingWeight().getValue());
+ return endpoint;
+ }
+
+ private static ClusterLoadAssignment unpackClusterLoadAssignment(Any any) {
+ try {
+ return any.unpack(ClusterLoadAssignment.class);
+ } catch (InvalidProtocolBufferException e) {
+ logger.error(REGISTRY_ERROR_RESPONSE_XDS, "", "", "Error occur when decode xDS response.", e);
+ return null;
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
new file mode 100644
index 0000000..e4494e2
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
@@ -0,0 +1,106 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.AbstractProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.delta.DeltaListener;
+import org.apache.dubbo.registry.xds.util.protocol.message.ListenerResult;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.config.listener.v3.Filter;
+import io.envoyproxy.envoy.config.listener.v3.Listener;
+import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager;
+import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.Rds;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_RESPONSE_XDS;
+
+public class LdsProtocol extends AbstractProtocol<ListenerResult, DeltaListener> {
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(LdsProtocol.class);
+
+ public LdsProtocol(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ @Override
+ public String getTypeUrl() {
+ return "type.googleapis.com/envoy.config.listener.v3.Listener";
+ }
+
+ public Map<String, ListenerResult> getListeners() {
+ return getResource(null);
+ }
+
+ @Override
+ protected Map<String, ListenerResult> decodeDiscoveryResponse(DiscoveryResponse response) {
+ if (getTypeUrl().equals(response.getTypeUrl())) {
+ Set<String> set = response.getResourcesList().stream()
+ .map(LdsProtocol::unpackListener)
+ .filter(Objects::nonNull)
+ .flatMap(e -> decodeResourceToListener(e).stream())
+ .collect(Collectors.toSet());
+ Map<String, ListenerResult> listenerDecodeResult = new ConcurrentHashMap<>();
+ listenerDecodeResult.put(emptyResourceName, new ListenerResult(set));
+ return listenerDecodeResult;
+ }
+ return new HashMap<>();
+ }
+
+ private Set<String> decodeResourceToListener(Listener resource) {
+ return resource.getFilterChainsList().stream()
+ .flatMap(e -> e.getFiltersList().stream())
+ .map(Filter::getTypedConfig)
+ .map(LdsProtocol::unpackHttpConnectionManager)
+ .filter(Objects::nonNull)
+ .map(HttpConnectionManager::getRds)
+ .map(Rds::getRouteConfigName)
+ .collect(Collectors.toSet());
+ }
+
+ private static Listener unpackListener(Any any) {
+ try {
+ return any.unpack(Listener.class);
+ } catch (InvalidProtocolBufferException e) {
+ logger.error(REGISTRY_ERROR_RESPONSE_XDS, "", "", "Error occur when decode xDS response.", e);
+ return null;
+ }
+ }
+
+ private static HttpConnectionManager unpackHttpConnectionManager(Any any) {
+ try {
+ if (!any.is(HttpConnectionManager.class)) {
+ return null;
+ }
+ return any.unpack(HttpConnectionManager.class);
+ } catch (InvalidProtocolBufferException e) {
+ logger.error(REGISTRY_ERROR_RESPONSE_XDS, "", "", "Error occur when decode xDS response.", e);
+ return null;
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
new file mode 100644
index 0000000..6d7ddad
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
@@ -0,0 +1,92 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.AbstractProtocol;
+import org.apache.dubbo.registry.xds.util.protocol.delta.DeltaRoute;
+import org.apache.dubbo.registry.xds.util.protocol.message.RouteResult;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.config.route.v3.Route;
+import io.envoyproxy.envoy.config.route.v3.RouteAction;
+import io.envoyproxy.envoy.config.route.v3.RouteConfiguration;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ERROR_RESPONSE_XDS;
+
+public class RdsProtocol extends AbstractProtocol<RouteResult, DeltaRoute> {
+
+ private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(RdsProtocol.class);
+
+ public RdsProtocol(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ @Override
+ public String getTypeUrl() {
+ return "type.googleapis.com/envoy.config.route.v3.RouteConfiguration";
+ }
+
+ @Override
+ protected Map<String, RouteResult> decodeDiscoveryResponse(DiscoveryResponse response) {
+ if (getTypeUrl().equals(response.getTypeUrl())) {
+ return response.getResourcesList().stream()
+ .map(RdsProtocol::unpackRouteConfiguration)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toConcurrentMap(RouteConfiguration::getName, this::decodeResourceToListener));
+ }
+ return new HashMap<>();
+ }
+
+ private RouteResult decodeResourceToListener(RouteConfiguration resource) {
+ Map<String, Set<String>> map = new HashMap<>();
+ Map<String, VirtualHost> rdsVirtualhostMap = new ConcurrentHashMap<>();
+ resource.getVirtualHostsList().forEach(virtualHost -> {
+ Set<String> cluster = virtualHost.getRoutesList().stream()
+ .map(Route::getRoute)
+ .map(RouteAction::getCluster)
+ .collect(Collectors.toSet());
+ for (String domain : virtualHost.getDomainsList()) {
+ map.put(domain, cluster);
+ rdsVirtualhostMap.put(domain, virtualHost);
+ }
+ });
+ return new RouteResult(map, rdsVirtualhostMap);
+ }
+
+ private static RouteConfiguration unpackRouteConfiguration(Any any) {
+ try {
+ return any.unpack(RouteConfiguration.class);
+ } catch (InvalidProtocolBufferException e) {
+ logger.error(REGISTRY_ERROR_RESPONSE_XDS, "", "", "Error occur when decode xDS response.", e);
+ return null;
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/Endpoint.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/Endpoint.java
new file mode 100644
index 0000000..ceed163
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/Endpoint.java
@@ -0,0 +1,96 @@
+/*
+ * 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.xds.util.protocol.message;
+
+import java.util.Objects;
+
+public class Endpoint {
+ private String clusterName;
+ private String address;
+ private int portValue;
+ private boolean healthy;
+ private int weight;
+
+ public String getClusterName() {
+ return clusterName;
+ }
+
+ public void setClusterName(String clusterName) {
+ this.clusterName = clusterName;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public int getPortValue() {
+ return portValue;
+ }
+
+ public void setPortValue(int portValue) {
+ this.portValue = portValue;
+ }
+
+ public boolean isHealthy() {
+ return healthy;
+ }
+
+ public void setHealthy(boolean healthy) {
+ this.healthy = healthy;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public void setWeight(int weight) {
+ this.weight = weight;
+ }
+
+ @Override
+ public String toString() {
+ return "Endpoint{" + "address='"
+ + address + '\'' + ", portValue='"
+ + portValue + '\'' + ", healthy="
+ + healthy + ", weight="
+ + weight + '}';
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Endpoint endpoint = (Endpoint) o;
+ return healthy == endpoint.healthy
+ && weight == endpoint.weight
+ && Objects.equals(address, endpoint.address)
+ && Objects.equals(portValue, endpoint.portValue);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(address, portValue, healthy, weight);
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/EndpointResult.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/EndpointResult.java
new file mode 100644
index 0000000..ead2c4d
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/EndpointResult.java
@@ -0,0 +1,60 @@
+/*
+ * 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.xds.util.protocol.message;
+
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+
+import java.util.Objects;
+import java.util.Set;
+
+public class EndpointResult {
+ private Set<Endpoint> endpoints;
+
+ public EndpointResult() {
+ this.endpoints = new ConcurrentHashSet<>();
+ }
+
+ public EndpointResult(Set<Endpoint> endpoints) {
+ this.endpoints = endpoints;
+ }
+
+ public Set<Endpoint> getEndpoints() {
+ return endpoints;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ EndpointResult that = (EndpointResult) o;
+ return Objects.equals(endpoints, that.endpoints);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(endpoints);
+ }
+
+ @Override
+ public String toString() {
+ return "EndpointResult{" + "endpoints=" + endpoints + '}';
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/ListenerResult.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/ListenerResult.java
new file mode 100644
index 0000000..7c16703
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/ListenerResult.java
@@ -0,0 +1,68 @@
+/*
+ * 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.xds.util.protocol.message;
+
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+
+import java.util.Objects;
+import java.util.Set;
+
+public class ListenerResult {
+ private Set<String> routeConfigNames;
+
+ public ListenerResult() {
+ this.routeConfigNames = new ConcurrentHashSet<>();
+ }
+
+ public ListenerResult(Set<String> routeConfigNames) {
+ this.routeConfigNames = routeConfigNames;
+ }
+
+ public Set<String> getRouteConfigNames() {
+ return routeConfigNames;
+ }
+
+ public void setRouteConfigNames(Set<String> routeConfigNames) {
+ this.routeConfigNames = routeConfigNames;
+ }
+
+ public void mergeRouteConfigNames(Set<String> names) {
+ this.routeConfigNames.addAll(names);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ ListenerResult listenerResult = (ListenerResult) o;
+ return Objects.equals(routeConfigNames, listenerResult.routeConfigNames);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(routeConfigNames);
+ }
+
+ @Override
+ public String toString() {
+ return "ListenerResult{" + "routeConfigNames=" + routeConfigNames + '}';
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/RouteResult.java b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/RouteResult.java
new file mode 100644
index 0000000..13029d6
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/RouteResult.java
@@ -0,0 +1,94 @@
+/*
+ * 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.xds.util.protocol.message;
+
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class RouteResult {
+ private final Map<String, Set<String>> domainMap;
+ private Map<String, VirtualHost> virtualHostMap;
+
+ public RouteResult() {
+ this.domainMap = new ConcurrentHashMap<>();
+ this.virtualHostMap = new ConcurrentHashMap<>();
+ }
+
+ public RouteResult(Map<String, Set<String>> domainMap) {
+ this.domainMap = domainMap;
+ this.virtualHostMap = new ConcurrentHashMap<>();
+ }
+
+ public RouteResult(Map<String, Set<String>> domainMap, Map<String, VirtualHost> virtualHostMap) {
+ this.domainMap = domainMap;
+ this.virtualHostMap = virtualHostMap;
+ }
+
+ public Map<String, Set<String>> getDomainMap() {
+ return domainMap;
+ }
+
+ public boolean isNotEmpty() {
+ return !domainMap.isEmpty();
+ }
+
+ public Set<String> searchDomain(String domain) {
+ return domainMap.getOrDefault(domain, new ConcurrentHashSet<>());
+ }
+
+ public Set<String> getDomains() {
+ return Collections.unmodifiableSet(domainMap.keySet());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ RouteResult that = (RouteResult) o;
+ return Objects.equals(domainMap, that.domainMap) && Objects.equals(virtualHostMap, that.virtualHostMap);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(domainMap, virtualHostMap);
+ }
+
+ public VirtualHost searchVirtualHost(String domain) {
+ return virtualHostMap.get(domain);
+ }
+
+ public void removeVirtualHost(String domain) {
+ virtualHostMap.remove(domain);
+ }
+
+ @Override
+ public String toString() {
+ return "RouteResult{" + "domainMap=" + domainMap + ", virtualHostMap=" + virtualHostMap + '}';
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointListener.java
similarity index 61%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointListener.java
index 52aff89..58aaa86 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointListener.java
@@ -14,24 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.router.xds;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import java.util.Set;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+public interface EdsEndpointListener {
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+ void onEndPointChange(String cluster, Set<Endpoint> endpoints);
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManager.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManager.java
new file mode 100644
index 0000000..a54d74c
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManager.java
@@ -0,0 +1,127 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashMapUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+import org.apache.dubbo.registry.xds.util.PilotExchanger;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.registry.xds.util.protocol.message.EndpointResult;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public class EdsEndpointManager {
+
+ private static final ConcurrentHashMap<String, Set<EdsEndpointListener>> ENDPOINT_LISTENERS =
+ new ConcurrentHashMap<>();
+
+ private static final ConcurrentHashMap<String, Set<Endpoint>> ENDPOINT_DATA_CACHE = new ConcurrentHashMap<>();
+
+ private static final ConcurrentHashMap<String, Consumer<Map<String, EndpointResult>>> EDS_LISTENERS =
+ new ConcurrentHashMap<>();
+
+ public EdsEndpointManager() {}
+
+ public synchronized void subscribeEds(String cluster, EdsEndpointListener listener) {
+
+ Set<EdsEndpointListener> listeners =
+ ConcurrentHashMapUtils.computeIfAbsent(ENDPOINT_LISTENERS, cluster, key -> new ConcurrentHashSet<>());
+ if (CollectionUtils.isEmpty(listeners)) {
+ doSubscribeEds(cluster);
+ }
+ listeners.add(listener);
+
+ if (ENDPOINT_DATA_CACHE.containsKey(cluster)) {
+ listener.onEndPointChange(cluster, ENDPOINT_DATA_CACHE.get(cluster));
+ }
+ }
+
+ private void doSubscribeEds(String cluster) {
+ ConcurrentHashMapUtils.computeIfAbsent(EDS_LISTENERS, cluster, key -> endpoints -> {
+ Set<Endpoint> result = endpoints.values().stream()
+ .map(EndpointResult::getEndpoints)
+ .flatMap(Set::stream)
+ .collect(Collectors.toSet());
+ notifyEndpointChange(cluster, result);
+ });
+ Consumer<Map<String, EndpointResult>> consumer = EDS_LISTENERS.get(cluster);
+ if (PilotExchanger.isEnabled()) {
+ FrameworkModel.defaultModel()
+ .getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class)
+ .getSharedExecutor()
+ .submit(() -> PilotExchanger.getInstance().observeEds(Collections.singleton(cluster), consumer));
+ }
+ }
+
+ public synchronized void unSubscribeEds(String cluster, EdsEndpointListener listener) {
+ Set<EdsEndpointListener> listeners = ENDPOINT_LISTENERS.get(cluster);
+ if (CollectionUtils.isEmpty(listeners)) {
+ return;
+ }
+ listeners.remove(listener);
+ if (listeners.isEmpty()) {
+ ENDPOINT_LISTENERS.remove(cluster);
+ doUnsubscribeEds(cluster);
+ }
+ }
+
+ private void doUnsubscribeEds(String cluster) {
+ Consumer<Map<String, EndpointResult>> consumer = EDS_LISTENERS.remove(cluster);
+
+ if (consumer != null && PilotExchanger.isEnabled()) {
+ PilotExchanger.getInstance().unObserveEds(Collections.singleton(cluster), consumer);
+ }
+ ENDPOINT_DATA_CACHE.remove(cluster);
+ }
+
+ public void notifyEndpointChange(String cluster, Set<Endpoint> endpoints) {
+
+ ENDPOINT_DATA_CACHE.put(cluster, endpoints);
+
+ Set<EdsEndpointListener> listeners = ENDPOINT_LISTENERS.get(cluster);
+ if (CollectionUtils.isEmpty(listeners)) {
+ return;
+ }
+ for (EdsEndpointListener listener : listeners) {
+ listener.onEndPointChange(cluster, endpoints);
+ }
+ }
+
+ // for test
+ static ConcurrentHashMap<String, Set<EdsEndpointListener>> getEndpointListeners() {
+ return ENDPOINT_LISTENERS;
+ }
+
+ // for test
+ static ConcurrentHashMap<String, Set<Endpoint>> getEndpointDataCache() {
+ return ENDPOINT_DATA_CACHE;
+ }
+
+ // for test
+ static ConcurrentHashMap<String, Consumer<Map<String, EndpointResult>>> getEdsListeners() {
+ return EDS_LISTENERS;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManager.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManager.java
new file mode 100644
index 0000000..9d267c9
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManager.java
@@ -0,0 +1,162 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashMapUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+import org.apache.dubbo.registry.xds.util.PilotExchanger;
+import org.apache.dubbo.registry.xds.util.protocol.message.ListenerResult;
+import org.apache.dubbo.registry.xds.util.protocol.message.RouteResult;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
+
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Consumer;
+
+public class RdsRouteRuleManager {
+
+ private static final ConcurrentHashMap<String, Set<XdsRouteRuleListener>> RULE_LISTENERS =
+ new ConcurrentHashMap<>();
+
+ private static final ConcurrentHashMap<String, List<XdsRouteRule>> ROUTE_DATA_CACHE = new ConcurrentHashMap<>();
+
+ private static final ConcurrentMap<String, RdsVirtualHostListener> RDS_LISTENERS = new ConcurrentHashMap<>();
+
+ private static volatile Consumer<Map<String, ListenerResult>> LDS_LISTENER;
+
+ private static volatile Consumer<Map<String, RouteResult>> RDS_LISTENER;
+
+ private static Map<String, RouteResult> RDS_RESULT;
+
+ public RdsRouteRuleManager() {}
+
+ public synchronized void subscribeRds(String domain, XdsRouteRuleListener listener) {
+
+ Set<XdsRouteRuleListener> listeners =
+ ConcurrentHashMapUtils.computeIfAbsent(RULE_LISTENERS, domain, key -> new ConcurrentHashSet<>());
+ if (CollectionUtils.isEmpty(listeners)) {
+ doSubscribeRds(domain);
+ }
+ listeners.add(listener);
+
+ if (ROUTE_DATA_CACHE.containsKey(domain)) {
+ listener.onRuleChange(domain, ROUTE_DATA_CACHE.get(domain));
+ }
+ }
+
+ private void doSubscribeRds(String domain) {
+ synchronized (RdsRouteRuleManager.class) {
+ if (RDS_LISTENER == null) {
+ RDS_LISTENER = rds -> {
+ if (rds == null) {
+ return;
+ }
+ for (RouteResult routeResult : rds.values()) {
+ for (String domainToNotify : RDS_LISTENERS.keySet()) {
+ VirtualHost virtualHost = routeResult.searchVirtualHost(domainToNotify);
+ if (virtualHost != null) {
+ RDS_LISTENERS.get(domainToNotify).parseVirtualHost(virtualHost);
+ }
+ }
+ }
+ RDS_RESULT = rds;
+ };
+ }
+ if (LDS_LISTENER == null) {
+ LDS_LISTENER = new Consumer<Map<String, ListenerResult>>() {
+ private volatile Set<String> configNames = null;
+
+ @Override
+ public void accept(Map<String, ListenerResult> listenerResults) {
+ if (listenerResults.size() == 1) {
+ for (ListenerResult listenerResult : listenerResults.values()) {
+ Set<String> newConfigNames = listenerResult.getRouteConfigNames();
+ if (configNames == null) {
+ PilotExchanger.getInstance().observeRds(newConfigNames, RDS_LISTENER);
+ } else if (!configNames.equals(newConfigNames)) {
+ PilotExchanger.getInstance().unObserveRds(configNames, RDS_LISTENER);
+ PilotExchanger.getInstance().observeRds(newConfigNames, RDS_LISTENER);
+ }
+ configNames = newConfigNames;
+ }
+ }
+ }
+ };
+ if (PilotExchanger.isEnabled()) {
+ PilotExchanger.getInstance().observeLds(LDS_LISTENER);
+ }
+ }
+ }
+ ConcurrentHashMapUtils.computeIfAbsent(RDS_LISTENERS, domain, key -> new RdsVirtualHostListener(domain, this));
+ RDS_LISTENER.accept(RDS_RESULT);
+ }
+
+ public synchronized void unSubscribeRds(String domain, XdsRouteRuleListener listener) {
+ Set<XdsRouteRuleListener> listeners = RULE_LISTENERS.get(domain);
+ if (CollectionUtils.isEmpty(listeners)) {
+ return;
+ }
+ listeners.remove(listener);
+ if (listeners.isEmpty()) {
+ RULE_LISTENERS.remove(domain);
+ doUnsubscribeRds(domain);
+ }
+ }
+
+ private void doUnsubscribeRds(String domain) {
+ RDS_LISTENERS.remove(domain);
+ }
+
+ public void notifyRuleChange(String domain, List<XdsRouteRule> xdsRouteRules) {
+
+ ROUTE_DATA_CACHE.put(domain, xdsRouteRules);
+
+ Set<XdsRouteRuleListener> listeners = RULE_LISTENERS.get(domain);
+ if (CollectionUtils.isEmpty(listeners)) {
+ return;
+ }
+ boolean empty = CollectionUtils.isEmpty(xdsRouteRules);
+ for (XdsRouteRuleListener listener : listeners) {
+ if (empty) {
+ listener.clearRule(domain);
+ } else {
+ listener.onRuleChange(domain, xdsRouteRules);
+ }
+ }
+ }
+
+ // for test
+ static ConcurrentHashMap<String, Set<XdsRouteRuleListener>> getRuleListeners() {
+ return RULE_LISTENERS;
+ }
+
+ // for test
+ static ConcurrentHashMap<String, List<XdsRouteRule>> getRouteDataCache() {
+ return ROUTE_DATA_CACHE;
+ }
+
+ // for test
+ static Map<String, RdsVirtualHostListener> getRdsListeners() {
+ return RDS_LISTENERS;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListener.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListener.java
new file mode 100644
index 0000000..44338cd
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListener.java
@@ -0,0 +1,184 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.constants.LoggerCodeConstants;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.ClusterWeight;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HTTPRouteDestination;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HeaderMatcher;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HttpRequestMatch;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.LongRangeMatch;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.PathMatcher;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
+
+import io.envoyproxy.envoy.config.route.v3.Route;
+import io.envoyproxy.envoy.config.route.v3.RouteAction;
+import io.envoyproxy.envoy.config.route.v3.RouteMatch;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class RdsVirtualHostListener {
+
+ private static final ErrorTypeAwareLogger LOGGER =
+ LoggerFactory.getErrorTypeAwareLogger(RdsVirtualHostListener.class);
+
+ private final String domain;
+
+ private final RdsRouteRuleManager routeRuleManager;
+
+ public RdsVirtualHostListener(String domain, RdsRouteRuleManager routeRuleManager) {
+ this.domain = domain;
+ this.routeRuleManager = routeRuleManager;
+ }
+
+ public void parseVirtualHost(VirtualHost virtualHost) {
+ if (virtualHost == null || CollectionUtils.isEmpty(virtualHost.getRoutesList())) {
+ // post empty
+ routeRuleManager.notifyRuleChange(domain, new ArrayList<>());
+ return;
+ }
+ try {
+ List<XdsRouteRule> xdsRouteRules = virtualHost.getRoutesList().stream()
+ .map(route -> {
+ if (route.getMatch().getQueryParametersCount() != 0) {
+ return null;
+ }
+ HttpRequestMatch match = parseMatch(route.getMatch());
+ HTTPRouteDestination action = parseAction(route);
+ return new XdsRouteRule(match, action);
+ })
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ // post rules
+ routeRuleManager.notifyRuleChange(domain, xdsRouteRules);
+ } catch (Exception e) {
+ LOGGER.error(
+ LoggerCodeConstants.INTERNAL_ERROR,
+ "",
+ "",
+ "parse domain: " + domain + " xds VirtualHost error",
+ e);
+ }
+ }
+
+ private HttpRequestMatch parseMatch(RouteMatch match) {
+ PathMatcher pathMatcher = parsePathMatch(match);
+ List<HeaderMatcher> headerMatchers = parseHeadMatch(match);
+ return new HttpRequestMatch(pathMatcher, headerMatchers);
+ }
+
+ private PathMatcher parsePathMatch(RouteMatch match) {
+ boolean caseSensitive = match.getCaseSensitive().getValue();
+ PathMatcher pathMatcher = new PathMatcher();
+ pathMatcher.setCaseSensitive(caseSensitive);
+ switch (match.getPathSpecifierCase()) {
+ case PREFIX:
+ pathMatcher.setPrefix(match.getPrefix());
+ return pathMatcher;
+ case PATH:
+ pathMatcher.setPath(match.getPath());
+ return pathMatcher;
+ case SAFE_REGEX:
+ String regex = match.getSafeRegex().getRegex();
+ pathMatcher.setRegex(regex);
+ return pathMatcher;
+ case PATHSPECIFIER_NOT_SET:
+ return null;
+ default:
+ throw new IllegalArgumentException("Path specifier is not expect");
+ }
+ }
+
+ private List<HeaderMatcher> parseHeadMatch(RouteMatch routeMatch) {
+ List<HeaderMatcher> headerMatchers = new ArrayList<>();
+ List<io.envoyproxy.envoy.config.route.v3.HeaderMatcher> headersList = routeMatch.getHeadersList();
+ for (io.envoyproxy.envoy.config.route.v3.HeaderMatcher headerMatcher : headersList) {
+ HeaderMatcher matcher = new HeaderMatcher();
+ matcher.setName(headerMatcher.getName());
+ matcher.setInverted(headerMatcher.getInvertMatch());
+ switch (headerMatcher.getHeaderMatchSpecifierCase()) {
+ case EXACT_MATCH:
+ matcher.setExactValue(headerMatcher.getExactMatch());
+ headerMatchers.add(matcher);
+ break;
+ case SAFE_REGEX_MATCH:
+ matcher.setRegex(headerMatcher.getSafeRegexMatch().getRegex());
+ headerMatchers.add(matcher);
+ break;
+ case RANGE_MATCH:
+ LongRangeMatch rang = new LongRangeMatch();
+ rang.setStart(headerMatcher.getRangeMatch().getStart());
+ rang.setEnd(headerMatcher.getRangeMatch().getEnd());
+ matcher.setRange(rang);
+ headerMatchers.add(matcher);
+ break;
+ case PRESENT_MATCH:
+ matcher.setPresent(headerMatcher.getPresentMatch());
+ headerMatchers.add(matcher);
+ break;
+ case PREFIX_MATCH:
+ matcher.setPrefix(headerMatcher.getPrefixMatch());
+ headerMatchers.add(matcher);
+ break;
+ case SUFFIX_MATCH:
+ matcher.setSuffix(headerMatcher.getSuffixMatch());
+ headerMatchers.add(matcher);
+ break;
+ case HEADERMATCHSPECIFIER_NOT_SET:
+ default:
+ throw new IllegalArgumentException("Header specifier is not expect");
+ }
+ }
+ return headerMatchers;
+ }
+
+ private HTTPRouteDestination parseAction(Route route) {
+ switch (route.getActionCase()) {
+ case ROUTE:
+ HTTPRouteDestination httpRouteDestination = new HTTPRouteDestination();
+ // only support cluster and weight cluster
+ RouteAction routeAction = route.getRoute();
+ RouteAction.ClusterSpecifierCase clusterSpecifierCase = routeAction.getClusterSpecifierCase();
+ if (clusterSpecifierCase == RouteAction.ClusterSpecifierCase.CLUSTER) {
+ httpRouteDestination.setCluster(routeAction.getCluster());
+ return httpRouteDestination;
+ } else if (clusterSpecifierCase == RouteAction.ClusterSpecifierCase.WEIGHTED_CLUSTERS) {
+ List<ClusterWeight> clusterWeights = routeAction.getWeightedClusters().getClustersList().stream()
+ .map(c ->
+ new ClusterWeight(c.getName(), c.getWeight().getValue()))
+ .sorted(Comparator.comparing(ClusterWeight::getWeight))
+ .collect(Collectors.toList());
+ httpRouteDestination.setWeightedClusters(clusterWeights);
+ return httpRouteDestination;
+ }
+ case REDIRECT:
+ case DIRECT_RESPONSE:
+ case FILTER_ACTION:
+ case ACTION_NOT_SET:
+ default:
+ throw new IllegalArgumentException("Cluster specifier is not expect");
+ }
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteRuleListener.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteRuleListener.java
index 52aff89..4e90fe2 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteRuleListener.java
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.router.xds;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+import java.util.List;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
+public interface XdsRouteRuleListener {
- public long getLastAccess() {
- return lastAccess;
- }
+ void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules);
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
- }
+ void clearRule(String appName);
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
new file mode 100644
index 0000000..e043e2d
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
@@ -0,0 +1,391 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.ConcurrentHashSet;
+import org.apache.dubbo.common.utils.Holder;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.xds.util.PilotExchanger;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.cluster.router.RouterSnapshotNode;
+import org.apache.dubbo.rpc.cluster.router.state.AbstractStateRouter;
+import org.apache.dubbo.rpc.cluster.router.state.BitList;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.ClusterWeight;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.DestinationSubset;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HTTPRouteDestination;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HeaderMatcher;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HttpRequestMatch;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.PathMatcher;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
+import org.apache.dubbo.rpc.support.RpcUtils;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+
+public class XdsRouter<T> extends AbstractStateRouter<T> implements XdsRouteRuleListener, EdsEndpointListener {
+
+ private Set<String> subscribeApplications;
+
+ private final ConcurrentHashMap<String, List<XdsRouteRule>> xdsRouteRuleMap;
+
+ private final ConcurrentHashMap<String, DestinationSubset<T>> destinationSubsetMap;
+
+ private final RdsRouteRuleManager rdsRouteRuleManager;
+
+ private final EdsEndpointManager edsEndpointManager;
+
+ private volatile BitList<Invoker<T>> currentInvokeList;
+
+ private static final String BINARY_HEADER_SUFFIX = "-bin";
+
+ private final boolean isEnable;
+
+ public XdsRouter(URL url) {
+ super(url);
+ isEnable = PilotExchanger.isEnabled();
+ rdsRouteRuleManager =
+ url.getOrDefaultApplicationModel().getBeanFactory().getBean(RdsRouteRuleManager.class);
+ edsEndpointManager = url.getOrDefaultApplicationModel().getBeanFactory().getBean(EdsEndpointManager.class);
+ subscribeApplications = new ConcurrentHashSet<>();
+ destinationSubsetMap = new ConcurrentHashMap<>();
+ xdsRouteRuleMap = new ConcurrentHashMap<>();
+ currentInvokeList = new BitList<>(new ArrayList<>());
+ }
+
+ /**
+ * @deprecated only for uts
+ */
+ protected XdsRouter(
+ URL url, RdsRouteRuleManager rdsRouteRuleManager, EdsEndpointManager edsEndpointManager, boolean isEnable) {
+ super(url);
+ this.isEnable = isEnable;
+ this.rdsRouteRuleManager = rdsRouteRuleManager;
+ this.edsEndpointManager = edsEndpointManager;
+ subscribeApplications = new ConcurrentHashSet<>();
+ destinationSubsetMap = new ConcurrentHashMap<>();
+ xdsRouteRuleMap = new ConcurrentHashMap<>();
+ currentInvokeList = new BitList<>(new ArrayList<>());
+ }
+
+ @Override
+ protected BitList<Invoker<T>> doRoute(
+ BitList<Invoker<T>> invokers,
+ URL url,
+ Invocation invocation,
+ boolean needToPrintMessage,
+ Holder<RouterSnapshotNode<T>> nodeHolder,
+ Holder<String> messageHolder)
+ throws RpcException {
+ if (!isEnable) {
+ if (needToPrintMessage) {
+ messageHolder.set(
+ "Directly Return. Reason: Pilot exchanger has not been initialized, may not in mesh mode.");
+ }
+ return invokers;
+ }
+
+ if (CollectionUtils.isEmpty(invokers)) {
+ if (needToPrintMessage) {
+ messageHolder.set("Directly Return. Reason: Invokers from previous router is empty.");
+ }
+ return invokers;
+ }
+
+ if (CollectionUtils.isEmptyMap(xdsRouteRuleMap)) {
+ if (needToPrintMessage) {
+ messageHolder.set("Directly Return. Reason: xds route rule is empty.");
+ }
+ return invokers;
+ }
+
+ StringBuilder stringBuilder = needToPrintMessage ? new StringBuilder() : null;
+
+ // find match cluster
+ String matchCluster = null;
+ Set<String> appNames = subscribeApplications;
+ for (String subscribeApplication : appNames) {
+ List<XdsRouteRule> rules = xdsRouteRuleMap.get(subscribeApplication);
+ if (CollectionUtils.isEmpty(rules)) {
+ continue;
+ }
+ for (XdsRouteRule rule : rules) {
+ String cluster = computeMatchCluster(invocation, rule);
+ if (cluster != null) {
+ matchCluster = cluster;
+ break;
+ }
+ }
+ if (matchCluster != null) {
+ if (stringBuilder != null) {
+ stringBuilder
+ .append("Match App: ")
+ .append(subscribeApplication)
+ .append(" Cluster: ")
+ .append(matchCluster)
+ .append(' ');
+ }
+ break;
+ }
+ }
+ // not match request just return
+ if (matchCluster == null) {
+ if (needToPrintMessage) {
+ messageHolder.set("Directly Return. Reason: xds rule not match.");
+ }
+ return invokers;
+ }
+ DestinationSubset<T> destinationSubset = destinationSubsetMap.get(matchCluster);
+ // cluster no target provider
+ if (destinationSubset == null) {
+ if (needToPrintMessage) {
+ messageHolder.set(stringBuilder.append("no target subset").toString());
+ }
+ return BitList.emptyList();
+ }
+ if (needToPrintMessage) {
+ messageHolder.set(stringBuilder.toString());
+ }
+ if (destinationSubset.getInvokers() == null) {
+ return BitList.emptyList();
+ }
+
+ return destinationSubset.getInvokers().and(invokers);
+ }
+
+ private String computeMatchCluster(Invocation invocation, XdsRouteRule rule) {
+ // compute request match cluster
+ HttpRequestMatch requestMatch = rule.getMatch();
+ if (requestMatch.getPathMatcher() == null && CollectionUtils.isEmpty(requestMatch.getHeaderMatcherList())) {
+ return null;
+ }
+ PathMatcher pathMatcher = requestMatch.getPathMatcher();
+ if (pathMatcher != null) {
+ String path = "/" + invocation.getInvoker().getUrl().getPath() + "/" + RpcUtils.getMethodName(invocation);
+ if (!pathMatcher.isMatch(path)) {
+ return null;
+ }
+ }
+ List<HeaderMatcher> headerMatchers = requestMatch.getHeaderMatcherList();
+ for (HeaderMatcher headerMatcher : headerMatchers) {
+ String headerName = headerMatcher.getName();
+ // not support byte
+ if (headerName.endsWith(BINARY_HEADER_SUFFIX)) {
+ return null;
+ }
+ String headValue = invocation.getAttachment(headerName);
+ if (!headerMatcher.match(headValue)) {
+ return null;
+ }
+ }
+ HTTPRouteDestination route = rule.getRoute();
+ if (route.getCluster() != null) {
+ return route.getCluster();
+ }
+ return computeWeightCluster(route.getWeightedClusters());
+ }
+
+ private String computeWeightCluster(List<ClusterWeight> weightedClusters) {
+ int totalWeight = Math.max(
+ weightedClusters.stream().mapToInt(ClusterWeight::getWeight).sum(), 1);
+ // target must greater than 0
+ // if weight is 0, the destination will not receive any traffic.
+ int target = ThreadLocalRandom.current().nextInt(1, totalWeight + 1);
+ for (ClusterWeight weightedCluster : weightedClusters) {
+ int weight = weightedCluster.getWeight();
+ target -= weight;
+ if (target <= 0) {
+ return weightedCluster.getName();
+ }
+ }
+ return null;
+ }
+
+ public void notify(BitList<Invoker<T>> invokers) {
+ BitList<Invoker<T>> invokerList = invokers == null ? BitList.emptyList() : invokers;
+ currentInvokeList = invokerList.clone();
+
+ // compute need subscribe/unsubscribe rds application
+ Set<String> currentApplications = new HashSet<>();
+ for (Invoker<T> invoker : invokerList) {
+ String applicationName = invoker.getUrl().getRemoteApplication();
+ if (StringUtils.isNotEmpty(applicationName)) {
+ currentApplications.add(applicationName);
+ }
+ }
+
+ if (!subscribeApplications.equals(currentApplications)) {
+ synchronized (this) {
+ for (String currentApplication : currentApplications) {
+ if (!subscribeApplications.contains(currentApplication)) {
+ rdsRouteRuleManager.subscribeRds(currentApplication, this);
+ }
+ }
+ for (String preApplication : subscribeApplications) {
+ if (!currentApplications.contains(preApplication)) {
+ rdsRouteRuleManager.unSubscribeRds(preApplication, this);
+ }
+ }
+ subscribeApplications = currentApplications;
+ }
+ }
+
+ // update subset
+ synchronized (this) {
+ BitList<Invoker<T>> allInvokers = currentInvokeList.clone();
+ for (DestinationSubset<T> subset : destinationSubsetMap.values()) {
+ computeSubset(subset, allInvokers);
+ }
+ }
+ }
+
+ private void computeSubset(DestinationSubset<T> subset, BitList<Invoker<T>> invokers) {
+ Set<Endpoint> endpoints = subset.getEndpoints();
+ List<Invoker<T>> filterInvokers = invokers.stream()
+ .filter(inv -> {
+ String host = inv.getUrl().getHost();
+ int port = inv.getUrl().getPort();
+ Optional<Endpoint> any = endpoints.stream()
+ .filter(end -> host.equals(end.getAddress()) && port == end.getPortValue())
+ .findAny();
+ return any.isPresent();
+ })
+ .collect(Collectors.toList());
+ subset.setInvokers(new BitList<>(filterInvokers));
+ }
+
+ @Override
+ public synchronized void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {
+ if (CollectionUtils.isEmpty(xdsRouteRules)) {
+ clearRule(appName);
+ return;
+ }
+ Set<String> oldCluster = getAllCluster();
+ xdsRouteRuleMap.put(appName, xdsRouteRules);
+ Set<String> newCluster = getAllCluster();
+ changeClusterSubscribe(oldCluster, newCluster);
+ }
+
+ private Set<String> getAllCluster() {
+ if (CollectionUtils.isEmptyMap(xdsRouteRuleMap)) {
+ return new HashSet<>();
+ }
+ Set<String> clusters = new HashSet<>();
+ xdsRouteRuleMap.forEach((appName, rules) -> {
+ for (XdsRouteRule rule : rules) {
+ HTTPRouteDestination action = rule.getRoute();
+ if (action.getCluster() != null) {
+ clusters.add(action.getCluster());
+ } else if (CollectionUtils.isNotEmpty(action.getWeightedClusters())) {
+ for (ClusterWeight weightedCluster : action.getWeightedClusters()) {
+ clusters.add(weightedCluster.getName());
+ }
+ }
+ }
+ });
+ return clusters;
+ }
+
+ private void changeClusterSubscribe(Set<String> oldCluster, Set<String> newCluster) {
+ Set<String> removeSubscribe = new HashSet<>(oldCluster);
+ Set<String> addSubscribe = new HashSet<>(newCluster);
+
+ removeSubscribe.removeAll(newCluster);
+ addSubscribe.removeAll(oldCluster);
+ // remove subscribe cluster
+ for (String cluster : removeSubscribe) {
+ edsEndpointManager.unSubscribeEds(cluster, this);
+ destinationSubsetMap.remove(cluster);
+ }
+ // add subscribe cluster
+ for (String cluster : addSubscribe) {
+ destinationSubsetMap.put(cluster, new DestinationSubset<>(cluster));
+ edsEndpointManager.subscribeEds(cluster, this);
+ }
+ }
+
+ @Override
+ public synchronized void clearRule(String appName) {
+ Set<String> oldCluster = getAllCluster();
+ List<XdsRouteRule> oldRules = xdsRouteRuleMap.remove(appName);
+ if (CollectionUtils.isEmpty(oldRules)) {
+ return;
+ }
+ Set<String> newCluster = getAllCluster();
+ changeClusterSubscribe(oldCluster, newCluster);
+ }
+
+ @Override
+ public synchronized void onEndPointChange(String cluster, Set<Endpoint> endpoints) {
+ // find and update subset
+ DestinationSubset<T> subset = destinationSubsetMap.get(cluster);
+ if (subset == null) {
+ return;
+ }
+ subset.setEndpoints(endpoints);
+ computeSubset(subset, currentInvokeList.clone());
+ }
+
+ @Override
+ public void stop() {
+ for (String app : subscribeApplications) {
+ rdsRouteRuleManager.unSubscribeRds(app, this);
+ }
+ for (String cluster : getAllCluster()) {
+ edsEndpointManager.unSubscribeEds(cluster, this);
+ }
+ }
+
+ @Deprecated
+ Set<String> getSubscribeApplications() {
+ return subscribeApplications;
+ }
+
+ /**
+ * for ut only
+ */
+ @Deprecated
+ BitList<Invoker<T>> getInvokerList() {
+ return currentInvokeList;
+ }
+
+ /**
+ * for ut only
+ */
+ @Deprecated
+ ConcurrentHashMap<String, List<XdsRouteRule>> getXdsRouteRuleMap() {
+ return xdsRouteRuleMap;
+ }
+
+ /**
+ * for ut only
+ */
+ @Deprecated
+ ConcurrentHashMap<String, DestinationSubset<T>> getDestinationSubsetMap() {
+ return destinationSubsetMap;
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouterFactory.java
similarity index 62%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouterFactory.java
index 52aff89..0e9a0c5 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouterFactory.java
@@ -14,24 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.router.xds;
-import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.cluster.router.state.StateRouter;
+import org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory;
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+@Activate(order = 100)
+public class XdsRouterFactory implements StateRouterFactory {
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
- }
-
- public long getLastAccess() {
- return lastAccess;
- }
-
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ @Override
+ public <T> StateRouter<T> getRouter(Class<T> interfaceClass, URL url) {
+ return new XdsRouter<>(url);
}
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsScopeModelInitializer.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsScopeModelInitializer.java
new file mode 100644
index 0000000..b34b86f
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsScopeModelInitializer.java
@@ -0,0 +1,39 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.apache.dubbo.rpc.model.ModuleModel;
+import org.apache.dubbo.rpc.model.ScopeModelInitializer;
+
+public class XdsScopeModelInitializer implements ScopeModelInitializer {
+
+ @Override
+ public void initializeFrameworkModel(FrameworkModel frameworkModel) {}
+
+ @Override
+ public void initializeApplicationModel(ApplicationModel applicationModel) {
+ ScopeBeanFactory beanFactory = applicationModel.getBeanFactory();
+ beanFactory.registerBean(RdsRouteRuleManager.class);
+ beanFactory.registerBean(EdsEndpointManager.class);
+ }
+
+ @Override
+ public void initializeModuleModel(ModuleModel moduleModel) {}
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/ClusterWeight.java
similarity index 63%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/ClusterWeight.java
index 52aff89..fe1307c 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/ClusterWeight.java
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.router.xds.rule;
-import org.apache.dubbo.rpc.Invoker;
+public class ClusterWeight {
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+ private final String name;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ private final int weight;
+
+ public ClusterWeight(String name, int weight) {
+ this.name = name;
+ this.weight = weight;
}
- public long getLastAccess() {
- return lastAccess;
+ public String getName() {
+ return name;
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ public int getWeight() {
+ return weight;
}
}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/DestinationSubset.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/DestinationSubset.java
new file mode 100644
index 0000000..79fa215
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/DestinationSubset.java
@@ -0,0 +1,57 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.router.state.BitList;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class DestinationSubset<T> {
+
+ public DestinationSubset(String clusterName) {
+ this.clusterName = clusterName;
+ }
+
+ private final String clusterName;
+
+ private Set<Endpoint> endpoints = new HashSet<>();
+
+ private BitList<Invoker<T>> invokers;
+
+ public String getClusterName() {
+ return clusterName;
+ }
+
+ public Set<Endpoint> getEndpoints() {
+ return endpoints;
+ }
+
+ public void setEndpoints(Set<Endpoint> endpoints) {
+ this.endpoints = endpoints;
+ }
+
+ public BitList<Invoker<T>> getInvokers() {
+ return invokers;
+ }
+
+ public void setInvokers(BitList<Invoker<T>> invokers) {
+ this.invokers = invokers;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HTTPRouteDestination.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HTTPRouteDestination.java
new file mode 100644
index 0000000..91d55d3
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HTTPRouteDestination.java
@@ -0,0 +1,42 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+import java.util.List;
+
+public class HTTPRouteDestination {
+
+ private String cluster;
+
+ private List<ClusterWeight> weightedClusters;
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public void setCluster(String cluster) {
+ this.cluster = cluster;
+ }
+
+ public List<ClusterWeight> getWeightedClusters() {
+ return weightedClusters;
+ }
+
+ public void setWeightedClusters(List<ClusterWeight> weightedClusters) {
+ this.weightedClusters = weightedClusters;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcher.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcher.java
new file mode 100644
index 0000000..04b0c45
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcher.java
@@ -0,0 +1,121 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+public class HeaderMatcher {
+
+ public String name;
+
+ public String exactValue;
+
+ private String regex;
+
+ public LongRangeMatch range;
+
+ public Boolean present;
+
+ public String prefix;
+
+ public String suffix;
+
+ public boolean inverted;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getExactValue() {
+ return exactValue;
+ }
+
+ public void setExactValue(String exactValue) {
+ this.exactValue = exactValue;
+ }
+
+ public String getRegex() {
+ return regex;
+ }
+
+ public void setRegex(String regex) {
+ this.regex = regex;
+ }
+
+ public LongRangeMatch getRange() {
+ return range;
+ }
+
+ public void setRange(LongRangeMatch range) {
+ this.range = range;
+ }
+
+ public Boolean getPresent() {
+ return present;
+ }
+
+ public void setPresent(Boolean present) {
+ this.present = present;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getSuffix() {
+ return suffix;
+ }
+
+ public void setSuffix(String suffix) {
+ this.suffix = suffix;
+ }
+
+ public boolean isInverted() {
+ return inverted;
+ }
+
+ public void setInverted(boolean inverted) {
+ this.inverted = inverted;
+ }
+
+ public boolean match(String input) {
+ if (getPresent() != null) {
+ return (input == null) == getPresent().equals(isInverted());
+ }
+ if (input == null) {
+ return false;
+ }
+ if (getExactValue() != null) {
+ return getExactValue().equals(input) != isInverted();
+ } else if (getRegex() != null) {
+ return input.matches(getRegex()) != isInverted();
+ } else if (getRange() != null) {
+ return getRange().isMatch(input) != isInverted();
+ } else if (getPrefix() != null) {
+ return input.startsWith(getPrefix()) != isInverted();
+ } else if (getSuffix() != null) {
+ return input.endsWith(getSuffix()) != isInverted();
+ }
+ return false;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HttpRequestMatch.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HttpRequestMatch.java
new file mode 100644
index 0000000..fef5aa1
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HttpRequestMatch.java
@@ -0,0 +1,39 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+import java.util.List;
+
+public class HttpRequestMatch {
+
+ private final PathMatcher pathMatcher;
+
+ private final List<HeaderMatcher> headerMatcherList;
+
+ public HttpRequestMatch(PathMatcher pathMatcher, List<HeaderMatcher> headerMatcherList) {
+ this.pathMatcher = pathMatcher;
+ this.headerMatcherList = headerMatcherList;
+ }
+
+ public PathMatcher getPathMatcher() {
+ return pathMatcher;
+ }
+
+ public List<HeaderMatcher> getHeaderMatcherList() {
+ return headerMatcherList;
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/LongRangeMatch.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/LongRangeMatch.java
new file mode 100644
index 0000000..df48257
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/LongRangeMatch.java
@@ -0,0 +1,47 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+public class LongRangeMatch {
+ private long start;
+ private long end;
+
+ public long getStart() {
+ return start;
+ }
+
+ public void setStart(long start) {
+ this.start = start;
+ }
+
+ public long getEnd() {
+ return end;
+ }
+
+ public void setEnd(long end) {
+ this.end = end;
+ }
+
+ public boolean isMatch(String input) {
+ try {
+ long num = Long.parseLong(input);
+ return num >= getStart() && num <= getEnd();
+ } catch (NumberFormatException ignore) {
+ return false;
+ }
+ }
+}
diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcher.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcher.java
new file mode 100644
index 0000000..cbf77e8
--- /dev/null
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcher.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.rpc.cluster.router.xds.rule;
+
+public class PathMatcher {
+
+ private String path;
+
+ private String prefix;
+
+ private String regex;
+
+ private boolean caseSensitive;
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public String getRegex() {
+ return regex;
+ }
+
+ public void setRegex(String regex) {
+ this.regex = regex;
+ }
+
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ public void setCaseSensitive(boolean caseSensitive) {
+ this.caseSensitive = caseSensitive;
+ }
+
+ public boolean isMatch(String input) {
+ if (getPath() != null) {
+ return isCaseSensitive() ? getPath().equals(input) : getPath().equalsIgnoreCase(input);
+ } else if (getPrefix() != null) {
+ return isCaseSensitive()
+ ? input.startsWith(getPrefix())
+ : input.toLowerCase().startsWith(getPrefix());
+ }
+ return input.matches(getRegex());
+ }
+}
diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/XdsRouteRule.java
similarity index 63%
copy from dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
copy to dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/XdsRouteRule.java
index 52aff89..5d2994d 100644
--- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/specifyaddress/InvokerCache.java
+++ b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/XdsRouteRule.java
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.rpc.cluster.specifyaddress;
+package org.apache.dubbo.rpc.cluster.router.xds.rule;
-import org.apache.dubbo.rpc.Invoker;
+public class XdsRouteRule {
-public class InvokerCache<T> {
- private long lastAccess = System.currentTimeMillis();
- private final Invoker<T> invoker;
+ private final HttpRequestMatch match;
- public InvokerCache(Invoker<T> invoker) {
- this.invoker = invoker;
+ private final HTTPRouteDestination route;
+
+ public XdsRouteRule(HttpRequestMatch match, HTTPRouteDestination route) {
+ this.match = match;
+ this.route = route;
}
- public long getLastAccess() {
- return lastAccess;
+ public HttpRequestMatch getMatch() {
+ return match;
}
- public Invoker<T> getInvoker() {
- lastAccess = System.currentTimeMillis();
- return invoker;
+ public HTTPRouteDestination getRoute() {
+ return route;
}
}
diff --git a/dubbo-xds/src/main/proto/ca.proto b/dubbo-xds/src/main/proto/ca.proto
new file mode 100644
index 0000000..41e6add
--- /dev/null
+++ b/dubbo-xds/src/main/proto/ca.proto
@@ -0,0 +1,62 @@
+// Copyright Istio Authors
+//
+// 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.
+
+// The canonical version of this proto can be found at
+// https://github.com/istio/api/blob/9abf4c87205f6ad04311fa021ce60803d8b95f78/security/v1alpha1/ca.proto
+
+syntax = "proto3";
+
+import "google/protobuf/struct.proto";
+
+// Keep this package for backward compatibility.
+package istio.v1.auth;
+
+option go_package = "istio.io/api/security/v1alpha1";
+option java_generic_services = true;
+option java_multiple_files = true;
+
+// Certificate request message. The authentication should be based on:
+// 1. Bearer tokens carried in the side channel;
+// 2. Client-side certificate via Mutual TLS handshake.
+// Note: the service implementation is REQUIRED to verify the authenticated caller is authorize to
+// all SANs in the CSR. The server side may overwrite any requested certificate field based on its
+// policies.
+message IstioCertificateRequest {
+ // PEM-encoded certificate request.
+ // The public key in the CSR is used to generate the certificate,
+ // and other fields in the generated certificate may be overwritten by the CA.
+ string csr = 1;
+ // Optional: requested certificate validity period, in seconds.
+ int64 validity_duration = 3;
+
+ // $hide_from_docs
+ // Optional: Opaque metadata provided by the XDS node to Istio.
+ // Supported metadata: WorkloadName, WorkloadIP, ClusterID
+ google.protobuf.Struct metadata = 4;
+}
+
+// Certificate response message.
+message IstioCertificateResponse {
+ // PEM-encoded certificate chain.
+ // The leaf cert is the first element, and the root cert is the last element.
+ repeated string cert_chain = 1;
+}
+
+// Service for managing certificates issued by the CA.
+service IstioCertificateService {
+ // Using provided CSR, returns a signed certificate.
+ rpc CreateCertificate(IstioCertificateRequest)
+ returns (IstioCertificateResponse) {
+ }
+}
diff --git a/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
new file mode 100644
index 0000000..2ee954e
--- /dev/null
+++ b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
@@ -0,0 +1 @@
+xds=org.apache.dubbo.registry.xds.XdsRegistryFactory
diff --git a/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
new file mode 100644
index 0000000..e6dfce2
--- /dev/null
+++ b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
@@ -0,0 +1 @@
+xds=org.apache.dubbo.registry.xds.XdsServiceDiscoveryFactory
diff --git a/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.xds.XdsCertificateSigner b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.xds.XdsCertificateSigner
new file mode 100644
index 0000000..bbfc0fb
--- /dev/null
+++ b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.xds.XdsCertificateSigner
@@ -0,0 +1 @@
+istio=org.apache.dubbo.registry.xds.istio.IstioCitadelCertificateSigner
diff --git a/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory
new file mode 100644
index 0000000..ca9b94e
--- /dev/null
+++ b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory
@@ -0,0 +1 @@
+xds=org.apache.dubbo.rpc.cluster.router.xds.XdsRouterFactory
\ No newline at end of file
diff --git a/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
new file mode 100644
index 0000000..3005831
--- /dev/null
+++ b/dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
@@ -0,0 +1 @@
+xds-route=org.apache.dubbo.rpc.cluster.router.xds.XdsScopeModelInitializer
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperTest.java
new file mode 100644
index 0000000..6318823
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.xds.util.bootstrap;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.url.component.URLAddress;
+import org.apache.dubbo.registry.xds.XdsInitializationException;
+
+import io.grpc.netty.shaded.io.netty.channel.unix.DomainSocketAddress;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+class BootstrapperTest {
+ @Test
+ void testParse() throws XdsInitializationException {
+ String rawData = "{\n" + " \"xds_servers\": [\n"
+ + " {\n"
+ + " \"server_uri\": \"unix:///etc/istio/proxy/XDS\",\n"
+ + " \"channel_creds\": [\n"
+ + " {\n"
+ + " \"type\": \"insecure\"\n"
+ + " }\n"
+ + " ],\n"
+ + " \"server_features\": [\n"
+ + " \"xds_v3\"\n"
+ + " ]\n"
+ + " }\n"
+ + " ],\n"
+ + " \"node\": {\n"
+ + " \"id\": \"sidecar~172.17.0.4~dubbo-demo-consumer-deployment-grpc-agent-58585cb9cd-gp79p.dubbo-demo~dubbo-demo.svc.cluster.local\",\n"
+ + " \"metadata\": {\n"
+ + " \"ANNOTATIONS\": {\n"
+ + " \"inject.istio.io/templates\": \"grpc-agent\",\n"
+ + " \"kubernetes.io/config.seen\": \"2022-07-19T12:53:29.742565722Z\",\n"
+ + " \"kubernetes.io/config.source\": \"api\",\n"
+ + " \"prometheus.io/path\": \"/stats/prometheus\",\n"
+ + " \"prometheus.io/port\": \"15020\",\n"
+ + " \"prometheus.io/scrape\": \"true\",\n"
+ + " \"proxy.istio.io/config\": \"{\\\"holdApplicationUntilProxyStarts\\\": true}\",\n"
+ + " \"proxy.istio.io/overrides\": \"{\\\"containers\\\":[{\\\"name\\\":\\\"app\\\",\\\"image\\\":\\\"gcr.io/istio-testing/app:latest\\\",\\\"args\\\":[\\\"--metrics=15014\\\",\\\"--port\\\",\\\"18080\\\",\\\"--tcp\\\",\\\"19090\\\",\\\"--xds-grpc-server=17070\\\",\\\"--grpc\\\",\\\"17070\\\",\\\"--grpc\\\",\\\"17171\\\",\\\"--port\\\",\\\"3333\\\",\\\"--port\\\",\\\"8080\\\",\\\"--version\\\",\\\"v1\\\",\\\"--crt=/cert.crt\\\",\\\"--key=/cert.key\\\"],\\\"ports\\\":[{\\\"containerPort\\\":17070,\\\"protocol\\\":\\\"TCP\\\"},{\\\"containerPort\\\":17171,\\\"protocol\\\":\\\"TCP\\\"},{\\\"containerPort\\\":8080,\\\"protocol\\\":\\\"TCP\\\"},{\\\"name\\\":\\\"tcp-health-port\\\",\\\"containerPort\\\":3333,\\\"protocol\\\":\\\"TCP\\\"}],\\\"env\\\":[{\\\"name\\\":\\\"INSTANCE_IP\\\",\\\"valueFrom\\\":{\\\"fieldRef\\\":{\\\"apiVersion\\\":\\\"v1\\\",\\\"fieldPath\\\":\\\"status.podIP\\\"}}}],\\\"resources\\\":{},\\\"volumeMounts\\\":[{\\\"name\\\":\\\"kube-api-access-2tknx\\\",\\\"readOnly\\\":true,\\\"mountPath\\\":\\\"/var/run/secrets/kubernetes.io/serviceaccount\\\"}],\\\"livenessProbe\\\":{\\\"tcpSocket\\\":{\\\"port\\\":\\\"tcp-health-port\\\"},\\\"initialDelaySeconds\\\":10,\\\"timeoutSeconds\\\":1,\\\"periodSeconds\\\":10,\\\"successThreshold\\\":1,\\\"failureThreshold\\\":10},\\\"readinessProbe\\\":{\\\"httpGet\\\":{\\\"path\\\":\\\"/\\\",\\\"port\\\":8080,\\\"scheme\\\":\\\"HTTP\\\"},\\\"initialDelaySeconds\\\":1,\\\"timeoutSeconds\\\":1,\\\"periodSeconds\\\":2,\\\"successThreshold\\\":1,\\\"failureThreshold\\\":10},\\\"startupProbe\\\":{\\\"tcpSocket\\\":{\\\"port\\\":\\\"tcp-health-port\\\"},\\\"timeoutSeconds\\\":1,\\\"periodSeconds\\\":10,\\\"successThreshold\\\":1,\\\"failureThreshold\\\":10},\\\"terminationMessagePath\\\":\\\"/dev/termination-log\\\",\\\"terminationMessagePolicy\\\":\\\"File\\\",\\\"imagePullPolicy\\\":\\\"Always\\\",\\\"securityContext\\\":{\\\"runAsUser\\\":1338,\\\"runAsGroup\\\":1338}},{\\\"name\\\":\\\"dubbo-demo-consumer\\\",\\\"image\\\":\\\"dockeddocking/dubbo:consumer.v1.0\\\",\\\"command\\\":[\\\"sh\\\",\\\"-c\\\",\\\"java $JAVA_OPTS -jar dubbo-demo-consumer.jar \\\"],\\\"resources\\\":{},\\\"volumeMounts\\\":[{\\\"name\\\":\\\"kube-api-access-2tknx\\\",\\\"readOnly\\\":true,\\\"mountPath\\\":\\\"/var/run/secrets/kubernetes.io/serviceaccount\\\"}],\\\"terminationMessagePath\\\":\\\"/dev/termination-log\\\",\\\"terminationMessagePolicy\\\":\\\"File\\\",\\\"imagePullPolicy\\\":\\\"Always\\\"}]}\",\n"
+ + " \"sidecar.istio.io/rewriteAppHTTPProbers\": \"false\",\n"
+ + " \"sidecar.istio.io/status\": \"{\\\"initContainers\\\":null,\\\"containers\\\":[\\\"app\\\",\\\"dubbo-demo-consumer\\\",\\\"istio-proxy\\\"],\\\"volumes\\\":[\\\"workload-socket\\\",\\\"workload-certs\\\",\\\"istio-xds\\\",\\\"istio-data\\\",\\\"istio-podinfo\\\",\\\"istio-token\\\",\\\"istiod-ca-cert\\\"],\\\"imagePullSecrets\\\":null,\\\"revision\\\":\\\"default\\\"}\"\n"
+ + " },\n"
+ + " \"APP_CONTAINERS\": \"app,dubbo-demo-consumer\",\n"
+ + " \"CLUSTER_ID\": \"Kubernetes\",\n"
+ + " \"ENVOY_PROMETHEUS_PORT\": 15090,\n"
+ + " \"ENVOY_STATUS_PORT\": 15021,\n"
+ + " \"GENERATOR\": \"grpc\",\n"
+ + " \"INSTANCE_IPS\": \"172.17.0.4\",\n"
+ + " \"INTERCEPTION_MODE\": \"REDIRECT\",\n"
+ + " \"ISTIO_PROXY_SHA\": \"2b6009118109b480e1d5abf3188fd7d9c0c0acf0\",\n"
+ + " \"ISTIO_VERSION\": \"1.14.1\",\n"
+ + " \"LABELS\": {\n"
+ + " \"app\": \"dubbo-demo-consumer-dev\",\n"
+ + " \"pod-template-hash\": \"58585cb9cd\",\n"
+ + " \"service.istio.io/canonical-name\": \"dubbo-demo-consumer-dev\",\n"
+ + " \"service.istio.io/canonical-revision\": \"v1\",\n"
+ + " \"version\": \"v1\"\n"
+ + " },\n"
+ + " \"MESH_ID\": \"cluster.local\",\n"
+ + " \"NAME\": \"dubbo-demo-consumer-deployment-grpc-agent-58585cb9cd-gp79p\",\n"
+ + " \"NAMESPACE\": \"dubbo-demo\",\n"
+ + " \"OWNER\": \"kubernetes://apis/apps/v1/namespaces/dubbo-demo/deployments/dubbo-demo-consumer-deployment-grpc-agent\",\n"
+ + " \"PILOT_SAN\": [\n"
+ + " \"istiod.istio-system.svc\"\n"
+ + " ],\n"
+ + " \"POD_PORTS\": \"[{\\\"containerPort\\\":17070,\\\"protocol\\\":\\\"TCP\\\"},{\\\"containerPort\\\":17171,\\\"protocol\\\":\\\"TCP\\\"},{\\\"containerPort\\\":8080,\\\"protocol\\\":\\\"TCP\\\"},{\\\"name\\\":\\\"tcp-health-port\\\",\\\"containerPort\\\":3333,\\\"protocol\\\":\\\"TCP\\\"}]\",\n"
+ + " \"PROV_CERT\": \"var/run/secrets/istio/root-cert.pem\",\n"
+ + " \"PROXY_CONFIG\": {\n"
+ + " \"binaryPath\": \"/usr/local/bin/envoy\",\n"
+ + " \"concurrency\": 2,\n"
+ + " \"configPath\": \"./etc/istio/proxy\",\n"
+ + " \"controlPlaneAuthPolicy\": \"MUTUAL_TLS\",\n"
+ + " \"discoveryAddress\": \"istiod.istio-system.svc:15012\",\n"
+ + " \"drainDuration\": \"45s\",\n"
+ + " \"holdApplicationUntilProxyStarts\": true,\n"
+ + " \"parentShutdownDuration\": \"60s\",\n"
+ + " \"proxyAdminPort\": 15000,\n"
+ + " \"serviceCluster\": \"istio-proxy\",\n"
+ + " \"statNameLength\": 189,\n"
+ + " \"statusPort\": 15020,\n"
+ + " \"terminationDrainDuration\": \"5s\",\n"
+ + " \"tracing\": {\n"
+ + " \"zipkin\": {\n"
+ + " \"address\": \"zipkin.istio-system:9411\"\n"
+ + " }\n"
+ + " }\n"
+ + " },\n"
+ + " \"SERVICE_ACCOUNT\": \"default\",\n"
+ + " \"WORKLOAD_NAME\": \"dubbo-demo-consumer-deployment-grpc-agent\"\n"
+ + " },\n"
+ + " \"locality\": {},\n"
+ + " \"UserAgentVersionType\": null\n"
+ + " },\n"
+ + " \"certificate_providers\": {\n"
+ + " \"default\": {\n"
+ + " \"plugin_name\": \"file_watcher\",\n"
+ + " \"config\": {\n"
+ + " \"certificate_file\": \"/var/lib/istio/data/cert-chain.pem\",\n"
+ + " \"private_key_file\": \"/var/lib/istio/data/key.pem\",\n"
+ + " \"ca_certificate_file\": \"/var/lib/istio/data/root-cert.pem\",\n"
+ + " \"refresh_interval\": \"900s\"\n"
+ + " }\n"
+ + " }\n"
+ + " },\n"
+ + " \"server_listener_resource_name_template\": \"xds.istio.io/grpc/lds/inbound/%s\"\n"
+ + "}";
+ BootstrapperImpl.bootstrapPathFromEnvVar = "";
+ BootstrapperImpl bootstrapper = new BootstrapperImpl();
+ bootstrapper.setFileReader(createFileReader(rawData));
+ Bootstrapper.BootstrapInfo info = bootstrapper.bootstrap();
+ List<Bootstrapper.ServerInfo> serverInfoList = info.servers();
+ Assertions.assertEquals(serverInfoList.get(0).target(), "unix:///etc/istio/proxy/XDS");
+ URLAddress address = URLAddress.parse(serverInfoList.get(0).target(), null, false);
+ Assertions.assertEquals(new DomainSocketAddress(address.getPath()).path(), "etc/istio/proxy/XDS");
+ }
+
+ @Test
+ void testUrl() {
+ URL url = URL.valueOf("dubbo://127.0.0.1:23456/TestService?useAgent=true");
+ Assertions.assertTrue(url.getParameter("useAgent", false));
+ }
+
+ private static BootstrapperImpl.FileReader createFileReader(final String rawData) {
+ return new BootstrapperImpl.FileReader() {
+ @Override
+ public String readFile(String path) {
+ return rawData;
+ }
+ };
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocolMock.java b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocolMock.java
new file mode 100644
index 0000000..f6ac1f0
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocolMock.java
@@ -0,0 +1,51 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.message.EndpointResult;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class EdsProtocolMock extends EdsProtocol {
+
+ public EdsProtocolMock(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ public Map<String, EndpointResult> getResourcesMap() {
+ return resourcesMap;
+ }
+
+ public void setResourcesMap(Map<String, EndpointResult> resourcesMap) {
+ this.resourcesMap = resourcesMap;
+ }
+
+ public void setConsumerObserveMap(
+ Map<Set<String>, List<Consumer<Map<String, EndpointResult>>>> consumerObserveMap) {
+ this.consumerObserveMap = consumerObserveMap;
+ }
+
+ public void setObserveResourcesName(Set<String> observeResourcesName) {
+ this.observeResourcesName = observeResourcesName;
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocolMock.java b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocolMock.java
new file mode 100644
index 0000000..0618ffb
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocolMock.java
@@ -0,0 +1,68 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.message.ListenerResult;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+import io.envoyproxy.envoy.service.discovery.v3.DiscoveryRequest;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class LdsProtocolMock extends LdsProtocol {
+
+ public LdsProtocolMock(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ public Map<String, ListenerResult> getResourcesMap() {
+ return resourcesMap;
+ }
+
+ public void setResourcesMap(Map<String, ListenerResult> resourcesMap) {
+ this.resourcesMap = resourcesMap;
+ }
+
+ protected DiscoveryRequest buildDiscoveryRequest(Set<String> resourceNames) {
+ return DiscoveryRequest.newBuilder()
+ .setNode(node)
+ .setTypeUrl(getTypeUrl())
+ .addAllResourceNames(resourceNames)
+ .build();
+ }
+
+ public Set<String> getObserveResourcesName() {
+ return observeResourcesName;
+ }
+
+ public void setObserveResourcesName(Set<String> observeResourcesName) {
+ this.observeResourcesName = observeResourcesName;
+ }
+
+ public Map<Set<String>, List<Consumer<Map<String, ListenerResult>>>> getConsumerObserveMap() {
+ return consumerObserveMap;
+ }
+
+ public void setConsumerObserveMap(
+ Map<Set<String>, List<Consumer<Map<String, ListenerResult>>>> consumerObserveMap) {
+ this.consumerObserveMap = consumerObserveMap;
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocolMock.java b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocolMock.java
new file mode 100644
index 0000000..544fc89
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocolMock.java
@@ -0,0 +1,54 @@
+/*
+ * 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.xds.util.protocol.impl;
+
+import org.apache.dubbo.registry.xds.util.AdsObserver;
+import org.apache.dubbo.registry.xds.util.protocol.message.RouteResult;
+
+import io.envoyproxy.envoy.config.core.v3.Node;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class RdsProtocolMock extends RdsProtocol {
+
+ public RdsProtocolMock(AdsObserver adsObserver, Node node, int checkInterval) {
+ super(adsObserver, node, checkInterval);
+ }
+
+ public Map<String, RouteResult> getResourcesMap() {
+ return resourcesMap;
+ }
+
+ public void setResourcesMap(Map<String, RouteResult> resourcesMap) {
+ this.resourcesMap = resourcesMap;
+ }
+
+ public Set<String> getObserveResourcesName() {
+ return observeResourcesName;
+ }
+
+ public void setConsumerObserveMap(Map<Set<String>, List<Consumer<Map<String, RouteResult>>>> consumerObserveMap) {
+ this.consumerObserveMap = consumerObserveMap;
+ }
+
+ public void setObserveResourcesName(Set<String> observeResourcesName) {
+ this.observeResourcesName = observeResourcesName;
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManagerTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManagerTest.java
new file mode 100644
index 0000000..b92fc91
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManagerTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class EdsEndpointManagerTest {
+
+ @BeforeEach
+ public void before() {
+ EdsEndpointManager.getEdsListeners().clear();
+ EdsEndpointManager.getEndpointListeners().clear();
+ EdsEndpointManager.getEndpointDataCache().clear();
+ }
+
+ @Test
+ public void subscribeEdsTest() {
+ EdsEndpointManager manager = new EdsEndpointManager();
+ String cluster = "testApp";
+ int subscribeNum = 3;
+ for (int i = 0; i < subscribeNum; i++) {
+ manager.subscribeEds(cluster, new EdsEndpointListener() {
+ @Override
+ public void onEndPointChange(String cluster, Set<Endpoint> endpoints) {}
+ });
+ }
+ assertNotNull(EdsEndpointManager.getEdsListeners().get(cluster));
+ assertEquals(EdsEndpointManager.getEndpointListeners().get(cluster).size(), subscribeNum);
+ }
+
+ @Test
+ public void unsubscribeRdsTest() {
+ EdsEndpointManager manager = new EdsEndpointManager();
+ String domain = "testApp";
+ EdsEndpointListener listener = new EdsEndpointListener() {
+ @Override
+ public void onEndPointChange(String cluster, Set<Endpoint> endpoints) {}
+ };
+ manager.subscribeEds(domain, listener);
+ assertNotNull(EdsEndpointManager.getEdsListeners().get(domain));
+ assertEquals(EdsEndpointManager.getEndpointListeners().get(domain).size(), 1);
+
+ manager.unSubscribeEds(domain, listener);
+ assertNull(EdsEndpointManager.getEdsListeners().get(domain));
+ assertNull(EdsEndpointManager.getEndpointListeners().get(domain));
+ }
+
+ @Test
+ public void notifyRuleChangeTest() {
+
+ Map<String, Set<Endpoint>> cacheData = new HashMap<>();
+ String domain = "testApp";
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint = new Endpoint();
+ endpoints.add(endpoint);
+
+ EdsEndpointListener listener = new EdsEndpointListener() {
+ @Override
+ public void onEndPointChange(String cluster, Set<Endpoint> endpoints) {
+ cacheData.put(cluster, endpoints);
+ }
+ };
+
+ EdsEndpointManager manager = new EdsEndpointManager();
+ manager.subscribeEds(domain, listener);
+ manager.notifyEndpointChange(domain, endpoints);
+ assertEquals(cacheData.get(domain), endpoints);
+
+ Map<String, Set<Endpoint>> cacheData2 = new HashMap<>();
+ EdsEndpointListener listener2 = new EdsEndpointListener() {
+ @Override
+ public void onEndPointChange(String cluster, Set<Endpoint> endpoints) {
+ cacheData2.put(cluster, endpoints);
+ }
+ };
+ manager.subscribeEds(domain, listener2);
+ assertEquals(cacheData2.get(domain), endpoints);
+ // clear
+ manager.notifyEndpointChange(domain, new HashSet<>());
+ assertEquals(cacheData.get(domain).size(), 0);
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManagerTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManagerTest.java
new file mode 100644
index 0000000..81ad9f3
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManagerTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HTTPRouteDestination;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.HttpRequestMatch;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class RdsRouteRuleManagerTest {
+
+ @BeforeEach
+ public void before() {
+ RdsRouteRuleManager.getRuleListeners().clear();
+ RdsRouteRuleManager.getRouteDataCache().clear();
+ RdsRouteRuleManager.getRdsListeners().clear();
+ }
+
+ @Test
+ public void subscribeRdsTest() {
+ RdsRouteRuleManager manager = new RdsRouteRuleManager();
+ String domain = "testApp";
+ int subscribeNum = 3;
+ for (int i = 0; i < subscribeNum; i++) {
+ manager.subscribeRds(domain, new XdsRouteRuleListener() {
+ @Override
+ public void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {}
+
+ @Override
+ public void clearRule(String appName) {}
+ });
+ }
+ assertNotNull(RdsRouteRuleManager.getRdsListeners().get(domain));
+ assertEquals(RdsRouteRuleManager.getRuleListeners().get(domain).size(), subscribeNum);
+ }
+
+ @Test
+ public void unsubscribeRdsTest() {
+ RdsRouteRuleManager manager = new RdsRouteRuleManager();
+ String domain = "testApp";
+ XdsRouteRuleListener listener = new XdsRouteRuleListener() {
+ @Override
+ public void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {}
+
+ @Override
+ public void clearRule(String appName) {}
+ };
+ manager.subscribeRds(domain, listener);
+ assertNotNull(RdsRouteRuleManager.getRdsListeners().get(domain));
+ assertEquals(RdsRouteRuleManager.getRuleListeners().get(domain).size(), 1);
+
+ manager.unSubscribeRds(domain, listener);
+ assertNull(RdsRouteRuleManager.getRdsListeners().get(domain));
+ assertNull(RdsRouteRuleManager.getRuleListeners().get(domain));
+ }
+
+ @Test
+ public void notifyRuleChangeTest() {
+
+ Map<String, List<XdsRouteRule>> cacheData = new HashMap<>();
+ String domain = "testApp";
+ List<XdsRouteRule> xdsRouteRules = new ArrayList<>();
+ XdsRouteRule rule = new XdsRouteRule(new HttpRequestMatch(null, null), new HTTPRouteDestination());
+ xdsRouteRules.add(rule);
+
+ XdsRouteRuleListener listener = new XdsRouteRuleListener() {
+ @Override
+ public void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {
+ cacheData.put(appName, xdsRouteRules);
+ }
+
+ @Override
+ public void clearRule(String appName) {
+ cacheData.remove(appName);
+ }
+ };
+
+ RdsRouteRuleManager manager = new RdsRouteRuleManager();
+ manager.subscribeRds(domain, listener);
+ manager.notifyRuleChange(domain, xdsRouteRules);
+ assertEquals(cacheData.get(domain), xdsRouteRules);
+
+ Map<String, List<XdsRouteRule>> cacheData2 = new HashMap<>();
+ XdsRouteRuleListener listener2 = new XdsRouteRuleListener() {
+ @Override
+ public void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {
+ cacheData2.put(appName, xdsRouteRules);
+ }
+
+ @Override
+ public void clearRule(String appName) {
+ cacheData2.remove(appName);
+ }
+ };
+ manager.subscribeRds(domain, listener2);
+ assertEquals(cacheData2.get(domain), xdsRouteRules);
+ // clear
+ manager.notifyRuleChange(domain, new ArrayList<>());
+ assertNull(cacheData.get(domain));
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListenerTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListenerTest.java
new file mode 100644
index 0000000..e23c8b6
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListenerTest.java
@@ -0,0 +1,258 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.rpc.cluster.router.xds.rule.ClusterWeight;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.XdsRouteRule;
+
+import com.google.protobuf.BoolValue;
+import com.google.protobuf.UInt32Value;
+import io.envoyproxy.envoy.config.route.v3.HeaderMatcher;
+import io.envoyproxy.envoy.config.route.v3.Route;
+import io.envoyproxy.envoy.config.route.v3.RouteAction;
+import io.envoyproxy.envoy.config.route.v3.RouteMatch;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+import io.envoyproxy.envoy.config.route.v3.WeightedCluster;
+import io.envoyproxy.envoy.type.matcher.v3.RegexMatcher;
+import io.envoyproxy.envoy.type.v3.Int64Range;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class RdsVirtualHostListenerTest {
+
+ private final String domain = "testApp";
+
+ private final Map<String, List<XdsRouteRule>> dataCache = new HashMap<>();
+
+ private final XdsRouteRuleListener listener = new XdsRouteRuleListener() {
+ @Override
+ public void onRuleChange(String appName, List<XdsRouteRule> xdsRouteRules) {
+ dataCache.put(appName, xdsRouteRules);
+ }
+
+ @Override
+ public void clearRule(String appName) {
+ dataCache.remove(appName);
+ }
+ };
+
+ private final RdsRouteRuleManager manager = new RdsRouteRuleManager();
+
+ private final RdsVirtualHostListener rdsVirtualHostListener = new RdsVirtualHostListener("testApp", manager);
+
+ @BeforeEach
+ public void init() {
+ dataCache.clear();
+ manager.subscribeRds(domain, listener);
+ }
+
+ @Test
+ public void parsePathPathMatcherTest() {
+ String path = "/test/name";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder()
+ .setPath(path)
+ .setCaseSensitive(
+ BoolValue.newBuilder().setValue(true).build())
+ .build())
+ .setRoute(RouteAction.newBuilder()
+ .setCluster("cluster-test")
+ .build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ assertEquals(rules.get(0).getMatch().getPathMatcher().getPath(), path);
+ assertTrue(rules.get(0).getMatch().getPathMatcher().isCaseSensitive());
+ }
+
+ @Test
+ public void parsePrefixPathMatcherTest() {
+ String prefix = "/test";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPrefix(prefix).build())
+ .setRoute(RouteAction.newBuilder()
+ .setCluster("cluster-test")
+ .build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ assertEquals(rules.get(0).getMatch().getPathMatcher().getPrefix(), prefix);
+ }
+
+ @Test
+ public void parseRegexPathMatcherTest() {
+ String regex = "/test/.*";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder()
+ .setSafeRegex(RegexMatcher.newBuilder()
+ .setRegex(regex)
+ .build())
+ .build())
+ .setRoute(RouteAction.newBuilder()
+ .setCluster("cluster-test")
+ .build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ assertEquals(rules.get(0).getMatch().getPathMatcher().getRegex(), regex);
+ }
+
+ @Test
+ public void parseHeadMatcherTest() {
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder()
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-exactValue")
+ .setExactMatch("exactValue")
+ .setInvertMatch(true)
+ .build())
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-regex")
+ .setSafeRegexMatch(RegexMatcher.newBuilder()
+ .setRegex("regex")
+ .build())
+ .build())
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-range")
+ .setRangeMatch(Int64Range.newBuilder()
+ .setStart(1)
+ .setEnd(100)
+ .build())
+ .build())
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-present")
+ .setPresentMatch(true)
+ .build())
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-prefix")
+ .setPrefixMatch("prefix")
+ .build())
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("head-suffix")
+ .setSuffixMatch("suffix")
+ .build())
+ .build())
+ .setRoute(RouteAction.newBuilder()
+ .setCluster("cluster-test")
+ .build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ List<org.apache.dubbo.rpc.cluster.router.xds.rule.HeaderMatcher> headerMatcherList =
+ rules.get(0).getMatch().getHeaderMatcherList();
+ for (org.apache.dubbo.rpc.cluster.router.xds.rule.HeaderMatcher matcher : headerMatcherList) {
+ if (matcher.getName().equals("head-exactValue")) {
+ assertEquals(matcher.getExactValue(), "exactValue");
+ } else if (matcher.getName().equals("head-regex")) {
+ assertEquals(matcher.getRegex(), "regex");
+ } else if (matcher.getName().equals("head-range")) {
+ assertEquals(matcher.getRange().getStart(), 1);
+ assertEquals(matcher.getRange().getEnd(), 100);
+ } else if (matcher.getName().equals("head-present")) {
+ assertTrue(matcher.getPresent());
+ } else if (matcher.getName().equals("head-prefix")) {
+ assertEquals(matcher.getPrefix(), "prefix");
+ } else if (matcher.getName().equals("head-suffix")) {
+ assertEquals(matcher.getSuffix(), "suffix");
+ }
+ }
+ }
+
+ @Test
+ public void parseRouteClusterTest() {
+ String cluster = "cluster-test";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPrefix("/test").build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster).build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ assertEquals(rules.get(0).getRoute().getCluster(), cluster);
+ }
+
+ @Test
+ public void parseRouteWeightClusterTest() {
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(domain)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPrefix("/test").build())
+ .setRoute(RouteAction.newBuilder()
+ .setWeightedClusters(WeightedCluster.newBuilder()
+ .addClusters(WeightedCluster.ClusterWeight.newBuilder()
+ .setName("cluster-test1")
+ .setWeight(UInt32Value.newBuilder()
+ .setValue(40)
+ .build())
+ .build())
+ .addClusters(WeightedCluster.ClusterWeight.newBuilder()
+ .setName("cluster-test2")
+ .setWeight(UInt32Value.newBuilder()
+ .setValue(60)
+ .build())
+ .build())
+ .build())
+ .build())
+ .build())
+ .build();
+ rdsVirtualHostListener.parseVirtualHost(virtualHost);
+ List<XdsRouteRule> rules = dataCache.get(domain);
+ assertNotNull(rules);
+ List<ClusterWeight> weightedClusters = rules.get(0).getRoute().getWeightedClusters();
+ assertEquals(weightedClusters.size(), 2);
+ for (ClusterWeight weightedCluster : weightedClusters) {
+ if (weightedCluster.getName().equals("cluster-test1")) {
+ assertEquals(weightedCluster.getWeight(), 40);
+ } else if (weightedCluster.getName().equals("cluster-test2")) {
+ assertEquals(weightedCluster.getWeight(), 60);
+ }
+ }
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java
new file mode 100644
index 0000000..c870c68
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java
@@ -0,0 +1,376 @@
+/*
+ * 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.rpc.cluster.router.xds;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.Holder;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.registry.xds.util.protocol.message.Endpoint;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider;
+import org.apache.dubbo.rpc.cluster.router.state.BitList;
+import org.apache.dubbo.rpc.cluster.router.xds.rule.DestinationSubset;
+
+import com.google.protobuf.UInt32Value;
+import io.envoyproxy.envoy.config.route.v3.HeaderMatcher;
+import io.envoyproxy.envoy.config.route.v3.Route;
+import io.envoyproxy.envoy.config.route.v3.RouteAction;
+import io.envoyproxy.envoy.config.route.v3.RouteMatch;
+import io.envoyproxy.envoy.config.route.v3.VirtualHost;
+import io.envoyproxy.envoy.config.route.v3.WeightedCluster;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class XdsRouteTest {
+
+ private EdsEndpointManager edsEndpointManager;
+
+ private RdsRouteRuleManager rdsRouteRuleManager;
+ private Set<TracingContextProvider> tracingContextProviders;
+ private URL url;
+
+ @BeforeEach
+ public void setup() {
+ edsEndpointManager = Mockito.spy(EdsEndpointManager.class);
+ rdsRouteRuleManager = Mockito.spy(RdsRouteRuleManager.class);
+ tracingContextProviders = new HashSet<>();
+
+ url = URL.valueOf("test://localhost/DemoInterface");
+ }
+
+ private Invoker<Object> createInvoker(String app) {
+ URL url = URL.valueOf(
+ "dubbo://localhost/DemoInterface?" + (StringUtils.isEmpty(app) ? "" : "remote.application=" + app));
+ Invoker invoker = Mockito.mock(Invoker.class);
+ when(invoker.getUrl()).thenReturn(url);
+ return invoker;
+ }
+
+ private Invoker<Object> createInvoker(String app, String address) {
+ URL url = URL.valueOf("dubbo://" + address + "/DemoInterface?"
+ + (StringUtils.isEmpty(app) ? "" : "remote.application=" + app));
+ Invoker invoker = Mockito.mock(Invoker.class);
+ when(invoker.getUrl()).thenReturn(url);
+ return invoker;
+ }
+
+ @Test
+ public void testNotifyInvoker() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ xdsRouter.notify(null);
+ assertEquals(0, xdsRouter.getSubscribeApplications().size());
+
+ BitList<Invoker<Object>> invokers = new BitList<>(Arrays.asList(createInvoker(""), createInvoker("app1")));
+
+ xdsRouter.notify(invokers);
+
+ assertEquals(1, xdsRouter.getSubscribeApplications().size());
+ assertTrue(xdsRouter.getSubscribeApplications().contains("app1"));
+ assertEquals(invokers, xdsRouter.getInvokerList());
+
+ verify(rdsRouteRuleManager, times(1)).subscribeRds("app1", xdsRouter);
+
+ invokers = new BitList<>(Arrays.asList(createInvoker("app2")));
+ xdsRouter.notify(invokers);
+ verify(rdsRouteRuleManager, times(1)).subscribeRds("app2", xdsRouter);
+ verify(rdsRouteRuleManager, times(1)).unSubscribeRds("app1", xdsRouter);
+ assertEquals(invokers, xdsRouter.getInvokerList());
+
+ xdsRouter.stop();
+ verify(rdsRouteRuleManager, times(1)).unSubscribeRds("app2", xdsRouter);
+ }
+
+ @Test
+ public void testRuleChange() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ String cluster1 = "cluster-test1";
+ String cluster2 = "cluster-test2";
+ BitList<Invoker<Object>> invokers = new BitList<>(Arrays.asList(createInvoker(appName)));
+ xdsRouter.notify(invokers);
+ String path = "/DemoInterface/call";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPath(path).build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster1).build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ assertEquals(xdsRouter.getXdsRouteRuleMap().get(appName).size(), 1);
+ verify(edsEndpointManager, times(1)).subscribeEds(cluster1, xdsRouter);
+
+ VirtualHost virtualHost2 = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPath(path).build())
+ .setRoute(RouteAction.newBuilder()
+ .setCluster("cluster-test2")
+ .build())
+ .build())
+ .build();
+ hostListener.parseVirtualHost(virtualHost2);
+ assertEquals(xdsRouter.getXdsRouteRuleMap().get(appName).size(), 1);
+ verify(edsEndpointManager, times(1)).subscribeEds(cluster2, xdsRouter);
+ verify(edsEndpointManager, times(1)).unSubscribeEds(cluster1, xdsRouter);
+ }
+
+ @Test
+ public void testEndpointChange() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ String cluster1 = "cluster-test1";
+ BitList<Invoker<Object>> invokers = new BitList<>(
+ Arrays.asList(createInvoker(appName, "1.1.1.1:20880"), createInvoker(appName, "2.2.2.2:20880")));
+ xdsRouter.notify(invokers);
+ String path = "/DemoInterface/call";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPath(path).build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster1).build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ assertEquals(xdsRouter.getXdsRouteRuleMap().get(appName).size(), 1);
+ verify(edsEndpointManager, times(1)).subscribeEds(cluster1, xdsRouter);
+
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setAddress("1.1.1.1");
+ endpoint1.setPortValue(20880);
+ Endpoint endpoint2 = new Endpoint();
+ endpoint2.setAddress("2.2.2.2");
+ endpoint2.setPortValue(20880);
+ endpoints.add(endpoint1);
+ endpoints.add(endpoint2);
+ edsEndpointManager.notifyEndpointChange(cluster1, endpoints);
+
+ DestinationSubset<Object> objectDestinationSubset =
+ xdsRouter.getDestinationSubsetMap().get(cluster1);
+ assertEquals(invokers, objectDestinationSubset.getInvokers());
+ }
+
+ @Test
+ public void testRouteNotMatch() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ BitList<Invoker<Object>> invokers = new BitList<>(
+ Arrays.asList(createInvoker(appName, "1.1.1.1:20880"), createInvoker(appName, "2.2.2.2:20880")));
+ assertEquals(invokers, xdsRouter.route(invokers.clone(), null, null, false, null));
+ Holder<String> message = new Holder<>();
+ xdsRouter.doRoute(invokers.clone(), null, null, true, null, message);
+ assertEquals("Directly Return. Reason: xds route rule is empty.", message.get());
+ }
+
+ @Test
+ public void testRoutePathMatch() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ String cluster1 = "cluster-test1";
+ Invoker<Object> invoker1 = createInvoker(appName, "1.1.1.1:20880");
+ BitList<Invoker<Object>> invokers =
+ new BitList<>(Arrays.asList(invoker1, createInvoker(appName, "2.2.2.2:20880")));
+ xdsRouter.notify(invokers);
+ String path = "/DemoInterface/call";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPath(path).build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster1).build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ Invocation invocation = Mockito.mock(Invocation.class);
+ Invoker invoker = Mockito.mock(Invoker.class);
+ URL url1 = Mockito.mock(URL.class);
+ when(invoker.getUrl()).thenReturn(url1);
+ when(url1.getPath()).thenReturn("DemoInterface");
+ when(invocation.getInvoker()).thenReturn(invoker);
+ when(invocation.getMethodName()).thenReturn("call");
+
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setAddress("1.1.1.1");
+ endpoint1.setPortValue(20880);
+ endpoints.add(endpoint1);
+ edsEndpointManager.notifyEndpointChange(cluster1, endpoints);
+ BitList<Invoker<Object>> routes = xdsRouter.route(invokers.clone(), null, invocation, false, null);
+ assertEquals(1, routes.size());
+ assertEquals(invoker1, routes.get(0));
+ }
+
+ @Test
+ public void testRouteHeadMatch() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ String cluster1 = "cluster-test1";
+ Invoker<Object> invoker1 = createInvoker(appName, "1.1.1.1:20880");
+ BitList<Invoker<Object>> invokers =
+ new BitList<>(Arrays.asList(invoker1, createInvoker(appName, "2.2.2.2:20880")));
+ xdsRouter.notify(invokers);
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder()
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("userId")
+ .setExactMatch("123")
+ .build())
+ .build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster1).build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ Invocation invocation = Mockito.mock(Invocation.class);
+ when(invocation.getAttachment("userId")).thenReturn("123");
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setAddress("1.1.1.1");
+ endpoint1.setPortValue(20880);
+ endpoints.add(endpoint1);
+ edsEndpointManager.notifyEndpointChange(cluster1, endpoints);
+ BitList<Invoker<Object>> routes = xdsRouter.route(invokers.clone(), null, invocation, false, null);
+ assertEquals(1, routes.size());
+ assertEquals(invoker1, routes.get(0));
+ }
+
+ @Test
+ public void testRouteWeightCluster() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName = "app1";
+ String cluster1 = "cluster-test1";
+ String cluster2 = "cluster-test2";
+ Invoker<Object> invoker1 = createInvoker(appName, "1.1.1.1:20880");
+ BitList<Invoker<Object>> invokers =
+ new BitList<>(Arrays.asList(invoker1, createInvoker(appName, "2.2.2.2:20880")));
+ xdsRouter.notify(invokers);
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder()
+ .addHeaders(HeaderMatcher.newBuilder()
+ .setName("userId")
+ .setExactMatch("123")
+ .build())
+ .build())
+ .setRoute(RouteAction.newBuilder()
+ .setWeightedClusters(WeightedCluster.newBuilder()
+ .addClusters(WeightedCluster.ClusterWeight.newBuilder()
+ .setName(cluster1)
+ .setWeight(UInt32Value.newBuilder()
+ .setValue(100)
+ .build())
+ .build())
+ .addClusters(WeightedCluster.ClusterWeight.newBuilder()
+ .setName(cluster2)
+ .setWeight(UInt32Value.newBuilder()
+ .setValue(0)
+ .build())
+ .build())
+ .build())
+ .build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ Invocation invocation = Mockito.mock(Invocation.class);
+ when(invocation.getAttachment("userId")).thenReturn("123");
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setAddress("1.1.1.1");
+ endpoint1.setPortValue(20880);
+ endpoints.add(endpoint1);
+ edsEndpointManager.notifyEndpointChange(cluster1, endpoints);
+
+ endpoints = new HashSet<>();
+ Endpoint endpoint2 = new Endpoint();
+ endpoint2.setAddress("2.2.2.2");
+ endpoint2.setPortValue(20880);
+ endpoints.add(endpoint2);
+ edsEndpointManager.notifyEndpointChange(cluster2, endpoints);
+
+ for (int i = 0; i < 10; i++) {
+ BitList<Invoker<Object>> routes = xdsRouter.route(invokers.clone(), null, invocation, false, null);
+ assertEquals(1, routes.size());
+ assertEquals(invoker1, routes.get(0));
+ }
+ }
+
+ @Test
+ public void testRouteMultiApp() {
+ XdsRouter<Object> xdsRouter = new XdsRouter<>(url, rdsRouteRuleManager, edsEndpointManager, true);
+ String appName1 = "app1";
+ String appName2 = "app2";
+ String cluster1 = "cluster-test1";
+ Invoker<Object> invoker1 = createInvoker(appName2, "1.1.1.1:20880");
+ Invoker<Object> invoker2 = createInvoker(appName1, "2.2.2.2:20880");
+ BitList<Invoker<Object>> invokers = new BitList<>(Arrays.asList(invoker1, invoker2));
+ xdsRouter.notify(invokers);
+ assertEquals(xdsRouter.getSubscribeApplications().size(), 2);
+ String path = "/DemoInterface/call";
+ VirtualHost virtualHost = VirtualHost.newBuilder()
+ .addDomains(appName2)
+ .addRoutes(Route.newBuilder()
+ .setName("route-test")
+ .setMatch(RouteMatch.newBuilder().setPath(path).build())
+ .setRoute(RouteAction.newBuilder().setCluster(cluster1).build())
+ .build())
+ .build();
+ RdsVirtualHostListener hostListener = new RdsVirtualHostListener(appName2, rdsRouteRuleManager);
+ hostListener.parseVirtualHost(virtualHost);
+ Invocation invocation = Mockito.mock(Invocation.class);
+ Invoker invoker = Mockito.mock(Invoker.class);
+ URL url1 = Mockito.mock(URL.class);
+ when(invoker.getUrl()).thenReturn(url1);
+ when(url1.getPath()).thenReturn("DemoInterface");
+ when(invocation.getInvoker()).thenReturn(invoker);
+ when(invocation.getMethodName()).thenReturn("call");
+
+ Set<Endpoint> endpoints = new HashSet<>();
+ Endpoint endpoint1 = new Endpoint();
+ endpoint1.setAddress("1.1.1.1");
+ endpoint1.setPortValue(20880);
+ endpoints.add(endpoint1);
+ edsEndpointManager.notifyEndpointChange(cluster1, endpoints);
+ BitList<Invoker<Object>> routes = xdsRouter.route(invokers.clone(), null, invocation, false, null);
+ assertEquals(1, routes.size());
+ assertEquals(invoker1, routes.get(0));
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcherTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcherTest.java
new file mode 100644
index 0000000..597c06e
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcherTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HeaderMatcherTest {
+
+ @Test
+ public void exactValueMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setName("testHead");
+ String value = "testValue";
+ headMatcher.setExactValue(value);
+ assertTrue(headMatcher.match(value));
+ }
+
+ @Test
+ public void regexMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setRegex("test.*");
+ String value = "testValue";
+ headMatcher.setExactValue(value);
+ assertTrue(headMatcher.match(value));
+ }
+
+ @Test
+ public void rangMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ LongRangeMatch range = new LongRangeMatch();
+ range.setStart(100);
+ range.setEnd(500);
+ headMatcher.setRange(range);
+ assertTrue(headMatcher.match("300"));
+ }
+
+ @Test
+ public void presentMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setName("testHead");
+ headMatcher.setPresent(true);
+ assertTrue(headMatcher.match("value"));
+ headMatcher.setPresent(false);
+ assertTrue(headMatcher.match(null));
+ }
+
+ @Test
+ public void prefixMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setName("testHead");
+ headMatcher.setPrefix("test");
+ assertTrue(headMatcher.match("testValue"));
+ }
+
+ @Test
+ public void suffixMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setName("testHead");
+ headMatcher.setSuffix("Value");
+ assertTrue(headMatcher.match("testValue"));
+ }
+
+ @Test
+ public void invertedMatcherTest() {
+ HeaderMatcher headMatcher = new HeaderMatcher();
+ headMatcher.setName("testHead");
+ String value = "testValue";
+ headMatcher.setExactValue(value);
+ headMatcher.setInverted(true);
+ assertFalse(headMatcher.match("testValue"));
+ }
+}
diff --git a/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcherTest.java b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcherTest.java
new file mode 100644
index 0000000..ce8e82b
--- /dev/null
+++ b/dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcherTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.rpc.cluster.router.xds.rule;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PathMatcherTest {
+
+ @Test
+ public void pathMatcherTest() {
+ PathMatcher pathMatcher = new PathMatcher();
+ String path = "/testService/test";
+ pathMatcher.setPath(path);
+ assertTrue(pathMatcher.isMatch(path));
+ assertTrue(pathMatcher.isMatch(path.toUpperCase()));
+ pathMatcher.setCaseSensitive(true);
+ assertFalse(pathMatcher.isMatch(path.toUpperCase()));
+ }
+
+ @Test
+ public void prefixMatcherTest() {
+ PathMatcher pathMatcher = new PathMatcher();
+ String prefix = "/test";
+ String path = "/testService/test";
+ pathMatcher.setPrefix(prefix);
+ assertTrue(pathMatcher.isMatch(path));
+ assertTrue(pathMatcher.isMatch(path.toUpperCase()));
+ pathMatcher.setCaseSensitive(true);
+ assertFalse(pathMatcher.isMatch(path.toUpperCase()));
+ }
+
+ @Test
+ public void regexMatcherTest() {
+ PathMatcher pathMatcher = new PathMatcher();
+ String regex = "/testService/.*";
+ String path = "/testService/test";
+ pathMatcher.setRegex(regex);
+ assertTrue(pathMatcher.isMatch(path));
+ }
+}
diff --git a/pom.xml b/pom.xml
index b6a1876..522f140 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,12 +94,19 @@
<module>dubbo-rpc-extensions</module>
<module>dubbo-serialization-extensions</module>
<module>dubbo-mock-extensions</module>
+ <module>dubbo-gateway-extensions</module>
+ <module>dubbo-cross-thread-extensions</module>
+ <module>dubbo-tag-extensions</module>
+ <module>dobbo-doc-auto-gen</module>
+ <module>dubbo-xds</module>
+ <module>dubbo-kubernetes</module>
</modules>
<properties>
- <revision>1.0.3-SNAPSHOT</revision>
+ <revision>1.0.5-SNAPSHOT</revision>
<!-- Test libs -->
<junit_jupiter_version>5.6.0</junit_jupiter_version>
+ <awaitility_version>4.2.0</awaitility_version>
<hazelcast_version>3.11.1</hazelcast_version>
<hamcrest_version>2.2</hamcrest_version>
<hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
@@ -181,6 +188,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito_version}</version>
@@ -557,9 +570,12 @@
<failOnViolation>true</failOnViolation>
<skip>${checkstyle.skip}</skip>
<excludes>
- **/istio/v1/auth/Ca.java,
- **/istio/v1/auth/IstioCertificateServiceGrpc.java,
+ **/istio/v1/auth/**/*,
+ **/com/google/rpc/*,
**/generated/**/*,
+ **/generated-sources/**/*,
+ **/grpc/health/**/*,
+ **/grpc/reflection/**/*,
**/target/**/*,
</excludes>
</configuration>
diff --git a/test/dubbo-scenario-builder/pom.xml b/test/dubbo-scenario-builder/pom.xml
index ee8fa8b..45b7855 100644
--- a/test/dubbo-scenario-builder/pom.xml
+++ b/test/dubbo-scenario-builder/pom.xml
@@ -27,7 +27,7 @@
<artifactId>dubbo-scenario-builder</artifactId>
<properties>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
</properties>
<dependencies>
@@ -76,7 +76,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
+ <version>1.3.12</version>
</dependency>
</dependencies>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml
index 72bb54c..7ea4941 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml
@@ -29,9 +29,9 @@
<source.level>1.8</source.level>
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
- <junit.version>4.12</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <junit.version>4.13.1</junit.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml
index 89d2a7c..cf8abd8 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml
@@ -29,10 +29,10 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
- <dubbo.version>3.0.4</dubbo.version>
+ <dubbo.version>3.2.7</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml
index b63a585..77b2957 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml
@@ -31,8 +31,8 @@
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml
index 3bad54d..069e982 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml
@@ -31,8 +31,8 @@
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml
index be0db1c..c9a4ea3 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml
@@ -31,9 +31,9 @@
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.extensions.version>1.0.3-SNAPSHOT</dubbo.extensions.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.extensions.version>1.0.5-SNAPSHOT</dubbo.extensions.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml
index d12cc73..2c14f1f 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml
@@ -31,9 +31,9 @@
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
<dubbo.compiler.version>0.0.2</dubbo.compiler.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml
index b15af1b..e5fc135 100644
--- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml
+++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml
@@ -31,8 +31,8 @@
<target.level>1.8</target.level>
<dubbo.version>3.0.4</dubbo.version>
<junit.version>4.13.1</junit.version>
- <spring.version>4.3.29.RELEASE</spring.version>
- <dubbo.serialization.version>1.0.1-SNAPSHOT</dubbo.serialization.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.serialization.version>1.0.2-SNAPSHOT</dubbo.serialization.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
