This is an automated email from the ASF dual-hosted git repository.

songxiaosheng pushed a commit to branch 3.2.0
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git

commit a2ccd4214bf6037b02e7c82fb504b39644e0d375
Merge: db84301 ca49157
Author: xiaosheng <songxiaosh...@apache.org>
AuthorDate: Mon Dec 18 22:41:44 2023 +0800

    Merge pull request #253 from apache/master
    
    merge master

 .asf.yaml                                          |   7 +
 .github/workflows/ci.yml                           |   4 +-
 .github/workflows/conformance.yml                  |   2 +-
 README.md                                          |   6 +
 .../main/java/org/apache/dubbo/doc/DocAutoGen.java |   5 +
 dubbo-extensions-dependencies-bom/pom.xml          |  35 +-
 dubbo-kubernetes/pom.xml                           |  86 ++++
 .../kubernetes/KubernetesMeshEnvListener.java      | 207 +++++++++
 .../KubernetesMeshEnvListenerFactory.java          |  42 ++
 .../registry/kubernetes/KubernetesRegistry.java    |  50 ++
 .../kubernetes/KubernetesRegistryFactory.java      |  34 ++
 .../kubernetes/KubernetesServiceDiscovery.java     | 451 ++++++++++++++++++
 .../KubernetesServiceDiscoveryFactory.java         |  28 ++
 .../dubbo/registry/kubernetes/MeshConstant.java    |  45 ++
 .../kubernetes/NopKubernetesMeshEnvListener.java   |  34 ++
 .../kubernetes/util/KubernetesClientConst.java     |  78 ++++
 .../kubernetes/util/KubernetesConfigUtils.java     | 104 +++++
 .../org.apache.dubbo.registry.RegistryFactory      |   1 +
 ...e.dubbo.registry.client.ServiceDiscoveryFactory |   1 +
 ...luster.router.mesh.route.MeshEnvListenerFactory |   1 +
 .../kubernetes/KubernetesServiceDiscoveryTest.java | 289 ++++++++++++
 .../org.mockito.plugins.MockMaker                  |   1 +
 .../remoting/redis/jedis/ClusterRedisClient.java   |   5 +-
 .../remoting/redis/jedis/MonoRedisClient.java      |   6 +-
 .../remoting/redis/jedis/SentinelRedisClient.java  |   8 +-
 .../dubbo-serialization-avro/pom.xml               |   8 +
 .../pom.xml                                        |  14 +-
 .../common/serialize/DefaultJsonDataInput.java     |  72 +++
 .../common/serialize/DefaultJsonDataOutput.java    |  65 +++
 .../dubbo-serialization-fastjson/README.md         |   1 +
 .../dubbo-serialization-fastjson/pom.xml           |  21 +-
 .../serialize/fastjson/FastJsonObjectInput.java    | 124 ++---
 .../serialize/fastjson/FastJsonObjectOutput.java   |  98 ++--
 .../fastjson/FastJsonSecurityManager.java          |  48 ++
 .../src/test/java/com/example/test/TestPojo.java   |  55 +++
 .../fastjson/FastJsonSerializationTest.java        | 509 +++++++++++++++++++++
 .../serialize/fastjson/TrustedNotSerializable.java |  48 ++
 .../common/serialize/fastjson/TrustedPojo.java     |  53 +++
 .../common/serialize/fastjson/TrustedPojo2.java    |  52 +++
 .../dubbo-serialization-gson/pom.xml               |  17 +-
 .../common/serialize/gson/GsonJsonObjectInput.java |  14 +-
 .../serialize/gson/GsonJsonObjectOutput.java       |  47 +-
 .../dubbo-serialization-jackson/pom.xml            |  11 +
 .../serialize/jackson/JacksonObjectInput.java      |  76 +--
 .../serialize/jackson/JacksonObjectOutput.java     |  44 +-
 .../dubbo/common/serialize/jackson/Image.java      | 120 +++++
 .../serialize/jackson/JacksonObjectInputTest.java} |  90 ++--
 .../jackson/JacksonObjectOutputTest.java}          |  67 +--
 .../jackson/JacksonSerializationTest.java}         |  31 +-
 .../common/serialize/jackson/Organization.java     |  30 ++
 .../dubbo/common/serialize/jackson/Person.java     |  95 ++++
 .../dubbo-serialization-protobuf/pom.xml           |   8 +
 .../dubbo-serialization-test/pom.xml               |   5 -
 dubbo-serialization-extensions/pom.xml             |   4 +
 dubbo-xds/pom.xml                                  | 141 ++++++
 .../dubbo/registry/xds/XdsCertificateSigner.java   |  58 +++
 .../java/org/apache/dubbo/registry/xds/XdsEnv.java |  22 +
 .../registry/xds/XdsInitializationException.java   |  28 ++
 .../org/apache/dubbo/registry/xds/XdsRegistry.java |  50 ++
 .../dubbo/registry/xds/XdsRegistryFactory.java     |  34 ++
 .../dubbo/registry/xds/XdsServiceDiscovery.java    | 117 +++++
 .../registry/xds/XdsServiceDiscoveryFactory.java   |  48 ++
 .../xds/istio/IstioCitadelCertificateSigner.java   | 294 ++++++++++++
 .../dubbo/registry/xds/istio/IstioConstant.java    | 109 +++++
 .../apache/dubbo/registry/xds/istio/IstioEnv.java  | 195 ++++++++
 .../dubbo/registry/xds/util/AdsObserver.java       | 140 ++++++
 .../dubbo/registry/xds/util/NodeBuilder.java       |  43 ++
 .../dubbo/registry/xds/util/PilotExchanger.java    | 250 ++++++++++
 .../apache/dubbo/registry/xds/util/XdsChannel.java | 142 ++++++
 .../dubbo/registry/xds/util/XdsListener.java       |  23 +
 .../xds/util/bootstrap/BootstrapInfoImpl.java      | 130 ++++++
 .../registry/xds/util/bootstrap/Bootstrapper.java  |  74 +++
 .../xds/util/bootstrap/BootstrapperImpl.java       | 178 +++++++
 .../bootstrap/CertificateProviderInfoImpl.java     |  45 ++
 .../xds/util/bootstrap/ServerInfoImpl.java         |  71 +++
 .../xds/util/protocol/AbstractProtocol.java        | 269 +++++++++++
 .../registry/xds/util/protocol/DeltaResource.java  |  32 ++
 .../registry/xds/util/protocol/XdsProtocol.java    |  41 ++
 .../xds/util/protocol/delta/DeltaEndpoint.java     |  48 ++
 .../xds/util/protocol/delta/DeltaListener.java     |  47 ++
 .../xds/util/protocol/delta/DeltaRoute.java        |  47 ++
 .../xds/util/protocol/impl/EdsProtocol.java        |  97 ++++
 .../xds/util/protocol/impl/LdsProtocol.java        | 106 +++++
 .../xds/util/protocol/impl/RdsProtocol.java        |  92 ++++
 .../xds/util/protocol/message/Endpoint.java        |  96 ++++
 .../xds/util/protocol/message/EndpointResult.java  |  60 +++
 .../xds/util/protocol/message/ListenerResult.java  |  68 +++
 .../xds/util/protocol/message/RouteResult.java     |  94 ++++
 .../cluster/router/xds/EdsEndpointListener.java    |  26 ++
 .../rpc/cluster/router/xds/EdsEndpointManager.java | 127 +++++
 .../cluster/router/xds/RdsRouteRuleManager.java    | 162 +++++++
 .../cluster/router/xds/RdsVirtualHostListener.java | 184 ++++++++
 .../cluster/router/xds/XdsRouteRuleListener.java   |  28 ++
 .../dubbo/rpc/cluster/router/xds/XdsRouter.java    | 391 ++++++++++++++++
 .../rpc/cluster/router/xds/XdsRouterFactory.java   |  31 ++
 .../router/xds/XdsScopeModelInitializer.java       |  39 ++
 .../rpc/cluster/router/xds/rule/ClusterWeight.java |  37 ++
 .../cluster/router/xds/rule/DestinationSubset.java |  57 +++
 .../router/xds/rule/HTTPRouteDestination.java      |  42 ++
 .../rpc/cluster/router/xds/rule/HeaderMatcher.java | 121 +++++
 .../cluster/router/xds/rule/HttpRequestMatch.java  |  39 ++
 .../cluster/router/xds/rule/LongRangeMatch.java    |  47 ++
 .../rpc/cluster/router/xds/rule/PathMatcher.java   |  71 +++
 .../rpc/cluster/router/xds/rule/XdsRouteRule.java  |  37 ++
 dubbo-xds/src/main/proto/ca.proto                  |  62 +++
 .../org.apache.dubbo.registry.RegistryFactory      |   1 +
 ...e.dubbo.registry.client.ServiceDiscoveryFactory |   1 +
 ....apache.dubbo.registry.xds.XdsCertificateSigner |   1 +
 ...bbo.rpc.cluster.router.state.StateRouterFactory |   1 +
 ...rg.apache.dubbo.rpc.model.ScopeModelInitializer |   1 +
 .../xds/util/bootstrap/BootstrapperTest.java       | 148 ++++++
 .../xds/util/protocol/impl/EdsProtocolMock.java    |  51 +++
 .../xds/util/protocol/impl/LdsProtocolMock.java    |  68 +++
 .../xds/util/protocol/impl/RdsProtocolMock.java    |  54 +++
 .../cluster/router/xds/EdsEndpointManagerTest.java | 108 +++++
 .../router/xds/RdsRouteRuleManagerTest.java        | 126 +++++
 .../router/xds/RdsVirtualHostListenerTest.java     | 258 +++++++++++
 .../dubbo/rpc/cluster/router/xds/XdsRouteTest.java | 376 +++++++++++++++
 .../cluster/router/xds/rule/HeaderMatcherTest.java |  89 ++++
 .../cluster/router/xds/rule/PathMatcherTest.java   |  57 +++
 pom.xml                                            |  16 +-
 .../dubbo-serialization-fastjson-test/pom.xml      |   2 +-
 122 files changed, 9095 insertions(+), 410 deletions(-)

Reply via email to