[incubator-dubbo] branch master updated: Changing tests to use singleton RegistryProtocol instead of making new instances (#3849)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 1706807 Changing tests to use singleton RegistryProtocol instead of
making new instances (#3849)
1706807 is described below
commit 1706807a1c9221fb13a24a8b318a56c699eea67d
Author: OrDTesters <44483852+ordtest...@users.noreply.github.com>
AuthorDate: Fri Apr 12 00:50:54 2019 -0500
Changing tests to use singleton RegistryProtocol instead of making new
instances (#3849)
---
.../org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
index f212a5c..f1669d3 100644
---
a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
+++
b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java
@@ -61,14 +61,14 @@ public class RegistryProtocolTest {
@Test
public void testDefaultPort() {
-RegistryProtocol registryProtocol = new RegistryProtocol();
+RegistryProtocol registryProtocol =
RegistryProtocol.getRegistryProtocol();
assertEquals(9090, registryProtocol.getDefaultPort());
}
@Test
public void testExportUrlNull() {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
-RegistryProtocol registryProtocol = new RegistryProtocol();
+RegistryProtocol registryProtocol =
RegistryProtocol.getRegistryProtocol();
registryProtocol.setCluster(new FailfastCluster());
Protocol dubboProtocol = DubboProtocol.getDubboProtocol();
@@ -81,7 +81,7 @@ public class RegistryProtocolTest {
@Test
public void testExport() {
-RegistryProtocol registryProtocol = new RegistryProtocol();
+RegistryProtocol registryProtocol =
RegistryProtocol.getRegistryProtocol();
registryProtocol.setCluster(new FailfastCluster());
registryProtocol.setRegistryFactory(ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension());
@@ -165,7 +165,7 @@ public class RegistryProtocolTest {
@Test
public void testGetParamsToRegistry() {
-RegistryProtocol registryProtocol = new RegistryProtocol();
+RegistryProtocol registryProtocol =
RegistryProtocol.getRegistryProtocol();
String[] additionalParams = new String[]{"key1", "key2"};
String[] registryParams =
registryProtocol.getParamsToRegistry(DEFAULT_REGISTER_PROVIDER_KEYS,
additionalParams);
String[] expectParams =
ArrayUtils.addAll(DEFAULT_REGISTER_PROVIDER_KEYS, additionalParams);
[incubator-dubbo] branch master updated: Revert #3688 config-center-config (#3853)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new a0f3408 Revert #3688 config-center-config (#3853)
a0f3408 is described below
commit a0f34086f2c7444fd4bcdf72f7ab577ec2e25fa6
Author: ken.lj
AuthorDate: Fri Apr 12 11:49:17 2019 +0800
Revert #3688 config-center-config (#3853)
---
.../java/org/apache/dubbo/config/ConfigCenterConfig.java | 16
.../java/org/apache/dubbo/config/support/Parameter.java | 15 +++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
index 4b88702..45677bf 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
@@ -95,7 +95,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.address = address;
}
-@Parameter(key = Constants.CONFIG_CLUSTER_KEY)
+@Parameter(key = Constants.CONFIG_CLUSTER_KEY, useKeyAsProperty = false)
public String getCluster() {
return cluster;
}
@@ -104,7 +104,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.cluster = cluster;
}
-@Parameter(key = Constants.CONFIG_NAMESPACE_KEY)
+@Parameter(key = Constants.CONFIG_NAMESPACE_KEY, useKeyAsProperty = false)
public String getNamespace() {
return namespace;
}
@@ -113,7 +113,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.namespace = namespace;
}
-@Parameter(key = Constants.CONFIG_GROUP_KEY)
+@Parameter(key = Constants.CONFIG_GROUP_KEY, useKeyAsProperty = false)
public String getGroup() {
return group;
}
@@ -122,7 +122,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.group = group;
}
-@Parameter(key = Constants.CONFIG_CHECK_KEY)
+@Parameter(key = Constants.CONFIG_CHECK_KEY, useKeyAsProperty = false)
public Boolean isCheck() {
return check;
}
@@ -131,7 +131,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.check = check;
}
-@Parameter(key = Constants.CONFIG_ENABLE_KEY)
+@Parameter(key = Constants.CONFIG_ENABLE_KEY, useKeyAsProperty = false)
public Boolean isHighestPriority() {
return highestPriority;
}
@@ -156,7 +156,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.password = password;
}
-@Parameter(key = Constants.CONFIG_TIMEOUT_KEY)
+@Parameter(key = Constants.CONFIG_TIMEOUT_KEY, useKeyAsProperty = false)
public Long getTimeout() {
return timeout;
}
@@ -165,7 +165,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.timeout = timeout;
}
-@Parameter(key = Constants.CONFIG_CONFIGFILE_KEY)
+@Parameter(key = Constants.CONFIG_CONFIGFILE_KEY, useKeyAsProperty = false)
public String getConfigFile() {
return configFile;
}
@@ -183,7 +183,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.appConfigFile = appConfigFile;
}
-@Parameter(key = Constants.CONFIG_APPNAME_KEY)
+@Parameter(key = Constants.CONFIG_APPNAME_KEY, useKeyAsProperty = false)
public String getAppName() {
return appName;
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java
index 029a491..c6ece12 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java
@@ -42,6 +42,21 @@ public @interface Parameter {
boolean append() default false;
+/**
+ * if {@link #key()} is specified, it will be used as the key for the
annotated property when generating url.
+ * by default, this key will also be used to retrieve the config value:
+ *
+ * {@code
+ * class ExampleConfig {
+ * // Dubbo will try to get "dubbo.example.alias_for_item=xxx" from
.properties, if you want to use the original property
+ * // "dubbo.example.item=xxx", you need to set
useKeyAsProperty=false.
+ * @Parameter(key = "alias_for_item")
+ * public getItem();
+ * }
+ * }
+ *
+ *
+ */
boolean useKeyAsProperty() default true;
}
\ No newline at end of file
[incubator-dubbo] branch master updated: polish code and fix (#3761) (#3838)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 47d3cbc polish code and fix (#3761) (#3838)
47d3cbc is described below
commit 47d3cbcdb4a0f6049590156512e4d6c45276c2d1
Author: Alex
AuthorDate: Fri Apr 12 11:39:38 2019 +0800
polish code and fix (#3761) (#3838)
---
README.md | 6 +++---
.../org/apache/dubbo/cache/support/expiring/ExpiringCache.java| 2 +-
.../java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java | 2 +-
.../main/java/org/apache/dubbo/cache/support/jcache/JCache.java | 2 +-
.../main/java/org/apache/dubbo/cache/support/lru/LruCache.java| 2 +-
.../apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java | 7 +--
.../org/apache/dubbo/validation/support/AbstractValidation.java | 2 +-
.../apache/dubbo/validation/support/jvalidation/JValidator.java | 8
.../dubbo/metadata/definition/builder/CollectionTypeBuilder.java | 2 +-
.../apache/dubbo/metadata/definition/builder/EnumTypeBuilder.java | 2 +-
.../apache/dubbo/metadata/definition/builder/MapTypeBuilder.java | 3 +--
.../apache/dubbo/metadata/definition/model/MethodDefinition.java | 2 +-
.../apache/dubbo/metadata/definition/model/ServiceDefinition.java | 4 ++--
.../apache/dubbo/metadata/definition/model/TypeDefinition.java| 4 ++--
.../org/apache/dubbo/metadata/definition/util/ClassUtils.java | 2 +-
.../dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java | 8
16 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/README.md b/README.md
index 2323272..513da15 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ public class GreetingServiceImpl implements GreetingService {
}
```
-*See
[provider/GreetingServiceImpl.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java)
on GitHub.*
+*See
[provider/GreetingServiceImpl.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/server/GreetingsServiceImpl.java)
on GitHub.*
### Start service provider
@@ -115,7 +115,7 @@ public class Application {
}
```
-*See
[provider/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java)
on GitHub.*
+*See
[provider/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/server/Application.java)
on GitHub.*
### Build and run the provider
@@ -155,7 +155,7 @@ public class Application {
The consumer will print out `Hello world` on the screen.
-*See
[consumer/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/consumer/Application.java)
on GitHub.*
+*See
[consumer/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java)
on GitHub.*
### Next steps
diff --git
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
index 9295718..afaf8c6 100644
---
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
+++
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java
@@ -48,7 +48,7 @@ public class ExpiringCache implements Cache {
final int secondsToLive = url.getParameter("cache.seconds", 180);
// Cache check interval (second)
final int intervalSeconds = url.getParameter("cache.interval", 4);
-ExpiringMap expiringMap = new ExpiringMap(secondsToLive, intervalSeconds);
+ExpiringMap expiringMap = new
ExpiringMap<>(secondsToLive, intervalSeconds);
expiringMap.getExpireThread().startExpiryIfNotStarted();
this.store = expiringMap;
}
diff --git
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
index 381a43a..8f25c8d 100644
---
a/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
+++
b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java
@@ -60,7 +60,7 @@ public class ExpiringMap implements Map {
}
public ExpiringMap(int timeToLive, int
[incubator-dubbo] branch master updated: code rule (#3651)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 84d355f code rule (#3651)
84d355f is described below
commit 84d355fb1b553c7c5f01357069b13d434f60e53c
Author: Wang jie <260072...@qq.com>
AuthorDate: Fri Apr 12 11:37:03 2019 +0800
code rule (#3651)
---
.../cluster/configurator/AbstractConfigurator.java | 1 -
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 1 +
.../dubbo/config/builders/AbstractBuilder.java | 8 ++-
.../config/builders/AbstractInterfaceBuilder.java | 81 --
.../config/builders/AbstractMethodBuilder.java | 49 +
.../config/builders/AbstractReferenceBuilder.java | 37 +++---
.../config/builders/AbstractServiceBuilder.java| 69 +-
.../dubbo/config/builders/ApplicationBuilder.java | 4 +-
.../apache/dubbo/registry/etcd/EtcdRegistry.java | 1 +
.../dubbo/remoting/etcd/AbstractRetryPolicy.java | 1 +
.../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 24 +--
.../remoting/etcd/jetcd/JEtcdClientWrapper.java| 21 --
.../dubbo/remoting/etcd/jetcd/RetryLoops.java | 8 ++-
.../dubbo/remoting/etcd/option/OptionUtil.java | 4 +-
.../remoting/etcd/support/AbstractEtcdClient.java | 10 +++
15 files changed, 243 insertions(+), 76 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
index 0134173..5e53b1b 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
@@ -28,7 +28,6 @@ import java.util.Set;
/**
* AbstractOverrideConfigurator
- *
*/
public abstract class AbstractConfigurator implements Configurator {
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
index 8811f59..5ad026f 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
@@ -24,6 +24,7 @@ public interface Invoker extends
org.apache.dubbo.rpc.Invoker {
Result invoke(Invocation invocation) throws RpcException;
+@Override
URL getUrl();
default org.apache.dubbo.rpc.Invoker getOriginal() {
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
index 404483e..d1e33c6 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
@@ -63,7 +63,11 @@ public abstract class AbstractBuilder {
if (state == StateListener.CONNECTED) {
try {
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
index f626202..b084ba3 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
@@ -24,6 +24,7 @@ public abstract class AbstractRetryPolicy implements
RetryPolicy {
this.maxRetried = maxRetried;
}
+@Override
public boolean shouldRetry(int retried, long elapsed, boolean sleep) {
if (retried < maxRetried) {
try {
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
index ff4c118..634a6ed 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
@@ -235,12 +235,16 @@ public class JEtcdClient extends
AbstractEtcdClient {
switch (event.getType()) {
case PUT: {
if (((service = find(event)) != null)
-&& safeUpdate(service, true)) modified++;
+&& safeUpdate(service, true)) {
+modified++;
+}
break;
[incubator-dubbo] branch 3.x-dev updated: use maven CI friendly versions: revision, cherry-pick to 3.x. (#3852)
This is an automated email from the ASF dual-hosted git repository. huxing pushed a commit to branch 3.x-dev in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/3.x-dev by this push: new b26604f use maven CI friendly versions: revision, cherry-pick to 3.x. (#3852) b26604f is described below commit b26604ffb470b043bd9dbd215617ff94e59aa298 Author: ken.lj AuthorDate: Fri Apr 12 11:33:26 2019 +0800 use maven CI friendly versions: revision, cherry-pick to 3.x. (#3852) * use maven CI friendly versions: revision * add back mis-deleted files * bump version to 3.0.0-SNAPSHOT --- .mvn/wrapper/maven-wrapper.properties | 2 +- codestyle/checkstyle.xml | 2 +- dubbo-all/pom.xml | 19 +- dubbo-bom/pom.xml | 29 ++- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-compatible/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 264 +-- dubbo-config/pom.xml | 2 +- dubbo-configcenter/dubbo-configcenter-api/pom.xml | 2 +- .../dubbo-configcenter-apollo/pom.xml | 2 +- .../dubbo-configcenter-consul/pom.xml | 2 +- dubbo-configcenter/dubbo-configcenter-etcd/pom.xml | 2 +- .../dubbo-configcenter-zookeeper/pom.xml | 2 +- dubbo-configcenter/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml| 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml| 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml| 2 +- .../dubbo-demo-annotation-consumer/pom.xml | 2 +- .../dubbo-demo-annotation-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- .../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 2 +- .../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-interface/pom.xml| 2 +- .../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 2 +- .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 84 -- .../dubbo-dependencies-zookeeper/pom.xml | 46 +++- dubbo-dependencies/pom.xml | 35 ++- dubbo-distribution/pom.xml | 16 +- dubbo-distribution/src/assembly/source-release.xml | 1 + dubbo-filter/dubbo-filter-cache/pom.xml| 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- .../dubbo-metadata-definition/pom.xml | 2 +- .../dubbo-metadata-report-api/pom.xml | 2 +- .../dubbo-metadata-report-consul/pom.xml | 6 +- .../dubbo-metadata-report-redis/pom.xml| 2 +- .../dubbo-metadata-report-zookeeper/pom.xml| 2 +- dubbo-metadata-report/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml| 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-consul/pom.xml | 6 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-etcd3/pom.xml| 6 +- dubbo-registry/dubbo-registry-multicast/pom.xml| 2 +- .../dubbo-registry-nacos}/pom.xml | 282 +++-- dubbo-registry/dubbo-registry-redis/pom.xml| 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml| 2 +- dubbo-registry/pom.xml | 3 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-etcd3/pom.xml| 4 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml| 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 12 +- dubbo-remoting/pom.xml | 2 +-
[incubator-dubbo] branch master updated: Merge pull request #3862, bugfix/remove-parse-error-log, revert #3823.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 68e5522 Merge pull request #3862, bugfix/remove-parse-error-log,
revert #3823.
68e5522 is described below
commit 68e5522a64a422ebedfe3ad216247bbb4dbe5a79
Author: xujingfeng <250577...@qq.com>
AuthorDate: Fri Apr 12 11:16:54 2019 +0800
Merge pull request #3862, bugfix/remove-parse-error-log, revert #3823.
---
.../apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 3c69294..f5c2ab0 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -136,6 +136,7 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
String beanProperty = name.substring(3, 4).toLowerCase() +
name.substring(4);
String property = StringUtils.camelToSplitName(beanProperty,
"-");
props.add(property);
+// check the setter/getter whether match
Method getter = null;
try {
getter = beanClass.getMethod("get" + name.substring(3),
new Class[0]);
@@ -143,7 +144,8 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
try {
getter = beanClass.getMethod("is" + name.substring(3),
new Class[0]);
} catch (NoSuchMethodException e2) {
-logger.error("Method " + name + " parse error, cause:
" + e2.getMessage(), e2);
+// ignore, there is no need any log here since some
class implement the interface: EnvironmentAware,
+// ApplicationAware, etc. They only have setter
method, otherwise will cause the error log during application start up.
}
}
if (getter == null
[incubator-dubbo] branch master updated (af8ad8f -> b48a045)
This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from af8ad8f Complete xsd definition for ConfigCenterConfig and MetadataReporterConfig (#3854) add b48a045 Merge pull request #3859, correct maven dependencies configuration. No new revisions were added by this update. Summary of changes: README.md | 1 + 1 file changed, 1 insertion(+)
[incubator-dubbo-spring-boot-project] branch master updated: Update README_CN.md
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 43ec541 Update README_CN.md 43ec541 is described below commit 43ec541737e451b43b66a9072e5e0d57014bea1b Author: Mercy Ma AuthorDate: Thu Apr 11 17:44:47 2019 +0800 Update README_CN.md --- README_CN.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README_CN.md b/README_CN.md index e0d7d64..67f7b15 100644 --- a/README_CN.md +++ b/README_CN.md @@ -283,6 +283,8 @@ Dubbo Spring Boot 示例工程包括: - [自动装配](dubbo-spring-boot-samples/auto-configure-samples) - [外部化配置](dubbo-spring-boot-samples/externalized-configuration-samples) - [Zookeeper 注册中心](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples) +- [Nacos 注册中心](dubbo-spring-boot-samples/dubbo-registry-nacos-samples) + ## License
[incubator-dubbo-spring-boot-project] branch master updated: Add Nacos Samples (#489)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 6601aae Add Nacos Samples (#489) 6601aae is described below commit 6601aae0d1c5e33322a8cc54cd3794cc3f1f588e Author: Mercy Ma AuthorDate: Thu Apr 11 17:43:22 2019 +0800 Add Nacos Samples (#489) * Fix apache/incubator-dubbo-spring-boot-project#169 * correct some wrongly written chinese characters in the README_CN.md * 0.2.1 (#345) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish apache/incubator-dubbo-spring-boot-project#341 * 0.2.1 (#357) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish apache/incubator-dubbo-spring-boot-project#341 * Add the samples * Add a license * 0.2.1 (#360) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish
[incubator-dubbo-spring-boot-project] branch master updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 3320f2b Update README.md 3320f2b is described below commit 3320f2bdebd78790b0ae61e35b42b2544c9b8401 Author: Mercy Ma AuthorDate: Thu Apr 11 17:43:57 2019 +0800 Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b4d458a..4c2c83e 100644 --- a/README.md +++ b/README.md @@ -289,6 +289,8 @@ The samples project of Dubbo Spring Boot that includes: - [Auto-Configuaration Samples](dubbo-spring-boot-samples/auto-configure-samples) - [Externalized Configuration Samples](dubbo-spring-boot-samples/externalized-configuration-samples) - [Registry Zookeeper Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples) +- [Registry Nacos Samples](dubbo-spring-boot-samples/dubbo-registry-nacos-samples) + ## License
[incubator-dubbo] branch master updated: Complete xsd definition for ConfigCenterConfig and MetadataReporterConfig (#3854)
This is an automated email from the ASF dual-hosted git repository. huxing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/master by this push: new af8ad8f Complete xsd definition for ConfigCenterConfig and MetadataReporterConfig (#3854) af8ad8f is described below commit af8ad8f0c9ef3b90e75c9add1d592c93574f06d9 Author: ken.lj AuthorDate: Thu Apr 11 17:30:21 2019 +0800 Complete xsd definition for ConfigCenterConfig and MetadataReporterConfig (#3854) --- .../src/main/resources/META-INF/compat/dubbo.xsd | 5 + .../dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd | 10 ++ 2 files changed, 15 insertions(+) diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd index 4f0b1bf..6568ab1 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd @@ -1357,6 +1357,11 @@ + + + + + diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd index 41af239..03fe3f7 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd @@ -1371,12 +1371,22 @@ + + + + + + + + + +
[incubator-dubbo] branch revert-3688-config-center-config deleted (was 4aeccd9)
This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch revert-3688-config-center-config in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 4aeccd9 Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)" This change permanently discards the following revisions: discard 4aeccd9 Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)"
[incubator-dubbo] branch revert-3688-config-center-config created (now 4aeccd9)
This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch revert-3688-config-center-config in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. at 4aeccd9 Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)" This branch includes the following new commits: new 4aeccd9 Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-dubbo] 01/01: Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)"
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch revert-3688-config-center-config
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 4aeccd9aa84557471e191c3cc81590bc47d7767a
Author: ken.lj
AuthorDate: Thu Apr 11 15:49:30 2019 +0800
Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)"
This reverts commit ad5f9f909e6282381499e63070c6175014c81935.
---
.../java/org/apache/dubbo/config/ConfigCenterConfig.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
index 4b88702..45677bf 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
@@ -95,7 +95,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.address = address;
}
-@Parameter(key = Constants.CONFIG_CLUSTER_KEY)
+@Parameter(key = Constants.CONFIG_CLUSTER_KEY, useKeyAsProperty = false)
public String getCluster() {
return cluster;
}
@@ -104,7 +104,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.cluster = cluster;
}
-@Parameter(key = Constants.CONFIG_NAMESPACE_KEY)
+@Parameter(key = Constants.CONFIG_NAMESPACE_KEY, useKeyAsProperty = false)
public String getNamespace() {
return namespace;
}
@@ -113,7 +113,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.namespace = namespace;
}
-@Parameter(key = Constants.CONFIG_GROUP_KEY)
+@Parameter(key = Constants.CONFIG_GROUP_KEY, useKeyAsProperty = false)
public String getGroup() {
return group;
}
@@ -122,7 +122,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.group = group;
}
-@Parameter(key = Constants.CONFIG_CHECK_KEY)
+@Parameter(key = Constants.CONFIG_CHECK_KEY, useKeyAsProperty = false)
public Boolean isCheck() {
return check;
}
@@ -131,7 +131,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.check = check;
}
-@Parameter(key = Constants.CONFIG_ENABLE_KEY)
+@Parameter(key = Constants.CONFIG_ENABLE_KEY, useKeyAsProperty = false)
public Boolean isHighestPriority() {
return highestPriority;
}
@@ -156,7 +156,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.password = password;
}
-@Parameter(key = Constants.CONFIG_TIMEOUT_KEY)
+@Parameter(key = Constants.CONFIG_TIMEOUT_KEY, useKeyAsProperty = false)
public Long getTimeout() {
return timeout;
}
@@ -165,7 +165,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.timeout = timeout;
}
-@Parameter(key = Constants.CONFIG_CONFIGFILE_KEY)
+@Parameter(key = Constants.CONFIG_CONFIGFILE_KEY, useKeyAsProperty = false)
public String getConfigFile() {
return configFile;
}
@@ -183,7 +183,7 @@ public class ConfigCenterConfig extends AbstractConfig {
this.appConfigFile = appConfigFile;
}
-@Parameter(key = Constants.CONFIG_APPNAME_KEY)
+@Parameter(key = Constants.CONFIG_APPNAME_KEY, useKeyAsProperty = false)
public String getAppName() {
return appName;
}
