natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0 improve reference bean register (#7497)

This commit is contained in:
Gong Dewei 2021-04-30 20:25:24 +08:00 committed by GitHub
parent 175d85f961
commit 3a3d0ef50e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
108 changed files with 5454 additions and 1272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dubbo-common/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
View File

@ -17,12 +17,21 @@
package com.alibaba.dubbo.config.annotation;
import org.apache.dubbo.config.annotation.DubboReference;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Reference
* <p>
*
* @see DubboReference
* @deprecated Recommend {@link DubboReference} as the substitute
*/
@Deprecated
@Documented
@Retention(RetentionPolicy.RUNTIME)
@ -41,13 +50,18 @@ public @interface Reference {
String client() default "";
/**
* Whether to enable generic invocation, default value is false
* @deprecated Do not need specify generic value, judge by injection type and interface class
*/
@Deprecated
boolean generic() default false;
boolean injvm() default true;
boolean check() default true;
boolean init() default false;
boolean init() default true;
boolean lazy() default false;
@ -63,9 +77,9 @@ public @interface Reference {
String cluster() default "";
int connections() default 0;
int connections() default -1;
int callbacks() default 0;
int callbacks() default -1;
String onconnect() default "";
@ -75,13 +89,13 @@ public @interface Reference {
String layer() default "";
int retries() default 2;
int retries() default -1;
String loadbalance() default "";
boolean async() default false;
int actives() default 0;
int actives() default -1;
boolean sent() default false;
@ -89,7 +103,7 @@ public @interface Reference {
String validation() default "";
int timeout() default 0;
int timeout() default -1;
String cache() default "";

24
dubbo-common/src/main/java/com/alibaba/dubbo/config/annotation/Service.java
View File

@ -17,6 +17,8 @@
package com.alibaba.dubbo.config.annotation;
import org.apache.dubbo.config.annotation.DubboService;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@ -24,6 +26,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Service annotation
*
* @see DubboService
* @deprecated Recommend {@link DubboService} as the substitute
*/
@Deprecated
@Documented
@Retention(RetentionPolicy.RUNTIME)
@ -51,15 +59,15 @@ public @interface Service {
String accesslog() default "";
int executes() default 0;
int executes() default -1;
boolean register() default false;
int weight() default 0;
int weight() default -1;
String document() default "";
int delay() default 0;
int delay() default -1;
String local() default "";
@ -69,9 +77,9 @@ public @interface Service {
String proxy() default "";
int connections() default 0;
int connections() default -1;
int callbacks() default 0;
int callbacks() default -1;
String onconnect() default "";
@ -81,13 +89,13 @@ public @interface Service {
String layer() default "";
int retries() default 0;
int retries() default -1;
String loadbalance() default "";
boolean async() default false;
int actives() default 0;
int actives() default -1;
boolean sent() default false;
@ -95,7 +103,7 @@ public @interface Service {
String validation() default "";
int timeout() default 0;
int timeout() default -1;
String cache() default "";

5
dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java
View File

@ -183,7 +183,7 @@ public class Environment extends LifecycleAdapter implements FrameworkExt {
if (logger.isWarnEnabled()) {
logger.warn("dynamicConfiguration is null , return globalConfiguration.");
}
return globalConfiguration;
return getConfiguration();
}
dynamicGlobalConfiguration = new CompositeConfiguration();
dynamicGlobalConfiguration.addConfiguration(dynamicConfiguration);
@ -214,6 +214,9 @@ public class Environment extends LifecycleAdapter implements FrameworkExt {
public void destroy() throws IllegalStateException {
clearExternalConfigs();
clearAppExternalConfigs();
globalConfiguration = null;
dynamicConfiguration = null;
dynamicGlobalConfiguration = null;
}
public PropertiesConfiguration getPropertiesConfiguration() {

2
dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
View File

@ -165,7 +165,9 @@ public abstract class AbstractMethodConfig extends AbstractConfig {
*
* @param mock the value of mock
* @since 2.7.6
* @deprecated use {@link #setMock(String)} instead
*/
@Deprecated
public void setMock(Object mock) {
if (mock == null) {
return;

11
dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java
View File

@ -130,11 +130,16 @@ public class MethodConfig extends AbstractMethodConfig {
public MethodConfig() {
}
/**
* TODO remove this construct, the callback method processing logic needs to rely on Spring context
*/
@Deprecated
public MethodConfig(Method method) {
appendAnnotation(Method.class, method);
this.setReturn(method.isReturn());
//TODO callback method processing is not completed
if(!"".equals(method.oninvoke())){
this.setOninvoke(method.oninvoke());
}
@ -155,6 +160,12 @@ public class MethodConfig extends AbstractMethodConfig {
}
}
/**
* TODO remove constructMethodConfig
* @param methods
* @return
*/
@Deprecated
public static List<MethodConfig> constructMethodConfig(Method[] methods) {
if (methods != null && methods.length != 0) {
List<MethodConfig> methodConfigs = new ArrayList<MethodConfig>(methods.length);

3
dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
View File

@ -104,8 +104,7 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
shouldInit = getConsumer().isInit();
}
if (shouldInit == null) {
// default is true, spring will still init lazily by setting init's default value to false,
// the def default setting happens in {@link ReferenceBean#afterPropertiesSet}.
// default is true
return true;
}
return shouldInit;

67
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
View File

@ -17,6 +17,7 @@
package org.apache.dubbo.config.annotation;
import org.apache.dubbo.common.constants.RegistryConstants;
import org.apache.dubbo.config.ReferenceConfigBase;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -25,9 +26,43 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* An annotation used for referencing a Dubbo service
* An annotation used for referencing a Dubbo service.
* <p>
* <b>It is recommended to use @DubboReference on the @Bean method in the Java-config class, but not on the fields or setter methods to be injected.</b>
* </p>
*
* Step 1: Register ReferenceBean in Java-config class:
* <pre class="code">
* &#64;Configuration
* public class ReferenceConfiguration {
* &#64;Bean
* &#64;DubboReference(group = "demo")
* public ReferenceBean&lt;HelloService&gt; helloService() {
* return new ReferenceBean();
* }
*
* &#64;Bean
* &#64;DubboReference(group = "demo", interfaceClass = HelloService.class)
* public ReferenceBean&lt;GenericService&gt; genericHelloService() {
* return new ReferenceBean();
* }
* }
* </pre>
*
* Step 2: Inject ReferenceBean by @Autowired
* <pre class="code">
* public class FooController {
* &#64;Autowired
* private HelloService helloService;
*
* &#64;Autowired
* private GenericService genericHelloService;
* }
* </pre>
*
* @since 2.7.7
* @see org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder
* @see org.apache.dubbo.config.spring.ReferenceBean
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@ -66,12 +101,16 @@ public @interface DubboReference {
/**
* Whether to enable generic invocation, default value is false
* @deprecated Do not need specify generic value, judge by injection type and interface class
*/
@Deprecated
boolean generic() default false;
/**
* When enable, prefer to call local service in the same JVM if it's present, default value is true
* @deprecated using scope="local" or scope="remote" instead
*/
@Deprecated
boolean injvm() default true;
/**
@ -80,9 +119,10 @@ public @interface DubboReference {
boolean check() default true;
/**
* Whether eager initialize the reference bean when all properties are set, default value is false
* Whether eager initialize the reference bean when all properties are set, default value is true ( null as true)
* @see ReferenceConfigBase#shouldInit()
*/
boolean init() default false;
boolean init() default true;
/**
* Whether to make connection when the client is created, the default value is false
@ -129,14 +169,14 @@ public @interface DubboReference {
/**
* Maximum connections service provider can accept, default value is 0 - connection is shared
*/
int connections() default 0;
int connections() default -1;
/**
* The callback instance limit peer connection
* <p>
* see org.apache.dubbo.rpc.Constants#DEFAULT_CALLBACK_INSTANCES
*/
int callbacks() default 0;
int callbacks() default -1;
/**
* Callback method name when connected, default value is empty string
@ -163,7 +203,7 @@ public @interface DubboReference {
* <p>
* see Constants#DEFAULT_RETRIES
*/
int retries() default 2;
int retries() default -1;
/**
* Load balance strategy, legal values include: random, roundrobin, leastactive
@ -180,7 +220,7 @@ public @interface DubboReference {
/**
* Maximum active requests allowed, default value is 0
*/
int actives() default 0;
int actives() default -1;
/**
* Whether the async request has already been sent, the default value is false
@ -200,7 +240,7 @@ public @interface DubboReference {
/**
* Timeout value for service invocation, default value is 0
*/
int timeout() default 0;
int timeout() default -1;
/**
* Specify cache implementation for service invocation, legal values include: lru, threadlocal, jcache
@ -222,7 +262,7 @@ public @interface DubboReference {
String[] listener() default {};
/**
* Customized parameter key-value pair, for example: {key1, value1, key2, value2}
* Customized parameter key-value pair, for example: {key1, value1, key2, value2} or {"key1=value1", "key2=value2"}
*/
String[] parameters() default {};
@ -276,7 +316,7 @@ public @interface DubboReference {
/**
* The id
*
* NOTE: The id attribute is ignored when using @DubboReference on @Bean method
* @return default value is empty
* @since 2.7.3
*/
@ -296,4 +336,11 @@ public @interface DubboReference {
* @see RegistryConstants#PROVIDED_BY
*/
String[] providedBy() default {};
/**
* the scope for referring/exporting a service, if it's local, it means searching in current JVM only.
* @see org.apache.dubbo.rpc.Constants#SCOPE_LOCAL
* @see org.apache.dubbo.rpc.Constants#SCOPE_REMOTE
*/
String scope() default "";
}

31
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboService.java
View File

@ -24,9 +24,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_LOADBALANCE;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_RETRIES;
/**
* Class-level annotation used for declaring Dubbo service
*
@ -91,7 +88,7 @@ public @interface DubboService {
/**
* Maximum concurrent executes for the service, default value is 0 - no limits
*/
int executes() default 0;
int executes() default -1;
/**
* Whether to register the service to register center, default value is true
@ -101,7 +98,7 @@ public @interface DubboService {
/**
* Service weight value, default value is 0
*/
int weight() default 0;
int weight() default -1;
/**
* Service doc, default value is ""
@ -111,7 +108,7 @@ public @interface DubboService {
/**
* Delay time for service registration, default value is 0
*/
int delay() default 0;
int delay() default -1;
/**
* @see DubboService#stub()
@ -137,14 +134,14 @@ public @interface DubboService {
/**
* Maximum connections service provider can accept, default value is 0 - connection is shared
*/
int connections() default 0;
int connections() default -1;
/**
* The callback instance limit peer connection
* <p>
* see org.apache.dubbo.rpc.Constants#DEFAULT_CALLBACK_INSTANCES
* see org.apache.dubbo.common.constants.CommonConstants.DEFAULT_CALLBACK_INSTANCES
*/
int callbacks() default org.apache.dubbo.common.constants.CommonConstants.DEFAULT_CALLBACK_INSTANCES;
int callbacks() default -1;
/**
* Callback method name when connected, default value is empty string
@ -171,14 +168,14 @@ public @interface DubboService {
*
* @see org.apache.dubbo.common.constants.CommonConstants#DEFAULT_RETRIES
*/
int retries() default DEFAULT_RETRIES;
int retries() default -1;
/**
* Load balance strategy, legal values include: random, roundrobin, leastactive
*
* @see org.apache.dubbo.common.constants.CommonConstants#DEFAULT_LOADBALANCE
*/
String loadbalance() default DEFAULT_LOADBALANCE;
String loadbalance() default "";
/**
* Whether to enable async invocation, default value is false
@ -188,7 +185,7 @@ public @interface DubboService {
/**
* Maximum active requests allowed, default value is 0
*/
int actives() default 0;
int actives() default -1;
/**
* Whether the async request has already been sent, the default value is false
@ -208,7 +205,7 @@ public @interface DubboService {
/**
* Timeout value for service invocation, default value is 0
*/
int timeout() default 0;
int timeout() default -1;
/**
* Specify cache implementation for service invocation, legal values include: lru, threadlocal, jcache
@ -275,4 +272,12 @@ public @interface DubboService {
* @return
*/
Method[] methods() default {};
/**
* the scope for referring/exporting a service, if it's local, it means searching in current JVM only.
* @see org.apache.dubbo.rpc.Constants#SCOPE_LOCAL
* @see org.apache.dubbo.rpc.Constants#SCOPE_REMOTE
*/
String scope() default "";
}

10
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
View File

@ -45,9 +45,9 @@ public @interface Method {
boolean sent() default true;
int actives() default 0;
int actives() default -1;
int executes() default 0;
int executes() default -1;
boolean deprecated() default false;
@ -68,4 +68,10 @@ public @interface Method {
String merger() default "";
Argument[] arguments() default {};
/**
* Customized parameter key-value pair, for example: {key1, value1, key2, value2} or {"key1=value1", "key2=value2"}
*/
String[] parameters() default {};
}

19
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Reference.java
View File

@ -16,6 +16,8 @@
*/
package org.apache.dubbo.config.annotation;
import org.apache.dubbo.config.ReferenceConfigBase;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -67,7 +69,9 @@ public @interface Reference {
/**
* Whether to enable generic invocation, default value is false
* @deprecated Do not need specify generic value, judge by injection type and interface class
*/
@Deprecated
boolean generic() default false;
/**
@ -81,9 +85,10 @@ public @interface Reference {
boolean check() default true;
/**
* Whether eager initialize the reference bean when all properties are set, default value is false
* Whether eager initialize the reference bean when all properties are set, default value is true ( null as true)
* @see ReferenceConfigBase#shouldInit()
*/
boolean init() default false;
boolean init() default true;
/**
* Whether to make connection when the client is created, the default value is false
@ -130,14 +135,14 @@ public @interface Reference {
/**
* Maximum connections service provider can accept, default value is 0 - connection is shared
*/
int connections() default 0;
int connections() default -1;
/**
* The callback instance limit peer connection
* <p>
* see org.apache.dubbo.rpc.Constants#DEFAULT_CALLBACK_INSTANCES
*/
int callbacks() default 0;
int callbacks() default -1;
/**
* Callback method name when connected, default value is empty string
@ -164,7 +169,7 @@ public @interface Reference {
* <p>
* see Constants#DEFAULT_RETRIES
*/
int retries() default 2;
int retries() default -1;
/**
* Load balance strategy, legal values include: random, roundrobin, leastactive
@ -181,7 +186,7 @@ public @interface Reference {
/**
* Maximum active requests allowed, default value is 0
*/
int actives() default 0;
int actives() default -1;
/**
* Whether the async request has already been sent, the default value is false
@ -201,7 +206,7 @@ public @interface Reference {
/**
* Timeout value for service invocation, default value is 0
*/
int timeout() default 0;
int timeout() default -1;
/**
* Specify cache implementation for service invocation, legal values include: lru, threadlocal, jcache

23
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Service.java
View File

@ -24,9 +24,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_LOADBALANCE;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_RETRIES;
/**
* Service annotation
*
@ -94,7 +91,7 @@ public @interface Service {
/**
* Maximum concurrent executes for the service, default value is 0 - no limits
*/
int executes() default 0;
int executes() default -1;
/**
* Whether to register the service to register center, default value is true
@ -104,7 +101,7 @@ public @interface Service {
/**
* Service weight value, default value is 0
*/
int weight() default 0;
int weight() default -1;
/**
* Service doc, default value is ""
@ -114,7 +111,7 @@ public @interface Service {
/**
* Delay time for service registration, default value is 0
*/
int delay() default 0;
int delay() default -1;
/**
* @see Service#stub()
@ -140,14 +137,14 @@ public @interface Service {
/**
* Maximum connections service provider can accept, default value is 0 - connection is shared
*/
int connections() default 0;
int connections() default -1;
/**
* The callback instance limit peer connection
* <p>
* see org.apache.dubbo.rpc.Constants#DEFAULT_CALLBACK_INSTANCES
* see org.apache.dubbo.common.constants.CommonConstants.DEFAULT_CALLBACK_INSTANCES
*/
int callbacks() default org.apache.dubbo.common.constants.CommonConstants.DEFAULT_CALLBACK_INSTANCES;
int callbacks() default -1;
/**
* Callback method name when connected, default value is empty string
@ -174,14 +171,14 @@ public @interface Service {
*
* @see org.apache.dubbo.common.constants.CommonConstants#DEFAULT_RETRIES
*/
int retries() default DEFAULT_RETRIES;
int retries() default -1;
/**
* Load balance strategy, legal values include: random, roundrobin, leastactive
*
* @see org.apache.dubbo.common.constants.CommonConstants#DEFAULT_LOADBALANCE
*/
String loadbalance() default DEFAULT_LOADBALANCE;
String loadbalance() default "";
/**
* Whether to enable async invocation, default value is false
@ -191,7 +188,7 @@ public @interface Service {
/**
* Maximum active requests allowed, default value is 0
*/
int actives() default 0;
int actives() default -1;
/**
* Whether the async request has already been sent, the default value is false
@ -211,7 +208,7 @@ public @interface Service {
/**
* Timeout value for service invocation, default value is 0
*/
int timeout() default 0;
int timeout() default -1;
/**
* Specify cache implementation for service invocation, legal values include: lru, threadlocal, jcache

1
dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
View File

@ -521,6 +521,7 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
if (existedConfig != null && !config.equals(existedConfig)) {
if (configWarnLogEnabled) {
//TODO throw exception
if (logger.isWarnEnabled()) {
String type = config.getClass().getSimpleName();
logger.warn(String.format("Duplicate %s found, there already has one default %s or more than two %ss have the same id, " +

12
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
View File

@ -66,6 +66,7 @@ import org.apache.dubbo.metadata.MetadataServiceExporter;
import org.apache.dubbo.metadata.WritableMetadataService;
import org.apache.dubbo.metadata.report.MetadataReportFactory;
import org.apache.dubbo.metadata.report.MetadataReportInstance;
import org.apache.dubbo.metadata.report.support.AbstractMetadataReportFactory;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceInstance;
import org.apache.dubbo.registry.client.metadata.MetadataUtils;
@ -202,12 +203,21 @@ public class DubboBootstrap extends GenericEventListener {
return instance;
}
/**
* Try reset dubbo status for new instance.
* For testing purposes only
*/
public static void reset() {
if (instance != null) {
instance.destroy();
instance = null;
}
ApplicationModel.reset();
instance = null;
MetadataReportInstance.destroy();
AbstractMetadataReportFactory.clear();
ExtensionLoader.resetExtensionLoader(DynamicConfigurationFactory.class);
ExtensionLoader.resetExtensionLoader(MetadataReportFactory.class);
ExtensionLoader.destroyAll();
}
private DubboBootstrap() {

22
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
View File

@ -53,9 +53,12 @@ public class MethodConfigTest {
private static final int EXECUTES = 5;
private static final boolean DEPERECATED = true;
private static final boolean STICKY = true;
private static final String ONINVOKE = "i";
private static final String ONTHROW = "t";
private static final String ONRETURN = "r";
private static final String ONINVOKE = "invokeNotify";
private static final String ONINVOKE_METHOD = "onInvoke";
private static final String ONTHROW = "throwNotify";
private static final String ONTHROW_METHOD = "onThrow";
private static final String ONRETURN = "returnNotify";
private static final String ONRETURN_METHOD = "onReturn";
private static final String CACHE = "c";
private static final String VALIDATION = "v";
private static final int ARGUMENTS_INDEX = 24;
@ -63,10 +66,12 @@ public class MethodConfigTest {
private static final String ARGUMENTS_TYPE = "sss";
@Reference(methods = {@Method(name = METHOD_NAME, timeout = TIMEOUT, retries = RETRIES, loadbalance = LOADBALANCE, async = ASYNC,
actives = ACTIVES, executes = EXECUTES, deprecated = DEPERECATED, sticky = STICKY, oninvoke = ONINVOKE, onthrow = ONTHROW, onreturn = ONRETURN, cache = CACHE, validation = VALIDATION,
actives = ACTIVES, executes = EXECUTES, deprecated = DEPERECATED, sticky = STICKY, oninvoke = ONINVOKE+"."+ONINVOKE_METHOD,
onthrow = ONTHROW+"."+ONTHROW_METHOD, onreturn = ONRETURN+"."+ONRETURN_METHOD, cache = CACHE, validation = VALIDATION,
arguments = {@Argument(index = ARGUMENTS_INDEX, callback = ARGUMENTS_CALLBACK, type = ARGUMENTS_TYPE)})})
private String testField;
//TODO remove this test
@Test
public void testStaticConstructor() throws NoSuchFieldException {
Method[] methods = this.getClass().getDeclaredField("testField").getAnnotation(Reference.class).methods();
@ -82,9 +87,12 @@ public class MethodConfigTest {
assertThat(EXECUTES, equalTo(methodConfig.getExecutes().intValue()));
assertThat(DEPERECATED, equalTo(methodConfig.getDeprecated()));
assertThat(STICKY, equalTo(methodConfig.getSticky()));
assertThat(ONINVOKE, equalTo(methodConfig.getOninvoke()));
assertThat(ONTHROW, equalTo(methodConfig.getOnthrow()));
assertThat(ONRETURN, equalTo(methodConfig.getOnreturn()));
// assertThat(ONINVOKE, equalTo(methodConfig.getOninvoke()));
// assertThat(ONINVOKE_METHOD, equalTo(methodConfig.getOninvokeMethod()));
// assertThat(ONTHROW, equalTo(methodConfig.getOnthrow()));
// assertThat(ONTHROW_METHOD, equalTo(methodConfig.getOnthrowMethod()));
// assertThat(ONRETURN, equalTo(methodConfig.getOnreturn()));
// assertThat(ONRETURN_METHOD, equalTo(methodConfig.getOnreturnMethod()));
assertThat(CACHE, equalTo(methodConfig.getCache()));
assertThat(VALIDATION, equalTo(methodConfig.getValidation()));
assertThat(ARGUMENTS_INDEX, equalTo(methodConfig.getArguments().get(0).getIndex().intValue()));

37
dubbo-config/dubbo-config-spring/pom.xml
View File

@ -27,6 +27,7 @@
<description>The spring config module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
</properties>
<dependencies>
<dependency>
@ -80,6 +81,7 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-injvm</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@ -118,17 +120,23 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit-vintage-engine</artifactId>
<groupId>org.junit.vintage</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- Zookeeper dependencies for testing -->
<dependency>
@ -169,6 +177,21 @@
<artifactId>nacos-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.yml</include>
<include>**/*.properties</include>
</includes>
</testResource>
</testResources>
</build>
</project>

25
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/Constants.java Normal file
View File

@ -0,0 +1,25 @@
/*
* 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.config.spring;
/**
* Constants of dubbo spring config
*/
public interface Constants {
String REFERENCE_PROPS = "referenceProps";
}

243
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
View File

@ -16,56 +16,124 @@
*/
package org.apache.dubbo.config.spring;
import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.ReferenceConfigBase;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.apache.dubbo.config.spring.reference.ReferenceBeanSupport;
import org.apache.dubbo.config.spring.reference.ReferenceAttributes;
import org.apache.dubbo.config.support.Parameter;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.rpc.proxy.AbstractProxyFactory;
import org.apache.dubbo.rpc.support.ProtocolUtils;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.target.AbstractLazyCreationTargetSource;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* ReferenceFactoryBean
* <p>
* Spring FactoryBean for {@link ReferenceConfig}.
* </p>
*
*
* <p></p>
* Step 1: Register ReferenceBean in Java-config class:
* <pre class="code">
* &#64;Configuration
* public class ReferenceConfiguration {
* &#64;Bean
* &#64;DubboReference(group = "demo")
* public ReferenceBean&lt;HelloService&gt; helloService() {
* return new ReferenceBean();
* }
*
* // As GenericService
* &#64;Bean
* &#64;DubboReference(group = "demo", interfaceClass = HelloService.class)
* public ReferenceBean&lt;GenericService&gt; genericHelloService() {
* return new ReferenceBean();
* }
* }
* </pre>
*
* Or register ReferenceBean in xml:
* <pre class="code">
* &lt;dubbo:reference id="helloService" interface="org.apache.dubbo.config.spring.api.HelloService"/&gt;
* &lt;!-- As GenericService --&gt;
* &lt;dubbo:reference id="genericHelloService" interface="org.apache.dubbo.config.spring.api.HelloService" generic="true"/&gt;
* </pre>
*
* Step 2: Inject ReferenceBean by @Autowired
* <pre class="code">
* public class FooController {
* &#64;Autowired
* private HelloService helloService;
*
* &#64;Autowired
* private GenericService genericHelloService;
* }
* </pre>
*
*
* @see org.apache.dubbo.config.annotation.DubboReference
* @see org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder
*/
public class ReferenceBean<T> implements FactoryBean,
ApplicationContextAware, BeanClassLoaderAware, InitializingBean, DisposableBean {
ApplicationContextAware, BeanClassLoaderAware, BeanNameAware, InitializingBean, DisposableBean {
private transient ApplicationContext applicationContext;
private ClassLoader beanClassLoader;
private DubboReferenceLazyInitTargetSource referenceTargetSource;
private Object referenceLazyProxy;
// lazy proxy of reference
private Object lazyProxy;
// beanName
protected String id;
// reference key
private String key;
/**
* The interface class of the reference service
*/
protected Class<?> interfaceClass;
private Class<?> interfaceClass;
/**
* Actual interface class of this reference.
* The actual service type of remote provider.
* see {@link ReferenceConfigBase#getActualInterface()}
*/
private Class actualInterface;
/*
* actual interface class name
*/
// Compatible with seata-1.4.0: io.seata.rm.tcc.remoting.parser.DubboRemotingParser#getServiceDesc()
private String interfaceName;
//beanName
protected String id;
//from annotation attributes
private Map<String, Object> referenceProps;
//from bean definition
//from xml bean definition
private MutablePropertyValues propertyValues;
//actual reference config
private ReferenceConfig referenceConfig;
private String generic;
private String interfaceName;
public ReferenceBean() {
super();
@ -85,12 +153,17 @@ public class ReferenceBean<T> implements FactoryBean,
this.beanClassLoader = classLoader;
}
@Override
public void setBeanName(String name) {
this.setId(name);
}
@Override
public Object getObject() {
if (referenceLazyProxy == null) {
createReferenceLazyProxy();
if (lazyProxy == null) {
createLazyProxy();
}
return referenceLazyProxy;
return lazyProxy;
}
@Override
@ -106,12 +179,43 @@ public class ReferenceBean<T> implements FactoryBean,
@Override
public void afterPropertiesSet() throws Exception {
if (referenceProps == null) {
Assert.notEmptyString(getId(), "The id of ReferenceBean cannot be empty");
ConfigurableListableBeanFactory beanFactory = getBeanFactory();
BeanDefinition beanDefinition = beanFactory.getBeanDefinition(getId());
propertyValues = beanDefinition.getPropertyValues();
ConfigurableListableBeanFactory beanFactory = getBeanFactory();
// pre init xml reference bean or @DubboReference annotation
Assert.notEmptyString(getId(), "The id of ReferenceBean cannot be empty");
BeanDefinition beanDefinition = beanFactory.getBeanDefinition(getId());
this.interfaceClass = (Class<?>) beanDefinition.getAttribute(ReferenceAttributes.INTERFACE_CLASS);
this.actualInterface = (Class) beanDefinition.getAttribute(ReferenceAttributes.ACTUAL_INTERFACE);
Assert.notNull(this.interfaceClass, "The interface class of ReferenceBean is not initialized");
if (beanDefinition.hasAttribute(Constants.REFERENCE_PROPS)) {
// @DubboReference annotation at java-config class @Bean method
// @DubboReference annotation at reference field or setter method
referenceProps = (Map<String, Object>) beanDefinition.getAttribute(Constants.REFERENCE_PROPS);
} else {
if (beanDefinition instanceof AnnotatedBeanDefinition) {
// Return ReferenceBean in java-config class @Bean method
if (referenceProps == null) {
referenceProps = new LinkedHashMap<>();
}
ReferenceBeanSupport.convertReferenceProps(referenceProps, interfaceClass);
if (this.actualInterface == null) {
try {
this.actualInterface = ClassUtils.forName((String) referenceProps.get(ReferenceAttributes.INTERFACE));
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
}
} else {
// xml reference bean
propertyValues = beanDefinition.getPropertyValues();
}
}
Assert.notNull(this.actualInterface, "The actual interface of ReferenceBean is not initialized");
this.interfaceName = actualInterface.getName();
ReferenceBeanManager referenceBeanManager = beanFactory.getBean(ReferenceBeanManager.BEAN_NAME, ReferenceBeanManager.class);
referenceBeanManager.addReference(this);
}
private ConfigurableListableBeanFactory getBeanFactory() {
@ -123,14 +227,9 @@ public class ReferenceBean<T> implements FactoryBean,
// do nothing
}
/**
* TODO remove get() method
*
* @return
*/
@Deprecated
public Object get() {
throw new UnsupportedOperationException("Should not call this method");
return referenceConfig.get();
}
public String getId() {
@ -141,17 +240,27 @@ public class ReferenceBean<T> implements FactoryBean,
this.id = id;
}
/* Compatible with seata: io.seata.rm.tcc.remoting.parser.DubboRemotingParser#getServiceDesc() */
@Deprecated
public String getGroup() {
Object version = propertyValues.get(CommonConstants.GROUP_KEY);
return version == null ? null : String.valueOf(version);
/* Compatible with seata-1.4.0: io.seata.rm.tcc.remoting.parser.DubboRemotingParser#getServiceDesc() */
public Class<?> getInterfaceClass() {
return interfaceClass;
}
@Deprecated
public Class getActualInterface() {
return actualInterface;
}
/* Compatible with seata-1.4.0: io.seata.rm.tcc.remoting.parser.DubboRemotingParser#getServiceDesc() */
public String getGroup() {
return referenceConfig.getGroup();
}
/* Compatible with seata-1.4.0: io.seata.rm.tcc.remoting.parser.DubboRemotingParser#getServiceDesc() */
public String getVersion() {
Object version = propertyValues.get(CommonConstants.VERSION_KEY);
return version == null ? null : String.valueOf(version);
return referenceConfig.getVersion();
}
public String getKey() {
return key;
}
public Map<String, Object> getReferenceProps() {
@ -166,74 +275,36 @@ public class ReferenceBean<T> implements FactoryBean,
return referenceConfig;
}
public void setReferenceConfig(ReferenceConfig referenceConfig) {
public void setKeyAndReferenceConfig(String key, ReferenceConfig referenceConfig) {
this.key = key;
this.referenceConfig = referenceConfig;
}
public Class<?> getInterfaceClass() {
// get interface class
if (interfaceClass == null) {
if (referenceProps != null) {
//get interface class name of @DubboReference
String interfaceName = (String) referenceProps.get("interfaceName");
if (interfaceName == null) {
Class clazz = (Class) referenceProps.get("interfaceClass");
if (clazz != null) {
interfaceName = clazz.getName();
}
}
if (StringUtils.isBlank(interfaceName)) {
throw new RuntimeException("Need to specify the 'interfaceName' or 'interfaceClass' attribute of '@DubboReference'");
}
this.interfaceName = interfaceName;
//get generic
Object genericValue = referenceProps.get("generic");
generic = genericValue != null ? genericValue.toString() : null;
String consumer = (String) referenceProps.get("consumer");
if (StringUtils.isBlank(generic) && consumer != null) {
// get generic from consumerConfig
BeanDefinition consumerBeanDefinition = getBeanFactory().getBeanDefinition(consumer);
if (consumerBeanDefinition != null) {
generic = (String) consumerBeanDefinition.getPropertyValues().get("generic");
}
}
} else if (propertyValues != null) {
generic = (String) propertyValues.get("generic");
interfaceName = (String) propertyValues.get("interface");
} else {
throw new RuntimeException("Required 'referenceProps' or beanDefinition");
}
interfaceClass = ReferenceConfig.determineInterfaceClass(generic, interfaceName);
}
return interfaceClass;
}
private void createReferenceLazyProxy() {
this.referenceTargetSource = new DubboReferenceLazyInitTargetSource();
/**
* create lazy proxy for reference
*/
private void createLazyProxy() {
//set proxy interfaces
//see also: org.apache.dubbo.rpc.proxy.AbstractProxyFactory.getProxy(org.apache.dubbo.rpc.Invoker<T>, boolean)
ProxyFactory proxyFactory = new ProxyFactory();
proxyFactory.setTargetSource(referenceTargetSource);
proxyFactory.setTargetSource(new DubboReferenceLazyInitTargetSource());
proxyFactory.addInterface(getInterfaceClass());
Class<?>[] internalInterfaces = AbstractProxyFactory.getInternalInterfaces();
for (Class<?> anInterface : internalInterfaces) {
proxyFactory.addInterface(anInterface);
}
if (ProtocolUtils.isGeneric(generic)) {
if (actualInterface != interfaceClass){
//add actual interface
proxyFactory.addInterface(ReflectUtils.forName(interfaceName));
proxyFactory.addInterface(actualInterface);
}
this.referenceLazyProxy = proxyFactory.getProxy(this.beanClassLoader);
this.lazyProxy = proxyFactory.getProxy(this.beanClassLoader);
}
private Object getCallProxy() throws Exception {
if (referenceConfig == null) {
throw new IllegalStateException("ReferenceBean is not ready yet, maybe dubbo engine is not started");
throw new IllegalStateException("ReferenceBean is not ready yet, please make sure to call reference interface method after dubbo is started.");
}
//get reference proxy
return ReferenceConfigCache.getCache().get(referenceConfig);

235
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBeanManager.java
View File

@ -1,235 +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.config.spring;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.config.ArgumentConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationPropertyValuesAdapter;
import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceBeanBuilder;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertyResolver;
import org.springframework.validation.DataBinder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public class ReferenceBeanManager implements ApplicationContextAware {
public static final String BEAN_NAME = "dubboReferenceBeanManager";
private final Log logger = LogFactory.getLog(getClass());
private Map<String, ReferenceBean> configMap = new ConcurrentHashMap<>();
private ApplicationContext applicationContext;
private volatile boolean initialized = false;
public void addReference(ReferenceBean referenceBean) throws Exception {
Assert.notNull(referenceBean.getId(), "The id of ReferenceBean cannot be empty");
//TODO generate reference bean id and unique cache key
String key = referenceBean.getId();
ReferenceBean oldReferenceBean = configMap.get(key);
if (oldReferenceBean != null) {
if (referenceBean != oldReferenceBean) {
logger.warn("Found duplicated ReferenceBean id: " + key);
}
return;
}
configMap.put(key, referenceBean);
// if add reference after prepareReferenceBeans(), should init it immediately.
if (initialized) {
initReferenceBean(referenceBean);
}
}
public ReferenceBean get(String id) {
return configMap.get(id);
}
public Collection<ReferenceBean> getReferences() {
return configMap.values();
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
/**
* Initialize all reference beans, call at Dubbo starting
* @throws Exception
*/
public void prepareReferenceBeans() throws Exception {
// prepare all reference beans
Map<String, ReferenceBean> referenceBeanMap = applicationContext.getBeansOfType(ReferenceBean.class, true, false);
for (ReferenceBean referenceBean : referenceBeanMap.values()) {
addReference(referenceBean);
}
for (ReferenceBean referenceBean : getReferences()) {
initReferenceBean(referenceBean);
}
initialized = true;
}
/**
* NOTE: This method should only call after all dubbo config beans and all property resolvers is loaded.
*
* @param referenceBean
* @throws Exception
*/
private void initReferenceBean(ReferenceBean referenceBean) throws Exception {
if (referenceBean.getReferenceConfig() != null) {
return;
}
Environment environment = applicationContext.getEnvironment();
Map<String, Object> referenceProps = referenceBean.getReferenceProps();
if (referenceProps == null) {
MutablePropertyValues propertyValues = referenceBean.getPropertyValues();
if (propertyValues == null) {
throw new RuntimeException("ReferenceBean is invalid, missing 'propertyValues'");
}
referenceProps = toReferenceProps(propertyValues, environment);
}
//resolve placeholders
resolvePlaceholders(referenceProps, environment);
//create real ReferenceConfig
ReferenceConfig referenceConfig = ReferenceBeanBuilder.create(new AnnotationAttributes(new LinkedHashMap<>(referenceProps)), applicationContext)
.defaultInterfaceClass(referenceBean.getObjectType())
.build();
referenceBean.setReferenceConfig(referenceConfig);
// register ReferenceConfig
DubboBootstrap.getInstance().reference(referenceConfig);
}
private void resolvePlaceholders(Map<String, Object> referenceProps, PropertyResolver propertyResolver) {
for (Map.Entry<String, Object> entry : referenceProps.entrySet()) {
Object value = entry.getValue();
if (value instanceof String) {
String valueToResovle = (String) value;
entry.setValue(propertyResolver.resolveRequiredPlaceholders(valueToResovle));
} else if (value instanceof String[]) {
String[] strings = (String[]) value;
for (int i = 0; i < strings.length; i++) {
strings[i] = propertyResolver.resolveRequiredPlaceholders(strings[i]);
}
entry.setValue(strings);
}
}
}
private Map<String, Object> toReferenceProps(MutablePropertyValues propertyValues, PropertyResolver propertyResolver) {
Map<String, Object> referenceProps;
referenceProps = new LinkedHashMap<>();
for (PropertyValue propertyValue : propertyValues.getPropertyValueList()) {
String propertyName = propertyValue.getName();
Object value = propertyValue.getValue();
if ("methods".equals(propertyName)) {
ManagedList managedList = (ManagedList) value;
List<MethodConfig> methodConfigs = new ArrayList<>();
for (Object el : managedList) {
MethodConfig methodConfig = createMethodConfig(((BeanDefinitionHolder) el).getBeanDefinition(), propertyResolver);
methodConfigs.add(methodConfig);
}
value = methodConfigs.toArray(new MethodConfig[0]);
} else if ("parameters".equals(propertyName)) {
value = createParameterMap((ManagedMap) value, propertyResolver);
}
if (value instanceof RuntimeBeanReference) {
RuntimeBeanReference beanReference = (RuntimeBeanReference) value;
value = applicationContext.getBean(beanReference.getBeanName());
}
referenceProps.put(propertyName, value);
}
return referenceProps;
}
private MethodConfig createMethodConfig(BeanDefinition beanDefinition, PropertyResolver propertyResolver) {
Map<String, Object> attributes = new LinkedHashMap<>();
MutablePropertyValues pvs = beanDefinition.getPropertyValues();
for (PropertyValue propertyValue : pvs.getPropertyValueList()) {
String propertyName = propertyValue.getName();
Object value = propertyValue.getValue();
if ("arguments".equals(propertyName)) {
ManagedList managedList = (ManagedList) value;
List<ArgumentConfig> argumentConfigs = new ArrayList<>();
for (Object el : managedList) {
ArgumentConfig argumentConfig = createArgumentConfig(((BeanDefinitionHolder) el).getBeanDefinition(), propertyResolver);
argumentConfigs.add(argumentConfig);
}
value = argumentConfigs.toArray(new ArgumentConfig[0]);
} else if ("parameters".equals(propertyName)) {
value = createParameterMap((ManagedMap) value, propertyResolver);
}
if (value instanceof RuntimeBeanReference) {
RuntimeBeanReference beanReference = (RuntimeBeanReference) value;
value = applicationContext.getBean(beanReference.getBeanName());
}
attributes.put(propertyName, value);
}
MethodConfig methodConfig = new MethodConfig();
DataBinder dataBinder = new DataBinder(methodConfig);
dataBinder.bind(new AnnotationPropertyValuesAdapter(attributes, propertyResolver));
return methodConfig;
}
private ArgumentConfig createArgumentConfig(BeanDefinition beanDefinition, PropertyResolver propertyResolver) {
ArgumentConfig argumentConfig = new ArgumentConfig();
DataBinder dataBinder = new DataBinder(argumentConfig);
dataBinder.bind(beanDefinition.getPropertyValues());
return argumentConfig;
}
private Map<String, String> createParameterMap(ManagedMap managedMap, PropertyResolver propertyResolver) {
Map<String, String> map = new LinkedHashMap<>();
Set<Map.Entry<String, TypedStringValue>> entrySet = managedMap.entrySet();
for (Map.Entry<String, TypedStringValue> entry : entrySet) {
map.put(entry.getKey(), entry.getValue().getValue());
}
return map;
}
}

117
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationBeanPostProcessor.java
View File

@ -26,7 +26,6 @@ import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
import org.springframework.beans.factory.annotation.InjectionMetadata;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@ -34,8 +33,8 @@ import org.springframework.beans.factory.config.InstantiationAwareBeanPostProces
import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.annotation.Bean;
import org.springframework.core.Ordered;
import org.springframework.core.PriorityOrdered;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.util.Assert;
@ -65,7 +64,7 @@ import static org.springframework.core.BridgeMethodResolver.isVisibilityBridgeMe
*/
@SuppressWarnings("unchecked")
public abstract class AbstractAnnotationBeanPostProcessor extends
InstantiationAwareBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor, PriorityOrdered,
InstantiationAwareBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor, Ordered,
BeanFactoryAware, BeanClassLoaderAware, EnvironmentAware, DisposableBean {
private final static int CACHE_SIZE = Integer.getInteger("", 32);
@ -85,10 +84,7 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
private ClassLoader classLoader;
/**
* make sure higher priority than {@link AutowiredAnnotationBeanPostProcessor}
*/
private int order = Ordered.LOWEST_PRECEDENCE - 3;
private int order = Ordered.LOWEST_PRECEDENCE;
/**
* @param annotationTypes the multiple types of {@link Annotation annotations}
@ -136,20 +132,20 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
try {
prepareInjection(metadata);
} catch (Exception e) {
logger.warn("Prepare injection of @"+getAnnotationType().getSimpleName()+" failed", e);
logger.error("Prepare injection of @"+getAnnotationType().getSimpleName()+" failed", e);
}
}
}
@Override
public PropertyValues postProcessPropertyValues(
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeanCreationException {
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
try {
AnnotatedInjectionMetadata metadata = findInjectionMetadata(beanName, bean.getClass(), pvs);
prepareInjection(metadata);
metadata.inject(bean, beanName, pvs);
} catch (BeanCreationException ex) {
} catch (BeansException ex) {
throw ex;
} catch (Throwable ex) {
throw new BeanCreationException(beanName, "Injection of @" + getAnnotationType().getSimpleName()
@ -216,6 +212,10 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
return;
}
if (method.getAnnotation(Bean.class) != null) {
// DO NOT inject to Java-config class's @Bean method
return;
}
for (Class<? extends Annotation> annotationType : getAnnotationTypes()) {
@ -223,16 +223,10 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
if (attributes != null && method.equals(ClassUtils.getMostSpecificMethod(method, beanClass))) {
if (Modifier.isStatic(method.getModifiers())) {
if (logger.isWarnEnabled()) {
logger.warn("@" + annotationType.getName() + " annotation is not supported on static methods: " + method);
}
return;
throw new IllegalStateException("When using @"+annotationType.getName() +" to inject interface proxy, it is not supported on static methods: "+method);
}
if (method.getParameterTypes().length == 0) {
if (logger.isWarnEnabled()) {
logger.warn("@" + annotationType.getName() + " annotation should only be used on methods with parameters: " +
method);
}
if (method.getParameterTypes().length != 1) {
throw new IllegalStateException("When using @"+annotationType.getName() +" to inject interface proxy, the method must have only one parameter: "+method);
}
PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, beanClass);
elements.add(new AnnotatedMethodElement(method, pd, attributes));
@ -244,7 +238,6 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
return elements;
}
private AbstractAnnotationBeanPostProcessor.AnnotatedInjectionMetadata buildAnnotatedMetadata(final Class<?> beanClass) {
Collection<AbstractAnnotationBeanPostProcessor.AnnotatedFieldElement> fieldElements = findFieldAnnotationMetadata(beanClass);
Collection<AbstractAnnotationBeanPostProcessor.AnnotatedMethodElement> methodElements = findAnnotatedMethodMetadata(beanClass);
@ -259,6 +252,7 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
if (InjectionMetadata.needsRefresh(metadata, clazz)) {
synchronized (this.injectionMetadataCache) {
metadata = this.injectionMetadataCache.get(cacheKey);
if (InjectionMetadata.needsRefresh(metadata, clazz)) {
if (metadata != null) {
metadata.clear(pvs);
@ -343,18 +337,18 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
protected Object getInjectedObject(AnnotationAttributes attributes, Object bean, String beanName, Class<?> injectedType,
AnnotatedInjectElement injectedElement) throws Exception {
String cacheKey = buildInjectedObjectCacheKey(attributes, bean, beanName, injectedType, injectedElement);
Object injectedObject = injectedObjectsCache.get(cacheKey);
if (injectedObject == null) {
injectedObject = doGetInjectedBean(attributes, bean, beanName, injectedType, injectedElement);
// Customized inject-object if necessary
injectedObjectsCache.put(cacheKey, injectedObject);
}
return injectedObject;
// String cacheKey = buildInjectedObjectCacheKey(attributes, bean, beanName, injectedType, injectedElement);
//
// Object injectedObject = injectedObjectsCache.get(cacheKey);
//
// if (injectedObject == null) {
// injectedObject = doGetInjectedBean(attributes, bean, beanName, injectedType, injectedElement);
// // Customized inject-object if necessary
// injectedObjectsCache.put(cacheKey, injectedObject);
// }
// return injectedObject;
return doGetInjectedBean(attributes, bean, beanName, injectedType, injectedElement);
}
/**
@ -401,15 +395,16 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
* @param injectedElement {@link AnnotatedInjectElement}
* @return Bean cache key
*/
protected abstract String buildInjectedObjectCacheKey(AnnotationAttributes attributes, Object bean, String beanName,
Class<?> injectedType,
AnnotatedInjectElement injectedElement);
// protected abstract String buildInjectedObjectCacheKey(AnnotationAttributes attributes, Object bean, String beanName,
// Class<?> injectedType,
// AnnotatedInjectElement injectedElement);
/**
* {@link Annotation Annotated} {@link InjectionMetadata} implementation
*/
protected class AnnotatedInjectionMetadata extends InjectionMetadata {
private Class<?> targetClass;
private final Collection<AbstractAnnotationBeanPostProcessor.AnnotatedFieldElement> fieldElements;
private final Collection<AbstractAnnotationBeanPostProcessor.AnnotatedMethodElement> methodElements;
@ -417,6 +412,7 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
public AnnotatedInjectionMetadata(Class<?> targetClass, Collection<AbstractAnnotationBeanPostProcessor.AnnotatedFieldElement> fieldElements,
Collection<AbstractAnnotationBeanPostProcessor.AnnotatedMethodElement> methodElements) {
super(targetClass, combine(fieldElements, methodElements));
this.targetClass = targetClass;
this.fieldElements = fieldElements;
this.methodElements = methodElements;
}
@ -428,6 +424,18 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
public Collection<AbstractAnnotationBeanPostProcessor.AnnotatedMethodElement> getMethodElements() {
return methodElements;
}
@Override
protected boolean needsRefresh(Class<?> clazz) {
if (this.targetClass == clazz) {
return false;
}
//IGNORE Spring CGLIB enhanced class
if (targetClass.isAssignableFrom(clazz) && clazz.getName().contains("$$EnhancerBySpringCGLIB$$")) {
return false;
}
return true;
}
}
/**
@ -437,7 +445,9 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
protected final AnnotationAttributes attributes;
protected volatile String refKey;
protected volatile Object injectedObject;
private Class<?> injectedType;
protected AnnotatedInjectElement(Member member, PropertyDescriptor pd, AnnotationAttributes attributes) {
super(member, pd);
@ -447,8 +457,7 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
@Override
protected void inject(Object bean, String beanName, PropertyValues pvs) throws Throwable {
Class<?> injectedType = getResourceType();
Object injectedObject = getInjectedObject(attributes, bean, beanName, injectedType, this);
Object injectedObject = getInjectedObject(attributes, bean, beanName, getInjectedType(), this);
if (member instanceof Field) {
Field field = (Field) member;
@ -461,8 +470,37 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
}
}
public Class<?> getInjectedType() {
return getResourceType();
public Class<?> getInjectedType() throws ClassNotFoundException {
if (injectedType == null) {
if (this.isField) {
injectedType = ((Field) this.member).getType();
}
else if (this.pd != null) {
return this.pd.getPropertyType();
}
else {
Method method = (Method) this.member;
if (method.getParameterTypes().length > 0) {
injectedType = method.getParameterTypes()[0];
} else {
throw new IllegalStateException("get injected type failed");
}
}
}
return injectedType;
}
public String getPropertyName() {
if (member instanceof Field) {
Field field = (Field) member;
return field.getName();
} else if (this.pd != null) {
// If it is method element, using propertyName of PropertyDescriptor
return pd.getName();
} else {
Method method = (Method) this.member;
return method.getName();
}
}
}
@ -484,6 +522,5 @@ public abstract class AbstractAnnotationBeanPostProcessor extends
super(field, null, attributes);
this.field = field;
}
}
}

546
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
View File

@ -18,48 +18,65 @@ package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Service;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.spring.Constants;
import org.apache.dubbo.config.spring.reference.ReferenceAttributes;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ReferenceBeanManager;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.util.DubboBeanUtils;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.apache.dubbo.config.spring.reference.ReferenceBeanSupport;
import org.apache.dubbo.rpc.service.GenericService;
import org.springframework.beans.BeansException;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.PropertyValues;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.annotation.InjectionMetadata;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.core.annotation.MergedAnnotations;
import org.springframework.core.type.MethodMetadata;
import java.beans.PropertyDescriptor;
import java.util.ArrayList;
import java.util.Arrays;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import static com.alibaba.spring.util.AnnotationUtils.getAttribute;
import static org.apache.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder.create;
import static org.springframework.util.StringUtils.hasText;
/**
* {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
* that Consumer service {@link Reference} annotated fields
* <p>
* Step 1:
* The purpose of implementing {@link BeanFactoryPostProcessor} is to scan the registration reference bean definition earlier,
* so that it can be shared with the xml bean configuration.
* </p>
*
* <p>
* Step 2:
* By implementing {@link org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor},
* inject the reference bean instance into the fields and setter methods which annotated with {@link DubboReference}.
* </p>
*
* @see DubboReference
* @see Reference
@ -67,7 +84,7 @@ import static org.springframework.util.StringUtils.hasText;
* @since 2.5.7
*/
public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBeanPostProcessor
implements ApplicationContextAware, BeanDefinitionRegistryPostProcessor {
implements ApplicationContextAware, BeanFactoryPostProcessor {
/**
* The bean name of {@link ReferenceAnnotationBeanPostProcessor}
@ -81,10 +98,10 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
private final Log logger = LogFactory.getLog(getClass());
private final ConcurrentMap<InjectionMetadata.InjectedElement, ReferenceBean<?>> injectedFieldReferenceBeanCache =
private final ConcurrentMap<InjectionMetadata.InjectedElement, String> injectedFieldReferenceBeanCache =
new ConcurrentHashMap<>(CACHE_SIZE);
private final ConcurrentMap<InjectionMetadata.InjectedElement, ReferenceBean<?>> injectedMethodReferenceBeanCache =
private final ConcurrentMap<InjectionMetadata.InjectedElement, String> injectedMethodReferenceBeanCache =
new ConcurrentHashMap<>(CACHE_SIZE);
private ApplicationContext applicationContext;
@ -101,14 +118,8 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
super(DubboReference.class, Reference.class, com.alibaba.dubbo.config.annotation.Reference.class);
}
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
this.beanDefinitionRegistry = registry;
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
DubboBeanUtils.registerBeansIfNotExists(beanDefinitionRegistry);
String[] beanNames = beanFactory.getBeanDefinitionNames();
for (String beanName : beanNames) {
@ -118,7 +129,17 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
if (isReferenceBean(beanDefinition)) {
continue;
}
if (isAnnotatedReferenceBean(beanDefinition)) {
// process @DubboReference at java-config @bean method
processReferenceAnnotatedBeanDefinition(beanName, (AnnotatedBeanDefinition) beanDefinition);
continue;
}
String beanClassName = beanDefinition.getBeanClassName();
// if (beanDefinition instanceof AnnotatedBeanDefinition) {
// AnnotatedBeanDefinition annotatedBeanDefinition = (AnnotatedBeanDefinition) beanDefinition;
// beanClassName = annotatedBeanDefinition.getFactoryMethodMetadata().getDeclaringClassName();
// }
beanType = ClassUtils.resolveClass(beanClassName, getClassLoader());
} else {
beanType = beanFactory.getType(beanName);
@ -127,13 +148,118 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
AnnotatedInjectionMetadata metadata = findInjectionMetadata(beanName, beanType, null);
try {
prepareInjection(metadata);
} catch (BeansException e) {
throw e;
} catch (Exception e) {
logger.warn("Prepare dubbo reference injection element failed", e);
throw new RuntimeException("Prepare dubbo reference injection element failed", e);
}
}
}
}
/**
* check whether is @DubboReference at java-config @bean method
*/
private boolean isAnnotatedReferenceBean(BeanDefinition beanDefinition) {
if (beanDefinition instanceof AnnotatedBeanDefinition) {
AnnotatedBeanDefinition annotatedBeanDefinition = (AnnotatedBeanDefinition) beanDefinition;
String beanClassName = annotatedBeanDefinition.getFactoryMethodMetadata().getReturnTypeName();
if (ReferenceBean.class.getName().equals(beanClassName)) {
return true;
}
}
return false;
}
/**
* process @DubboReference at java-config @bean method
* <pre class="code">
* &#064;Configuration
* public class ConsumerConfig {
*
* &#064;Bean
* &#064;DubboReference(group="demo", version="1.2.3")
* public ReferenceBean&lt;DemoService&gt; demoService() {
* return new ReferenceBean();
* }
*
* }
* </pre>
* @param beanName
* @param beanDefinition
*/
private void processReferenceAnnotatedBeanDefinition(String beanName, AnnotatedBeanDefinition beanDefinition) {
// Extract beanClass from generic return type of java-config bean method: ReferenceBean<DemoService>
// see org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.getTypeForFactoryBeanFromMethod
Class beanClass = getBeanFactory().getType(beanName);
if (beanClass == null) {
MethodMetadata factoryMethodMetadata = beanDefinition.getFactoryMethodMetadata();
String beanMethodSignature = factoryMethodMetadata.getDeclaringClassName()+"#"+factoryMethodMetadata.getMethodName()+"()";
throw new BeanCreationException("The ReferenceBean is missing necessary generic type, which returned by the @Bean method of Java-config class. " +
"The generic type of the returned ReferenceBean must be specified as the referenced interface type, " +
"such as ReferenceBean<DemoService>. Please check bean method: "+beanMethodSignature);
}
// get dubbo reference annotation attributes
Map<String, Object> annotationAttributes = null;
MergedAnnotations mergedAnnotations = beanDefinition.getFactoryMethodMetadata().getAnnotations();
Class referenceAnnotationType = null;
// try all dubbo reference annotation types
for (Class<? extends Annotation> annotationType : getAnnotationTypes()) {
if (mergedAnnotations.isPresent(annotationType)) {
referenceAnnotationType = annotationType;
annotationAttributes = mergedAnnotations.get(annotationType).filterDefaultValues().asMap();
break;
}
}
if (annotationAttributes != null) {
// @DubboReference on @Bean method
LinkedHashMap<String, Object> attributes = new LinkedHashMap<>(annotationAttributes);
// reset id attribute
attributes.put(ReferenceAttributes.ID, beanName);
// convert annotation props
ReferenceBeanSupport.convertReferenceProps(attributes, beanClass);
// get interface
String interfaceName = (String) attributes.get(ReferenceAttributes.INTERFACE);
// check beanClass and reference interface class
if (!StringUtils.isEquals(interfaceName, beanClass.getName()) && beanClass != GenericService.class) {
MethodMetadata factoryMethodMetadata = beanDefinition.getFactoryMethodMetadata();
String beanMethodSignature = factoryMethodMetadata.getDeclaringClassName()+"#"+factoryMethodMetadata.getMethodName()+"()";
throw new BeanCreationException("The 'interfaceClass' or 'interfaceName' attribute value of @DubboReference annotation " +
"is inconsistent with the generic type of the ReferenceBean returned by the bean method. " +
"The interface class of @DubboReference is: "+interfaceName+", but return ReferenceBean<"+beanClass.getName()+">. " +
"Please remove the 'interfaceClass' and 'interfaceName' attributes from @DubboReference annotation. " +
"Please check bean method: "+beanMethodSignature);
}
Class interfaceClass = beanClass;
Class actualInterface = null;
try {
actualInterface = ClassUtils.forName(interfaceName);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
// set attribute instead of property values
beanDefinition.setAttribute(Constants.REFERENCE_PROPS, attributes);
beanDefinition.setAttribute(ReferenceAttributes.INTERFACE_CLASS, interfaceClass);
beanDefinition.setAttribute(ReferenceAttributes.ACTUAL_INTERFACE, actualInterface);
} else {
// raw reference bean
// the ReferenceBean is not yet initialized
beanDefinition.setAttribute(ReferenceAttributes.INTERFACE_CLASS, beanClass);
if (beanClass != GenericService.class) {
beanDefinition.setAttribute(ReferenceAttributes.ACTUAL_INTERFACE, beanClass);
}
}
// set id
beanDefinition.getPropertyValues().add(ReferenceAttributes.ID, beanName);
}
@Override
public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
if (beanType != null) {
@ -143,27 +269,35 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
for (PropertyValue propertyValue : propertyValues) {
propertyValue.setOptional(true);
}
} else if (isAnnotatedReferenceBean(beanDefinition)) {
// extract beanClass from java-config bean method generic return type: ReferenceBean<DemoService>
//Class beanClass = getBeanFactory().getType(beanName);
} else {
AnnotatedInjectionMetadata metadata = findInjectionMetadata(beanName, beanType, null);
metadata.checkConfigMembers(beanDefinition);
try {
prepareInjection(metadata);
} catch (Exception e) {
logger.warn("Prepare dubbo reference injection element failed", e);
throw new RuntimeException("Prepare dubbo reference injection element failed", e);
}
}
}
}
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
return super.postProcessBeforeInitialization(bean, beanName);
}
@Override
public PropertyValues postProcessPropertyValues(
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeanCreationException {
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
try {
AnnotatedInjectionMetadata metadata = findInjectionMetadata(beanName, bean.getClass(), pvs);
prepareInjection(metadata);
metadata.inject(bean, beanName, pvs);
} catch (BeanCreationException ex) {
} catch (BeansException ex) {
throw ex;
} catch (Throwable ex) {
throw new BeanCreationException(beanName, "Injection of @" + getAnnotationType().getSimpleName()
@ -176,223 +310,187 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
return ReferenceBean.class.getName().equals(beanDefinition.getBeanClassName());
}
protected void prepareInjection(AnnotatedInjectionMetadata metadata) throws Exception {
//find and registry bean definition for @DubboReference/@Reference
for (AnnotatedFieldElement fieldElement : metadata.getFieldElements()) {
if (fieldElement.refKey != null) {
continue;
protected void prepareInjection(AnnotatedInjectionMetadata metadata) throws BeansException {
try {
//find and registry bean definition for @DubboReference/@Reference
for (AnnotatedFieldElement fieldElement : metadata.getFieldElements()) {
if (fieldElement.injectedObject != null) {
continue;
}
Class<?> injectedType = fieldElement.field.getType();
AnnotationAttributes attributes = fieldElement.attributes;
String referenceBeanName = registerReferenceBean(fieldElement.getPropertyName(), injectedType, attributes, fieldElement.field);
//associate fieldElement and reference bean
fieldElement.injectedObject = referenceBeanName;
injectedFieldReferenceBeanCache.put(fieldElement, referenceBeanName);
}
Class<?> injectedType = fieldElement.field.getType();
AnnotationAttributes attributes = fieldElement.attributes;
ReferenceBean referenceBean = getReferenceBean(injectedType, attributes);
//associate fieldElement and reference bean
fieldElement.refKey = referenceBean.getId();
injectedFieldReferenceBeanCache.put(fieldElement, referenceBean);
for (AnnotatedMethodElement methodElement : metadata.getMethodElements()) {
if (methodElement.injectedObject != null) {
continue;
}
Class<?> injectedType = methodElement.getInjectedType();
AnnotationAttributes attributes = methodElement.attributes;
String referenceBeanName = registerReferenceBean(methodElement.getPropertyName(), injectedType, attributes, methodElement.method);
}
for (AnnotatedMethodElement methodElement : metadata.getMethodElements()) {
if (methodElement.refKey != null) {
continue;
//associate fieldElement and reference bean
methodElement.injectedObject = referenceBeanName;
injectedMethodReferenceBeanCache.put(methodElement, referenceBeanName);
}
Class<?> injectedType = methodElement.getInjectedType();
AnnotationAttributes attributes = methodElement.attributes;
ReferenceBean referenceBean = getReferenceBean(injectedType, attributes);
//associate fieldElement and reference bean
methodElement.refKey = referenceBean.getId();
injectedMethodReferenceBeanCache.put(methodElement, referenceBean);
} catch (ClassNotFoundException e) {
throw new BeanCreationException("prepare reference annotation failed", e);
}
}
private ReferenceBean getReferenceBean(Class<?> injectedType, AnnotationAttributes attributes) throws Exception {
public String registerReferenceBean(String propertyName, Class<?> injectedType, Map<String, Object> attributes, Member member) throws BeansException {
boolean renameable = true;
// referenceBeanName
String referenceBeanName = getReferenceBeanName(attributes, injectedType);
// reuse exist reference bean?
ReferenceBean referenceBean = referenceBeanManager.get(referenceBeanName);
//create referenceBean
if (referenceBean == null) {
//handle injvm/localServiceBean
/**
* The name of bean that annotated Dubbo's {@link Service @Service} in local Spring {@link ApplicationContext}
*/
String localServiceBeanName = buildReferencedBeanName(attributes, injectedType);
boolean localServiceBean = isLocalServiceBean(localServiceBeanName, attributes);
if (localServiceBean) { // If the local @Service Bean exists
attributes.put("injvm", Boolean.TRUE);
// Issue : https://github.com/apache/dubbo/issues/6224
//exportServiceBeanIfNecessary(localServiceBeanName); // If the referenced ServiceBean exits, export it immediately
}
//check interfaceClass
if (attributes.get("interfaceName") == null && attributes.get("interfaceClass") == null) {
Class<?> interfaceClass = injectedType;
Assert.isTrue(interfaceClass.isInterface(),
"The class of field or method that was annotated @DubboReference is not an interface!");
attributes.put("interfaceClass", interfaceClass);
}
//init reference bean
try {
//registry referenceBean
RootBeanDefinition beanDefinition = new RootBeanDefinition();
beanDefinition.setBeanClassName(ReferenceBean.class.getName());
//set autowireCandidate to false for local call, avoiding multiple candidate beans for @Autowire
beanDefinition.setAutowireCandidate(!localServiceBean);
//beanDefinition.getPropertyValues()
referenceBean = new ReferenceBean(attributes);
referenceBean.setId(referenceBeanName);
referenceBean.setApplicationContext(applicationContext);
referenceBean.setBeanClassLoader(getClassLoader());
referenceBean.afterPropertiesSet();
beanDefinitionRegistry.registerBeanDefinition(referenceBeanName, beanDefinition);
getBeanFactory().registerSingleton(referenceBeanName, referenceBean);
//cache reference bean, avoid re-inject same element after prepare reference bean
referenceBeanManager.addReference(referenceBean);
} catch (Exception e) {
throw new Exception("Create dubbo reference bean failed", e);
}
String referenceBeanName = getAttribute(attributes, ReferenceAttributes.ID);
if (hasText(referenceBeanName)) {
renameable = false;
} else {
referenceBeanName = propertyName;
}
return referenceBean;
String checkLocation = "Please check " + member.toString();
// convert annotation props
ReferenceBeanSupport.convertReferenceProps(attributes, injectedType);
// get interface
String interfaceName = (String) attributes.get(ReferenceAttributes.INTERFACE);
if (StringUtils.isBlank(interfaceName)) {
throw new BeanCreationException("Need to specify the 'interfaceName' or 'interfaceClass' attribute of '@DubboReference' if enable generic. "+checkLocation);
}
// check reference key
String referenceKey = ReferenceBeanSupport.generateReferenceKey(attributes, applicationContext.getEnvironment());
// check registered reference beans in referenceBeanManager
List<String> registeredReferenceBeanNames = referenceBeanManager.getByKey(referenceKey);
if (registeredReferenceBeanNames.contains(referenceBeanName)) {
return referenceBeanName;
}
//check bean definition
if (beanDefinitionRegistry.containsBeanDefinition(referenceBeanName)) {
BeanDefinition prevBeanDefinition = beanDefinitionRegistry.getBeanDefinition(referenceBeanName);
String prevBeanType = prevBeanDefinition.getBeanClassName();
String prevBeanDesc = referenceBeanName + "[" + prevBeanType + "]";
String newBeanDesc = referenceBeanName + "[" + referenceKey + "]";
if (isReferenceBean(prevBeanDefinition)) {
//check reference key
String prevReferenceKey = ReferenceBeanSupport.generateReferenceKey(prevBeanDefinition, applicationContext.getEnvironment());
if (StringUtils.isEquals(prevReferenceKey, referenceKey)) {
//found matched dubbo reference bean, ignore register
return referenceBeanName;
}
//get interfaceName from attribute
Class prevInterfaceClass = (Class) prevBeanDefinition.getAttribute(ReferenceAttributes.INTERFACE_CLASS);
Assert.notNull(prevBeanDefinition, "The interface class of ReferenceBean is not initialized");
prevBeanType = prevInterfaceClass.getName();
prevBeanDesc = referenceBeanName + "[" + prevReferenceKey + "]";
//check bean type
if (StringUtils.isEquals(prevBeanType, interfaceName)) {
throw new BeanCreationException("Already exists another reference bean with the same bean name and type but difference attributes. " +
"In order to avoid injection confusion, please modify the name of one of the beans: " +
"prev: " + prevBeanDesc + ", new: " + newBeanDesc+". "+checkLocation);
}
} else {
//check bean type
if (StringUtils.isEquals(prevBeanType, interfaceName)) {
throw new BeanCreationException("Already exists another bean definition with the same bean name and type. " +
"In order to avoid injection confusion, please modify the name of one of the beans: " +
"prev: " + prevBeanDesc + ", new: " + newBeanDesc+". "+checkLocation);
}
}
// bean name from attribute 'id' or java-config bean, cannot be renamed
if (!renameable) {
throw new BeanCreationException("Already exists another bean definition with the same bean name, " +
"but cannot rename the reference bean name (specify the id attribute or java-config bean), " +
"please modify the name of one of the beans: " +
"prev: " + prevBeanDesc + ", new: " + newBeanDesc+". "+checkLocation);
}
// the prev bean type is different, rename the new reference bean
int index = 2;
String newReferenceBeanName = null;
while (newReferenceBeanName == null || beanDefinitionRegistry.containsBeanDefinition(newReferenceBeanName)) {
newReferenceBeanName = referenceBeanName + "#" + index;
index++;
}
newBeanDesc = newReferenceBeanName + "[" + referenceKey + "]";
logger.warn("Already exists another bean definition with the same bean name but difference type, " +
"rename dubbo reference bean to: " + newReferenceBeanName + ". " +
"It is recommended to modify the name of one of the beans to avoid injection problems. " +
"prev: " + prevBeanDesc + ", new: " + newBeanDesc+". "+checkLocation);
referenceBeanName = newReferenceBeanName;
}
attributes.put(ReferenceAttributes.ID, referenceBeanName);
// If registered matched reference before, add alias
if (registeredReferenceBeanNames.size() > 0) {
beanDefinitionRegistry.registerAlias(registeredReferenceBeanNames.get(0), referenceBeanName);
return referenceBeanName;
}
Class interfaceClass = injectedType;
Class actualInterface = null;
try {
actualInterface = ClassUtils.forName(interfaceName);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
// TODO Only register one reference bean for same (group, interface, version)
// Register the reference bean definition to the beanFactory
RootBeanDefinition beanDefinition = new RootBeanDefinition();
beanDefinition.setBeanClassName(ReferenceBean.class.getName());
beanDefinition.getPropertyValues().add(ReferenceAttributes.ID, referenceBeanName);
// set attribute instead of property values
beanDefinition.setAttribute(Constants.REFERENCE_PROPS, attributes);
beanDefinition.setAttribute(ReferenceAttributes.INTERFACE_CLASS, interfaceClass);
beanDefinition.setAttribute(ReferenceAttributes.ACTUAL_INTERFACE, actualInterface);
// create decorated definition for reference bean, Avoid being instantiated when getting the beanType of ReferenceBean
// see org.springframework.beans.factory.support.AbstractBeanFactory#getTypeForFactoryBean()
GenericBeanDefinition targetDefinition = new GenericBeanDefinition();
targetDefinition.setBeanClass(interfaceClass);
String id = (String) beanDefinition.getPropertyValues().get(ReferenceAttributes.ID);
beanDefinition.setDecoratedDefinition(new BeanDefinitionHolder(targetDefinition, id+"_decorated"));
// signal object type since Spring 5.2
beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, interfaceClass);
beanDefinitionRegistry.registerBeanDefinition(referenceBeanName, beanDefinition);
logger.info("Register dubbo reference bean: "+referenceBeanName+" = "+referenceKey+" at "+member);
return referenceBeanName;
}
@Override
protected Object doGetInjectedBean(AnnotationAttributes attributes, Object bean, String beanName, Class<?> injectedType,
AnnotatedInjectElement injectedElement) throws Exception {
if (injectedElement.refKey == null) {
if (injectedElement.injectedObject == null) {
throw new IllegalStateException("The AnnotatedInjectElement of @DubboReference should be inited before injection");
}
return getBeanFactory().getBean(injectedElement.refKey);
}
/**
* Get the bean name of {@link ReferenceBean} if {@link Reference#id() id attribute} is present,
* or {@link #generateReferenceBeanName(AnnotationAttributes, Class) generate}.
*
* @param attributes the {@link AnnotationAttributes attributes} of {@link Reference @Reference}
* @param interfaceClass the {@link Class class} of Service interface
* @return non-null
* @since 2.7.3
*/
private String getReferenceBeanName(AnnotationAttributes attributes, Class<?> interfaceClass) {
// id attribute appears since 2.7.3
String beanName = getAttribute(attributes, "id");
if (!hasText(beanName)) {
beanName = generateReferenceBeanName(attributes, interfaceClass);
}
return beanName;
}
/**
* Build the bean name of {@link ReferenceBean}
*
* @param attributes the {@link AnnotationAttributes attributes} of {@link Reference @Reference}
* @param interfaceClass the {@link Class class} of Service interface
* @return
* @since 2.7.3
*/
private String generateReferenceBeanName(AnnotationAttributes attributes, Class<?> interfaceClass) {
StringBuilder beanNameBuilder = new StringBuilder("@Reference");
if (!attributes.isEmpty()) {
beanNameBuilder.append('(');
//sort attributes keys
List<String> sortedAttrKeys = new ArrayList<>(attributes.keySet());
Collections.sort(sortedAttrKeys);
for (String key : sortedAttrKeys) {
Object value = attributes.get(key);
//handle method array, generic array
if (value!=null && value.getClass().isArray()) {
Object[] array = ObjectUtils.toObjectArray(value);
value = Arrays.toString(array);
}
beanNameBuilder.append(key)
.append('=')
.append(value)
.append(',');
}
// replace the latest "," to be ")"
beanNameBuilder.setCharAt(beanNameBuilder.lastIndexOf(","), ')');
}
beanNameBuilder.append(" ").append(interfaceClass.getName());
//TODO remove invalid chars
//TODO test @DubboReference with Method config
//.replaceAll("[<>]", "_")
return beanNameBuilder.toString();
}
/**
* Is Local Service bean or not?
*
* @param referencedBeanName the bean name to the referenced bean
* @return If the target referenced bean is existed, return <code>true</code>, or <code>false</code>
* @since 2.7.6
*/
private boolean isLocalServiceBean(String referencedBeanName, AnnotationAttributes attributes) {
return existsServiceBean(referencedBeanName) && !isRemoteReferenceBean(attributes);
}
/**
* Check the {@link ServiceBean} is exited or not
*
* @param referencedBeanName the bean name to the referenced bean
* @return if exists, return <code>true</code>, or <code>false</code>
* @revised 2.7.6
*/
private boolean existsServiceBean(String referencedBeanName) {
return applicationContext.containsBean(referencedBeanName) &&
applicationContext.isTypeMatch(referencedBeanName, ServiceBean.class);
}
private boolean isRemoteReferenceBean(AnnotationAttributes attributes) {
//TODO Can the interface be called locally when injvm is empty? https://github.com/apache/dubbo/issues/6842
boolean remote = Boolean.FALSE.equals(attributes.get("injvm"));
return remote;
}
private void exportServiceBeanIfNecessary(String referencedBeanName) {
if (existsServiceBean(referencedBeanName)) {
ServiceBean serviceBean = getServiceBean(referencedBeanName);
if (!serviceBean.isExported()) {
serviceBean.export();
}
}
}
private ServiceBean getServiceBean(String referencedBeanName) {
return applicationContext.getBean(referencedBeanName, ServiceBean.class);
}
@Override
protected String buildInjectedObjectCacheKey(AnnotationAttributes attributes, Object bean, String beanName,
Class<?> injectedType, AnnotatedInjectElement injectedElement) {
return generateReferenceBeanName(attributes, injectedType);
}
/**
* @param attributes the attributes of {@link Reference @Reference}
* @param serviceInterfaceType the type of Dubbo's service interface
* @return The name of bean that annotated Dubbo's {@link Service @Service} in local Spring {@link ApplicationContext}
*/
private String buildReferencedBeanName(AnnotationAttributes attributes, Class<?> serviceInterfaceType) {
ServiceBeanNameBuilder serviceBeanNameBuilder = create(attributes, serviceInterfaceType, getEnvironment());
return serviceBeanNameBuilder.build();
return getBeanFactory().getBean((String) injectedElement.injectedObject);
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
this.referenceBeanManager = applicationContext.getBean(ReferenceBeanManager.BEAN_NAME, ReferenceBeanManager.class);
this.beanDefinitionRegistry = (BeanDefinitionRegistry) applicationContext.getAutowireCapableBeanFactory();
}
@Override
@ -418,7 +516,11 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
* @since 2.5.11
*/
public Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> getInjectedFieldReferenceBeanMap() {
return Collections.unmodifiableMap(injectedFieldReferenceBeanCache);
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> map = new HashMap<>();
for (Map.Entry<InjectionMetadata.InjectedElement, String> entry : injectedFieldReferenceBeanCache.entrySet()) {
map.put(entry.getKey(), referenceBeanManager.getById(entry.getValue()));
}
return Collections.unmodifiableMap(map);
}
/**
@ -428,6 +530,10 @@ public class ReferenceAnnotationBeanPostProcessor extends AbstractAnnotationBean
* @since 2.5.11
*/
public Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> getInjectedMethodReferenceBeanMap() {
return Collections.unmodifiableMap(injectedMethodReferenceBeanCache);
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> map = new HashMap<>();
for (Map.Entry<InjectionMetadata.InjectedElement, String> entry : injectedMethodReferenceBeanCache.entrySet()) {
map.put(entry.getKey(), referenceBeanManager.getById(entry.getValue()));
}
return Collections.unmodifiableMap(map);
}
}

1
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
View File

@ -305,6 +305,7 @@ public class ServiceClassPostProcessor implements BeanDefinitionRegistryPostProc
} else {
//TODO throw exception
if (logger.isWarnEnabled()) {
logger.warn("The Duplicated BeanDefinition[" + serviceBeanDefinition +
"] of ServiceBean[ bean name : " + beanName +

6
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/DubboConfigInitializationPostProcessor.java → dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboConfigInitializationPostProcessor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.config.spring;
package org.apache.dubbo.config.spring.context;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ConsumerConfig;
@ -26,6 +26,8 @@ import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.SslConfig;
import org.apache.dubbo.config.spring.ConfigCenterBean;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanFactory;
@ -48,7 +50,7 @@ import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncl
*/
public class DubboConfigInitializationPostProcessor implements BeanPostProcessor, BeanFactoryAware, Ordered {
public static String BEAN_NAME = "dubboBeanFactoryPostProcessor";
public static String BEAN_NAME = "dubboConfigInitializationPostProcessor";
/**
* This bean post processor should run before seata GlobalTransactionScanner(1024)

51
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java Normal file
View File

@ -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.config.spring.context;
import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
import org.apache.dubbo.config.spring.util.DubboBeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
/**
* Register some infrastructure beans if not exists.
* This post-processor MUST impl BeanDefinitionRegistryPostProcessor,
* in order to enable the registered BeanFactoryPostProcessor bean to be loaded and executed.
* @see org.springframework.context.support.PostProcessorRegistrationDelegate#invokeBeanFactoryPostProcessors(org.springframework.beans.factory.config.ConfigurableListableBeanFactory, java.util.List)
*/
public class DubboInfraBeanRegisterPostProcessor implements BeanDefinitionRegistryPostProcessor {
/**
* The bean name of {@link ReferenceAnnotationBeanPostProcessor}
*/
public static final String BEAN_NAME = "dubboInfraBeanRegisterPostProcessor";
private BeanDefinitionRegistry registry;
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
this.registry = registry;
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
DubboBeanUtils.registerBeansIfNotExists(registry);
}
}

137
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceAttributes.java Normal file
View File

@ -0,0 +1,137 @@
/*
* 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.config.spring.reference;
/**
* Attribute names of {@link org.apache.dubbo.config.annotation.DubboReference}
* and {@link org.apache.dubbo.config.ReferenceConfig}
*/
public interface ReferenceAttributes {
String ID = "id";
String INTERFACE = "interface";
String INTERFACE_NAME = "interfaceName";
String INTERFACE_CLASS = "interfaceClass";
String ACTUAL_INTERFACE = "actualInterface";
String GENERIC = "generic";
String REGISTRY = "registry";
String REGISTRIES = "registries";
String REGISTRY_IDS = "registryIds";
String GROUP = "group";
String VERSION = "version";
String ARGUMENTS = "arguments";
String METHODS = "methods";
String PARAMETERS = "parameters";
String PROVIDED_BY = "providedBy";
String URL = "url";
String CLIENT = "client";
// /**
// * When enable, prefer to call local service in the same JVM if it's present, default value is true
// * @deprecated using scope="local" or scope="remote" instead
// */
// @Deprecated
String INJVM = "injvm";
String CHECK = "check";
String INIT = "init";
String LAZY = "lazy";
String STUBEVENT = "stubevent";
String RECONNECT = "reconnect";
String STICKY = "sticky";
String PROXY = "proxy";
String STUB = "stub";
String CLUSTER = "cluster";
String CONNECTIONS = "connections";
String CALLBACKS = "callbacks";
String ONCONNECT = "onconnect";
String ONDISCONNECT = "ondisconnect";
String OWNER = "owner";
String LAYER = "layer";
String RETRIES = "retries";
String LOAD_BALANCE = "loadbalance";
String ASYNC = "async";
String ACTIVES = "actives";
String SENT = "sent";
String MOCK = "mock";
String VALIDATION = "validation";
String TIMEOUT = "timeout";
String CACHE = "cache";
String FILTER = "filter";
String LISTENER = "listener";
String APPLICATION = "application";
String MODULE = "module";
String CONSUMER = "consumer";
String MONITOR = "monitor";
String PROTOCOL = "protocol";
String TAG = "tag";
String MERGER = "merger";
String SERVICES = "services";
String SCOPE = "scope";
// String ROUTER = "router";
}

383
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanBuilder.java Normal file
View File

@ -0,0 +1,383 @@
/*
* 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.config.spring.reference;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.MonitorConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.spring.ReferenceBean;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* Builder for ReferenceBean, used to return ReferenceBean instance in Java-config @Bean method,
* equivalent to {@link DubboReference} annotation.
* </p>
*
* <p>
* <b>It is recommended to use {@link DubboReference} on the @Bean method in the Java-config class.</b>
* </p>
*
* Step 1: Register ReferenceBean in Java-config class:
* <pre class="code">
* &#64;Configuration
* public class ReferenceConfiguration {
*
* &#64;Bean
* public ReferenceBean&lt;HelloService&gt; helloService() {
* return new ReferenceBeanBuilder()
* .setGroup("demo")
* .build();
* }
*
* &#64;Bean
* public ReferenceBean&lt;HelloService&gt; helloService2() {
* return new ReferenceBean();
* }
*
* &#64;Bean
* public ReferenceBean&lt;GenericService&gt; genericHelloService() {
* return new ReferenceBeanBuilder()
* .setGroup("demo")
* .setInterface(HelloService.class)
* .build();
* }
*
* }
* </pre>
*
* Step 2: Inject ReferenceBean by @Autowired
* <pre class="code">
* public class FooController {
* &#64;Autowired
* private HelloService helloService;
*
* &#64;Autowired
* private GenericService genericHelloService;
* }
* </pre>
*
* @see org.apache.dubbo.config.annotation.DubboReference
* @see org.apache.dubbo.config.spring.ReferenceBean
*/
public class ReferenceBeanBuilder {
private Map<String, Object> attributes = new HashMap<>();
public <T> ReferenceBean<T> build() {
return new ReferenceBean(attributes);
}
public ReferenceBeanBuilder setServices(String services) {
attributes.put(ReferenceAttributes.SERVICES, services);
return this;
}
public ReferenceBeanBuilder setInterface(String interfaceName) {
attributes.put(ReferenceAttributes.INTERFACE_NAME, interfaceName);
return this;
}
public ReferenceBeanBuilder setInterface(Class interfaceClass) {
attributes.put(ReferenceAttributes.INTERFACE_CLASS, interfaceClass);
return this;
}
public ReferenceBeanBuilder setClient(String client) {
attributes.put(ReferenceAttributes.CLIENT, client);
return this;
}
public ReferenceBeanBuilder setUrl(String url) {
attributes.put(ReferenceAttributes.URL, url);
return this;
}
public ReferenceBeanBuilder setConsumer(ConsumerConfig consumer) {
attributes.put(ReferenceAttributes.CONSUMER, consumer);
return this;
}
public ReferenceBeanBuilder setConsumer(String consumer) {
attributes.put(ReferenceAttributes.CONSUMER, consumer);
return this;
}
public ReferenceBeanBuilder setProtocol(String protocol) {
attributes.put(ReferenceAttributes.PROTOCOL, protocol);
return this;
}
public ReferenceBeanBuilder setCheck(Boolean check) {
attributes.put(ReferenceAttributes.CHECK, check);
return this;
}
public ReferenceBeanBuilder setInit(Boolean init) {
attributes.put(ReferenceAttributes.INIT, init);
return this;
}
//@Deprecated
public ReferenceBeanBuilder setGeneric(Boolean generic) {
attributes.put(ReferenceAttributes.GENERIC, generic);
return this;
}
/**
* @param injvm
* @deprecated instead, use the parameter <b>scope</b> to judge if it's in jvm, scope=local
*/
@Deprecated
public ReferenceBeanBuilder setInjvm(Boolean injvm) {
attributes.put(ReferenceAttributes.INJVM, injvm);
return this;
}
public ReferenceBeanBuilder setListener(String listener) {
attributes.put(ReferenceAttributes.LISTENER, listener);
return this;
}
public ReferenceBeanBuilder setLazy(Boolean lazy) {
attributes.put(ReferenceAttributes.LAZY, lazy);
return this;
}
public ReferenceBeanBuilder setOnconnect(String onconnect) {
attributes.put(ReferenceAttributes.ONCONNECT, onconnect);
return this;
}
public ReferenceBeanBuilder setOndisconnect(String ondisconnect) {
attributes.put(ReferenceAttributes.ONDISCONNECT, ondisconnect);
return this;
}
public ReferenceBeanBuilder setReconnect(String reconnect) {
attributes.put(ReferenceAttributes.RECONNECT, reconnect);
return this;
}
public ReferenceBeanBuilder setSticky(Boolean sticky) {
attributes.put(ReferenceAttributes.STICKY, sticky);
return this;
}
public ReferenceBeanBuilder setVersion(String version) {
attributes.put(ReferenceAttributes.VERSION, version);
return this;
}
public ReferenceBeanBuilder setGroup(String group) {
attributes.put(ReferenceAttributes.GROUP, group);
return this;
}
public ReferenceBeanBuilder setProvidedBy(String providedBy) {
attributes.put(ReferenceAttributes.PROVIDED_BY, providedBy);
return this;
}
// public ReferenceBeanBuilder setRouter(String router) {
// attributes.put(ReferenceAttributes.ROUTER, router);
// return this;
// }
public ReferenceBeanBuilder setStub(String stub) {
attributes.put(ReferenceAttributes.STUB, stub);
return this;
}
public ReferenceBeanBuilder setCluster(String cluster) {
attributes.put(ReferenceAttributes.CLUSTER, cluster);
return this;
}
public ReferenceBeanBuilder setProxy(String proxy) {
attributes.put(ReferenceAttributes.PROXY, proxy);
return this;
}
public ReferenceBeanBuilder setConnections(Integer connections) {
attributes.put(ReferenceAttributes.CONNECTIONS, connections);
return this;
}
public ReferenceBeanBuilder setFilter(String filter) {
attributes.put(ReferenceAttributes.FILTER, filter);
return this;
}
public ReferenceBeanBuilder setLayer(String layer) {
attributes.put(ReferenceAttributes.LAYER, layer);
return this;
}
// @Deprecated
// public ReferenceBeanBuilder setApplication(ApplicationConfig application) {
// attributes.put(ReferenceAttributes.APPLICATION, application);
// return this;
// }
// @Deprecated
// public ReferenceBeanBuilder setModule(ModuleConfig module) {
// attributes.put(ReferenceAttributes.MODULE, module);
// return this;
// }
public ReferenceBeanBuilder setRegistry(String[] registryIds) {
attributes.put(ReferenceAttributes.REGISTRY, registryIds);
return this;
}
public ReferenceBeanBuilder setRegistry(RegistryConfig registry) {
setRegistries(Arrays.asList(registry));
return this;
}
public ReferenceBeanBuilder setRegistries(List<? extends RegistryConfig> registries) {
attributes.put(ReferenceAttributes.REGISTRIES, registries);
return this;
}
public ReferenceBeanBuilder setMethods(List<? extends MethodConfig> methods) {
attributes.put(ReferenceAttributes.METHODS, methods);
return this;
}
@Deprecated
public ReferenceBeanBuilder setMonitor(MonitorConfig monitor) {
attributes.put(ReferenceAttributes.MONITOR, monitor);
return this;
}
@Deprecated
public ReferenceBeanBuilder setMonitor(String monitor) {
attributes.put(ReferenceAttributes.MONITOR, monitor);
return this;
}
public ReferenceBeanBuilder setOwner(String owner) {
attributes.put(ReferenceAttributes.OWNER, owner);
return this;
}
public ReferenceBeanBuilder setCallbacks(Integer callbacks) {
attributes.put(ReferenceAttributes.CALLBACKS, callbacks);
return this;
}
public ReferenceBeanBuilder setScope(String scope) {
attributes.put(ReferenceAttributes.SCOPE, scope);
return this;
}
public ReferenceBeanBuilder setTag(String tag) {
attributes.put(ReferenceAttributes.TAG, tag);
return this;
}
public ReferenceBeanBuilder setTimeout(Integer timeout) {
attributes.put(ReferenceAttributes.TIMEOUT, timeout);
return this;
}
public ReferenceBeanBuilder setRetries(Integer retries) {
attributes.put(ReferenceAttributes.RETRIES, retries);
return this;
}
public ReferenceBeanBuilder setLoadBalance(String loadbalance) {
attributes.put(ReferenceAttributes.LOAD_BALANCE, loadbalance);
return this;
}
public ReferenceBeanBuilder setAsync(Boolean async) {
attributes.put(ReferenceAttributes.ASYNC, async);
return this;
}
public ReferenceBeanBuilder setActives(Integer actives) {
attributes.put(ReferenceAttributes.ACTIVES, actives);
return this;
}
public ReferenceBeanBuilder setSent(Boolean sent) {
attributes.put(ReferenceAttributes.SENT, sent);
return this;
}
public ReferenceBeanBuilder setMock(String mock) {
attributes.put(ReferenceAttributes.MOCK, mock);
return this;
}
public ReferenceBeanBuilder setMerger(String merger) {
attributes.put(ReferenceAttributes.MERGER, merger);
return this;
}
public ReferenceBeanBuilder setCache(String cache) {
attributes.put(ReferenceAttributes.CACHE, cache);
return this;
}
public ReferenceBeanBuilder setValidation(String validation) {
attributes.put(ReferenceAttributes.VALIDATION, validation);
return this;
}
public ReferenceBeanBuilder setParameters(Map<String, String> parameters) {
attributes.put(ReferenceAttributes.PARAMETERS, parameters);
return this;
}
// public ReferenceBeanBuilder setAuth(Boolean auth) {
// attributes.put(ReferenceAttributes.AUTH, auth);
// return this;
// }
//
// public ReferenceBeanBuilder setForks(Integer forks) {
// attributes.put(ReferenceAttributes.FORKS, forks);
// return this;
// }
//
// @Deprecated
// public ReferenceBeanBuilder setConfigCenter(ConfigCenterConfig configCenter) {
// attributes.put(ReferenceAttributes.CONFIG_CENTER, configCenter);
// return this;
// }
//
// @Deprecated
// public ReferenceBeanBuilder setMetadataReportConfig(MetadataReportConfig metadataReportConfig) {
// attributes.put(ReferenceAttributes.METADATA_REPORT_CONFIG, metadataReportConfig);
// return this;
// }
//
// @Deprecated
// public ReferenceBeanBuilder setMetrics(MetricsConfig metrics) {
// attributes.put(ReferenceAttributes.METRICS, metrics);
// return this;
// }
}

155
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanManager.java Normal file
View File

@ -0,0 +1,155 @@
/*
* 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.config.spring.reference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.env.PropertyResolver;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class ReferenceBeanManager implements ApplicationContextAware {
public static final String BEAN_NAME = "dubboReferenceBeanManager";
private final Log logger = LogFactory.getLog(getClass());
//reference bean id/name -> ReferenceBean
private Map<String, ReferenceBean> referenceIdMap = new ConcurrentHashMap<>();
//reference key -> [ reference bean names ]
private Map<String, List<String>> referenceKeyMap = new ConcurrentHashMap<>();
//reference key -> ReferenceConfig instance
private Map<String, ReferenceConfig> referenceConfigMap = new ConcurrentHashMap<>();
private ApplicationContext applicationContext;
private volatile boolean initialized = false;
public void addReference(ReferenceBean referenceBean) throws Exception {
String referenceBeanName = referenceBean.getId();
Assert.notEmptyString(referenceBeanName, "The id of ReferenceBean cannot be empty");
PropertyResolver propertyResolver = applicationContext.getEnvironment();
if (!initialized) {
//TODO add issue url to describe early initialization
logger.warn("Early initialize reference bean before DubboConfigInitializationPostProcessor," +
" the BeanPostProcessor has not been loaded at this time, which may cause abnormalities in some components (such as seata): " +
referenceBeanName + " = " + ReferenceBeanSupport.generateReferenceKey(referenceBean, propertyResolver));
}
String referenceKey = ReferenceBeanSupport.generateReferenceKey(referenceBean, propertyResolver);
ReferenceBean oldReferenceBean = referenceIdMap.get(referenceBeanName);
if (oldReferenceBean != null) {
if (referenceBean != oldReferenceBean) {
String oldReferenceKey = ReferenceBeanSupport.generateReferenceKey(oldReferenceBean, propertyResolver);
throw new IllegalStateException("Found duplicated ReferenceBean with id: " + referenceBeanName +
", old: " + oldReferenceKey + ", new: " + referenceKey);
}
return;
}
referenceIdMap.put(referenceBeanName, referenceBean);
//save cache, map reference key to referenceBeanName
this.registerReferenceKeyAndBeanName(referenceKey, referenceBeanName);
// if add reference after prepareReferenceBeans(), should init it immediately.
if (initialized) {
initReferenceBean(referenceBean);
}
}
public void registerReferenceKeyAndBeanName(String referenceKey, String referenceBeanName) {
referenceKeyMap.getOrDefault(referenceKey, new ArrayList<>()).add(referenceBeanName);
}
public ReferenceBean getById(String key) {
return referenceIdMap.get(key);
}
public List<String> getByKey(String key) {
return Collections.unmodifiableList(referenceKeyMap.getOrDefault(key, new ArrayList<>()));
}
public Collection<ReferenceBean> getReferences() {
return referenceIdMap.values();
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
/**
* Initialize all reference beans, call at Dubbo starting
*
* @throws Exception
*/
public void prepareReferenceBeans() throws Exception {
initialized = true;
for (ReferenceBean referenceBean : getReferences()) {
initReferenceBean(referenceBean);
}
// prepare all reference beans, including those loaded very early that are dependent on some BeanFactoryPostProcessor
// Map<String, ReferenceBean> referenceBeanMap = applicationContext.getBeansOfType(ReferenceBean.class, true, false);
// for (ReferenceBean referenceBean : referenceBeanMap.values()) {
// addReference(referenceBean);
// }
}
/**
* NOTE: This method should only call after all dubbo config beans and all property resolvers is loaded.
*
* @param referenceBean
* @throws Exception
*/
private synchronized void initReferenceBean(ReferenceBean referenceBean) throws Exception {
if (referenceBean.getReferenceConfig() != null) {
return;
}
// reference key
String referenceKey = ReferenceBeanSupport.generateReferenceKey(referenceBean, applicationContext.getEnvironment());
ReferenceConfig referenceConfig = referenceConfigMap.get(referenceKey);
if (referenceConfig == null) {
//create real ReferenceConfig
Map<String, Object> referenceAttributes = ReferenceBeanSupport.getReferenceAttributes(referenceBean);
referenceConfig = ReferenceCreator.create(referenceAttributes, applicationContext)
.defaultInterfaceClass(referenceBean.getObjectType())
.build();
//cache referenceConfig
referenceConfigMap.put(referenceKey, referenceConfig);
// register ReferenceConfig
DubboBootstrap.getInstance().reference(referenceConfig);
}
// associate referenceConfig to referenceBean
referenceBean.setKeyAndReferenceConfig(referenceKey, referenceConfig);
}
}

258
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanSupport.java Normal file
View File

@ -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.config.spring.reference;
import com.alibaba.spring.util.AnnotationUtils;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.spring.Constants;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.rpc.service.GenericService;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.PropertyResolver;
import org.springframework.util.ObjectUtils;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import static org.apache.dubbo.common.utils.StringUtils.join;
import static org.apache.dubbo.config.spring.reference.ReferenceCreator.convertStringArrayToMap;
public class ReferenceBeanSupport {
public static void convertReferenceProps(Map<String, Object> attributes, Class defaultInterfaceClass) {
// interface class
String interfaceName = (String) attributes.get(ReferenceAttributes.INTERFACE);
if (interfaceName == null) {
interfaceName = (String) attributes.get(ReferenceAttributes.INTERFACE_NAME);
}
if (interfaceName == null) {
Class clazz = (Class) attributes.get(ReferenceAttributes.INTERFACE_CLASS);
interfaceName = clazz != null ? clazz.getName() : null;
}
if (interfaceName == null && defaultInterfaceClass != GenericService.class) {
interfaceName = defaultInterfaceClass.getName();
}
Assert.notEmptyString(interfaceName, "The interface class or name of reference was not found");
attributes.put(ReferenceAttributes.INTERFACE, interfaceName);
attributes.remove(ReferenceAttributes.INTERFACE_NAME);
attributes.remove(ReferenceAttributes.INTERFACE_CLASS);
//reset generic value
String generic = String.valueOf(defaultInterfaceClass == GenericService.class);
String oldGeneric = attributes.containsValue(ReferenceAttributes.GENERIC) ? String.valueOf(attributes.get(ReferenceAttributes.GENERIC)) : "false";
if (!StringUtils.isEquals(oldGeneric, generic)) {
attributes.put(ReferenceAttributes.GENERIC, generic);
}
//Specially convert @DubboReference attribute name/value to ReferenceConfig property
// String[] registry => String registryIds
String[] registryIds = (String[]) attributes.get(ReferenceAttributes.REGISTRY);
if (registryIds != null) {
String value = join((String[]) registryIds, ",");
attributes.remove(ReferenceAttributes.REGISTRY);
attributes.put(ReferenceAttributes.REGISTRY_IDS, value);
}
}
public static String generateReferenceKey(Map<String, Object> attributes, PropertyResolver propertyResolver) {
String interfaceClass = (String) attributes.get(ReferenceAttributes.INTERFACE);
Assert.notEmptyString(interfaceClass, "No interface class or name found from attributes");
String group = (String) attributes.get(ReferenceAttributes.GROUP);
String version = (String) attributes.get(ReferenceAttributes.VERSION);
//ReferenceBean:group/interface:version
StringBuilder beanNameBuilder = new StringBuilder("ReferenceBean:");
if (StringUtils.isNotEmpty(group)) {
beanNameBuilder.append(group).append("/");
}
beanNameBuilder.append(interfaceClass);
if (StringUtils.isNotEmpty(version)) {
beanNameBuilder.append(":").append(version);
}
// append attributes
beanNameBuilder.append('(');
//sort attributes keys
List<String> sortedAttrKeys = new ArrayList<>(attributes.keySet());
Collections.sort(sortedAttrKeys);
List<String> ignoredAttrs = Arrays.asList(ReferenceAttributes.ID, ReferenceAttributes.GROUP, ReferenceAttributes.VERSION, ReferenceAttributes.INTERFACE, ReferenceAttributes.INTERFACE_NAME, ReferenceAttributes.INTERFACE_CLASS);
for (String key : sortedAttrKeys) {
if (ignoredAttrs.contains(key)) {
continue;
}
Object value = attributes.get(key);
value = convertToString(key, value);
beanNameBuilder.append(key)
.append('=')
.append(value)
.append(',');
}
// replace the latest "," to be ")"
if (beanNameBuilder.charAt(beanNameBuilder.length() - 1) == ',') {
beanNameBuilder.setCharAt(beanNameBuilder.length() - 1, ')');
} else {
beanNameBuilder.append(')');
}
String referenceKey = beanNameBuilder.toString();
if (propertyResolver != null) {
referenceKey = propertyResolver.resolveRequiredPlaceholders(referenceKey);
}
return referenceKey;
}
// public static void verifyReferenceKey(String referenceKey) {
// if (referenceKey != null && referenceKey.contains("${")) {
// throw new IllegalStateException("Reference key contains unresolved placeholders ${..}");
// }
// }
private static String convertToString(String key, Object obj) {
if (obj == null) {
return null;
}
if (ReferenceAttributes.PARAMETERS.equals(key) && obj instanceof String[]) {
//convert parameters array pairs to map
obj = convertStringArrayToMap((String[]) obj);
}
//to string
if (obj instanceof Annotation) {
AnnotationAttributes attributes = AnnotationUtils.getAnnotationAttributes((Annotation) obj, true);
for (Map.Entry<String, Object> entry : attributes.entrySet()) {
entry.setValue(convertToString(entry.getKey(), entry.getValue()));
}
return String.valueOf(attributes);
} else if (obj.getClass().isArray()) {
Object[] array = ObjectUtils.toObjectArray(obj);
String[] newArray = new String[array.length];
for (int i = 0; i < array.length; i++) {
newArray[i] = convertToString(null, array[i]);
}
Arrays.sort(newArray);
return Arrays.toString(newArray);
} else if (obj instanceof Map) {
Map<String, Object> map = (Map<String, Object>) obj;
TreeMap newMap = new TreeMap();
for (Map.Entry<String, Object> entry : map.entrySet()) {
newMap.put(entry.getKey(), convertToString(entry.getKey(), entry.getValue()));
}
return String.valueOf(newMap);
} else {
return String.valueOf(obj);
}
}
/**
* Convert to raw props, without parsing nested config objects
*/
public static Map<String, Object> convertPropertyValues(MutablePropertyValues propertyValues) {
Map<String, Object> referenceProps = new LinkedHashMap<>();
for (PropertyValue propertyValue : propertyValues.getPropertyValueList()) {
String propertyName = propertyValue.getName();
Object value = propertyValue.getValue();
if (ReferenceAttributes.METHODS.equals(propertyName) || ReferenceAttributes.ARGUMENTS.equals(propertyName)) {
ManagedList managedList = (ManagedList) value;
List<Map<String, Object>> elementList = new ArrayList<>();
for (Object el : managedList) {
Map<String, Object> element = convertPropertyValues(((BeanDefinitionHolder) el).getBeanDefinition().getPropertyValues());
element.remove(ReferenceAttributes.ID);
elementList.add(element);
}
value = elementList.toArray(new Object[0]);
} else if (ReferenceAttributes.PARAMETERS.equals(propertyName)) {
value = createParameterMap((ManagedMap) value);
}
//convert ref
if (value instanceof RuntimeBeanReference) {
RuntimeBeanReference beanReference = (RuntimeBeanReference) value;
value = beanReference.getBeanName();
}
if (value == null ||
(value instanceof String && StringUtils.isBlank((String) value))
) {
//ignore null or blank string
continue;
}
referenceProps.put(propertyName, value);
}
return referenceProps;
}
private static Map<String, String> createParameterMap(ManagedMap managedMap) {
Map<String, String> map = new LinkedHashMap<>();
Set<Map.Entry<String, TypedStringValue>> entrySet = managedMap.entrySet();
for (Map.Entry<String, TypedStringValue> entry : entrySet) {
map.put(entry.getKey(), entry.getValue().getValue());
}
return map;
}
public static String generateReferenceKey(ReferenceBean referenceBean, PropertyResolver propertyResolver) {
return generateReferenceKey(getReferenceAttributes(referenceBean), propertyResolver);
}
public static String generateReferenceKey(BeanDefinition beanDefinition, PropertyResolver propertyResolver) {
return generateReferenceKey(getReferenceAttributes(beanDefinition), propertyResolver);
}
public static Map<String, Object> getReferenceAttributes(ReferenceBean referenceBean) {
Map<String, Object> referenceProps = referenceBean.getReferenceProps();
if (referenceProps == null) {
MutablePropertyValues propertyValues = referenceBean.getPropertyValues();
if (propertyValues == null) {
throw new RuntimeException("ReferenceBean is invalid, 'referenceProps' and 'propertyValues' cannot both be empty.");
}
referenceProps = convertPropertyValues(propertyValues);
}
return referenceProps;
}
public static Map<String, Object> getReferenceAttributes(BeanDefinition beanDefinition) {
Map<String, Object> referenceProps = null;
if (beanDefinition.hasAttribute(Constants.REFERENCE_PROPS)) {
referenceProps = (Map<String, Object>) beanDefinition.getAttribute(Constants.REFERENCE_PROPS);
} else {
referenceProps = convertPropertyValues(beanDefinition.getPropertyValues());
}
return referenceProps;
}
}

160
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java → dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceCreator.java
View File

@ -14,28 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;
package org.apache.dubbo.config.spring.reference;
import com.alibaba.spring.util.AnnotationUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ArgumentConfig;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ModuleConfig;
import org.apache.dubbo.config.MonitorConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.annotation.Argument;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationPropertyValuesAdapter;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.validation.DataBinder;
import java.beans.PropertyEditorSupport;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -44,21 +48,27 @@ import static com.alibaba.spring.util.AnnotationUtils.getAttribute;
import static com.alibaba.spring.util.BeanFactoryUtils.getBeans;
import static com.alibaba.spring.util.BeanFactoryUtils.getOptionalBean;
import static com.alibaba.spring.util.ObjectUtils.of;
import static org.springframework.util.StringUtils.arrayToCommaDelimitedString;
import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;
/**
* {@link ReferenceConfig} Builder for @{@link DubboReference}
* {@link ReferenceConfig} Creator for @{@link DubboReference}
*
* @since 3.0
*/
public class ReferenceBeanBuilder {
public class ReferenceCreator {
// Ignore those fields
static final String[] IGNORE_FIELD_NAMES = of("application", "module", "consumer", "monitor", "registry", "interfaceClass");
private static final String ONRETURN = "onreturn";
private static final String ONTHROW = "onthrow";
private static final String ONINVOKE = "oninvoke";
private static final String METHOD = "Method";
protected final Log logger = LogFactory.getLog(getClass());
protected final AnnotationAttributes attributes;
protected final Map<String, Object> attributes;
protected final ApplicationContext applicationContext;
@ -66,7 +76,7 @@ public class ReferenceBeanBuilder {
protected Class<?> defaultInterfaceClass;
private ReferenceBeanBuilder(AnnotationAttributes attributes, ApplicationContext applicationContext) {
private ReferenceCreator(Map<String, Object> attributes, ApplicationContext applicationContext) {
Assert.notNull(attributes, "The Annotation attributes must not be null!");
Assert.notNull(applicationContext, "The ApplicationContext must not be null!");
this.attributes = attributes;
@ -93,7 +103,7 @@ public class ReferenceBeanBuilder {
populateBean(attributes, configBean);
configureRegistryConfigs(configBean);
//configureRegistryConfigs(configBean);
configureMonitorConfig(configBean);
@ -102,11 +112,11 @@ public class ReferenceBeanBuilder {
configureModuleConfig(configBean);
//interfaceClass
configureInterface(attributes, configBean);
//configureInterface(attributes, configBean);
configureConsumerConfig(attributes, configBean);
configureMethodConfig(attributes, configBean);
//configureMethodConfig(attributes, configBean);
//bean.setApplicationContext(applicationContext);
//bean.afterPropertiesSet();
@ -116,10 +126,10 @@ public class ReferenceBeanBuilder {
private void configureRegistryConfigs(ReferenceConfig configBean) {
String[] registryConfigBeanIds = getAttribute(attributes, "registry");
List<RegistryConfig> registryConfigs = getBeans(applicationContext, registryConfigBeanIds, RegistryConfig.class);
configBean.setRegistries(registryConfigs);
if (registryConfigBeanIds != null) {
List<RegistryConfig> registryConfigs = getBeans(applicationContext, registryConfigBeanIds, RegistryConfig.class);
configBean.setRegistries(registryConfigs);
}
}
@ -155,7 +165,7 @@ public class ReferenceBeanBuilder {
}
private void configureInterface(AnnotationAttributes attributes, ReferenceConfig referenceBean) {
private void configureInterface(Map<String, Object> attributes, ReferenceConfig referenceBean) {
if (referenceBean.getInterface() == null) {
Object genericValue = getAttribute(attributes, "generic");
@ -187,7 +197,7 @@ public class ReferenceBeanBuilder {
}
private void configureConsumerConfig(AnnotationAttributes attributes, ReferenceConfig<?> referenceBean) {
private void configureConsumerConfig(Map<String, Object> attributes, ReferenceConfig<?> referenceBean) {
ConsumerConfig consumerConfig = null;
Object consumer = getAttribute(attributes, "consumer");
if (consumer != null) {
@ -202,7 +212,7 @@ public class ReferenceBeanBuilder {
}
}
void configureMethodConfig(AnnotationAttributes attributes, ReferenceConfig<?> referenceBean) {
void configureMethodConfig(Map<String, Object> attributes, ReferenceConfig<?> referenceBean) {
Object value = attributes.get("methods");
if (value instanceof Method[]) {
Method[] methods = (Method[]) value;
@ -216,40 +226,118 @@ public class ReferenceBeanBuilder {
}
}
protected void populateBean(AnnotationAttributes attributes, ReferenceConfig referenceBean) {
Assert.notNull(defaultInterfaceClass, "The default interface class must set first!");
protected void populateBean(Map<String, Object> attributes, ReferenceConfig referenceBean) {
Assert.notNull(defaultInterfaceClass, "The default interface class cannot be empty!");
ReferenceBeanSupport.convertReferenceProps(attributes, defaultInterfaceClass);
DataBinder dataBinder = new DataBinder(referenceBean);
// Register CustomEditors for special fields
dataBinder.registerCustomEditor(String.class, "filter", new StringTrimmerEditor(true));
dataBinder.registerCustomEditor(String.class, "listener", new StringTrimmerEditor(true));
dataBinder.registerCustomEditor(Map.class, "parameters", new PropertyEditorSupport() {
DefaultConversionService conversionService = new DefaultConversionService();
// convert String[] to Map (such as @Method.parameters())
conversionService.addConverter(String[].class, Map.class, new Converter<String[], Map>() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
// Trim all whitespace
String content = StringUtils.trimAllWhitespace(text);
if (!StringUtils.hasText(content)) { // No content , ignore directly
return;
}
// replace "=" to ","
content = StringUtils.replace(content, "=", ",");
// replace ":" to ","
content = StringUtils.replace(content, ":", ",");
// String[] to Map
Map<String, String> parameters = CollectionUtils.toStringMap(commaDelimitedListToStringArray(content));
setValue(parameters);
public Map convert(String[] source) {
return convertStringArrayToMap(source);
}
});
//convert Map to MethodConfig
conversionService.addConverter(Map.class, MethodConfig.class, new Converter<Map, MethodConfig>() {
@Override
public MethodConfig convert(Map source) {
return createMethodConfig(source, conversionService);
}
});
//convert @Method to MethodConfig
conversionService.addConverter(Method.class, MethodConfig.class, new Converter<Method, MethodConfig>() {
@Override
public MethodConfig convert(Method source) {
Map<String, Object> methodAttributes = AnnotationUtils.getAnnotationAttributes(source, true);
return createMethodConfig(methodAttributes, conversionService);
}
});
//convert Map to ArgumentConfig
conversionService.addConverter(Map.class, ArgumentConfig.class, new Converter<Map, ArgumentConfig>() {
@Override
public ArgumentConfig convert(Map source) {
ArgumentConfig argumentConfig = new ArgumentConfig();
DataBinder argDataBinder = new DataBinder(argumentConfig);
argDataBinder.setConversionService(conversionService);
argDataBinder.bind(new AnnotationPropertyValuesAdapter(source, applicationContext.getEnvironment()));
return argumentConfig;
}
});
//convert @Argument to ArgumentConfig
conversionService.addConverter(Argument.class, ArgumentConfig.class, new Converter<Argument, ArgumentConfig>() {
@Override
public ArgumentConfig convert(Argument source) {
ArgumentConfig argumentConfig = new ArgumentConfig();
DataBinder argDataBinder = new DataBinder(argumentConfig);
argDataBinder.setConversionService(conversionService);
argDataBinder.bind(new AnnotationPropertyValuesAdapter(source, applicationContext.getEnvironment()));
return argumentConfig;
}
});
// Bind annotation attributes
dataBinder.setConversionService(conversionService);
dataBinder.bind(new AnnotationPropertyValuesAdapter(attributes, applicationContext.getEnvironment(), IGNORE_FIELD_NAMES));
}
public static ReferenceBeanBuilder create(AnnotationAttributes attributes, ApplicationContext applicationContext) {
return new ReferenceBeanBuilder(attributes, applicationContext);
private MethodConfig createMethodConfig(Map<String, Object> methodAttributes, DefaultConversionService conversionService) {
String[] callbacks = new String[]{ONINVOKE, ONRETURN, ONTHROW};
for (String callbackName : callbacks) {
Object value = methodAttributes.get(callbackName);
if (value instanceof String) {
//parse callback: beanName.methodName
String strValue = (String) value;
int index = strValue.lastIndexOf(".");
if (index != -1) {
String beanName = strValue.substring(0, index);
String methodName = strValue.substring(index + 1);
methodAttributes.put(callbackName, applicationContext.getBean(beanName));
methodAttributes.put(callbackName+METHOD, methodName);
} else {
methodAttributes.put(callbackName, applicationContext.getBean(strValue));
}
}
}
MethodConfig methodConfig = new MethodConfig();
DataBinder mcDataBinder = new DataBinder(methodConfig);
mcDataBinder.setConversionService(conversionService);
AnnotationPropertyValuesAdapter propertyValues = new AnnotationPropertyValuesAdapter(methodAttributes, applicationContext.getEnvironment());
mcDataBinder.bind(propertyValues);
return methodConfig;
}
public ReferenceBeanBuilder defaultInterfaceClass(Class<?> interfaceClass) {
public static Map convertStringArrayToMap(String[] source) {
String content = arrayToCommaDelimitedString(source);
// Trim all whitespace
content = StringUtils.trimAllWhitespace(content);
if (!StringUtils.hasText(content)) { // No content , ignore directly
return null;
}
// replace "=" to ","
content = StringUtils.replace(content, "=", ",");
// replace ":" to ","
content = StringUtils.replace(content, ":", ",");
// String[] to Map
Map<String, String> parameters = CollectionUtils.toStringMap(commaDelimitedListToStringArray(content));
return parameters;
}
public static ReferenceCreator create(Map<String, Object> attributes, ApplicationContext applicationContext) {
return new ReferenceCreator(attributes, applicationContext);
}
public ReferenceCreator defaultInterfaceClass(Class<?> interfaceClass) {
this.defaultInterfaceClass = interfaceClass;
return this;
}

25
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
View File

@ -18,6 +18,7 @@ package org.apache.dubbo.config.spring.schema;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.AbstractServiceConfig;
@ -31,6 +32,7 @@ import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@ -201,7 +203,9 @@ public class DubboBeanDefinitionParser implements BeanDefinitionParser {
}
reference = new RuntimeBeanReference(value);
}
beanDefinition.getPropertyValues().addPropertyValue(beanProperty, reference);
if (reference != null) {
beanDefinition.getPropertyValues().addPropertyValue(beanProperty, reference);
}
}
}
}
@ -239,7 +243,7 @@ public class DubboBeanDefinitionParser implements BeanDefinitionParser {
private static void configReferenceBean(Element element, ParserContext parserContext, RootBeanDefinition beanDefinition, BeanDefinition consumerDefinition) {
// process interface class
String interfaceClassName = resolveAttribute(element, "interface", parserContext);
String interfaceName = resolveAttribute(element, "interface", parserContext);
String generic = resolveAttribute(element, "generic", parserContext);
if (StringUtils.isBlank(generic) && consumerDefinition != null) {
// get generic from consumerConfig
@ -251,15 +255,28 @@ public class DubboBeanDefinitionParser implements BeanDefinitionParser {
beanDefinition.getPropertyValues().add("generic", generic);
}
Class interfaceClass = ReferenceConfig.determineInterfaceClass(generic, interfaceClassName);
Class interfaceClass = ReferenceConfig.determineInterfaceClass(generic, interfaceName);
Class actualInterface = null;
try {
actualInterface = ClassUtils.forName(interfaceName);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
beanDefinition.setAttribute("interfaceClass", interfaceClass);
beanDefinition.setAttribute("actualInterface", actualInterface);
// TODO Only register one reference bean for same (group, interface, version)
// create decorated definition for reference bean, Avoid being instantiated when getting the beanType of ReferenceBean
// refer to org.springframework.beans.factory.support.AbstractBeanFactory#getType()
// see org.springframework.beans.factory.support.AbstractBeanFactory#getTypeForFactoryBean()
GenericBeanDefinition targetDefinition = new GenericBeanDefinition();
targetDefinition.setBeanClass(interfaceClass);
String id = (String) beanDefinition.getPropertyValues().get("id");
beanDefinition.setDecoratedDefinition(new BeanDefinitionHolder(targetDefinition, id+"_decorated"));
// signal object type since Spring 5.2
beanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, interfaceClass);
//mark property value as optional
List<PropertyValue> propertyValues = beanDefinition.getPropertyValues().getPropertyValueList();
for (PropertyValue propertyValue : propertyValues) {

16
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboBeanUtils.java
View File

@ -18,12 +18,13 @@ package org.apache.dubbo.config.spring.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.dubbo.config.spring.DubboConfigInitializationPostProcessor;
import org.apache.dubbo.config.spring.ReferenceBeanManager;
import org.apache.dubbo.config.spring.context.DubboConfigInitializationPostProcessor;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.apache.dubbo.config.spring.beans.factory.annotation.DubboConfigAliasPostProcessor;
import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
import org.apache.dubbo.config.spring.beans.factory.config.DubboConfigDefaultPropertyValueBeanPostProcessor;
import org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener;
import org.apache.dubbo.config.spring.context.DubboInfraBeanRegisterPostProcessor;
import org.apache.dubbo.config.spring.context.DubboLifecycleComponentApplicationListener;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
@ -79,7 +80,11 @@ public interface DubboBeanUtils {
registerInfrastructureBean(registry, DubboConfigDefaultPropertyValueBeanPostProcessor.BEAN_NAME,
DubboConfigDefaultPropertyValueBeanPostProcessor.class);
// Dubbo config initialization processor
registerInfrastructureBean(registry, DubboConfigInitializationPostProcessor.BEAN_NAME, DubboConfigInitializationPostProcessor.class);
// register infra bean if not exists later
registerInfrastructureBean(registry, DubboInfraBeanRegisterPostProcessor.BEAN_NAME, DubboInfraBeanRegisterPostProcessor.class);
}
/**
@ -112,8 +117,11 @@ public interface DubboBeanUtils {
}
/**
* Call this method in postProcessBeanFactory()
*
* Register some beans later
* Call this method in BeanDefinitionRegistryPostProcessor,
* in order to enable the registered BeanFactoryPostProcessor bean to be loaded and executed.
* @see DubboInfraBeanRegisterPostProcessor
* @see org.springframework.context.support.PostProcessorRegistrationDelegate#invokeBeanFactoryPostProcessors(org.springframework.beans.factory.config.ConfigurableListableBeanFactory, java.util.List)
* @param registry
*/
static void registerBeansIfNotExists(BeanDefinitionRegistry registry) {

121
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
View File

@ -19,9 +19,10 @@ package org.apache.dubbo.config.spring;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ArgumentConfig;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.ReferenceConfig;
@ -37,6 +38,7 @@ import org.apache.dubbo.config.spring.context.annotation.provider.ProviderConfig
import org.apache.dubbo.config.spring.filter.MockFilter;
import org.apache.dubbo.config.spring.impl.DemoServiceImpl;
import org.apache.dubbo.config.spring.impl.HelloServiceImpl;
import org.apache.dubbo.config.spring.impl.NotifyService;
import org.apache.dubbo.config.spring.registry.MockRegistry;
import org.apache.dubbo.config.spring.registry.MockRegistryFactory;
import org.apache.dubbo.registry.Registry;
@ -45,52 +47,51 @@ import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Filter;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.service.GenericService;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
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 org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.GENERIC_SERIALIZATION_BEAN;
import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.matchers.JUnitMatchers.containsString;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
/**
* ConfigTest
*/
@Ignore
public class ConfigTest {
private static String resourcePath = ConfigTest.class.getPackage().getName().replace('.', '/');
@BeforeEach
public void setUp() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@AfterEach
public void tearDown() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@Test
@Disabled("waiting-to-fix")
public void testSpringExtensionInject() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/spring-extension-inject.xml");
ctx.start();
@ -110,7 +111,7 @@ public class ConfigTest {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/service-class.xml");
ctx.start();
try {
DemoService demoService = refer("dubbo://127.0.0.1:30887");
DemoService demoService = refer("dubbo://127.0.0.1:20887");
String hello = demoService.sayName("hello");
assertEquals("welcome:hello", hello);
} finally {
@ -120,6 +121,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testServiceAnnotation() {
AnnotationConfigApplicationContext providerContext = new AnnotationConfigApplicationContext();
providerContext.register(ProviderConfiguration.class);
@ -175,6 +177,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testToString() {
ReferenceConfig<DemoService> reference = new ReferenceConfig<DemoService>();
reference.setApplication(new ApplicationConfig("consumer"));
@ -189,6 +192,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testForks() {
ReferenceConfig<DemoService> reference = new ReferenceConfig<DemoService>();
reference.setApplication(new ApplicationConfig("consumer"));
@ -217,6 +221,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testMultiProtocolDefault() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/multi-protocol-default.xml");
ctx.start();
@ -231,18 +236,21 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testMultiProtocolError() {
try {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(resourcePath + "/multi-protocol-error.xml");
ctx.start();
ctx.stop();
ctx.close();
fail();
} catch (BeanCreationException e) {
assertTrue(e.getMessage().contains("Found multi-protocols"));
}
}
@Test
@Disabled("waiting-to-fix")
public void testMultiProtocolRegister() {
SimpleRegistryService registryService = new SimpleRegistryService();
Exporter<RegistryService> exporter = SimpleRegistryExporter.export(4547, registryService);
@ -261,6 +269,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testMultiRegistry() {
SimpleRegistryService registryService1 = new SimpleRegistryService();
Exporter<RegistryService> exporter1 = SimpleRegistryExporter.export(4545, registryService1);
@ -284,6 +293,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testDelayFixedTime() throws Exception {
SimpleRegistryService registryService = new SimpleRegistryService();
Exporter<RegistryService> exporter = SimpleRegistryExporter.export(4548, registryService);
@ -308,6 +318,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testDelayOnInitialized() throws Exception {
SimpleRegistryService registryService = new SimpleRegistryService();
Exporter<RegistryService> exporter = SimpleRegistryExporter.export(4548, registryService);
@ -338,6 +349,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testAutowireAndAOP() throws Exception {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(
resourcePath + "/demo-provider.xml",
@ -435,14 +447,47 @@ public class ConfigTest {
resourcePath + "/init-reference-properties.xml");
ctx.start();
try {
NotifyService notifyService = ctx.getBean(NotifyService.class);
// check reference bean
Map<String, ReferenceBean> referenceBeanMap = ctx.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(2, referenceBeanMap.size());
ReferenceBean referenceBean = referenceBeanMap.get("&demoService");
Assertions.assertNotNull(referenceBean);
ReferenceConfig referenceConfig = referenceBean.getReferenceConfig();
// reference parameters
Assertions.assertNotNull(referenceConfig.getParameters().get("connec.timeout"));
//methods
Assertions.assertEquals(1, referenceConfig.getMethods().size());
MethodConfig methodConfig = referenceConfig.getMethods().get(0);
Assertions.assertEquals("sayName", methodConfig.getName());
Assertions.assertEquals(notifyService, methodConfig.getOninvoke());
Assertions.assertEquals(notifyService, methodConfig.getOnreturn());
Assertions.assertEquals(notifyService, methodConfig.getOnthrow());
Assertions.assertEquals("onInvoke", methodConfig.getOninvokeMethod());
Assertions.assertEquals("onReturn", methodConfig.getOnreturnMethod());
Assertions.assertEquals("onThrow", methodConfig.getOnthrowMethod());
//method arguments
Assertions.assertEquals(1, methodConfig.getArguments().size());
ArgumentConfig argumentConfig = methodConfig.getArguments().get(0);
Assertions.assertEquals(0, argumentConfig.getIndex());
Assertions.assertEquals(true, argumentConfig.isCallback());
// method parameters
Assertions.assertEquals(1, methodConfig.getParameters().size());
Assertions.assertEquals("my-token", methodConfig.getParameters().get("access-token"));
// do call
DemoService demoService = (DemoService) ctx.getBean("demoService");
assertEquals("say:world", demoService.sayName("world"));
GenericService demoService2 = (GenericService) ctx.getBean("demoService2");
assertEquals("say:world", demoService2.$invoke("sayName", new String[]{"java.lang.String"}, new Object[]{"world"}));
} catch (Throwable ex){
ex.printStackTrace();
} finally {
ctx.stop();
ctx.close();
@ -471,7 +516,8 @@ public class ConfigTest {
}
// DUBBO-147 find all invoker instances which have been tried from RpcContext
//@Test
@Disabled("waiting-to-fix")
@Test
public void test_RpcContext_getUrls() throws Exception {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(
resourcePath + "/demo-provider-long-waiting.xml");
@ -502,6 +548,7 @@ public class ConfigTest {
// BUG: DUBBO-846 in version 2.0.9, config retry="false" on provider's method doesn't work
@Test
@Disabled("waiting-to-fix")
public void test_retrySettingFail() throws Exception {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/demo-provider-long-waiting.xml");
providerContext.start();
@ -533,6 +580,7 @@ public class ConfigTest {
// BuG: DUBBO-146 Provider doesn't have exception output, and consumer has timeout error when serialization fails
// for example, object transported on the wire doesn't implement Serializable
@Test
@Disabled("waiting-to-fix")
public void test_returnSerializationFail() throws Exception {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/demo-provider-UnserializableBox.xml");
providerContext.start();
@ -559,6 +607,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testXmlOverrideProperties() throws Exception {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/xml-override-properties.xml");
providerContext.start();
@ -580,6 +629,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testApiOverrideProperties() throws Exception {
ApplicationConfig application = new ApplicationConfig();
application.setName("api-override-properties");
@ -624,6 +674,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideProtocol() throws Exception {
System.setProperty("dubbo.protocol.port", "20812");
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/override-protocol.xml");
@ -639,6 +690,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideMultiProtocol() throws Exception {
System.setProperty("dubbo.protocol.dubbo.port", "20814");
System.setProperty("dubbo.protocol.rmi.port", "10914");
@ -659,6 +711,7 @@ public class ConfigTest {
@SuppressWarnings("unchecked")
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideXmlDefault() throws Exception {
System.setProperty("dubbo.application.name", "sysover");
System.setProperty("dubbo.application.owner", "sysowner");
@ -687,6 +740,7 @@ public class ConfigTest {
@SuppressWarnings("unchecked")
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideXml() throws Exception {
System.setProperty("dubbo.application.name", "sysover");
System.setProperty("dubbo.application.owner", "sysowner");
@ -719,6 +773,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideReferenceConfig() throws Exception {
System.setProperty("dubbo.reference.retries", "5");
@ -747,6 +802,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideApiDefault() throws Exception {
System.setProperty("dubbo.application.name", "sysover");
System.setProperty("dubbo.application.owner", "sysowner");
@ -780,6 +836,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideApi() throws Exception {
System.setProperty("dubbo.application.name", "sysover");
System.setProperty("dubbo.application.owner", "sysowner");
@ -830,6 +887,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testSystemPropertyOverrideProperties() throws Exception {
String portString = System.getProperty("dubbo.protocol.port");
System.clearProperty("dubbo.protocol.port");
@ -878,6 +936,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
@SuppressWarnings("unchecked")
public void testCustomizeParameter() throws Exception {
ClassPathXmlApplicationContext context =
@ -890,6 +949,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testPath() throws Exception {
ServiceConfig<DemoService> service = new ServiceConfig<DemoService>();
service.setPath("a/b$c");
@ -902,10 +962,12 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testAnnotation() {
SimpleRegistryService registryService = new SimpleRegistryService();
Exporter<RegistryService> exporter = SimpleRegistryExporter.export(4548, registryService);
try {
System.setProperty("provider.version", "1.2");
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(resourcePath + "/annotation-provider.xml");
providerContext.start();
try {
@ -924,13 +986,13 @@ public class ConfigTest {
providerContext.close();
}
} finally {
System.clearProperty("provider.version");
exporter.unexport();
}
}
@Test
public void testDubboProtocolPortOverride() throws Exception {
String dubboPort = System.getProperty("dubbo.protocol.dubbo.port");
int port = 55555;
System.setProperty("dubbo.protocol.dubbo.port", String.valueOf(port));
ServiceConfig<DemoService> service = null;
@ -959,11 +1021,9 @@ public class ConfigTest {
.service(service)
.start();
Assert.assertEquals(port, service.getExportedUrls().get(0).getPort());
assertEquals(port, service.getExportedUrls().get(0).getPort());
} finally {
if (StringUtils.isNotEmpty(dubboPort)) {
System.setProperty("dubbo.protocol.dubbo.port", dubboPort);
}
System.clearProperty("dubbo.protocol.dubbo.port");
if (bootstrap != null) {
bootstrap.stop();
}
@ -971,6 +1031,7 @@ public class ConfigTest {
}
@Test
@Disabled("waiting-to-fix")
public void testProtocolRandomPort() throws Exception {
ServiceConfig<DemoService> demoService = null;
ServiceConfig<HelloService> helloService = null;
@ -1008,7 +1069,7 @@ public class ConfigTest {
try {
bootstrap.start();
Assert.assertEquals(demoService.getExportedUrls().get(0).getPort(),
assertEquals(demoService.getExportedUrls().get(0).getPort(),
helloService.getExportedUrls().get(0).getPort());
} finally {
bootstrap.stop();
@ -1035,7 +1096,7 @@ public class ConfigTest {
.reference(ref);
try {
bootstrap.start();
Assert.fail();
fail();
} catch (Exception e) {
e.printStackTrace();
} finally {
@ -1059,7 +1120,7 @@ public class ConfigTest {
Collection<Registry> collection = MockRegistryFactory.getCachedRegistry();
MockRegistry registry = (MockRegistry) collection.iterator().next();
URL url = registry.getRegistered().get(0);
Assert.assertEquals(GENERIC_SERIALIZATION_BEAN, url.getParameter(GENERIC_KEY));
assertEquals(GENERIC_SERIALIZATION_BEAN, url.getParameter(GENERIC_KEY));
} finally {
MockRegistryFactory.cleanCachedRegistry();
bootstrap.stop();
@ -1073,9 +1134,9 @@ public class ConfigTest {
ctx.start();
ServiceConfig serviceConfig = (ServiceConfig) ctx.getBean("dubboDemoService");
URL url = (URL) serviceConfig.getExportedUrls().get(0);
Assert.assertEquals(GENERIC_SERIALIZATION_BEAN, url.getParameter(GENERIC_KEY));
assertEquals(GENERIC_SERIALIZATION_BEAN, url.getParameter(GENERIC_KEY));
} finally {
ctx.destroy();
ctx.close();
}
}
}

250
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/EmbeddedZooKeeper.java Normal file
View File

@ -0,0 +1,250 @@
/*
* Copyright 2014 the original author or 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.
*/
package org.apache.dubbo.config.spring;
import org.apache.zookeeper.server.ServerConfig;
import org.apache.zookeeper.server.ZooKeeperServerMain;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.SmartLifecycle;
import org.springframework.util.ErrorHandler;
import org.springframework.util.SocketUtils;
import java.io.File;
import java.lang.reflect.Method;
import java.util.Properties;
import java.util.UUID;
/**
* from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java
* <p>
* Helper class to start an embedded instance of standalone (non clustered) ZooKeeper.
* <p>
* NOTE: at least an external standalone server (if not an ensemble) are recommended, even for
* {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication}
*
* @author Patrick Peralta
* @author Mark Fisher
* @author David Turanski
*/
public class EmbeddedZooKeeper implements SmartLifecycle {
/**
* Logger.
*/
private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class);
/**
* ZooKeeper client port. This will be determined dynamically upon startup.
*/
private final int clientPort;
/**
* Whether to auto-start. Default is true.
*/
private boolean autoStartup = true;
/**
* Lifecycle phase. Default is 0.
*/
private int phase = 0;
/**
* Thread for running the ZooKeeper server.
*/
private volatile Thread zkServerThread;
/**
* ZooKeeper server.
*/
private volatile ZooKeeperServerMain zkServer;
/**
* {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread.
*/
private ErrorHandler errorHandler;
private boolean daemon = true;
/**
* Construct an EmbeddedZooKeeper with a random port.
*/
public EmbeddedZooKeeper() {
clientPort = SocketUtils.findAvailableTcpPort();
}
/**
* Construct an EmbeddedZooKeeper with the provided port.
*
* @param clientPort port for ZooKeeper server to bind to
*/
public EmbeddedZooKeeper(int clientPort, boolean daemon) {
this.clientPort = clientPort;
this.daemon = daemon;
}
/**
* Returns the port that clients should use to connect to this embedded server.
*
* @return dynamically determined client port
*/
public int getClientPort() {
return this.clientPort;
}
/**
* Specify whether to start automatically. Default is true.
*
* @param autoStartup whether to start automatically
*/
public void setAutoStartup(boolean autoStartup) {
this.autoStartup = autoStartup;
}
/**
* {@inheritDoc}
*/
@Override
public boolean isAutoStartup() {
return this.autoStartup;
}
/**
* Specify the lifecycle phase for the embedded server.
*
* @param phase the lifecycle phase
*/
public void setPhase(int phase) {
this.phase = phase;
}
/**
* {@inheritDoc}
*/
@Override
public int getPhase() {
return this.phase;
}
/**
* {@inheritDoc}
*/
@Override
public boolean isRunning() {
return (zkServerThread != null);
}
/**
* Start the ZooKeeper server in a background thread.
* <p>
* Register an error handler via {@link #setErrorHandler} in order to handle
* any exceptions thrown during startup or execution.
*/
@Override
public synchronized void start() {
if (zkServerThread == null) {
zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter");
zkServerThread.setDaemon(daemon);
zkServerThread.start();
}
}
/**
* Shutdown the ZooKeeper server.
*/
@Override
public synchronized void stop() {
if (zkServerThread != null) {
// The shutdown method is protected...thus this hack to invoke it.
// This will log an exception on shutdown; see
// https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details.
try {
Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown");
shutdown.setAccessible(true);
shutdown.invoke(zkServer);
} catch (Exception e) {
throw new RuntimeException(e);
}
// It is expected that the thread will exit after
// the server is shutdown; this will block until
// the shutdown is complete.
try {
zkServerThread.join(5000);
zkServerThread = null;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
logger.warn("Interrupted while waiting for embedded ZooKeeper to exit");
// abandoning zk thread
zkServerThread = null;
}
}
}
/**
* Stop the server if running and invoke the callback when complete.
*/
@Override
public void stop(Runnable callback) {
stop();
callback.run();
}
/**
* Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none
* is provided, only error-level logging will occur.
*
* @param errorHandler the {@link ErrorHandler} to be invoked
*/
public void setErrorHandler(ErrorHandler errorHandler) {
this.errorHandler = errorHandler;
}
/**
* Runnable implementation that starts the ZooKeeper server.
*/
private class ServerRunnable implements Runnable {
@Override
public void run() {
try {
Properties properties = new Properties();
File file = new File(System.getProperty("java.io.tmpdir")
+ File.separator + UUID.randomUUID());
file.deleteOnExit();
properties.setProperty("dataDir", file.getAbsolutePath());
properties.setProperty("clientPort", String.valueOf(clientPort));
QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
quorumPeerConfig.parseProperties(properties);
zkServer = new ZooKeeperServerMain();
ServerConfig configuration = new ServerConfig();
configuration.readFrom(quorumPeerConfig);
zkServer.runFromConfig(configuration);
} catch (Exception e) {
if (errorHandler != null) {
errorHandler.handleError(e);
} else {
logger.error("Exception running embedded ZooKeeper", e);
}
}
}
}
}

14
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java
View File

@ -18,7 +18,10 @@ package org.apache.dubbo.config.spring;
import org.apache.dubbo.config.annotation.Service;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.not;
@ -26,6 +29,17 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.mockito.Mockito.mock;
public class ServiceBeanTest {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@AfterEach
public void tearDown() {
DubboBootstrap.reset();
}
@Test
public void testGetService() {
TestService service = mock(TestService.class);

43
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ZooKeeperServer.java Normal file
View File

@ -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.config.spring;
public class ZooKeeperServer {
private static EmbeddedZooKeeper zookeeper1;
private static EmbeddedZooKeeper zookeeper2;
public static void start() {
if (zookeeper1 == null) {
zookeeper1 = new EmbeddedZooKeeper(2181, true);
zookeeper1.start();
}
if (zookeeper2 == null) {
zookeeper2 = new EmbeddedZooKeeper(2182, true);
zookeeper2.start();
}
}
public static void stop() {
if (zookeeper1 != null) {
zookeeper1.stop();
}
if (zookeeper2 != null) {
zookeeper2.stop();
}
}
}

2
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/consumer/AnnotationAction.java
View File

@ -28,7 +28,7 @@ import org.springframework.stereotype.Controller;
@Controller("annotationAction")
public class AnnotationAction {
@Reference(version = "1.2", methods = {@Method(name = "sayHello", timeout = 5000)})
@Reference(version = "1.2", methods = {@Method(name = "sayName", timeout = 5000)})
private DemoService demoService;
public String doSayName(String name) {

161
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
View File

@ -1,161 +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.config.spring.beans.factory.annotation;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.api.DemoService;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.mock.env.MockEnvironment;
import org.springframework.util.ReflectionUtils;
import org.springframework.validation.DataBinder;
import java.lang.reflect.Field;
import java.util.LinkedHashMap;
import java.util.Map;
import static org.springframework.util.StringUtils.arrayToCommaDelimitedString;
/**
* {@link AnnotationPropertyValuesAdapter} Test
*
* @since 2.5.11
*/
public class AnnotationPropertyValuesAdapterTest {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@Test
public void test() {
MockEnvironment mockEnvironment = new MockEnvironment();
mockEnvironment.setProperty("version", "1.0.0");
mockEnvironment.setProperty("url", " dubbo://localhost:12345");
Field field = ReflectionUtils.findField(TestBean.class, "demoService");
Reference reference = AnnotationUtils.getAnnotation(field, Reference.class);
AnnotationPropertyValuesAdapter propertyValues = new AnnotationPropertyValuesAdapter(reference, mockEnvironment);
ReferenceConfig referenceBean = new ReferenceConfig();
DataBinder dataBinder = new DataBinder(referenceBean);
dataBinder.setDisallowedFields("application", "module", "consumer", "monitor", "registry");
DefaultConversionService conversionService = new DefaultConversionService();
conversionService.addConverter(new Converter<String[], String>() {
@Override
public String convert(String[] source) {
return arrayToCommaDelimitedString(source);
}
});
conversionService.addConverter(new Converter<String[], Map<String, String>>() {
@Override
public Map<String, String> convert(String[] source) {
return CollectionUtils.toStringMap(source);
}
});
dataBinder.setConversionService(conversionService);
dataBinder.bind(propertyValues);
// System.out.println(referenceBean);
Assert.assertEquals(DemoService.class, referenceBean.getInterfaceClass());
Assert.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface());
Assert.assertEquals("1.0.0", referenceBean.getVersion());
Assert.assertEquals("group", referenceBean.getGroup());
Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
Assert.assertEquals("client", referenceBean.getClient());
Assert.assertEquals(true, referenceBean.isGeneric());
Assert.assertNull(referenceBean.isInjvm());
Assert.assertEquals(false, referenceBean.isCheck());
Assert.assertEquals(true, referenceBean.isInit());
Assert.assertEquals(true, referenceBean.getLazy());
Assert.assertEquals(true, referenceBean.getStubevent());
Assert.assertEquals("reconnect", referenceBean.getReconnect());
Assert.assertEquals(true, referenceBean.getSticky());
Assert.assertEquals("javassist", referenceBean.getProxy());
Assert.assertEquals("stub", referenceBean.getStub());
Assert.assertEquals("failover", referenceBean.getCluster());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getConnections());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
Assert.assertEquals("onconnect", referenceBean.getOnconnect());
Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
Assert.assertEquals("owner", referenceBean.getOwner());
Assert.assertEquals("layer", referenceBean.getLayer());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
Assert.assertEquals("random", referenceBean.getLoadbalance());
Assert.assertEquals(true, referenceBean.isAsync());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getActives());
Assert.assertEquals(true, referenceBean.getSent());
Assert.assertEquals("mock", referenceBean.getMock());
Assert.assertEquals("validation", referenceBean.getValidation());
Assert.assertEquals(Integer.valueOf(2), referenceBean.getTimeout());
Assert.assertEquals("cache", referenceBean.getCache());
Assert.assertEquals("default,default", referenceBean.getFilter());
Assert.assertEquals("default,default", referenceBean.getListener());
Map<String, String> data = new LinkedHashMap<String, String>();
data.put("key1", "value1");
Assert.assertEquals(data, referenceBean.getParameters());
// Bean compare
Assert.assertNull(referenceBean.getRegistry());
}
private static class TestBean {
@Reference(
interfaceClass = DemoService.class, interfaceName = "com.alibaba.dubbo.config.spring.api.DemoService", version = "${version}", group = "group",
url = "${url} ", client = "client", generic = true, injvm = true,
check = false, init = true, lazy = true, stubevent = true,
reconnect = "reconnect", sticky = true, proxy = "javassist", stub = "stub",
cluster = "failover", connections = 1, callbacks = 1, onconnect = "onconnect",
ondisconnect = "ondisconnect", owner = "owner", layer = "layer", retries = 1,
loadbalance = "random", async = true, actives = 1, sent = true,
mock = "mock", validation = "validation", timeout = 2, cache = "cache",
filter = {"default", "default"}, listener = {"default", "default"}, parameters = {"key1", "value1"}, application = "application",
module = "module", consumer = "consumer", monitor = "monitor", registry = {"registry1", "registry2"}
)
private DemoService demoService;
}
}

20
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MergedAnnotationTest.java
View File

@ -22,8 +22,8 @@ import org.apache.dubbo.config.spring.annotation.merged.MergedReference;
import org.apache.dubbo.config.spring.annotation.merged.MergedService;
import org.apache.dubbo.config.spring.api.DemoService;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.ReflectionUtils;
@ -35,24 +35,24 @@ public class MergedAnnotationTest {
public void testMergedReference() {
Field field = ReflectionUtils.findField(TestBean1.class, "demoService");
Reference reference = AnnotatedElementUtils.getMergedAnnotation(field, Reference.class);
Assert.assertEquals("dubbo", reference.group());
Assert.assertEquals("1.0.0", reference.version());
Assertions.assertEquals("dubbo", reference.group());
Assertions.assertEquals("1.0.0", reference.version());
Field field2 = ReflectionUtils.findField(TestBean2.class, "demoService");
Reference reference2 = AnnotatedElementUtils.getMergedAnnotation(field2, Reference.class);
Assert.assertEquals("group", reference2.group());
Assert.assertEquals("2.0", reference2.version());
Assertions.assertEquals("group", reference2.group());
Assertions.assertEquals("2.0", reference2.version());
}
@Test
public void testMergedService() {
Service service1 = AnnotatedElementUtils.getMergedAnnotation(DemoServiceImpl1.class, Service.class);
Assert.assertEquals("dubbo", service1.group());
Assert.assertEquals("1.0.0", service1.version());
Assertions.assertEquals("dubbo", service1.group());
Assertions.assertEquals("1.0.0", service1.version());
Service service2 = AnnotatedElementUtils.getMergedAnnotation(DemoServiceImpl2.class, Service.class);
Assert.assertEquals("group", service2.group());
Assert.assertEquals("2.0", service2.version());
Assertions.assertEquals("group", service2.group());
Assertions.assertEquals("2.0", service2.version());
}
@MergedService

208
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
View File

@ -16,55 +16,61 @@
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ReferenceBeanManager;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
import org.apache.dubbo.config.utils.ReferenceConfigCache;
import org.apache.dubbo.rpc.RpcContext;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.InjectionMetadata;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Component;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor.BEAN_NAME;
import static org.junit.Assert.assertTrue;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
/**
* {@link ReferenceAnnotationBeanPostProcessor} Test
*
* @since 2.5.7
*/
@RunWith(SpringRunner.class)
@EnableDubboConfig
@ExtendWith(SpringExtension.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration.class,
ReferenceAnnotationBeanPostProcessorTest.class,
ReferenceAnnotationBeanPostProcessorTest.MyConfiguration.class,
ReferenceAnnotationBeanPostProcessorTest.TestAspect.class
})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@TestPropertySource(properties = {
"packagesToScan = org.apache.dubbo.config.spring.context.annotation.provider",
"consumer.version = ${demo.service.version}",
@ -73,14 +79,15 @@ import static org.junit.Assert.assertTrue;
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
public class ReferenceAnnotationBeanPostProcessorTest {
@BeforeEach
public void setUp() {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@AfterEach
public void tearDown() {
}
// @AfterEach
// public void tearDown() {
// DubboBootstrap.reset();
// }
private static final String AOP_SUFFIX = "(based on AOP)";
@ -89,80 +96,78 @@ public class ReferenceAnnotationBeanPostProcessorTest {
public static class TestAspect {
@Around("execution(* org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl.*(..))")
public Object aroundApi(ProceedingJoinPoint pjp) throws Throwable {
return pjp.proceed() + AOP_SUFFIX;
public Object aroundDemoService(ProceedingJoinPoint pjp) throws Throwable {
return pjp.proceed() + AOP_SUFFIX + " from " + RpcContext.getContext().getLocalAddress();
}
}
@Bean
public TestBean testBean() {
return new TestBean();
}
@Around("execution(* org.apache.dubbo.config.spring.context.annotation.provider.*HelloService*.*(..))")
public Object aroundHelloService(ProceedingJoinPoint pjp) throws Throwable {
return pjp.proceed() + AOP_SUFFIX + " from " + RpcContext.getContext().getLocalAddress();
}
@Bean(ReferenceBeanManager.BEAN_NAME)
public ReferenceBeanManager referenceBeanManager() {
return new ReferenceBeanManager();
}
@Bean(BEAN_NAME)
public ReferenceAnnotationBeanPostProcessor referenceAnnotationBeanPostProcessor() {
return new ReferenceAnnotationBeanPostProcessor();
}
@Autowired
private ConfigurableApplicationContext context;
@Autowired
@Qualifier("defaultHelloService")
private HelloService defaultHelloService;
@Autowired
@Qualifier("helloServiceImpl")
private HelloService helloServiceImpl;
@Autowired
private DemoService demoServiceImpl;
// #4 ReferenceBean (Field Injection #2)
@Reference(id = "helloService", methods = @Method(name = "sayHello", timeout = 100))
private HelloService helloService;
// #5 ReferenceBean (Field Injection #3)
@Reference
@DubboReference(version = "2", url = "dubbo://127.0.0.1:12345?version=2")
private HelloService helloService2;
@Test
public void testAop() throws Exception {
assertTrue(context.containsBean("helloService"));
Assertions.assertTrue(context.containsBean("helloService"));
TestBean testBean = context.getBean(TestBean.class);
DemoService demoService = testBean.getDemoService();
Map<String, DemoService> demoServicesMap = context.getBeansOfType(DemoService.class);
Assert.assertNotNull(testBean.getDemoServiceFromAncestor());
Assert.assertNotNull(testBean.getDemoServiceFromParent());
Assert.assertNotNull(testBean.getDemoService());
Assert.assertNotNull(testBean.autowiredDemoService);
Assert.assertEquals(3, demoServicesMap.size());
Assert.assertNotNull(demoServicesMap.get("demoServiceImpl"));
Assert.assertNotNull(demoServicesMap.get("my-reference-bean"));
Assert.assertNotNull(demoServicesMap.get("@Reference(url=dubbo://127.0.0.1:12345?version=2.5.7,version=2.5.7) org.apache.dubbo.config.spring.api.DemoService"));
Assertions.assertNotNull(testBean.getDemoServiceFromAncestor());
Assertions.assertNotNull(testBean.getDemoServiceFromParent());
Assertions.assertNotNull(testBean.getDemoService());
Assertions.assertNotNull(testBean.myDemoService);
Assertions.assertEquals(4, demoServicesMap.size());
Assertions.assertNotNull(demoServicesMap.get("demoServiceImpl"));
Assertions.assertNotNull(demoServicesMap.get("myDemoService"));
Assertions.assertNotNull(demoServicesMap.get("demoService"));
Assertions.assertNotNull(demoServicesMap.get("demoServiceFromParent"));
String expectedResult = "Hello,Mercy" + AOP_SUFFIX;
String callSuffix = AOP_SUFFIX + " from "+ NetUtils.getLocalHost() +":12345";
String localCallSuffix = AOP_SUFFIX + " from 127.0.0.1:0";
String directInvokeSuffix = AOP_SUFFIX + " from null";
Assert.assertEquals(expectedResult, testBean.autowiredDemoService.sayName("Mercy"));
Assert.assertEquals(expectedResult, demoService.sayName("Mercy"));
Assert.assertEquals("Greeting, Mercy", defaultHelloService.sayHello("Mercy"));
Assert.assertEquals("Hello, Mercy", helloServiceImpl.sayHello("Mercy"));
Assert.assertEquals("Greeting, Mercy", helloService.sayHello("Mercy"));
String defaultHelloServiceResult = "Greeting, Mercy";
Assertions.assertEquals(defaultHelloServiceResult + directInvokeSuffix, defaultHelloService.sayHello("Mercy"));
Assertions.assertEquals(defaultHelloServiceResult + localCallSuffix, helloService.sayHello("Mercy"));
String helloServiceImplResult = "Hello, Mercy";
Assertions.assertEquals(helloServiceImplResult + directInvokeSuffix, helloServiceImpl.sayHello("Mercy"));
Assertions.assertEquals(helloServiceImplResult + callSuffix, helloService2.sayHello("Mercy"));
Assert.assertEquals(expectedResult, testBean.getDemoServiceFromAncestor().sayName("Mercy"));
Assert.assertEquals(expectedResult, testBean.getDemoServiceFromParent().sayName("Mercy"));
Assert.assertEquals(expectedResult, testBean.getDemoService().sayName("Mercy"));
String demoServiceResult = "Hello,Mercy";
Assertions.assertEquals(demoServiceResult + directInvokeSuffix, demoServiceImpl.sayName("Mercy"));
Assertions.assertEquals(demoServiceResult + callSuffix, testBean.getDemoServiceFromAncestor().sayName("Mercy"));
Assertions.assertEquals(demoServiceResult + callSuffix, testBean.myDemoService.sayName("Mercy"));
Assertions.assertEquals(demoServiceResult + callSuffix, testBean.getDemoService().sayName("Mercy"));
Assertions.assertEquals(demoServiceResult + callSuffix, testBean.getDemoServiceFromParent().sayName("Mercy"));
DemoService myDemoService = context.getBean("my-reference-bean", DemoService.class);
Assert.assertEquals(expectedResult, myDemoService.sayName("Mercy"));
DemoService myDemoService = context.getBean("myDemoService", DemoService.class);
Assertions.assertEquals(demoServiceResult + callSuffix, myDemoService.sayName("Mercy"));
}
@ -175,25 +180,24 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
beanPostProcessor.getInjectedFieldReferenceBeanMap();
Assert.assertEquals(3, referenceBeanMap.size());
Assertions.assertEquals(4, referenceBeanMap.size());
Map<String, Integer> checkingFieldNames = new HashMap<>();
checkingFieldNames.put("helloService", 0);
checkingFieldNames.put("helloService2", 0);
checkingFieldNames.put("demoServiceFromParent", 0);
checkingFieldNames.put("private org.apache.dubbo.config.spring.api.HelloService org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessorTest$MyConfiguration.helloService", 0);
checkingFieldNames.put("private org.apache.dubbo.config.spring.api.HelloService org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessorTest.helloService", 0);
checkingFieldNames.put("private org.apache.dubbo.config.spring.api.HelloService org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessorTest.helloService2", 0);
checkingFieldNames.put("private org.apache.dubbo.config.spring.api.DemoService org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessorTest$ParentBean.demoServiceFromParent", 0);
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>> entry : referenceBeanMap.entrySet()) {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
Field field = (Field) injectedElement.getMember();
Integer count = checkingFieldNames.get(field.getName());
Assert.assertNotNull(count);
Assert.assertEquals(0, count.intValue());
checkingFieldNames.put(field.getName(), count+1);
String member = injectedElement.getMember().toString();
Integer count = checkingFieldNames.get(member);
Assertions.assertNotNull(count);
checkingFieldNames.put(member, count+1);
}
for (Map.Entry<String, Integer> entry : checkingFieldNames.entrySet()) {
Assert.assertEquals("check field element failed: "+entry.getKey(), 1, entry.getValue().intValue());
Assertions.assertEquals(1, entry.getValue().intValue(), "check field element failed: "+entry.getKey());
}
}
@ -206,7 +210,7 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
beanPostProcessor.getInjectedMethodReferenceBeanMap();
Assert.assertEquals(2, referenceBeanMap.size());
Assertions.assertEquals(2, referenceBeanMap.size());
Map<String, Integer> checkingMethodNames = new HashMap<>();
checkingMethodNames.put("setDemoServiceFromAncestor", 0);
@ -217,13 +221,13 @@ public class ReferenceAnnotationBeanPostProcessorTest {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
java.lang.reflect.Method method = (java.lang.reflect.Method) injectedElement.getMember();
Integer count = checkingMethodNames.get(method.getName());
Assert.assertNotNull(count);
Assert.assertEquals(0, count.intValue());
Assertions.assertNotNull(count);
Assertions.assertEquals(0, count.intValue());
checkingMethodNames.put(method.getName(), count+1);
}
for (Map.Entry<String, Integer> entry : checkingMethodNames.entrySet()) {
Assert.assertEquals("check method element failed: "+entry.getKey(), 1, entry.getValue().intValue());
Assertions.assertEquals(1, entry.getValue().intValue(), "check method element failed: "+entry.getKey());
}
}
@ -246,6 +250,37 @@ public class ReferenceAnnotationBeanPostProcessorTest {
// }
// }
@Test
public void testReferenceBeansMethodAnnotation() {
ReferenceBeanManager referenceBeanManager = context.getBean(ReferenceBeanManager.BEAN_NAME,
ReferenceBeanManager.class);
Collection<ReferenceBean> referenceBeans = referenceBeanManager.getReferences();
Assertions.assertEquals(5, referenceBeans.size());
for (ReferenceBean referenceBean : referenceBeans) {
ReferenceConfig referenceConfig = referenceBean.getReferenceConfig();
Assertions.assertNotNull(referenceConfig);
Assertions.assertNotNull(ReferenceConfigCache.getCache().get(referenceConfig));
}
ReferenceBean helloServiceReferenceBean = referenceBeanManager.getById("helloService");
Assertions.assertEquals("helloService", helloServiceReferenceBean.getId());
ReferenceConfig referenceConfig = helloServiceReferenceBean.getReferenceConfig();
Assertions.assertEquals(1, referenceConfig.getMethods().size());
ReferenceBean demoServiceFromParentReferenceBean = referenceBeanManager.getById("demoServiceFromParent");
ReferenceBean demoServiceReferenceBean = referenceBeanManager.getById("demoService");
Assertions.assertEquals(demoServiceFromParentReferenceBean.getKey(), demoServiceReferenceBean.getKey());
Assertions.assertEquals(demoServiceFromParentReferenceBean.getReferenceConfig(), demoServiceReferenceBean.getReferenceConfig());
Assertions.assertNotNull(referenceBeanManager.getById("helloService2"));
Assertions.assertNotNull(referenceBeanManager.getById("myDemoService"));
}
private static class AncestorBean {
private DemoService demoServiceFromAncestor;
@ -258,7 +293,7 @@ public class ReferenceAnnotationBeanPostProcessorTest {
}
// #1 ReferenceBean (Method Injection #1)
@Reference(id = "my-reference-bean", version = "2.5.7", url = "dubbo://127.0.0.1:12345?version=2.5.7")
@Reference(id = "myDemoService", version = "2.5.7", url = "dubbo://127.0.0.1:12345?version=2.5.7")
public void setDemoServiceFromAncestor(DemoService demoServiceFromAncestor) {
this.demoServiceFromAncestor = demoServiceFromAncestor;
}
@ -286,7 +321,7 @@ public class ReferenceAnnotationBeanPostProcessorTest {
private DemoService demoService;
@Autowired
private DemoService autowiredDemoService;
private DemoService myDemoService;
@Autowired
private ApplicationContext applicationContext;
@ -296,33 +331,22 @@ public class ReferenceAnnotationBeanPostProcessorTest {
}
// #3 ReferenceBean (Method Injection #2)
@com.alibaba.dubbo.config.annotation.Reference(version = "2.5.7", url = "dubbo://127.0.0.1:12345?version=2.5.7")
@Reference(version = "2.5.7", url = "dubbo://127.0.0.1:12345?version=2.5.7")
public void setDemoService(DemoService demoService) {
this.demoService = demoService;
}
}
@Test
public void testReferenceBeansMethodAnnotation() {
@Configuration
static class MyConfiguration {
ReferenceBeanManager referenceBeanManager = context.getBean(ReferenceBeanManager.BEAN_NAME,
ReferenceBeanManager.class);
@Reference(methods = @Method(name = "sayHello", timeout = 100))
private HelloService helloService;
Collection<ReferenceBean> referenceBeans = referenceBeanManager.getReferences();
Assert.assertEquals(4, referenceBeans.size());
for (ReferenceBean referenceBean : referenceBeans) {
ReferenceConfig referenceConfig = referenceBean.getReferenceConfig();
Assert.assertNotNull(referenceConfig);
Assert.assertNotNull(ReferenceConfigCache.getCache().get(referenceConfig));
@Bean
public TestBean testBean() {
return new TestBean();
}
ReferenceBean referenceBean = referenceBeanManager.get("helloService");
if ("helloService".equals(referenceBean.getId())) {
ReferenceConfig referenceConfig = referenceBean.getReferenceConfig();
Assert.assertNotNull(referenceConfig.getMethods());
}
}
}

146
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
View File

@ -1,146 +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.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import static org.apache.dubbo.common.utils.CollectionUtils.ofSet;
import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
import static org.springframework.util.ReflectionUtils.findField;
/**
* {@link ReferenceBeanBuilder} Test
*
* @see ReferenceBeanBuilder
* @see DubboReference
* @see Reference
* @since 2.6.4
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = ReferenceBeanBuilderTest.class)
public class ReferenceBeanBuilderTest {
@DubboReference(
interfaceClass = CharSequence.class,
interfaceName = "java.lang.CharSequence",
version = "1.0.0", group = "TEST_GROUP", url = "dubbo://localhost:12345",
client = "client", generic = true, injvm = true,
check = false, init = false, lazy = true,
stubevent = true, reconnect = "reconnect", sticky = true,
proxy = "javassist", stub = "java.lang.CharSequence", cluster = "failover",
connections = 3, callbacks = 1, onconnect = "onconnect", ondisconnect = "ondisconnect",
owner = "owner", layer = "layer", retries = 1,
loadbalance = "random", async = true, actives = 3,
sent = true, mock = "mock", validation = "validation",
timeout = 3, cache = "cache", filter = {"echo", "generic", "accesslog"},
listener = {"deprecated"}, parameters = {"n1=v1 ", "n2 = v2 ", " n3 = v3 "},
application = "application",
module = "module", consumer = "consumer", monitor = "monitor", registry = {"registry"},
// @since 2.7.3
id = "reference",
// @since 2.7.8
services = {"service1", "service2", "service3", "service2", "service1"},
providedBy = {"service1", "service2", "service3"}
)
private static final Object TEST_FIELD = new Object();
@Autowired
private ApplicationContext context;
@BeforeEach
public void init() {
DubboBootstrap.reset();
}
@Test
public void testBuild() throws Exception {
DubboReference reference = findAnnotation(findField(getClass(), "TEST_FIELD"), DubboReference.class);
AnnotationAttributes attributes = AnnotationUtils.getAnnotationAttributes(reference, false, false);
ReferenceBeanBuilder beanBuilder = ReferenceBeanBuilder.create(attributes, context);
beanBuilder.defaultInterfaceClass(CharSequence.class);
ReferenceConfig referenceBean = beanBuilder.build();
Assert.assertEquals(CharSequence.class, referenceBean.getInterfaceClass());
Assert.assertEquals("1.0.0", referenceBean.getVersion());
Assert.assertEquals("TEST_GROUP", referenceBean.getGroup());
Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
Assert.assertEquals("client", referenceBean.getClient());
Assert.assertEquals(true, referenceBean.isGeneric());
Assert.assertTrue(referenceBean.isInjvm());
Assert.assertEquals(false, referenceBean.isCheck());
Assert.assertFalse(referenceBean.isInit());
Assert.assertEquals(true, referenceBean.getLazy());
Assert.assertEquals(true, referenceBean.getStubevent());
Assert.assertEquals("reconnect", referenceBean.getReconnect());
Assert.assertEquals(true, referenceBean.getSticky());
Assert.assertEquals("javassist", referenceBean.getProxy());
Assert.assertEquals("java.lang.CharSequence", referenceBean.getStub());
Assert.assertEquals("failover", referenceBean.getCluster());
Assert.assertEquals(Integer.valueOf(3), referenceBean.getConnections());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
Assert.assertEquals("onconnect", referenceBean.getOnconnect());
Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
Assert.assertEquals("owner", referenceBean.getOwner());
Assert.assertEquals("layer", referenceBean.getLayer());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
Assert.assertEquals("random", referenceBean.getLoadbalance());
Assert.assertEquals(true, referenceBean.isAsync());
Assert.assertEquals(Integer.valueOf(3), referenceBean.getActives());
Assert.assertEquals(true, referenceBean.getSent());
Assert.assertEquals("mock", referenceBean.getMock());
Assert.assertEquals("validation", referenceBean.getValidation());
Assert.assertEquals(Integer.valueOf(3), referenceBean.getTimeout());
Assert.assertEquals("cache", referenceBean.getCache());
Assert.assertEquals("echo,generic,accesslog", referenceBean.getFilter());
Assert.assertEquals("deprecated", referenceBean.getListener());
Assert.assertEquals("reference", referenceBean.getId());
Assert.assertEquals(ofSet("service1", "service2", "service3"), referenceBean.getSubscribedServices());
Assert.assertEquals("service1,service2,service3", referenceBean.getProvidedBy());
// parameters
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("n1", "v1");
parameters.put("n2", "v2");
parameters.put("n3", "v3");
Assert.assertEquals(parameters, referenceBean.getParameters());
// Asserts Null fields
Assertions.assertThrows(IllegalStateException.class, () -> referenceBean.getApplication());
Assert.assertNull(referenceBean.getModule());
Assert.assertNull(referenceBean.getConsumer());
Assert.assertNull(referenceBean.getMonitor());
Assert.assertEquals(Collections.emptyList(), referenceBean.getRegistries());
}
}

214
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceCreatorTest.java Normal file
View File

@ -0,0 +1,214 @@
/*
* 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.config.spring.beans.factory.annotation;
import com.alibaba.spring.util.AnnotationUtils;
import org.apache.dubbo.config.ArgumentConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.annotation.Argument;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.impl.NotifyService;
import org.apache.dubbo.config.spring.reference.ReferenceCreator;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.apache.dubbo.common.utils.CollectionUtils.ofSet;
import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
import static org.springframework.util.ReflectionUtils.findField;
/**
* {@link ReferenceCreator} Test
*
* @see ReferenceCreator
* @see DubboReference
* @see Reference
* @since 2.6.4
*/
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = {ReferenceCreatorTest.class, ReferenceCreatorTest.ConsumerConfiguration.class})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class ReferenceCreatorTest {
@DubboReference(
//interfaceClass = HelloService.class,
version = "1.0.0", group = "TEST_GROUP", url = "dubbo://localhost:12345",
client = "client", generic = false, injvm = false,
check = false, init = false, lazy = true,
stubevent = true, reconnect = "reconnect", sticky = true,
proxy = "javassist", stub = "org.apache.dubbo.config.spring.api.HelloService", cluster = "failover",
connections = 3, callbacks = 1, onconnect = "onconnect", ondisconnect = "ondisconnect",
owner = "owner", layer = "layer", retries = 1,
loadbalance = "random", async = true, actives = 3,
sent = true, mock = "mock", validation = "validation",
timeout = 3, cache = "cache", filter = {"echo", "generic", "accesslog"},
listener = {"deprecated"}, parameters = {"n1=v1 ", "n2 = v2 ", " n3 = v3 "},
application = "application",
module = "module", consumer = "consumer", monitor = "monitor", registry = {"myregistry"},
// @since 2.7.3
id = "reference",
// @since 2.7.8
services = {"service1", "service2", "service3", "service2", "service1"},
providedBy = {"service1", "service2", "service3"},
methods = @Method(name = "sayHello",
loadbalance = "loadbalance",
oninvoke = "notifyService.onInvoke",
onreturn = "notifyService.onReturn",
onthrow = "notifyService.onThrow",
timeout = 1000,
retries = 2,
parameters = {"a", "1", "b", "2"},
arguments = @Argument(index = 0, callback = true)
)
)
private HelloService helloService;
@Autowired
private ApplicationContext context;
@Autowired
private NotifyService notifyService;
@BeforeEach
public void init() {
DubboBootstrap.reset();
}
@Test
public void testBuild() throws Exception {
Field helloServiceField = findField(getClass(), "helloService");
DubboReference reference = findAnnotation(helloServiceField, DubboReference.class);
// filter default value
AnnotationAttributes attributes = AnnotationUtils.getAnnotationAttributes(reference, true);
ReferenceConfig referenceBean = ReferenceCreator.create(attributes, context)
.defaultInterfaceClass(helloServiceField.getType())
.build();
Assertions.assertEquals(HelloService.class, referenceBean.getInterfaceClass());
Assertions.assertEquals("org.apache.dubbo.config.spring.api.HelloService", referenceBean.getInterface());
Assertions.assertEquals("1.0.0", referenceBean.getVersion());
Assertions.assertEquals("TEST_GROUP", referenceBean.getGroup());
Assertions.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
Assertions.assertEquals("client", referenceBean.getClient());
Assertions.assertEquals(null, referenceBean.isGeneric());
Assertions.assertEquals(false, referenceBean.isInjvm());
Assertions.assertEquals(false, referenceBean.isCheck());
Assertions.assertEquals(false, referenceBean.isInit());
Assertions.assertEquals(true, referenceBean.getLazy());
Assertions.assertEquals(true, referenceBean.getStubevent());
Assertions.assertEquals("reconnect", referenceBean.getReconnect());
Assertions.assertEquals(true, referenceBean.getSticky());
Assertions.assertEquals("javassist", referenceBean.getProxy());
Assertions.assertEquals("org.apache.dubbo.config.spring.api.HelloService", referenceBean.getStub());
Assertions.assertEquals("failover", referenceBean.getCluster());
Assertions.assertEquals(Integer.valueOf(3), referenceBean.getConnections());
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
Assertions.assertEquals("onconnect", referenceBean.getOnconnect());
Assertions.assertEquals("ondisconnect", referenceBean.getOndisconnect());
Assertions.assertEquals("owner", referenceBean.getOwner());
Assertions.assertEquals("layer", referenceBean.getLayer());
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
Assertions.assertEquals("random", referenceBean.getLoadbalance());
Assertions.assertEquals(true, referenceBean.isAsync());
Assertions.assertEquals(Integer.valueOf(3), referenceBean.getActives());
Assertions.assertEquals(true, referenceBean.getSent());
Assertions.assertEquals("mock", referenceBean.getMock());
Assertions.assertEquals("validation", referenceBean.getValidation());
Assertions.assertEquals(Integer.valueOf(3), referenceBean.getTimeout());
Assertions.assertEquals("cache", referenceBean.getCache());
Assertions.assertEquals("echo,generic,accesslog", referenceBean.getFilter());
Assertions.assertEquals("deprecated", referenceBean.getListener());
Assertions.assertEquals("reference", referenceBean.getId());
Assertions.assertEquals(ofSet("service1", "service2", "service3"), referenceBean.getSubscribedServices());
Assertions.assertEquals("service1,service2,service3", referenceBean.getProvidedBy());
Assertions.assertEquals("myregistry", referenceBean.getRegistryIds());
// parameters
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("n1", "v1");
parameters.put("n2", "v2");
parameters.put("n3", "v3");
Assertions.assertEquals(parameters, referenceBean.getParameters());
// methods
List<MethodConfig> methods = referenceBean.getMethods();
Assertions.assertNotNull(methods);
Assertions.assertEquals(1, methods.size());
MethodConfig methodConfig = methods.get(0);
Assertions.assertEquals("sayHello", methodConfig.getName());
Assertions.assertEquals(1000, methodConfig.getTimeout());
Assertions.assertEquals(2, methodConfig.getRetries());
Assertions.assertEquals("loadbalance", methodConfig.getLoadbalance());
Assertions.assertEquals(notifyService, methodConfig.getOninvoke());
Assertions.assertEquals(notifyService, methodConfig.getOnreturn());
Assertions.assertEquals(notifyService, methodConfig.getOnthrow());
Assertions.assertEquals("onInvoke", methodConfig.getOninvokeMethod());
Assertions.assertEquals("onReturn", methodConfig.getOnreturnMethod());
Assertions.assertEquals("onThrow", methodConfig.getOnthrowMethod());
// method parameters
Map<String, String> methodParameters = new HashMap<String, String>();
methodParameters.put("a", "1");
methodParameters.put("b", "2");
Assertions.assertEquals(methodParameters, methodConfig.getParameters());
// method arguments
List<ArgumentConfig> arguments = methodConfig.getArguments();
Assertions.assertEquals(1, arguments.size());
ArgumentConfig argumentConfig = arguments.get(0);
Assertions.assertEquals(0, argumentConfig.getIndex());
Assertions.assertEquals(true, argumentConfig.isCallback());
// Asserts Null fields
Assertions.assertThrows(IllegalStateException.class, () -> referenceBean.getApplication());
Assertions.assertNull(referenceBean.getModule());
Assertions.assertNull(referenceBean.getConsumer());
Assertions.assertNull(referenceBean.getMonitor());
}
@Configuration
public static class ConsumerConfiguration {
@Bean
public NotifyService notifyService() {
return new NotifyService();
}
}
}

43
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java
View File

@ -16,50 +16,53 @@
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Map;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
/**
* {@link ServiceAnnotationBeanPostProcessor} Test
*
* @since 2.5.8
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration.class,
ServiceAnnotationBeanPostProcessorTest.class
})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@TestPropertySource(properties = {
"provider.package = org.apache.dubbo.config.spring.context.annotation.provider",
"packagesToScan = ${provider.package}",
})
public class ServiceAnnotationBeanPostProcessorTest {
@Before
@BeforeEach
public void setUp() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@After
@AfterEach
public void tearDown() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@Autowired
@ -76,19 +79,19 @@ public class ServiceAnnotationBeanPostProcessorTest {
Map<String, HelloService> helloServicesMap = beanFactory.getBeansOfType(HelloService.class);
Assert.assertEquals(2, helloServicesMap.size());
Assertions.assertEquals(2, helloServicesMap.size());
Map<String, ServiceBean> serviceBeansMap = beanFactory.getBeansOfType(ServiceBean.class);
Assert.assertEquals(2, serviceBeansMap.size());
Assertions.assertEquals(3, serviceBeansMap.size());
Map<String, ServiceAnnotationBeanPostProcessor> beanPostProcessorsMap =
beanFactory.getBeansOfType(ServiceAnnotationBeanPostProcessor.class);
Assert.assertEquals(2, beanPostProcessorsMap.size());
Assertions.assertEquals(2, beanPostProcessorsMap.size());
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor"));
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor2"));
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor"));
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor2"));
}
@ -97,11 +100,11 @@ public class ServiceAnnotationBeanPostProcessorTest {
Map<String, ServiceBean> serviceBeansMap = beanFactory.getBeansOfType(ServiceBean.class);
Assert.assertEquals(2, serviceBeansMap.size());
Assertions.assertEquals(3, serviceBeansMap.size());
ServiceBean demoServiceBean = serviceBeansMap.get("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:2.5.7");
Assert.assertNotNull(demoServiceBean.getMethods());
Assertions.assertNotNull(demoServiceBean.getMethods());
}

15
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
View File

@ -19,10 +19,9 @@ package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Service;
import org.apache.dubbo.config.spring.api.DemoService;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.mock.env.MockEnvironment;
import org.springframework.util.ReflectionUtils;
@ -50,7 +49,7 @@ public class ServiceBeanNameBuilderTest {
private MockEnvironment environment;
@Before
@BeforeEach
public void prepare() {
environment = new MockEnvironment();
environment.setProperty("dubbo.version", "1.0.0");
@ -60,10 +59,10 @@ public class ServiceBeanNameBuilderTest {
public void testServiceAnnotation() {
Service service = AnnotationUtils.getAnnotation(ServiceBeanNameBuilderTest.class, Service.class);
ServiceBeanNameBuilder builder = ServiceBeanNameBuilder.create(service, INTERFACE_CLASS, environment);
Assert.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
Assertions.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
builder.build());
Assert.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
Assertions.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
builder.build());
}
@ -71,7 +70,7 @@ public class ServiceBeanNameBuilderTest {
public void testReferenceAnnotation() {
Reference reference = AnnotationUtils.getAnnotation(ReflectionUtils.findField(ServiceBeanNameBuilderTest.class, "INTERFACE_CLASS"), Reference.class);
ServiceBeanNameBuilder builder = ServiceBeanNameBuilder.create(reference, INTERFACE_CLASS, environment);
Assert.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
Assertions.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:1.0.0:DUBBO",
builder.build());
}

43
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessorTest.java
View File

@ -16,50 +16,53 @@
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Map;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
/**
* {@link ServiceClassPostProcessor} Test
*
* @since 2.7.7
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration2.class,
ServiceClassPostProcessorTest.class
})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@TestPropertySource(properties = {
"provider.package = org.apache.dubbo.config.spring.context.annotation.provider",
"packagesToScan = ${provider.package}",
})
public class ServiceClassPostProcessorTest {
@Before
@BeforeEach
public void setUp() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@After
@AfterEach
public void tearDown() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@Autowired
@ -76,19 +79,19 @@ public class ServiceClassPostProcessorTest {
Map<String, HelloService> helloServicesMap = beanFactory.getBeansOfType(HelloService.class);
Assert.assertEquals(2, helloServicesMap.size());
Assertions.assertEquals(2, helloServicesMap.size());
Map<String, ServiceBean> serviceBeansMap = beanFactory.getBeansOfType(ServiceBean.class);
Assert.assertEquals(2, serviceBeansMap.size());
Assertions.assertEquals(3, serviceBeansMap.size());
Map<String, ServiceClassPostProcessor> beanPostProcessorsMap =
beanFactory.getBeansOfType(ServiceClassPostProcessor.class);
Assert.assertEquals(2, beanPostProcessorsMap.size());
Assertions.assertEquals(2, beanPostProcessorsMap.size());
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceClassPostProcessor"));
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceClassPostProcessor2"));
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceClassPostProcessor"));
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceClassPostProcessor2"));
}
@ -97,11 +100,11 @@ public class ServiceClassPostProcessorTest {
Map<String, ServiceBean> serviceBeansMap = beanFactory.getBeansOfType(ServiceBean.class);
Assert.assertEquals(2, serviceBeansMap.size());
Assertions.assertEquals(3, serviceBeansMap.size());
ServiceBean demoServiceBean = serviceBeansMap.get("ServiceBean:org.apache.dubbo.config.spring.api.DemoService:2.5.7");
Assert.assertNotNull(demoServiceBean.getMethods());
Assertions.assertNotNull(demoServiceBean.getMethods());
}

28
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/MultipleServicesWithMethodConfigsTest.java
View File

@ -16,19 +16,34 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.ImportResource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@RunWith(SpringRunner.class)
import java.util.Map;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = MultipleServicesWithMethodConfigsTest.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@ImportResource(locations = "classpath:/META-INF/spring/multiple-services-with-methods.xml")
public class MultipleServicesWithMethodConfigsTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@Autowired
private ApplicationContext applicationContext;
@ -36,6 +51,11 @@ public class MultipleServicesWithMethodConfigsTest {
public void test() {
// Map<String, MethodConfig> methodConfigs = applicationContext.getBeansOfType(MethodConfig.class);
// assertEquals(2, methodConfigs.size());
Map<String, ReferenceBean> referenceBeanMap = applicationContext.getBeansOfType(ReferenceBean.class);
for (ReferenceBean referenceBean : referenceBeanMap.values()) {
Assertions.assertEquals(1, referenceBean.getReferenceConfig().getMethods().size());
}
}
}

61
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
View File

@ -16,22 +16,28 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
import java.io.IOException;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import org.springframework.beans.factory.config.YamlProcessor;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertySourceFactory;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.parser.ParserException;
import org.yaml.snakeyaml.representer.Representer;
import org.yaml.snakeyaml.resolver.Resolver;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.regex.Pattern;
/**
* YAML {@link PropertySourceFactory} implementation, some source code is copied Spring Boot
* org.springframework.boot.env.YamlPropertySourceLoader , see {@link #createYaml()} and {@link #process()}
@ -48,7 +54,36 @@ public class YamlPropertySourceFactory extends YamlProcessor implements Property
@Override
protected Yaml createYaml() {
return new Yaml(new StrictMapAppenderConstructor(), new Representer(),
return new Yaml(new Constructor() {
@Override
protected Map<Object, Object> constructMapping(MappingNode node) {
try {
return super.constructMapping(node);
} catch (IllegalStateException ex) {
throw new ParserException("while parsing MappingNode",
node.getStartMark(), ex.getMessage(), node.getEndMark());
}
}
@Override
protected Map<Object, Object> createDefaultMap() {
final Map<Object, Object> delegate = super.createDefaultMap();
return new AbstractMap<Object, Object>() {
@Override
public Object put(Object key, Object value) {
if (delegate.containsKey(key)) {
throw new IllegalStateException("Duplicate key: " + key);
}
return delegate.put(key, value);
}
@Override
public Set<Entry<Object, Object>> entrySet() {
return delegate.entrySet();
}
};
}
}, new Representer(),
new DumperOptions(), new Resolver() {
@Override
public void addImplicitResolver(Tag tag, Pattern regexp,
@ -61,10 +96,22 @@ public class YamlPropertySourceFactory extends YamlProcessor implements Property
});
}
/**
* {@link Resolver} that limits {@link Tag#TIMESTAMP} tags.
*/
private static class LimitedResolver extends Resolver {
@Override
public void addImplicitResolver(Tag tag, Pattern regexp, String first) {
if (tag == Tag.TIMESTAMP) {
return;
}
super.addImplicitResolver(tag, regexp, first);
}
}
public Map<String, Object> process() {
final Map<String, Object> result = new LinkedHashMap<String, Object>();
process((properties, map) -> result.putAll(getFlattenedMap(map)));
return result;
}
}

26
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
View File

@ -16,26 +16,30 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
/**
* {@link YamlPropertySourceFactory} Test
*
* @since 2.6.5
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@PropertySource(name = "yaml-source", value = {"classpath:/META-INF/dubbo.yml"}, factory = YamlPropertySourceFactory.class)
@Configuration
@ContextConfiguration(classes = YamlPropertySourceFactoryTest.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class YamlPropertySourceFactoryTest {
@Autowired
@ -61,11 +65,11 @@ public class YamlPropertySourceFactoryTest {
@Test
public void testProperty() {
Assert.assertEquals(isDefault, environment.getProperty("dubbo.consumer.default", Boolean.class));
Assert.assertEquals(client, environment.getProperty("dubbo.consumer.client", String.class));
Assert.assertEquals(threadPool, environment.getProperty("dubbo.consumer.threadpool", String.class));
Assert.assertEquals(coreThreads, environment.getProperty("dubbo.consumer.corethreads", Integer.class));
Assert.assertEquals(threads, environment.getProperty("dubbo.consumer.threads", Integer.class));
Assert.assertEquals(queues, environment.getProperty("dubbo.consumer.queues", Integer.class));
Assertions.assertEquals(isDefault, environment.getProperty("dubbo.consumer.default", Boolean.class));
Assertions.assertEquals(client, environment.getProperty("dubbo.consumer.client", String.class));
Assertions.assertEquals(threadPool, environment.getProperty("dubbo.consumer.threadpool", String.class));
Assertions.assertEquals(coreThreads, environment.getProperty("dubbo.consumer.corethreads", Integer.class));
Assertions.assertEquals(threads, environment.getProperty("dubbo.consumer.threads", Integer.class));
Assertions.assertEquals(queues, environment.getProperty("dubbo.consumer.queues", Integer.class));
}
}

101
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/conditional1/XmlReferenceBeanConditionalTest.java Normal file
View File

@ -0,0 +1,101 @@
/*
* 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.config.spring.boot.conditional1;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.core.annotation.Order;
import java.util.Map;
/**
* issue: https://github.com/apache/dubbo-spring-boot-project/issues/779
*/
@SpringBootTest(
properties = {
"dubbo.registry.address=N/A"
},
classes = {
XmlReferenceBeanConditionalTest.class
}
)
@Configuration
//@ComponentScan
public class XmlReferenceBeanConditionalTest {
@BeforeAll
public static void setUp(){
ZooKeeperServer.start();
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown(){
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testConsumer() {
Map<String, HelloService> helloServiceMap = applicationContext.getBeansOfType(HelloService.class);
Assertions.assertEquals(1, helloServiceMap.size());
Assertions.assertNotNull(helloServiceMap.get("helloService"));
Assertions.assertNull(helloServiceMap.get("myHelloService"));
}
@Order(Integer.MAX_VALUE-2)
@Configuration
@ImportResource("classpath:/org/apache/dubbo/config/spring/boot/conditional1/consumer/dubbo-consumer.xml")
public static class ConsumerConfiguration {
}
@Order(Integer.MAX_VALUE-1)
@Configuration
public static class ConsumerConfiguration2 {
//TEST Conditional, this bean should be ignored
@Bean
@ConditionalOnMissingBean
public HelloService myHelloService() {
return new HelloService() {
@Override
public String sayHello(String name) {
return "HI, " + name;
}
};
}
}
}

36
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/conditional1/consumer/dubbo-consumer.xml Normal file
View File

@ -0,0 +1,36 @@
<?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.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://code.alibabatech.com/schema/dubbo
http://code.alibabatech.com/schema/dubbo/dubbo.xsd" default-lazy-init ="false">
<dubbo:application name="consumer-app"/>
<dubbo:registry client="curator" address="${dubbo.registry.address}"/>
<dubbo:protocol name="dubbo" port="${myapp.dubbo.port:20880}"/>
<dubbo:reference id="helloService" group="${myapp.group:foo}" interface="org.apache.dubbo.config.spring.api.HelloService" init="false"/>
</beans>

109
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/conditional2/JavaConfigAnnotationReferenceBeanConditionalTest.java Normal file
View File

@ -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.config.spring.boot.conditional2;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.config.spring.context.annotation.provider.HelloServiceImpl;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import java.util.Map;
/**
* issue: https://github.com/apache/dubbo-spring-boot-project/issues/779
*/
@SpringBootTest(
properties = {
"dubbo.application.name=consumer-app",
"dubbo.registry.address=N/A",
"myapp.group=demo"
},
classes = {
JavaConfigAnnotationReferenceBeanConditionalTest.class
}
)
@Configuration
//@ComponentScan
@EnableDubbo
public class JavaConfigAnnotationReferenceBeanConditionalTest {
@BeforeAll
public static void setUp(){
ZooKeeperServer.start();
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown(){
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testConsumer() {
Map<String, HelloService> helloServiceMap = applicationContext.getBeansOfType(HelloService.class);
Assertions.assertEquals(1, helloServiceMap.size());
Assertions.assertNotNull(helloServiceMap.get("helloService"));
Assertions.assertNull(helloServiceMap.get("myHelloService"));
}
@Order(Integer.MAX_VALUE-2)
@Configuration
public static class AnnotationBeanConfiguration {
@Bean
@DubboReference(group = "${myapp.group}", init = false)
public ReferenceBean<HelloService> helloService() {
return new ReferenceBean();
}
}
@Order(Integer.MAX_VALUE-1)
@Configuration
public static class ConditionalBeanConfiguration {
//TEST Conditional, this bean should be ignored
@Bean
@ConditionalOnMissingBean
public HelloService myHelloService() {
return new HelloServiceImpl();
}
}
}

111
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/conditional3/JavaConfigRawReferenceBeanConditionalTest.java Normal file
View File

@ -0,0 +1,111 @@
/*
* 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.config.spring.boot.conditional3;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.config.spring.context.annotation.provider.HelloServiceImpl;
import org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import java.util.Map;
/**
* issue: https://github.com/apache/dubbo-spring-boot-project/issues/779
*/
@SpringBootTest(
properties = {
"dubbo.application.name=consumer-app",
"dubbo.registry.address=N/A",
"myapp.group=demo"
},
classes = {
JavaConfigRawReferenceBeanConditionalTest.class
}
)
@Configuration
//@ComponentScan
@EnableDubbo
public class JavaConfigRawReferenceBeanConditionalTest {
@BeforeAll
public static void setUp(){
ZooKeeperServer.start();
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown(){
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testConsumer() {
Map<String, HelloService> helloServiceMap = applicationContext.getBeansOfType(HelloService.class);
Assertions.assertEquals(1, helloServiceMap.size());
Assertions.assertNotNull(helloServiceMap.get("helloService"));
Assertions.assertNull(helloServiceMap.get("myHelloService"));
}
@Order(Integer.MAX_VALUE-2)
@Configuration
public static class RawReferenceBeanConfiguration {
@Bean
public ReferenceBean<HelloService> helloService() {
return new ReferenceBeanBuilder()
.setGroup("${myapp.group}")
.setInit(false)
.build();
}
}
@Order(Integer.MAX_VALUE-1)
@Configuration
public static class ConditionalBeanConfiguration {
//TEST Conditional, this bean should be ignored
@Bean
@ConditionalOnMissingBean
public HelloService myHelloService() {
return new HelloServiceImpl();
}
}
}

72
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/importxml/SpringBootImportDubboXmlTest.java Normal file
View File

@ -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.config.spring.boot.importxml;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
@SpringBootTest(
properties = {
"dubbo.registry.protocol=zookeeper",
"dubbo.registry.address=localhost:2181"
},
classes = {
SpringBootImportDubboXmlTest.class
}
)
@Configuration
@ComponentScan
@ImportResource("classpath:/org/apache/dubbo/config/spring/boot/importxml/consumer/dubbo-consumer.xml")
public class SpringBootImportDubboXmlTest {
@BeforeAll
public static void setUp(){
ZooKeeperServer.start();
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown(){
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Test
public void testConsumer() {
try {
helloService.sayHello("dubbo");
Assertions.fail("Should not be called successfully");
} catch (Exception e) {
String s = e.toString();
Assertions.assertTrue(s.contains("No provider available"), s);
Assertions.assertTrue(s.contains("service org.apache.dubbo.config.spring.api.HelloService"), s);
}
}
}

48
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/importxml/consumer/dubbo-consumer.xml Normal file
View File

@ -0,0 +1,48 @@
<?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.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://code.alibabatech.com/schema/dubbo
http://code.alibabatech.com/schema/dubbo/dubbo.xsd" default-lazy-init ="false">
<description>wisdom app Service Dubbo Admin Consumers</description>
<dubbo:application name="cimmdms"
owner="wisdom" organization="wisdom" logger="slf4j">
<dubbo:parameter key="qos.enable" value="false" />
</dubbo:application>
<dubbo:protocol id="cimmdmsSrvClientProtocol"
accesslog="true" />
<dubbo:registry id="cimmdmsSrvClientRegistry"
protocol="${dubbo.registry.protocol}" address="${dubbo.registry.address}" client="curator"
group="dubboservice/wisdom/cimmdmsservice/group_mdms_dev"
subscribe="true" check="true">
</dubbo:registry>
<dubbo:consumer id="wisdomcimmdmsSrvConsumer"
registry="cimmdmsSrvClientRegistry" init="false" check="false"
retries="0" timeout="25000">
<dubbo:reference consumer="wisdomcimmdmsSrvConsumer" interface="org.apache.dubbo.config.spring.api.HelloService" id="mdmMessageProviderService" />
</dubbo:consumer>
</beans>

30
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/importxml2/HelloServiceImpl.java Normal file
View File

@ -0,0 +1,30 @@
/*
* 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.config.spring.boot.importxml2;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.config.spring.api.HelloService;
@DubboService(group = "${myapp.group:foo2}")
public class HelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello, " + name;
}
}

97
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/importxml2/SpringBootImportAndScanTest.java Normal file
View File

@ -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.config.spring.boot.importxml2;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.reference.ReferenceBeanManager;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan;
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 org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import java.util.Map;
@SpringBootTest(properties = {
//"dubbo.scan.base-packages=org.apache.dubbo.config.spring.boot.importxml2",
"dubbo.registry.address=N/A",
"myapp.dubbo.port=20881",
"myapp.name=dubbo-provider",
"myapp.group=test"
}, classes = SpringBootImportAndScanTest.class)
@Configuration
@ComponentScan
@DubboComponentScan
@ImportResource("classpath:/org/apache/dubbo/config/spring/boot/importxml2/dubbo-provider.xml")
public class SpringBootImportAndScanTest implements ApplicationContextAware {
private ApplicationContext applicationContext;
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Test
public void testProvider() {
String result = helloService.sayHello("dubbo");
Assertions.assertEquals("Hello, dubbo", result);
Map<String, ReferenceBean> referenceBeanMap = applicationContext.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(1, referenceBeanMap.size());
Assertions.assertNotNull(referenceBeanMap.get("&helloService"));
ReferenceBeanManager referenceBeanManager = applicationContext.getBean(ReferenceBeanManager.BEAN_NAME, ReferenceBeanManager.class);
Assertions.assertNotNull(referenceBeanManager.getById("helloService"));
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
}
@Configuration
public static class ConsumerConfiguration {
// Match and reuse 'helloService' reference bean definition in dubbo-provider.xml
@DubboReference(group = "${myapp.group}")
private HelloService helloService;
}
}

37
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/importxml2/dubbo-provider.xml Normal file
View File

@ -0,0 +1,37 @@
<?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.
~
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- <context:property-placeholder/>-->
<dubbo:application name="${myapp.name:foo}"/>
<dubbo:registry client="curator" address="${dubbo.registry.address}"/>
<dubbo:protocol name="dubbo" port="${myapp.dubbo.port:20880}"/>
<dubbo:provider delay="-1"/>
<dubbo:reference id="helloService" group="${myapp.group:foo}" interface="org.apache.dubbo.config.spring.api.HelloService"/>
</beans>

3
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
View File

@ -25,7 +25,6 @@ import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@ -120,7 +119,7 @@ public class EnableDubboConfigTest {
for (Map.Entry<String, ProtocolConfig> entry : protocolConfigs.entrySet()) {
ProtocolConfig protocol = entry.getValue();
Assert.assertEquals(protocol, context.getBean(protocol.getName(), ProtocolConfig.class));
Assertions.assertEquals(protocol, context.getBean(protocol.getName(), ProtocolConfig.class));
}
// asserts aliases

9
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
View File

@ -57,7 +57,8 @@ public class EnableDubboTest {
@AfterEach
public void tearDown() {
//context.close();
context.close();
DubboBootstrap.reset();
}
@Test
@ -87,21 +88,19 @@ public class EnableDubboTest {
public void testConsumer() {
context.register(TestProviderConfiguration.class, TestConsumerConfiguration.class);
context.refresh();
TestConsumerConfiguration consumerConfiguration = context.getBean(TestConsumerConfiguration.class);
DemoService demoService = consumerConfiguration.getDemoService();
String value = demoService.sayName("Mercy");
Assertions.assertEquals("Hello,Mercy", value);
DemoService autowiredDemoService = consumerConfiguration.getAutowiredDemoService();
Assertions.assertEquals("Hello,Mercy", autowiredDemoService.sayName("Mercy"));
DemoService autowiredReferDemoService = consumerConfiguration.getAutowiredReferDemoService();
Assertions.assertEquals("Hello,Mercy", autowiredReferDemoService.sayName("Mercy"));
TestConsumerConfiguration.Child child = context.getBean(TestConsumerConfiguration.Child.class);

2
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java
View File

@ -67,7 +67,7 @@ public class ConsumerConfiguration {
}
@Autowired
private DemoService autowiredDemoService;
private DemoService demoServiceFromAncestor;
@Reference(version = "2.5.7", url = remoteURL)
private DemoService demoService;

13
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java
View File

@ -22,6 +22,7 @@ import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.PropertySource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@ -38,19 +39,29 @@ public class TestConsumerConfiguration {
private static final String remoteURL = "dubbo://127.0.0.1:12345?version=2.5.7";
@Reference(version = "2.5.7",
@Reference(id = "demoService",
version = "2.5.7",
url = remoteURL,
application = "dubbo-demo-application",
filter = "mymock")
private DemoService demoService;
@Autowired
@Qualifier("demoServiceImpl")
private DemoService autowiredDemoService;
@Autowired
@Qualifier("demoService")
private DemoService autowiredReferDemoService;
public DemoService getAutowiredDemoService() {
return autowiredDemoService;
}
public DemoService getAutowiredReferDemoService() {
return autowiredReferDemoService;
}
public DemoService getDemoService() {
return demoService;
}

1
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java
View File

@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
* Default {@link HelloService} annotation with Spring's {@link Service}
* and Dubbo's {@link org.apache.dubbo.config.annotation.Service}
*
* @since TODO
*/
@Service
@DubboService

2
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java
View File

@ -25,7 +25,7 @@ import com.alibaba.dubbo.config.annotation.Service;
*
* @since 2.5.9
*/
@Service(interfaceName = "org.apache.dubbo.config.spring.api.HelloService")
@Service(interfaceName = "org.apache.dubbo.config.spring.api.HelloService", version = "2")
public class HelloServiceImpl implements HelloService {
@Override

27
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
View File

@ -20,31 +20,34 @@ package org.apache.dubbo.config.spring.context.properties;
import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@RunWith(SpringJUnit4ClassRunner.class)
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@ExtendWith(SpringExtension.class)
@TestPropertySource(locations = "classpath:/dubbo-binder.properties")
@ContextConfiguration(classes = DefaultDubboConfigBinder.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class DefaultDubboConfigBinderTest {
@Before
@BeforeEach
public void setUp() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@After
@AfterEach
public void tearDown() {
ApplicationModel.reset();
DubboBootstrap.reset();
}
@Autowired

29
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/NotifyService.java Normal file
View File

@ -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.
*/
package org.apache.dubbo.config.spring.impl;
public class NotifyService {
public void onInvoke(String name, int id) {
}
public void onReturn(String name, int id) {
}
public void onThrow(Throwable ex, int id) {
}
}

71
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue6000/Issue6000Test.java Normal file
View File

@ -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.config.spring.issues.issue6000;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.config.spring.issues.issue6000.adubbo.HelloDubbo;
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.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
/**
* The test-case for https://github.com/apache/dubbo/issues/6000
* Autowired a ReferenceBean failed in some situation in Spring enviroment
*/
@Configuration
@EnableDubbo
@ComponentScan
@PropertySource("classpath:/META-INF/issues/issue6000/config.properties")
public class Issue6000Test {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@AfterEach
public void tearDown() {
DubboBootstrap.reset();
}
@Test
public void test() throws Exception {
ZooKeeperServer.start();
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Issue6000Test.class);
try {
HelloDubbo helloDubbo = context.getBean(HelloDubbo.class);
String result = helloDubbo.sayHello("dubbo");
System.out.println(result);
} catch (Exception e){
String s = e.toString();
Assertions.assertTrue(s.contains("No provider available"), s);
Assertions.assertTrue(s.contains("org.apache.dubbo.config.spring.api.HelloService:1.0.0"), s);
} finally {
context.close();
}
}
}

35
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue6000/adubbo/HelloDubbo.java Normal file
View File

@ -0,0 +1,35 @@
/*
* 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.config.spring.issues.issue6000.adubbo;
import org.apache.dubbo.config.spring.api.HelloService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class HelloDubbo {
HelloService helloService;
@Resource
public void setHelloService(HelloService helloService) {
this.helloService = helloService;
}
public String sayHello(String name) {
return helloService.sayHello(name);
}
}

31
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue6000/dubbo/MyReferenceConfig.java Normal file
View File

@ -0,0 +1,31 @@
/*
* 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.config.spring.issues.issue6000.dubbo;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.spring.api.HelloService;
import org.springframework.context.annotation.Configuration;
/**
* This configuration class is considered to be initialized after HelloDubbo,
* but the reference bean defined in it can be injected into HelloDubbo
*/
@Configuration
public class MyReferenceConfig {
@Reference(version = "1.0.0", check = false)
HelloService helloService;
}

24
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/Issue6252Test.java → dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue6252/Issue6252Test.java
View File

@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.config.spring.issues;
package org.apache.dubbo.config.spring.issues.issue6252;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Configuration;
@ -31,20 +32,29 @@ import org.springframework.context.annotation.PropertySource;
*
* @since 2.7.8
*/
@Disabled
@Configuration
@EnableDubboConfig
@PropertySource("classpath:/META-INF/issue-6252-test.properties")
@PropertySource("classpath:/META-INF/issues/issue6252/config.properties")
public class Issue6252Test {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@DubboReference
private DemoService demoService;
@Test
public void test() throws Exception {
ZooKeeperServer.start();
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Issue6252Test.class);
DemoService demoService = context.getBean(DemoService.class);
context.close();
try {
DemoService demoService = context.getBean(DemoService.class);
} finally {
context.close();
}
}
}

89
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/issues/issue7003/Issue7003Test.java Normal file
View File

@ -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.config.spring.issues.issue7003;
import org.apache.dubbo.config.ReferenceConfigBase;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
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;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
import java.util.Collection;
import java.util.Map;
/**
*
* Multiple duplicate Dubbo Reference annotations with the same attribute generate only one instance.
* The test-case for https://github.com/apache/dubbo/issues/7003
*/
@Configuration
@EnableDubbo
@ComponentScan
@PropertySource("classpath:/META-INF/issues/issue7003/config.properties")
public class Issue7003Test {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@Test
public void test() throws Exception {
ZooKeeperServer.start();
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Issue7003Test.class);
try {
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(1, referenceBeanMap.size());
Collection<ReferenceConfigBase<?>> references = ApplicationModel.getConfigManager().getReferences();
Assertions.assertEquals(1, references.size());
} finally {
context.close();
}
}
@Component
static class ClassA {
@DubboReference(group = "demo", version = "1.2.3", check = false)
private HelloService helloService;
}
@Component
static class ClassB {
@DubboReference(check = false, version = "1.2.3", group = "demo")
private HelloService helloService;
}
}

48
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/DemoBeanFactoryPostProcessor.java Normal file
View File

@ -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.config.spring.propertyconfigurer.consumer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.PriorityOrdered;
public class DemoBeanFactoryPostProcessor implements BeanFactoryPostProcessor, PriorityOrdered {
private HelloService demoService;
public DemoBeanFactoryPostProcessor(HelloService demoService) {
this.demoService = demoService;
}
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (demoService == null) {
throw new IllegalStateException("demoService is not injected");
}
System.out.println("DemoBeanFactoryPostProcessor");
}
/**
* call before PropertyPlaceholderConfigurer
*/
@Override
public int getOrder() {
return HIGHEST_PRECEDENCE;
}
}

81
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/PropertyConfigurerTest.java Normal file
View File

@ -0,0 +1,81 @@
/*
* 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.config.spring.propertyconfigurer.consumer;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class PropertyConfigurerTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
ZooKeeperServer.start();
}
@Test
public void testEarlyInit() {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext("org/apache/dubbo/config/spring/propertyconfigurer/provider/dubbo-provider.xml");
try {
providerContext.start();
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
context.start();
HelloService service = (HelloService) context.getBean("demoService");
String result = service.sayHello("world");
System.out.println("result: " + result);
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
context.close();
} finally {
providerContext.close();
}
}
@Configuration
@EnableDubbo(scanBasePackages = "org.apache.dubbo.config.spring.propertyconfigurer.consumer")
@ComponentScan(value = {"org.apache.dubbo.config.spring.propertyconfigurer.consumer"})
@ImportResource("classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer/dubbo-consumer.xml")
@PropertySource("classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer/app.properties")
static class ConsumerConfiguration {
@Bean
public DemoBeanFactoryPostProcessor bizBeanFactoryPostProcessor(HelloService service) {
return new DemoBeanFactoryPostProcessor(service);
}
}
}

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/app.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.registry.address=zookeeper://127.0.0.1:2181?registry-type=service
biz.group=greeting
biz.group2=group2
dubbo.call-timeout=2000

43
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer/dubbo-consumer.xml Normal file
View File

@ -0,0 +1,43 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location">
<value>classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer/app.properties</value>
</property>
</bean>
<dubbo:application name="demo-consumer">
<dubbo:parameter key="mapping-type" value="metadata"/>
</dubbo:application>
<!-- <dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>-->
<dubbo:registry address="${dubbo.registry.address}"/>
<!-- timeout="${dubbo.call-timeout}" -->
<dubbo:reference id="demoService" check="false" group="${biz.group}" timeout="${dubbo.call-timeout:foo-timeout}"
interface="org.apache.dubbo.config.spring.api.HelloService"/>
</beans>

82
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/PropertySourcesConfigurerTest.java Normal file
View File

@ -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.config.spring.propertyconfigurer.consumer2;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.config.spring.propertyconfigurer.consumer.DemoBeanFactoryPostProcessor;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class PropertySourcesConfigurerTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
ZooKeeperServer.start();
// ExtensionLoader.resetExtensionLoader(DynamicConfigurationFactory.class);
}
@Test
public void testEarlyInit() {
ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext("org/apache/dubbo/config/spring/propertyconfigurer/provider/dubbo-provider.xml");
try {
providerContext.start();
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
context.start();
HelloService service = (HelloService) context.getBean("demoService");
String result = service.sayHello("world");
System.out.println("result: " + result);
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
context.close();
} finally {
providerContext.close();
}
}
@Configuration
@EnableDubbo(scanBasePackages = "org.apache.dubbo.config.spring.propertyconfigurer.consumer2")
@ComponentScan(value = {"org.apache.dubbo.config.spring.propertyconfigurer.consumer2"})
@ImportResource("classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/dubbo-consumer.xml")
@PropertySource("classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/app.properties")
static class ConsumerConfiguration {
@Bean
public DemoBeanFactoryPostProcessor bizBeanFactoryPostProcessor(HelloService service) {
return new DemoBeanFactoryPostProcessor(service);
}
}
}

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/app.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.registry.address=zookeeper://127.0.0.1:2181?registry-type=service
biz.group=greeting
biz.group2=group2
dubbo.call-timeout=2000

43
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/dubbo-consumer.xml Normal file
View File

@ -0,0 +1,43 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<bean id="propertyConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="location">
<value>classpath:/org/apache/dubbo/config/spring/propertyconfigurer/consumer2/app.properties</value>
</property>
</bean>
<dubbo:application name="demo-consumer">
<dubbo:parameter key="mapping-type" value="metadata"/>
</dubbo:application>
<!-- <dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>-->
<dubbo:registry address="${dubbo.registry.address}"/>
<!-- timeout="${dubbo.call-timeout}" -->
<dubbo:reference id="demoService" check="false" group="${biz.group}" timeout="${dubbo.call-timeout:foo-timeout}"
interface="org.apache.dubbo.config.spring.api.HelloService"/>
</beans>

38
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/provider/HelloServiceImpl.java Normal file
View File

@ -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.config.spring.propertyconfigurer.provider;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.rpc.RpcContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HelloServiceImpl implements HelloService {
private static final Logger logger = LoggerFactory.getLogger(HelloServiceImpl.class);
@Override
public String sayHello(String name) {
logger.info("Hello " + name + ", request from consumer: " + RpcContext.getContext().getRemoteAddress());
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}

5
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/provider/app.properties Normal file
View File

@ -0,0 +1,5 @@
dubbo.registry.address=zookeeper://127.0.0.1:2181?registry-type=service
dubbo.config-center.address=zookeeper://127.0.0.1:2181
dubbo.metadata-report.address=zookeeper://127.0.0.1:2181
biz.group=greeting
biz.group2=group2

49
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/propertyconfigurer/provider/dubbo-provider.xml Normal file
View File

@ -0,0 +1,49 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location">
<value>classpath:/org/apache/dubbo/config/spring/propertyconfigurer/provider/app.properties</value>
</property>
<property name="fileEncoding">
<value>UTF-8</value>
</property>
</bean>
<dubbo:application name="demo-provider">
<dubbo:parameter key="mapping-type" value="metadata"/>
</dubbo:application>
<dubbo:config-center address="${dubbo.config-center.address}"/>
<dubbo:metadata-report address="${dubbo.metadata-report.address}"/>
<dubbo:registry id="registry1" address="${dubbo.registry.address}"/>
<dubbo:protocol name="dubbo" port="-1"/>
<dubbo:protocol name="rest" port="-1"/>
<bean id="demoService" class="org.apache.dubbo.config.spring.propertyconfigurer.provider.HelloServiceImpl"/>
<dubbo:service interface="org.apache.dubbo.config.spring.api.HelloService" timeout="3000"
group="${biz.group:abc}" ref="demoService" registry="registry1" protocol="dubbo"/>
</beans>

303
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/ReferenceKeyTest.java Normal file
View File

@ -0,0 +1,303 @@
/*
* 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.config.spring.reference;
import com.alibaba.spring.util.AnnotationUtils;
import org.apache.dubbo.config.annotation.Argument;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.impl.DemoServiceImpl;
import org.apache.dubbo.config.spring.impl.HelloServiceImpl;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.core.annotation.AnnotationAttributes;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.util.Map;
public class ReferenceKeyTest {
@Test
public void testReferenceKey() throws Exception {
String helloService1 = getReferenceKey("helloService");
String helloService2 = getReferenceKey("helloService2");
String helloService3 = getReferenceKey("helloService3");
String helloService4 = getReferenceKey("helloService4");
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(methods=[{name=sayHello, retries=0, timeout=100}])",
helloService1);
Assertions.assertEquals(helloService1, helloService2);
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(methods=[{arguments=[{callback=true, index=0}], name=sayHello, timeout=100}])",
helloService3);
Assertions.assertEquals(helloService3, helloService4);
String helloServiceWithArray0 = getReferenceKey("helloServiceWithArray0");
String helloServiceWithArray1 = getReferenceKey("helloServiceWithArray1");
String helloServiceWithArray2 = getReferenceKey("helloServiceWithArray2");
String helloServiceWithMethod1 = getReferenceKey("helloServiceWithMethod1");
String helloServiceWithMethod2 = getReferenceKey("helloServiceWithMethod2");
String helloServiceWithArgument1 = getReferenceKey("helloServiceWithArgument1");
String helloServiceWithArgument2 = getReferenceKey("helloServiceWithArgument2");
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(check=false,filter=[echo],parameters={a=2, b=1})",
helloServiceWithArray0);
Assertions.assertNotEquals(helloServiceWithArray0, helloServiceWithArray1);
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(check=false,filter=[echo],parameters={a=1, b=2})",
helloServiceWithArray1);
Assertions.assertEquals(helloServiceWithArray1, helloServiceWithArray2);
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(check=false,filter=[echo],methods=[{name=sayHello, parameters={c=1, d=2}, timeout=100}],parameters={a=1, b=2})",
helloServiceWithMethod1);
Assertions.assertEquals(helloServiceWithMethod1, helloServiceWithMethod2);
Assertions.assertEquals("ReferenceBean:org.apache.dubbo.config.spring.api.HelloService(check=false,filter=[echo],methods=[{arguments=[{callback=true, type=String}, {type=int}], name=sayHello, timeout=100}],parameters={a=1, b=2})",
helloServiceWithArgument1);
Assertions.assertEquals(helloServiceWithArgument1, helloServiceWithArgument2);
}
@Test
public void testConfig() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(2, referenceBeanMap.size());
Assertions.assertEquals("ReferenceBean:demo/org.apache.dubbo.config.spring.api.DemoService:1.2.3(consumer=my-consumer,init=false,methods=[{arguments=[{callback=true, index=0}], name=sayName, parameters={access-token=my-token, b=2}, retries=0}],parameters={connec.timeout=1000},protocol=dubbo,registryIds=my-registry,scope=remote,timeout=1000,url=dubbo://127.0.0.1:20813)",
referenceBeanMap.get("&demoService").getKey());
}
@Test
public void testConfig2() {
try {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration2.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.fail("Reference bean check failed");
} catch (BeansException e) {
String s = e.toString();
Assertions.assertTrue(s.contains("Already exists another reference bean with the same bean name and type but difference attributes"), getStackTrace(e));
Assertions.assertTrue(s.contains("ConsumerConfiguration2.demoService"), getStackTrace(e));
}
}
@Test
public void testConfig3() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration3.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(3, referenceBeanMap.size());
Assertions.assertNotNull(referenceBeanMap.get("&demoService#2"));
ConsumerConfiguration3 consumerConfiguration3 = context.getBean(ConsumerConfiguration3.class);
Assertions.assertEquals(consumerConfiguration3.demoService, consumerConfiguration3.helloService);
}
@Test
public void testConfig4() {
try {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration4.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.fail("Reference bean check failed");
} catch (BeansException e) {
Assertions.assertTrue(e.getMessage().contains("Duplicate spring bean id demoService"), getStackTrace(e));
}
}
@Test
public void testConfig5() {
try {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration5.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.fail("Reference bean check failed");
} catch (BeansException e) {
Assertions.assertTrue(e.getMessage().contains("Duplicate spring bean id demoService"), getStackTrace(e));
}
}
@Test
public void testConfig6() {
try {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration6.class);
context.start();
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.fail("Reference bean check failed");
} catch (BeansException e) {
String checkString = "Already exists another bean definition with the same bean name, but cannot rename the reference bean name";
Assertions.assertTrue(e.getMessage().contains(checkString), getStackTrace(e));
Assertions.assertTrue(e.getMessage().contains("ConsumerConfiguration6.demoService"), getStackTrace(e));
}
}
private String getStackTrace(Throwable ex) {
StringWriter stringWriter = new StringWriter();
ex.printStackTrace(new PrintWriter(stringWriter));
return stringWriter.toString();
}
private String getReferenceKey(String fieldName) throws NoSuchFieldException {
Field field = ReferenceConfiguration.class.getDeclaredField(fieldName);
AnnotationAttributes attributes = AnnotationUtils.getAnnotationAttributes(field, DubboReference.class, null, true);
ReferenceBeanSupport.convertReferenceProps(attributes, field.getType());
return ReferenceBeanSupport.generateReferenceKey(attributes, null);
}
static class ReferenceConfiguration {
@DubboReference(methods = @Method(name = "sayHello", timeout = 100, retries = 0))
private HelloService helloService;
@DubboReference(methods = @Method(timeout = 100, name = "sayHello", retries = 0))
private HelloService helloService2;
@DubboReference(methods = @Method(name = "sayHello", timeout = 100, arguments = @Argument(index = 0, callback = true)))
private HelloService helloService3;
@DubboReference(methods = @Method(arguments = @Argument(callback = true, index = 0), name = "sayHello", timeout = 100))
private HelloService helloService4;
// Instance 1
@DubboReference(check = false, parameters = {"a", "2", "b", "1"}, filter = {"echo"})
private HelloService helloServiceWithArray0;
// Instance 2
@DubboReference(check = false, parameters = {"a=1", "b", "2"}, filter = {"echo"})
private HelloService helloServiceWithArray1;
@DubboReference(parameters = {"b", "2", "a", "1"}, filter = {"echo"}, check = false)
private HelloService helloServiceWithArray2;
// Instance 3
@DubboReference(check = false, parameters = {"a", "1", "b", "2"}, filter = {"echo"}, methods = {@Method(parameters = {"d", "2", "c", "1"}, name = "sayHello", timeout = 100)})
private HelloService helloServiceWithMethod1;
@DubboReference(parameters = {"b=2", "a=1"}, filter = {"echo"}, check = false, methods = {@Method(name = "sayHello", timeout = 100, parameters = {"c", "1", "d", "2"})})
private HelloService helloServiceWithMethod2;
// Instance 4
@DubboReference(parameters = {"a", "1", "b", "2"}, filter = {"echo"}, methods = {@Method(name = "sayHello", arguments = {@Argument(callback = true, type = "String"), @Argument(callback = false, type = "int")}, timeout = 100)}, check = false)
private HelloService helloServiceWithArgument1;
@DubboReference(check = false, filter = {"echo"}, parameters = {"b", "2", "a", "1"}, methods = {@Method(name = "sayHello", timeout = 100, arguments = {@Argument(callback = false, type = "int"), @Argument(callback = true, type = "String")})})
private HelloService helloServiceWithArgument2;
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration {
//both are reference beans, same as xml config
@DubboReference(group = "demo", version = "1.2.3", consumer="my-consumer", init=false,
methods={@Method(arguments={@Argument(callback=true, index=0)}, name="sayName", parameters={"access-token", "my-token", "b", "2"}, retries=0)},
parameters={"connec.timeout", "1000"},
protocol="dubbo",
registry="my-registry",
scope="remote",
timeout=1000,
url="dubbo://127.0.0.1:20813")
private DemoService demoService;
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration2 {
//both are reference beans, same bean name and type, but difference attributes from xml config
@DubboReference(group = "demo", version = "1.2.3", consumer="my-consumer", init=false,
scope="local",
timeout=100)
private DemoService demoService;
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration3 {
//both are reference beans, same bean name but difference interface type
@DubboReference(group = "demo", version = "1.2.3", consumer="my-consumer", init=false,
url="dubbo://127.0.0.1:20813")
private HelloService demoService;
@Autowired
private HelloService helloService;
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration4 {
//not reference bean: same bean name and type
@Bean
public DemoService demoService() {
return new DemoServiceImpl();
}
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration5 {
//not reference bean: same bean name but difference type
@Bean
public HelloService demoService() {
return new HelloServiceImpl();
}
}
@Configuration
@ImportResource({"classpath:/org/apache/dubbo/config/spring/init-reference-keys.xml",
"classpath:/org/apache/dubbo/config/spring/init-reference-properties.xml"})
static class ConsumerConfiguration6 {
//both are reference beans, same bean name but difference interface type, fixed bean name
@DubboReference(id = "demoService", group = "demo", version = "1.2.3", consumer="my-consumer", init=false,
url="dubbo://127.0.0.1:20813")
private HelloService demoService;
// @Autowired
// private HelloService helloService;
}
}

285
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/javaconfig/JavaConfigReferenceBeanTest.java Normal file
View File

@ -0,0 +1,285 @@
/*
* 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.config.spring.reference.javaconfig;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.config.spring.reference.ReferenceBeanBuilder;
import org.apache.dubbo.rpc.service.GenericService;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class JavaConfigReferenceBeanTest {
@BeforeEach
public void setUp() {
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@Test
public void testAnnotationBean() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfig.class, AnnotationBeanConfiguration.class);
Map<String, HelloService> helloServiceMap = context.getBeansOfType(HelloService.class);
Assertions.assertEquals(1, helloServiceMap.size());
Assertions.assertNotNull(helloServiceMap.get("helloService"));
Map<String, GenericService> genericServiceMap = context.getBeansOfType(GenericService.class);
Assertions.assertEquals(1, genericServiceMap.size());
Assertions.assertNotNull(genericServiceMap.get("genericHelloService"));
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(2, referenceBeanMap.size());
ReferenceBean referenceBean = referenceBeanMap.get("&helloService");
Assertions.assertEquals("demo", referenceBean.getGroup());
Assertions.assertEquals(HelloService.class, referenceBean.getInterfaceClass());
Assertions.assertEquals(HelloService.class, referenceBean.getActualInterface());
ReferenceBean genericHelloServiceReferenceBean = referenceBeanMap.get("&genericHelloService");
Assertions.assertEquals("demo", genericHelloServiceReferenceBean.getGroup());
Assertions.assertEquals(GenericService.class, genericHelloServiceReferenceBean.getInterfaceClass());
Assertions.assertEquals(HelloService.class, genericHelloServiceReferenceBean.getActualInterface());
context.close();
}
@Test
public void testGenericReferenceBean() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfig.class, ReferenceBeanConfiguration.class);
Map<String, HelloService> helloServiceMap = context.getBeansOfType(HelloService.class);
Assertions.assertEquals(2, helloServiceMap.size());
Assertions.assertNotNull(helloServiceMap.get("helloService"));
Assertions.assertNotNull(helloServiceMap.get("helloService2"));
Map<String, GenericService> genericServiceMap = context.getBeansOfType(GenericService.class);
Assertions.assertEquals(1, genericServiceMap.size());
Assertions.assertNotNull(genericServiceMap.get("genericHelloService"));
Map<String, ReferenceBean> referenceBeanMap = context.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(3, referenceBeanMap.size());
ReferenceBean referenceBean = referenceBeanMap.get("&helloService");
Assertions.assertEquals(HelloService.class, referenceBean.getInterfaceClass());
Assertions.assertEquals(HelloService.class, referenceBean.getActualInterface());
ReferenceBean genericHelloServiceReferenceBean = referenceBeanMap.get("&genericHelloService");
Assertions.assertEquals("demo", genericHelloServiceReferenceBean.getGroup());
Assertions.assertEquals(GenericService.class, genericHelloServiceReferenceBean.getInterfaceClass());
Assertions.assertEquals(HelloService.class, genericHelloServiceReferenceBean.getActualInterface());
context.close();
}
@Test
public void testRawReferenceBean() {
AnnotationConfigApplicationContext context = null;
try {
context = new AnnotationConfigApplicationContext(ConsumerConfig.class, ReferenceBeanWithoutGenericTypeConfiguration.class);
Assertions.fail("Should not load application");
} catch (Exception e) {
String s = e.toString();
Assertions.assertTrue(s.contains("The ReferenceBean is missing necessary generic type"), s);
Assertions.assertTrue(s.contains("ReferenceBeanWithoutGenericTypeConfiguration#helloService()"), s);
} finally {
if (context != null) {
context.close();
}
}
}
@Test
public void testInconsistentBean() {
AnnotationConfigApplicationContext context = null;
try {
context = new AnnotationConfigApplicationContext(ConsumerConfig.class, InconsistentBeanConfiguration.class);
Assertions.fail("Should not load application");
} catch (Exception e) {
String s = e.toString();
Assertions.assertTrue(s.contains("@DubboReference annotation is inconsistent with the generic type of the ReferenceBean"), s);
Assertions.assertTrue(s.contains("ReferenceBean<org.apache.dubbo.config.spring.api.HelloService>"), s);
Assertions.assertTrue(s.contains("InconsistentBeanConfiguration#helloService()"), s);
} finally {
if (context != null) {
context.close();
}
}
}
@Test
public void testMissingGenericTypeBean() {
AnnotationConfigApplicationContext context = null;
try {
context = new AnnotationConfigApplicationContext(ConsumerConfig.class, MissingGenericTypeAnnotationBeanConfiguration.class);
Assertions.fail("Should not load application");
} catch (Exception e) {
String s = e.toString();
Assertions.assertTrue(s.contains("The ReferenceBean is missing necessary generic type"), s);
Assertions.assertTrue(s.contains("MissingGenericTypeAnnotationBeanConfiguration#helloService()"), s);
} finally {
if (context != null) {
context.close();
}
}
}
@Test
public void testMissingInterfaceTypeBean() {
AnnotationConfigApplicationContext context = null;
try {
context = new AnnotationConfigApplicationContext(ConsumerConfig.class, MissingInterfaceTypeAnnotationBeanConfiguration.class);
Assertions.fail("Should not load application");
} catch (Exception e) {
String s = e.toString();
Assertions.assertTrue(s.contains("The interface class or name of reference was not found"), s);
} finally {
if (context != null) {
context.close();
}
}
}
@Configuration
@EnableDubbo
@PropertySource("classpath:/org/apache/dubbo/config/spring/reference/javaconfig/consumer.properties")
public static class ConsumerConfig {
@Bean
public List<String> testBean(HelloService helloService) {
return Arrays.asList(helloService.getClass().getName());
}
}
@Configuration
public static class AnnotationBeanConfiguration {
@Bean
@DubboReference(group = "${myapp.group}", init = false)
public ReferenceBean<HelloService> helloService() {
return new ReferenceBean();
}
@Bean
@Reference(group = "${myapp.group}", interfaceClass = HelloService.class, init = false)
public ReferenceBean<GenericService> genericHelloService() {
return new ReferenceBean();
}
}
@Configuration
public static class ReferenceBeanConfiguration {
@Bean
public ReferenceBean<HelloService> helloService() {
return new ReferenceBeanBuilder()
.setGroup("${myapp.group}")
.setInit(false)
.build();
}
@Bean
public ReferenceBean<HelloService> helloService2() {
return new ReferenceBeanBuilder()
.setInit(false)
.build();
}
@Bean
public ReferenceBean<GenericService> genericHelloService() {
return new ReferenceBeanBuilder()
.setGroup("${myapp.group}")
.setInterface(HelloService.class)
.setInit(false)
.build();
}
}
@Configuration
public static class ReferenceBeanWithoutGenericTypeConfiguration {
// The ReferenceBean is missing necessary generic type
@Bean
public ReferenceBean helloService() {
return new ReferenceBeanBuilder()
.setGroup("${myapp.group}")
.setInterface(HelloService.class)
.build();
}
}
@Configuration
public static class InconsistentBeanConfiguration {
// The 'interfaceClass' or 'interfaceName' attribute value of @DubboReference annotation is inconsistent with
// the generic type of the ReferenceBean returned by the bean method.
@Bean
@DubboReference(group = "${myapp.group}", interfaceClass = DemoService.class)
public ReferenceBean<HelloService> helloService() {
return new ReferenceBean();
}
}
@Configuration
public static class MissingGenericTypeAnnotationBeanConfiguration {
// The ReferenceBean is missing necessary generic type
@Bean
@DubboReference(group = "${myapp.group}", interfaceClass = DemoService.class)
public ReferenceBean helloService() {
return new ReferenceBean();
}
}
@Configuration
public static class MissingInterfaceTypeAnnotationBeanConfiguration {
// The ReferenceBean is missing necessary generic type
@Bean
@DubboReference(group = "${myapp.group}")
public ReferenceBean<GenericService> helloService() {
return new ReferenceBean();
}
}
}

5
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/javaconfig/consumer.properties Normal file
View File

@ -0,0 +1,5 @@
dubbo.application.name=consumer-app
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=N/A
myapp.group=demo

74
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcall/LocalCallTest.java Normal file
View File

@ -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.config.spring.reference.localcall;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ZooKeeperServer;
import org.apache.dubbo.config.spring.api.HelloService;
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 org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(locations = {"classpath:/org/apache/dubbo/config/spring/reference/localcall/local-call-provider.xml",
"classpath:/org/apache/dubbo/config/spring/reference/localcall/local-call-consumer.xml"})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class LocalCallTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
ZooKeeperServer.start();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
//@Qualifier("localHelloService")
private HelloService localHelloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testLocalCall() {
// see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke
// InjvmInvoker set remote address to 127.0.0.1:0
String result = helloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
// direct call local service, the remote address is null
String originResult = localHelloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: null", originResult);
}
}

64
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcall/LocalCallTest2.java Normal file
View File

@ -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.config.spring.reference.localcall;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.api.HelloService;
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 org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@ExtendWith(SpringExtension.class)
@ContextConfiguration(locations = {"classpath:/org/apache/dubbo/config/spring/reference/localcall/local-call-provider.xml"})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class LocalCallTest2 {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@DubboReference
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testLocalCall() {
// see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke
// InjvmInvoker set remote address to 127.0.0.1:0
String result = helloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
}
}

30
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcall/LocalHelloServiceImpl.java Normal file
View File

@ -0,0 +1,30 @@
/*
* 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.config.spring.reference.localcall;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.rpc.RpcContext;
public class LocalHelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}

27
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcall/local-call-consumer.xml Normal file
View File

@ -0,0 +1,27 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<dubbo:reference id="helloService" interface="org.apache.dubbo.config.spring.api.HelloService"/>
</beans>

36
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcall/local-call-provider.xml Normal file
View File

@ -0,0 +1,36 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:property-placeholder/>
<dubbo:application name="demo-provider"/>
<dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<dubbo:protocol name="dubbo" port="20880"/>
<bean id="localHelloService" class="org.apache.dubbo.config.spring.reference.localcall.LocalHelloServiceImpl"/>
<dubbo:service interface="org.apache.dubbo.config.spring.api.HelloService" ref="localHelloService"/>
</beans>

84
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcalla/LocalCallReferenceAnnotationTest.java Normal file
View File

@ -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.config.spring.reference.localcalla;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.rpc.RpcContext;
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 org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@EnableDubbo
@ExtendWith(SpringExtension.class)
@PropertySource("classpath:/org/apache/dubbo/config/spring/reference/localcalla/local-call-config.properties")
@ContextConfiguration(classes = {LocalCallReferenceAnnotationTest.class, LocalCallReferenceAnnotationTest.LocalCallConfiguration.class})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class LocalCallReferenceAnnotationTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testLocalCall() {
// see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke
// InjvmInvoker set remote address to 127.0.0.1:0
String result = helloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
}
@Configuration
public static class LocalCallConfiguration {
@DubboReference(injvm = true)
private HelloService helloService;
}
@DubboService
public static class AnotherLocalHelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}
}

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcalla/local-call-config.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.application.name=local-call-demo
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=N/A

133
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcallam/LocalCallMultipleReferenceAnnotationsTest.java Normal file
View File

@ -0,0 +1,133 @@
/*
* 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.config.spring.reference.localcallam;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.rpc.RpcContext;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Map;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@EnableDubbo
@ExtendWith(SpringExtension.class)
@PropertySource("classpath:/org/apache/dubbo/config/spring/reference/localcallam/local-call-config.properties")
@ContextConfiguration(classes = {LocalCallMultipleReferenceAnnotationsTest.class, LocalCallMultipleReferenceAnnotationsTest.LocalCallConfiguration.class})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
public class LocalCallMultipleReferenceAnnotationsTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private HelloService demoHelloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testLocalCall() {
// see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke
// InjvmInvoker set remote address to 127.0.0.1:0
String result = helloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
String demoResult = demoHelloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", demoResult);
Map<String, ReferenceBean> referenceBeanMap = applicationContext.getBeansOfType(ReferenceBean.class);
Assertions.assertEquals(3, referenceBeanMap.size());
Assertions.assertTrue(referenceBeanMap.containsKey("&helloService"));
Assertions.assertTrue(referenceBeanMap.containsKey("&demoHelloService"));
Assertions.assertTrue(referenceBeanMap.containsKey("&helloService3"));
//helloService3 and demoHelloService share the same ReferenceConfig instance
ReferenceBean helloService3ReferenceBean = referenceBeanMap.get("&helloService3");
ReferenceBean demoHelloServiceReferenceBean = referenceBeanMap.get("&demoHelloService");
Assertions.assertTrue(helloService3ReferenceBean.getReferenceConfig() == demoHelloServiceReferenceBean.getReferenceConfig());
}
@Configuration
public static class LocalCallConfiguration {
@DubboReference
private HelloService helloService;
@DubboReference(group = "demo")
private HelloService demoHelloService;
@DubboReference(group = "${biz.group}")
private HelloService helloService3;
}
@Configuration
public static class LocalCallConfiguration2 {
@DubboReference
private HelloService helloService;
@DubboReference(group = "${biz.group}")
private HelloService demoHelloService;
}
@Configuration
public static class LocalCallConfiguration3 {
@DubboReference(group = "foo")
private HelloService demoHelloService;
}
@DubboService
public static class AnotherLocalHelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}
@DubboService(group = "demo")
public static class DemoHelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}
}

5
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcallam/local-call-config.properties Normal file
View File

@ -0,0 +1,5 @@
dubbo.application.name=local-call-demo
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=N/A
biz.group=demo

86
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcallmix/LocalCallReferenceMixTest.java Normal file
View File

@ -0,0 +1,86 @@
/*
* 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.config.spring.reference.localcallmix;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.api.HelloService;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.rpc.RpcContext;
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 org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@EnableDubbo
@ExtendWith(SpringExtension.class)
@PropertySource("classpath:/org/apache/dubbo/config/spring/reference/localcallmix/local-call-config.properties")
@ContextConfiguration(classes = {LocalCallReferenceMixTest.class, LocalCallReferenceMixTest.LocalCallConfiguration.class})
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@ImportResource("classpath:/org/apache/dubbo/config/spring/reference/localcallmix/local-call-consumer.xml")
public class LocalCallReferenceMixTest {
@BeforeAll
public static void setUp() {
DubboBootstrap.reset();
}
@AfterAll
public static void tearDown() {
DubboBootstrap.reset();
}
@Autowired
private HelloService helloService;
@Autowired
private ApplicationContext applicationContext;
@Test
public void testLocalCall() {
// see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke
// InjvmInvoker set remote address to 127.0.0.1:0
String result = helloService.sayHello("world");
Assertions.assertEquals("Hello world, response from provider: 127.0.0.1:0", result);
}
@Configuration
public static class LocalCallConfiguration {
@DubboReference(injvm = true)
private HelloService helloService;
}
@DubboService
public static class AnotherLocalHelloServiceImpl implements HelloService {
@Override
public String sayHello(String name) {
return "Hello " + name + ", response from provider: " + RpcContext.getContext().getLocalAddress();
}
}
}

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcallmix/local-call-config.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.application.name=local-call-demo
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=N/A

27
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/localcallmix/local-call-consumer.xml Normal file
View File

@ -0,0 +1,27 @@
<?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.
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<dubbo:reference id="helloService" interface="org.apache.dubbo.config.spring.api.HelloService"/>
</beans>

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/nacos/nacos/NacosServiceNameTest.java
View File

@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_CATEGORY;
import static org.apache.dubbo.registry.nacos.NacosServiceName.WILDCARD;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**

18
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java
View File

@ -19,20 +19,23 @@ package org.apache.dubbo.config.spring.schema;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.ImportResource;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD;
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = GenericServiceTest.class)
@DirtiesContext(classMode = AFTER_EACH_TEST_METHOD)
@ImportResource(locations = "classpath:/META-INF/spring/dubbo-generic-consumer.xml")
public class GenericServiceTest {
@ -41,8 +44,9 @@ public class GenericServiceTest {
DubboBootstrap.reset();
}
@After
@AfterEach
public void tearDown() {
DubboBootstrap.reset();
}
@Autowired

4
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/SpringStatusCheckerTest.java
View File

@ -20,8 +20,8 @@ import org.apache.dubbo.common.status.Status;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
import org.junit.Assert;
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.mockito.Mock;
@ -99,6 +99,6 @@ public class SpringStatusCheckerTest {
SpringExtensionFactory.addApplicationContext(context);
SpringStatusChecker checker = new SpringStatusChecker();
Status status = checker.check();
Assert.assertEquals(Status.Level.UNKNOWN, status.getLevel());
Assertions.assertEquals(Status.Level.UNKNOWN, status.getLevel());
}
}

2
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/init-reference.properties
View File

@ -1,5 +1,5 @@
# The properties for org/apache/dubbo/config/spring/init-reference*.xml
call.timeout=100
call.timeout=1000
connection.timeout=1000
sayName.retry=false

4
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/issues/issue6000/config.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.application.name=demo-6000
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=zookeeper://127.0.0.1:2181

8
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/issue-6252-test.properties → dubbo-config/dubbo-config-spring/src/test/resources/META-INF/issues/issue6252/config.properties
View File

@ -4,12 +4,12 @@ dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.scan.basePackages=com.example.demo
dubbo.consumer.check=false
dubbo.registries.z214.address=zookeeper://192.168.99.214:2181
dubbo.registries.z214.timeout=60000
dubbo.registries.z214.address=zookeeper://127.0.0.1:2181
dubbo.registries.z214.timeout=20000
dubbo.registries.z214.subscribe=false
dubbo.registries.z214.useAsConfigCenter=false
dubbo.registries.z214.useAsMetadataCenter=false
dubbo.registries.z205.address=zookeeper://192.168.99.205:2181
dubbo.registries.z205.timeout=60000
dubbo.registries.z205.address=zookeeper://127.0.0.1:2182
dubbo.registries.z205.timeout=20000
dubbo.registries.z205.useAsConfigCenter=false
dubbo.registries.z205.useAsMetadataCenter=false

4
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/issues/issue7003/config.properties Normal file
View File

@ -0,0 +1,4 @@
dubbo.application.name=demo-app
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.registry.address=zookeeper://127.0.0.1:2181

Some files were not shown because too many files have changed in this diff Show More