This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/cloud-native by this push: new 35e3aea Fix compile problem 35e3aea is described below commit 35e3aea062be8914a9bdd3c95ba001cce75e28ed Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Fri Aug 9 18:00:31 2019 +0800 Fix compile problem --- .../dubbo/config/spring/schema/DubboNamespaceHandler.java | 13 ++++++------- .../support/etcd/EtcdDynamicConfigurationTest.java | 4 ++-- .../registry/consul/ConsulServiceDiscoveryFactory.java | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java index 915a9ea..ef62259 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java @@ -17,16 +17,15 @@ package org.apache.dubbo.config.spring.schema; import org.apache.dubbo.common.Version; - -import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; import org.apache.dubbo.config.MetadataReportConfig; +import org.apache.dubbo.config.MetricsConfig; import org.apache.dubbo.config.ModuleConfig; -import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.MonitorConfig; -import org.apache.dubbo.config.MetricsConfig; -import org.apache.dubbo.config.ProviderConfig; -import org.apache.dubbo.config.ConsumerConfig; import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.spring.ApplicationBean; import org.apache.dubbo.config.spring.ConfigCenterBean; import org.apache.dubbo.config.spring.ReferenceBean; import org.apache.dubbo.config.spring.ServiceBean; @@ -46,7 +45,7 @@ public class DubboNamespaceHandler extends NamespaceHandlerSupport { @Override public void init() { - registerBeanDefinitionParser("application", new DubboBeanDefinitionParser(ApplicationConfig.class, true)); + registerBeanDefinitionParser("application", new DubboBeanDefinitionParser(ApplicationBean.class, true)); registerBeanDefinitionParser("module", new DubboBeanDefinitionParser(ModuleConfig.class, true)); registerBeanDefinitionParser("registry", new DubboBeanDefinitionParser(RegistryConfig.class, true)); registerBeanDefinitionParser("config-center", new DubboBeanDefinitionParser(ConfigCenterBean.class, true)); diff --git a/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java index bc4fd68..c0ea8c3 100644 --- a/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java +++ b/dubbo-configcenter/dubbo-configcenter-etcd/src/test/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfigurationTest.java @@ -58,8 +58,8 @@ public class EtcdDynamicConfigurationTest { put("/dubbo/config/org.apache.dubbo.etcd.testService/configurators", "hello"); put("/dubbo/config/test/dubbo.properties", "aaa=bbb"); - Assert.assertEquals("hello", config.getRule("org.apache.dubbo.etcd.testService.configurators", DynamicConfiguration.DEFAULT_GROUP)); - Assert.assertEquals("aaa=bbb", config.getRule("dubbo.properties", "test")); + Assert.assertEquals("hello", config.getConfig("org.apache.dubbo.etcd.testService.configurators", DynamicConfiguration.DEFAULT_GROUP)); + Assert.assertEquals("aaa=bbb", config.getConfig("dubbo.properties", "test")); } @Test diff --git a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java index 189642b..95b4213 100644 --- a/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java +++ b/dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscoveryFactory.java @@ -17,15 +17,15 @@ package org.apache.dubbo.registry.consul; import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.client.AbstractServiceDiscoveryFactory; import org.apache.dubbo.registry.client.ServiceDiscovery; -import org.apache.dubbo.registry.client.ServiceDiscoveryFactory; /** * 2019-07-31 */ -public class ConsulServiceDiscoveryFactory implements ServiceDiscoveryFactory { +public class ConsulServiceDiscoveryFactory extends AbstractServiceDiscoveryFactory { @Override - public ServiceDiscovery create(URL connectionURL) { + public ServiceDiscovery createDiscovery(URL connectionURL) { return new ConsulServiceDiscovery(connectionURL); } }