This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 86c4737 merge pull request #2353 to 2.6.x to fix #2353 (#2761)
86c4737 is described below
commit 86c473771adb859a361d369248b809c245898bf8
Author: Ian Luo <[email protected]>
AuthorDate: Thu Nov 8 14:47:16 2018 +0800
merge pull request #2353 to 2.6.x to fix #2353 (#2761)
---
.../ServiceAnnotationBeanPostProcessor.java | 5 +++--
.../com/alibaba/dubbo/config/spring/ConfigTest.java | 20 +++++++++++++++++++-
.../annotation/provider/HelloServiceImpl.java | 2 +-
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java
index 9ba4cc5..d34b4a6 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java
@@ -369,7 +369,8 @@ public class ServiceAnnotationBeanPostProcessor implements
BeanDefinitionRegistr
MutablePropertyValues propertyValues =
beanDefinition.getPropertyValues();
- String[] ignoreAttributeNames = of("provider", "monitor",
"application", "module", "registry", "protocol", "interface");
+ String[] ignoreAttributeNames = of("provider", "monitor",
"application", "module", "registry", "protocol",
+ "interface", "interfaceName");
propertyValues.addPropertyValues(new
AnnotationPropertyValuesAdapter(service, environment, ignoreAttributeNames));
@@ -483,4 +484,4 @@ public class ServiceAnnotationBeanPostProcessor implements
BeanDefinitionRegistr
this.classLoader = classLoader;
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
index 69f716b..edaaa88 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ConfigTest.java
@@ -33,6 +33,7 @@ import
com.alibaba.dubbo.config.spring.action.DemoActionBySetter;
import com.alibaba.dubbo.config.spring.annotation.consumer.AnnotationAction;
import com.alibaba.dubbo.config.spring.api.DemoService;
import com.alibaba.dubbo.config.spring.api.HelloService;
+import
com.alibaba.dubbo.config.spring.context.annotation.provider.ProviderConfiguration;
import com.alibaba.dubbo.config.spring.filter.MockFilter;
import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl;
import com.alibaba.dubbo.config.spring.impl.HelloServiceImpl;
@@ -51,6 +52,7 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
+import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.Collection;
@@ -107,6 +109,22 @@ public class ConfigTest {
}
@Test
+ public void testServiceAnnotation() {
+ AnnotationConfigApplicationContext providerContext = new
AnnotationConfigApplicationContext();
+ providerContext.register(ProviderConfiguration.class);
+
+ providerContext.refresh();
+
+ ReferenceConfig<HelloService> reference = new
ReferenceConfig<HelloService>();
+ reference.setApplication(new ApplicationConfig("consumer"));
+ reference.setRegistry(new RegistryConfig(RegistryConfig.NO_AVAILABLE));
+ reference.setInterface(HelloService.class);
+ reference.setUrl("dubbo://127.0.0.1:12345");
+ String hello = reference.get().sayHello("hello");
+ assertEquals("Hello, hello", hello);
+ }
+
+ @Test
@SuppressWarnings("unchecked")
public void testProviderNestedService() {
ClassPathXmlApplicationContext ctx = new
ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.',
'/') + "/provider-nested-service.xml");
@@ -999,4 +1017,4 @@ public class ConfigTest {
ctx.destroy();
}
}
-}
\ No newline at end of file
+}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java
index 9d0fdbb..a9212f0 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java
@@ -24,7 +24,7 @@ import com.alibaba.dubbo.config.spring.api.HelloService;
*
* @since 2.5.9
*/
-@Service
+@Service(interfaceName = "com.alibaba.dubbo.config.spring.api.HelloService")
public class HelloServiceImpl implements HelloService {
@Override
