diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java index 568aae63ddd..65ede76291c 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java @@ -28,6 +28,7 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; import org.apache.dubbo.metadata.MetadataService; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; import org.apache.dubbo.rpc.Protocol; import org.apache.dubbo.rpc.ProtocolServer; import org.apache.dubbo.rpc.model.ApplicationModel; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ExporterDeployListener.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ExporterDeployListener.java index 1a0bafc12db..bff2e2920ea 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ExporterDeployListener.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ExporterDeployListener.java @@ -19,6 +19,7 @@ import org.apache.dubbo.common.deploy.ApplicationDeployListener; import org.apache.dubbo.common.lang.Prioritized; import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; import org.apache.dubbo.rpc.model.ApplicationModel; import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_METADATA_STORAGE_TYPE; diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/MultipleRegistryCenterServiceDiscoveryRegistryIntegrationTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/MultipleRegistryCenterServiceDiscoveryRegistryIntegrationTest.java index 1c2b154637c..f27fcd71b31 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/MultipleRegistryCenterServiceDiscoveryRegistryIntegrationTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/MultipleRegistryCenterServiceDiscoveryRegistryIntegrationTest.java @@ -25,8 +25,8 @@ import org.apache.dubbo.config.ServiceConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; import org.apache.dubbo.config.integration.IntegrationTest; -import org.apache.dubbo.config.metadata.MetadataServiceDelegation; import org.apache.dubbo.registry.RegistryServiceListener; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; import org.apache.dubbo.test.check.registrycenter.config.ZookeeperConfig; import org.apache.dubbo.test.check.registrycenter.config.ZookeeperRegistryCenterConfig; diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/ServiceDiscoveryRegistryInfoWrapper.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/ServiceDiscoveryRegistryInfoWrapper.java index be60e4ea83d..94b7200f81c 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/ServiceDiscoveryRegistryInfoWrapper.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/multiple/servicediscoveryregistry/ServiceDiscoveryRegistryInfoWrapper.java @@ -16,8 +16,8 @@ */ package org.apache.dubbo.config.integration.multiple.servicediscoveryregistry; -import org.apache.dubbo.config.metadata.MetadataServiceDelegation; import org.apache.dubbo.registry.client.ServiceDiscoveryRegistry; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; /** * The instance to wrap {@link org.apache.dubbo.registry.client.ServiceDiscoveryRegistry} diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java index 3b5ec697b98..c4f1e866a08 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/integration/single/SingleRegistryCenterDubboProtocolIntegrationTest.java @@ -27,13 +27,13 @@ import org.apache.dubbo.config.ServiceListener; import org.apache.dubbo.config.bootstrap.DubboBootstrap; import org.apache.dubbo.config.integration.IntegrationTest; -import org.apache.dubbo.config.metadata.MetadataServiceDelegation; import org.apache.dubbo.metadata.MetadataInfo; import org.apache.dubbo.metadata.MetadataService; import org.apache.dubbo.registry.ListenerRegistryWrapper; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.client.ServiceDiscoveryRegistry; import org.apache.dubbo.registry.client.ServiceDiscoveryRegistryDirectory; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; import org.apache.dubbo.registry.client.migration.MigrationInvoker; import org.apache.dubbo.registry.support.RegistryManager; import org.apache.dubbo.registry.zookeeper.ZookeeperServiceDiscovery; diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java index 6e601315e69..dbaf02f41b6 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java @@ -27,7 +27,7 @@ //import org.apache.dubbo.config.bootstrap.DubboBootstrap; //import org.apache.dubbo.config.metadata.ConfigurableMetadataServiceExporter; //import org.apache.dubbo.config.metadata.ExporterDeployListener; -//import org.apache.dubbo.config.metadata.MetadataServiceDelegation; +//import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; //import org.apache.dubbo.config.provider.impl.DemoServiceImpl; //import org.apache.dubbo.rpc.model.ApplicationModel; //import org.apache.dubbo.rpc.model.FrameworkModel; diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 2534fbbc454..c35aa01fc25 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -98,7 +98,7 @@ 2.4.4 4.5.13 4.4.6 - 1.2.70 + 1.2.83 3.4.14 4.2.0 2.12.0 @@ -133,8 +133,10 @@ 3.0.19.Final 8.5.69 0.5.3 - 2.0.4 - 1.31.1 + 2.1.0 + 1.44.0 + 0.8.1 + 1.2.1 1.7.25 1.2 @@ -166,7 +168,7 @@ 1.68 2.0.1 5.2.0 - 2.8.5 + 2.8.9 1.2.0 6.1.26 2.0 @@ -726,6 +728,21 @@ grpc-grpclb ${grpc.version} + + io.grpc + grpc-context + ${grpc.version} + + + com.salesforce.servicelibs + grpc-contrib + ${grpc_contrib_verdion} + + + com.salesforce.servicelibs + jprotoc + ${jprotoc_version} + io.fabric8 kubernetes-client diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index 0d69265f2b9..8cb14965440 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -80,10 +80,5 @@ zookeeper test - - org.apache.dubbo - dubbo-config-api - ${project.parent.version} - diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java index bbbea2d90a9..fe5b193d51c 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ReflectionBasedServiceDiscovery.java @@ -23,13 +23,13 @@ import org.apache.dubbo.common.utils.NamedThreadFactory; import org.apache.dubbo.common.utils.NetUtils; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.metadata.MetadataServiceDelegation; import org.apache.dubbo.metadata.InstanceMetadataChangedListener; import org.apache.dubbo.metadata.MetadataService; import org.apache.dubbo.metadata.RevisionResolver; import org.apache.dubbo.registry.Constants; import org.apache.dubbo.registry.client.event.ServiceInstancesChangedEvent; import org.apache.dubbo.registry.client.event.listener.ServiceInstancesChangedListener; +import org.apache.dubbo.registry.client.metadata.MetadataServiceDelegation; import org.apache.dubbo.registry.client.metadata.MetadataUtils; import org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils; import org.apache.dubbo.rpc.RpcException; @@ -261,7 +261,7 @@ private String computeKey(ServiceInstance serviceInstance) { } private synchronized MetadataService getMetadataServiceProxy(ServiceInstance instance) { - return metadataServiceProxies.computeIfAbsent(computeKey(instance), k -> MetadataUtils.referProxy(instance)); + return metadataServiceProxies.computeIfAbsent(computeKey(instance), k -> MetadataUtils.referProxy(instance).getProxy()); } private synchronized void destroyMetadataServiceProxy(ServiceInstance instance) { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/MetadataServiceDelegation.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceDelegation.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/MetadataServiceDelegation.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceDelegation.java index 451bf75d01e..eefc097d367 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/MetadataServiceDelegation.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceDelegation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.config.metadata; +package org.apache.dubbo.registry.client.metadata; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.Logger; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java index 2e44b5d65f4..0101aece5b6 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java @@ -203,7 +203,7 @@ private static ServiceInstance selectInstance(List instances) { return instances.get(ThreadLocalRandom.current().nextInt(0, instances.size())); } - private static class ProxyHolder { + public static class ProxyHolder { private final ConsumerModel consumerModel; private final MetadataService proxy; private final ModuleModel internalModel; diff --git a/pom.xml b/pom.xml index c90a145f7a4..dfd97912b80 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,7 @@ dubbo-common dubbo-container + dubbo-compiler dubbo-remoting dubbo-rpc dubbo-cluster @@ -325,10 +326,10 @@ **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/MapValue.java, **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/ThrowablePB.java, **/org/apache/dubbo/triple/TripleWrapper.java, - **/istio/v1/auth/Ca.java, - **/istio/v1/auth/IstioCertificateServiceGrpc.java, + **/istio/v1/auth/**/*, **/com/google/rpc/*, **/generated/**/*, + **/generated-sources/**/*, **/grpc/health/**/*, **/grpc/reflection/**/*, **/target/**/*,