[incubator-dubbo] 04/04: Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git commit 701cf26d918f58095377d4682b0c5d13dce82895 Merge: 912498a 1ab215e Author: ken.lj AuthorDate: Tue Nov 20 14:36:21 2018 +0800 Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata .../main/java/org/apache/dubbo/common/Constants.java | 6 -- .../org/apache/dubbo/config/ReferenceConfig.java | 1 + .../java/org/apache/dubbo/config/ServiceConfig.java | 1 + .../metadata/integration/MetadataReportService.java | 2 +- .../apache/dubbo/metadata/store/MetadataReport.java | 4 +++- .../metadata/support/AbstractMetadataReport.java | 19 +++ .../support/AbstractMetadataReportFactoryTest.java | 4 ++-- .../metadata/support/AbstractMetadataReportTest.java | 20 ++-- .../store/redis/RedisMetadataReportTest.java | 8 ++-- .../store/zookeeper/ZookeeperMetadataReportTest.java | 9 ++--- 10 files changed, 49 insertions(+), 25 deletions(-)
[incubator-dubbo] 02/04: Split the Environment into two parts: Environment in Common and ConfigurationUtils in ConfigCenter
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 51146f726d38bc72b07547ddbf6de662976f2813
Author: ken.lj
AuthorDate: Tue Nov 20 14:33:35 2018 +0800
Split the Environment into two parts: Environment in Common and
ConfigurationUtils in ConfigCenter
---
.../condition/config/ConfigConditionRouter.java| 8 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 6 ++
.../apache/dubbo/common/config}/Environment.java | 64 +---
.../org/apache/dubbo/common/utils/ConfigUtils.java | 25 -
.../apache/dubbo/common/utils/ConfigUtilsTest.java | 27 -
.../org/apache/dubbo/config/AbstractConfig.java| 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 6 +-
.../apache/dubbo/config/ConfigCenterConfig.java| 2 +-
.../org/apache/dubbo/config/RegistryConfig.java| 4 +
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/spring/ConfigCenterBean.java | 8 +-
.../dubbo/configcenter/ConfigurationUtils.java | 112 +
.../dubbo/configcenter}/ConfigurationWrapper.java | 2 +-
.../dubbo/configcenter/DynamicConfiguration.java | 2 +-
dubbo-container/dubbo-container-log4j/pom.xml | 5 +
.../dubbo/container/log4j/Log4jContainer.java | 9 +-
.../META-INF/spring/dubbo-demo-consumer.xml| 6 +-
.../META-INF/spring/dubbo-demo-provider.xml| 6 +-
.../registry/integration/RegistryDirectory.java| 2 +-
.../registry/integration/RegistryProtocol.java | 6 +-
.../java/org/apache/dubbo/registry/ZKTools.java| 32 +++---
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 5 +
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java| 8 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 4 +-
.../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 4 +-
26 files changed, 190 insertions(+), 171 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java
index 3d994c7..f18254a 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ConfigConditionRouter.java
@@ -58,11 +58,9 @@ public class ConfigConditionRouter extends AbstractRouter
implements Configurati
this.configuration = configuration;
this.force = false;
this.url = url;
-String app = this.url.getParameter(Constants.APPLICATION_KEY);
-String serviceKey = this.url.getServiceKey();
try {
-String rawRule = this.configuration.getConfig(serviceKey +
Constants.ROUTERS_SUFFIX, this);
-String appRawRule = this.configuration.getConfig(app +
Constants.ROUTERS_SUFFIX, this);
+String rawRule =
this.configuration.getConfig(url.getEncodedServiceKey() +
Constants.ROUTERS_SUFFIX, this);
+String appRawRule =
this.configuration.getConfig(url.getParameter(Constants.APPLICATION_KEY) +
Constants.ROUTERS_SUFFIX, this);
if (!StringUtils.isEmpty(rawRule)) {
try {
routerRule = ConditionRuleParser.parse(rawRule);
@@ -81,7 +79,7 @@ public class ConfigConditionRouter extends AbstractRouter
implements Configurati
}
} catch (Exception e) {
-throw new IllegalStateException("Failed to init the condition
router for service " + serviceKey + ", application " + app, e);
+throw new IllegalStateException("Failed to init the condition
router for service " + url.getServiceKey() + ", application " +
url.getParameter(Constants.APPLICATION_KEY), e);
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
index b0396bd..c94cb58 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
@@ -1285,6 +1285,12 @@ public /**final**/ class URL implements Serializable {
return new InetSocketAddress(host, port);
}
+public String getEncodedServiceKey() {
+String serviceKey = this.getServiceKey();
+serviceKey = serviceKey.replaceFirst("/", "*");
+return serviceKey;
+}
+
public String getServiceKey() {
String inf = getServiceInterface();
if (inf == null) {
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/Environment.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java
similarity index 65%
rename from
[incubator-dubbo] branch dev-metadata updated (1ab215e -> 701cf26)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 1ab215e add dubbo specification version into registry for ops
new c880720 if the registry type is zookeeper, use the address as default
configcenter address.
new 51146f7 Split the Environment into two parts: Environment in Common
and ConfigurationUtils in ConfigCenter
new 912498a empty rule protection: "" should not be treated as delete.
new 701cf26 Merge branch 'dev-metadata' of
https://github.com/apache/incubator-dubbo into dev-metadata
The 4 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.
Summary of changes:
.../condition/config/ConfigConditionRouter.java| 8 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 6 ++
.../apache/dubbo/common/config}/Environment.java | 64 +---
.../org/apache/dubbo/common/utils/ConfigUtils.java | 25 -
.../apache/dubbo/common/utils/ConfigUtilsTest.java | 27 -
.../org/apache/dubbo/config/AbstractConfig.java| 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 22 +++-
.../apache/dubbo/config/ConfigCenterConfig.java| 36 ++-
.../org/apache/dubbo/config/RegistryConfig.java| 20
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/spring/ConfigCenterBean.java | 27 -
.../dubbo/configcenter/ConfigurationUtils.java | 112 +
.../dubbo/configcenter}/ConfigurationWrapper.java | 2 +-
.../dubbo/configcenter/DynamicConfiguration.java | 2 +-
.../support/apollo/ApolloDynamicConfiguration.java | 6 +-
.../archaius/ArchaiusDynamicConfiguration.java | 9 +-
dubbo-container/dubbo-container-log4j/pom.xml | 5 +
.../dubbo/container/log4j/Log4jContainer.java | 9 +-
.../META-INF/spring/dubbo-demo-consumer.xml| 6 +-
.../META-INF/spring/dubbo-demo-provider.xml| 6 +-
.../registry/integration/RegistryDirectory.java| 2 +-
.../registry/integration/RegistryProtocol.java | 6 +-
.../java/org/apache/dubbo/registry/ZKTools.java| 32 +++---
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 5 +
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java| 8 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 4 +-
.../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 4 +-
28 files changed, 289 insertions(+), 172 deletions(-)
rename
{dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context =>
dubbo-common/src/main/java/org/apache/dubbo/common/config}/Environment.java
(65%)
create mode 100644
dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/ConfigurationUtils.java
rename
{dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context =>
dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter}/ConfigurationWrapper.java
(97%)
[incubator-dubbo] 01/04: if the registry type is zookeeper, use the address as default configcenter address.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit c880720724d27458475b638f9f70a0ebee5dd0b4
Author: ken.lj
AuthorDate: Mon Nov 19 19:50:42 2018 +0800
if the registry type is zookeeper, use the address as default configcenter
address.
---
.../dubbo/config/AbstractInterfaceConfig.java | 18
.../apache/dubbo/config/ConfigCenterConfig.java| 34 +-
.../org/apache/dubbo/config/RegistryConfig.java| 16 ++
.../dubbo/config/spring/ConfigCenterBean.java | 21 +
4 files changed, 88 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index b572f5e..34fc01f 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.extension.ExtensionLoader;
+import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.common.utils.ReflectUtils;
@@ -27,6 +28,7 @@ import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.common.utils.UrlUtils;
import org.apache.dubbo.config.context.Environment;
import org.apache.dubbo.config.support.Parameter;
+import org.apache.dubbo.configcenter.DynamicConfiguration;
import org.apache.dubbo.metadata.integration.MetadataReportService;
import org.apache.dubbo.monitor.MonitorFactory;
import org.apache.dubbo.monitor.MonitorService;
@@ -41,6 +43,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.apache.dubbo.common.Constants.APPLICATION_KEY;
@@ -150,6 +153,17 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
throw new IllegalStateException("No registry config found or
it's not a valid config!");
}
}
+
+// For compatibility purpose, use registry as the default config
center if there's no one specified explicitly.
+RegistryConfig registry = registries.get(0);
+if (registry.isZookeeperProtocol()) {
+Set loadedConfigurations =
ExtensionLoader.getExtensionLoader(DynamicConfiguration.class).getLoadedExtensionInstances();
+if (CollectionUtils.isEmpty(loadedConfigurations)) {
+ConfigCenterConfig configCenterConfig = new
ConfigCenterConfig();
+configCenterConfig.setProtocol(registry.getProtocol());
+configCenterConfig.setAddress(registry.getAddress());
+}
+}
}
@SuppressWarnings("deprecation")
@@ -209,6 +223,10 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
}
+protected void checkConfigCenter() {
+
+}
+
protected List loadRegistries(boolean provider) {
// check && override if necessary
checkRegistry();
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 f753126..3d7c212 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
@@ -54,6 +54,7 @@ public class ConfigCenterConfig extends AbstractConfig {
private String localconfigfile;
private ApplicationConfig application;
+private RegistryConfig registry;
// customized parameters
private Map parameters;
@@ -93,6 +94,11 @@ public class ConfigCenterConfig extends AbstractConfig {
// give jvm properties the chance to override local configs, e.g.,
-Ddubbo.configcenter.config.priority
refresh();
+// try to use registryConfig as the default configcenter, only applies
to zookeeper.
+if (!isValid() && registry != null && registry.isZookeeperProtocol()) {
+setAddress(registry.getAddress());
+setProtocol(registry.getProtocol());
+}
//checkConfigCenter();
URL url = toConfigUrl();
@@ -114,6 +120,10 @@ public class ConfigCenterConfig extends AbstractConfig {
address = Constants.ANYHOST_VALUE;
}
map.put(Constants.PATH_KEY, ConfigCenterConfig.class.getSimpleName());
+// use 'zookeeper' as the
[incubator-dubbo] 03/04: empty rule protection: "" should not be treated as delete.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 912498ab0830f9c7ae232fce58ed392489080ecc
Author: ken.lj
AuthorDate: Tue Nov 20 14:35:17 2018 +0800
empty rule protection: "" should not be treated as delete.
---
.../configcenter/support/apollo/ApolloDynamicConfiguration.java | 6 +-
.../support/archaius/ArchaiusDynamicConfiguration.java | 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
index ad16d50..f5f2cc0 100644
---
a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
+++
b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
@@ -133,7 +133,7 @@ public class ApolloDynamicConfiguration extends
AbstractDynamicConfiguration {
+private static final Logger logger =
LoggerFactory.getLogger(ArchaiusDynamicConfiguration.class);
public ArchaiusDynamicConfiguration() {
}
@@ -142,10 +145,14 @@ public class ArchaiusDynamicConfiguration extends
AbstractDynamicConfiguration
[incubator-dubbo-ops] branch metadata updated: change dependency
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/metadata by this push:
new bb795f7 change dependency
bb795f7 is described below
commit bb795f70e45abf3af9d9b8e28d6dcb3d87c45696
Author: nzomkxia
AuthorDate: Tue Nov 20 14:06:19 2018 +0800
change dependency
---
.../org/apache/dubbo/admin/data/config/GovernanceConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/GovernanceConfiguration.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/GovernanceConfiguration.java
index e5a38da..bbb0188 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/GovernanceConfiguration.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/data/config/GovernanceConfiguration.java
@@ -1,6 +1,6 @@
package org.apache.dubbo.admin.data.config;
-import org.apache.dubbo.governance.DynamicConfiguration;
+import org.apache.dubbo.configcenter.DynamicConfiguration;
public interface GovernanceConfiguration extends DynamicConfiguration {
[incubator-dubbo] branch master updated: [Dubbo-2798]fix apporiate NotWritablePropertyException (#2800)
This is an automated email from the ASF dual-hosted git repository.
victory 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 5ea6b33 [Dubbo-2798]fix apporiate NotWritablePropertyException (#2800)
5ea6b33 is described below
commit 5ea6b33f2b270d83c37726750e1395f0972636c0
Author: kexianjun
AuthorDate: Tue Nov 20 12:29:51 2018 +0800
[Dubbo-2798]fix apporiate NotWritablePropertyException (#2800)
fix #2798 .
'propertyname in java donot contain '-' but camel format'.
---
.../apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 e38d1af..73c1819 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
@@ -135,7 +135,8 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
&& Modifier.isPublic(setter.getModifiers())
&& setter.getParameterTypes().length == 1) {
Class type = setter.getParameterTypes()[0];
-String property =
StringUtils.camelToSplitName(name.substring(3, 4).toLowerCase() +
name.substring(4), "-");
+String propertyName = name.substring(3, 4).toLowerCase() +
name.substring(4);
+String property = StringUtils.camelToSplitName(propertyName,
"-");
props.add(property);
Method getter = null;
try {
@@ -223,7 +224,7 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
}
reference = new
RuntimeBeanReference(value);
}
-
beanDefinition.getPropertyValues().addPropertyValue(property, reference);
+
beanDefinition.getPropertyValues().addPropertyValue(propertyName, reference);
}
}
}
[incubator-dubbo-ops.wiki] branch master updated: Created 如何在Github上贡献代码 (markdown)
This is an automated email from the ASF dual-hosted git repository. mjk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.wiki.git The following commit(s) were added to refs/heads/master by this push: new 2957c74 Created 如何在Github上贡献代码 (markdown) 2957c74 is described below commit 2957c741e0b9e638504c9a1c60f4c4840a68544b Author: 马金凯 AuthorDate: Tue Nov 20 10:36:22 2018 +0800 Created 如何在Github上贡献代码 (markdown) --- ...264\241\347\214\256\344\273\243\347\240\201.md" | 67 ++ 1 file changed, 67 insertions(+) diff --git "a/\345\246\202\344\275\225\345\234\250Github\344\270\212\350\264\241\347\214\256\344\273\243\347\240\201.md" "b/\345\246\202\344\275\225\345\234\250Github\344\270\212\350\264\241\347\214\256\344\273\243\347\240\201.md" new file mode 100644 index 000..f47d5f2 --- /dev/null +++ "b/\345\246\202\344\275\225\345\234\250Github\344\270\212\350\264\241\347\214\256\344\273\243\347\240\201.md" @@ -0,0 +1,67 @@ +# 操作顺序 +1. 找到心仪的开源项目，Fork它，Star它 +2. 根据自己的项目地址Clone到本地 +3. 将被Fork的项目添加为upstream，用以跟踪其所有修改 +4. 创建一个新的分支（补丁/特性都可以，名称跟你要开发的内容相关） +5. 编写你的代码 +6. 提交N次代码（如果想把这N次提交合并成一次，显得漂亮一些的话，可以执行提交合并[1]） +7. 将创建的分支推送到origin +8. 在Github上面发起Pull Request请求等待合并 +9. 如果代码被合并了，可以删除自己的分支 +10. 拉取upstream的最新提交 +11. 创建新的分支 +12. 将新分支rebase到upstream的最新提交点 +13. 重复5~12即可 + + [1] 提交合并 +我们在本地开发时，可以随时去提交写好的代码，但是这样会导致提交历史比较多，推送到远端或者发起Pull Request显得比较杂乱，这时我们就可以将几次提交或者全部提交合并成一次提交，执行顺序如下： +* 切换到需要合并提交的分支 +* 输入git rebase -i HEAD~N（N=你想合并的最后几次提交），看到如下输出： +```shell +pick 708fa0a commit message A +pick 8baaa26 commit message B +pick dba177a commit message C + +# Rebase 2d2fb07..bfa62a9 onto 2d2fb07 (3 command(s)) +# +# Commands: +# p, pick = use commit +# r, reword = use commit, but edit the commit message +# e, edit = use commit, but stop for amending +# s, squash = use commit, but meld into previous commit +# f, fixup = like "squash", but discard this commit's log message +# x, exec = run command (the rest of the line) using shell +# d, drop = remove commit +# +# These lines can be re-ordered; they are executed from top to bottom. +# +# If you remove a line here THAT COMMIT WILL BE LOST. +# +# However, if you remove everything, the rebase will be aborted. +# +# Note that empty commits are commented out +``` + +* 根据Commands注释修改成你想要的效果，例如： +```shell +pick 708fa0a commit message A +squash 8baaa26 commit message B +squash dba177a commit message C + +# ... +``` +* 输入:wq保存退出，会出现如下提交信息： +```shell +# This is a combination of 3 commits. +# The first commit's message is: +commit message A + +# This is the 2nd commit message: +commit message B + +# This is the 3rd commit message: +commit message C +``` +* 根据实际情况修改提交信息 +* 再次输入:wq就会看到合并完毕的提示信息 +* 这时候Rebase合并就成功了，并且三次提交也合并在一起成为一次提交 \ No newline at end of file
[incubator-dubbo] branch dev-metadata updated: modify consumer metadatareport: param type from string to map
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/dev-metadata by this push:
new 0aebefe modify consumer metadatareport: param type from string to map
0aebefe is described below
commit 0aebefec3d4653c5144e4e68e77049d7b1198b1d
Author: cvictory
AuthorDate: Tue Nov 20 10:00:11 2018 +0800
modify consumer metadatareport: param type from string to map
---
.../metadata/integration/MetadataReportService.java | 2 +-
.../apache/dubbo/metadata/store/MetadataReport.java | 4 +++-
.../metadata/support/AbstractMetadataReport.java | 19 +++
.../support/AbstractMetadataReportFactoryTest.java | 4 ++--
.../metadata/support/AbstractMetadataReportTest.java | 20 ++--
.../store/redis/RedisMetadataReportTest.java | 8 ++--
.../store/zookeeper/ZookeeperMetadataReportTest.java | 9 ++---
7 files changed, 43 insertions(+), 23 deletions(-)
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
index 10c0942..3ff7b2d 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
@@ -97,7 +97,7 @@ public class MetadataReportService {
consumerURL = consumerURL.removeParameters(Constants.PID_KEY,
Constants.TIMESTAMP_KEY, Constants.BIND_IP_KEY, Constants.BIND_PORT_KEY,
Constants.TIMESTAMP_KEY);
metadataReport.storeConsumerMetadata(new
ConsumerMetadataIdentifier(consumerURL.getServiceInterface(),
consumerURL.getParameter(Constants.VERSION_KEY),
consumerURL.getParameter(Constants.GROUP_KEY),
-consumerURL.getParameter(Constants.APPLICATION_KEY)),
consumerURL.toParameterString());
+consumerURL.getParameter(Constants.APPLICATION_KEY)),
consumerURL.getParameters());
}
}
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
index fa60496..8857e4b 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/store/MetadataReport.java
@@ -21,6 +21,8 @@ import
org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
import org.apache.dubbo.metadata.identifier.ConsumerMetadataIdentifier;
import org.apache.dubbo.metadata.identifier.ProviderMetadataIdentifier;
+import java.util.Map;
+
/**
*/
public interface MetadataReport {
@@ -30,6 +32,6 @@ public interface MetadataReport {
void storeProviderMetadata(ProviderMetadataIdentifier
providerMetadataIdentifier, FullServiceDefinition serviceDefinition);
-void storeConsumerMetadata(ConsumerMetadataIdentifier
consumerMetadataIdentifier, String serviceParameterString);
+void storeConsumerMetadata(ConsumerMetadataIdentifier
consumerMetadataIdentifier, Map serviceParameterMap);
}
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
index d664dd5..044a6da 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
@@ -248,20 +248,23 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
}
}
-public void storeConsumerMetadata(ConsumerMetadataIdentifier
consumerMetadataIdentifier, String serviceParameterString) {
+public void storeConsumerMetadata(ConsumerMetadataIdentifier
consumerMetadataIdentifier, Map serviceParameterMap) {
try {
if (logger.isInfoEnabled()) {
-logger.info("store consumer metadata. Identifier : " +
consumerMetadataIdentifier + "; definition: " + serviceParameterString);
+logger.info("store consumer metadata. Identifier : " +
consumerMetadataIdentifier + "; definition: " + serviceParameterMap);
}
-allMetadataReports.put(consumerMetadataIdentifier,
serviceParameterString);
+
[incubator-dubbo.wiki] branch master updated: Updated Label an Issue (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 0d8cb71 Updated Label an Issue (markdown) 0d8cb71 is described below commit 0d8cb71579d420afab0a9fa87f7aff1e1b2b246d Author: Xin Wang AuthorDate: Mon Nov 19 22:44:08 2018 +0800 Updated Label an Issue (markdown) --- Label-an-Issue.md | 29 + 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/Label-an-Issue.md b/Label-an-Issue.md index 5f8d8ea..af70615 100644 --- a/Label-an-Issue.md +++ b/Label-an-Issue.md @@ -1,28 +1 @@ -If you are handling an issue, remember to **mark the issue cearly with one or more labels** whenever you think it's meaningful. With labels on, other developers can easily recognize problems, classify them or track progress. - -For issues or pull requests that need coding and further version release to fix, you should always **mark it with a [milestone](https://github.com/apache/incubator-dubbo/milestones)**. - -Some frequently used labels: -* Help Wanted - * help wanted - * good first issue - -* Prority - * priority/blocker - * priority/high - * priority/low - * priority/normal - -* Status - * status/need-triage - * status/DO-NOT-MERGE - * status/READY-TO-MERGE - * status/invalid - * status/wontfix - -* Type - * type/bug - * type/documentation - * type/enhancement - * type/feature - +Label an Issue has been migrated to http://dubbo.apache.org/en-us/docs/developers/committer-guide/label-an-issue-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated New Committer Guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 5fac32c Updated New Committer Guide (markdown) 5fac32c is described below commit 5fac32c853ef7cc1ac1032779c577a97f1026220 Author: Xin Wang AuthorDate: Mon Nov 19 22:43:35 2018 +0800 Updated New Committer Guide (markdown) --- New-Committer-Guide.md | 89 +- 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/New-Committer-Guide.md b/New-Committer-Guide.md index ac29273..e5988fd 100644 --- a/New-Committer-Guide.md +++ b/New-Committer-Guide.md @@ -1,88 +1 @@ -# Apache Committer Guide - -## First: How to become a committer - -### Initial committers at the project incubator stage -At the project incubator stage, there will be an initial committers list in the proposal of the incubator project. Confirm that you are one of the initial committers. After the vote is passed in the Apache incubator community, these committers can start preparing their account. See [incubator wiki](https://wiki.apache.org/incubator/) for details. - -### The active contributor is elected as a committer -At the late development stage, an active contributor can be elected as a committer. See [how to become a committer](https://www.apache.org/dev/new-committers-guide.html#becoming-a-committer) - -## Second: The individual contributor signs ICLA - -### 1, Apache ID -Choose a Apache ID not in the [apache committers list page](http://people.apache.org/committer-index.html). - -### 2, Individual Contributor License Agreement (ICLA): -Download the [ICLA template](https://www.apache.org/licenses/icla.pdf). After filling the icla.pdf with personal information correctly, print, sign, scan, and send it in mail as an attachment to the secretary secret...@apache.org, the secretary will help to create the Apache user ID. At the same time, a your...@apache.org mailbox will be created. You can see if the user has been created on the [apache committers list page (http://people.apache.org/committer-index.html). - -## Third: Join The Apache Developer Group - -* 1, login via the [Apache account tool](https://id.apache.org/), when you login at the first time, you can select the "Change password?" checkbox to get the initial password. Then the initial password will be sent to the forward mailbox (the developer mail recorded in the project incubator proposal) - -* 2, about Apache mailbox: does not have its own mail content storage server. It needs to borrow the mail content storage and mail sending functions of other mail providers. In many voting sessions, Apache mailbox is recommended. - -There is a question about how to configure the apache.org mailbox forwarding function using other mailboxes. - -1) inbox: to receive mails that sent to youer...@apache.org mailbox. The forward mailbox configured in the Apache account tool in the first step can use the forward mailbox to pick up incoming mail. - -2) the Outbox: emails sent out will show the sender as your...@apache.org account. Please refer to: [set up Apache mailbox guide](https://reference.apache.org/committer/email) and [Gmail mailbox setting](http://gmailblog.blogspot.com/2009/07/send-mail-from-another-address-without.html). In other mailbox service settings, this forwarding mode is not easy to find. Gmail is the most convenient, which is recommended (no advertising). - -* 3, Modify the homepage URL option in the edit page, homepage link of your account can be added in [apache committer index page](http://people.apache.org/committer-index.html) - -* 4, Modify the GitHub account in the edit page, and an email will be sent to invite you to join the github.com/apache-commiiters group. Now, please learn from the way [ASF works](http://www.apache.org/foundation/how-it-works.html#developers) to do some basic preparation of ASF development. - -## Fourth: To obtain write permission of the project - -Operation of the [GitBox account link tool](https://gitbox.apache.org/setup/) - -### 1, Apache account authorization - -According to the prompt, the OAuth protocol of Apache account is authorized to login. - -### 2, Github account authorization - -According to the prompt, the OAuth protocol of Github account is authorized to login. - -### 3, Set up GitHub account in github.com, two-factors authorization (2FA) - -* 1) install "Google Authenticator" app on your cell phone -* 2), Following the [authorized GitHub 2FA wiki](https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/), you can operation step by step . - -In the [two-factors authorization authentication (2. Scan this barcode with your app.)](https://github.com/settings/two_factor_authentication/verify) page, it is not recommended to select a
[incubator-dubbo.wiki] branch master updated: Updated CLA signing guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new e7cee43 Updated CLA signing guide (markdown) e7cee43 is described below commit e7cee4320df52244a0040469c9bc5c6838f37824 Author: Xin Wang AuthorDate: Mon Nov 19 22:41:44 2018 +0800 Updated CLA signing guide (markdown) --- CLA-signing-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLA-signing-guide.md b/CLA-signing-guide.md index 94a2bff..20ca703 100644 --- a/CLA-signing-guide.md +++ b/CLA-signing-guide.md @@ -1 +1 @@ -CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file +CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/cla-signing-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated Mailing list subscription guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new c3273de Updated Mailing list subscription guide (markdown) c3273de is described below commit c3273def1bf736c59a7f073b55b1f84f2272e67c Author: Xin Wang AuthorDate: Mon Nov 19 22:41:18 2018 +0800 Updated Mailing list subscription guide (markdown) --- Mailing-list-subscription-guide.md | 77 +- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/Mailing-list-subscription-guide.md b/Mailing-list-subscription-guide.md index 1def3f0..035711a 100644 --- a/Mailing-list-subscription-guide.md +++ b/Mailing-list-subscription-guide.md @@ -1,76 +1 @@ -The Dubbo developer mailing list (d...@dubbo.incubator.apache.org) for Apache Incubator has been established, please feel free to subscribe and refer to [1] for more details. - -Here is a brief guide specific to Dubbo: - -1. Send an email to dev-subscr...@dubbo.incubator.apache.org, you can have empty subject and empty content. You will receive an email with the following content: - -``` -from: dev-h...@dubbo.apache.org -reply-to: dev-sc.xxx.-hello=example@dubbo.apache.org -to: he...@example.com -date: Sat, Feb 24, 2018 at 3:12 PM -subject: confirm subscribe to d...@dubbo.apache.org -mailed-by: apache.org - -Hi! This is the ezmlm program. I'm managing the -d...@dubbo.apache.org mailing list. - -I'm working for my owner, who can be reached -at dev-ow...@dubbo.apache.org. - -To confirm that you would like - - he...@example.com - -added to the dev mailing list, please send -a short reply to this address: - - dev-sc.xxx.-hello=example@dubbo.apache.org - -Usually, this happens when you just hit the "reply" button. -If this does not work, simply copy the address and paste it into -the "To:" field of a new message. - -or click here: -mailto:dev-sc.xxx.-hello=example@dubbo.apache.org - -... -``` - -2. Reply the email directly, you can have empty subject and empty content. You will receive an email with the following content: - -``` -from: dev-h...@dubbo.apache.org -to: he...@example.com -date: Sat, Feb 24, 2018 at 3:14 PM -subject: WELCOME to d...@dubbo.apache.org -mailed-by: apache.org - -Hi! This is the ezmlm program. I'm managing the -d...@dubbo.apache.org mailing list. - -I'm working for my owner, who can be reached -at dev-ow...@dubbo.apache.org. - -Acknowledgment: I have added the address - - he...@example.com - -to the dev mailing list. - -Welcome to d...@dubbo.apache.org! - -Please save this message so that you know the address you are -subscribed under, in case you later want to unsubscribe or change your -subscription address. - -... -``` - -3. After that, you will receive any email that is posted to this mailing list. If you have any further questions, just send email to d...@dubbo.incubator.apache.org and hopefully someone will answer your questions. - -4. If you want to unsubscribe, just send an email to dev-unsubscr...@dubbo.incubator.apache.org, and follow the steps once you get an reply. - -> Note that both d...@dubbo.apache.org and d...@dubbo.incubator.apache.org should work, you can pick any of it. - -[1] http://apache.org/foundation/mailinglists.html#subscribing \ No newline at end of file +Mailing list subscription guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated CLA signing guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 57b4797 Updated CLA signing guide (markdown) 57b4797 is described below commit 57b4797190aacf8ffe17cd5072789308d5cd11b1 Author: Xin Wang AuthorDate: Mon Nov 19 22:40:25 2018 +0800 Updated CLA signing guide (markdown) --- CLA-signing-guide.md | 24 +--- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/CLA-signing-guide.md b/CLA-signing-guide.md index bf017ef..94a2bff 100644 --- a/CLA-signing-guide.md +++ b/CLA-signing-guide.md @@ -1,23 +1 @@ -You are required to sign the Apache ICLA under the following condition: -* You have made lots of contribution to Dubbo before Dubbo get donated to Apache, and you haven't sign the Alibaba-CLA before. -* You have made lots of contribution to Dubbo, and you are invited to become committer of Dubbo, and you have not signed Alibaba-CLA or Apache ICLA before. - - Steps - -* Download this [pdf](https://www.apache.org/licenses/icla.pdf) -* Fill in the necessary blanks -* Print it out -* Sign the printed file -* Scan it -* Send an email to secret...@apache.org and cc priv...@dubbo.apache.org: - * entitled with "ICLA submission" - * please also provide the link to your github account in the email body - * remember to add you ICLA as attachment. - - - Explanation to the fields - -* Mailing address: Your company address in English is preferred. -* preferred apache id(s): if you are invited to become committers, you have to choose one apache id, otherwise you can leave it blank. -* notify project: Dubbo (This means Dubbo is the project who notifies you to sign the ICLA) - +CLA signing guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/mailing-list-subscription-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated Test coverage guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 5c2508c Updated Test coverage guide (markdown) 5c2508c is described below commit 5c2508cee27a76640d407b91d27301b69125c6f5 Author: Xin Wang AuthorDate: Mon Nov 19 22:39:33 2018 +0800 Updated Test coverage guide (markdown) --- Test-coverage-guide.md | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Test-coverage-guide.md b/Test-coverage-guide.md index 18e9e05..7ca1a59 100644 --- a/Test-coverage-guide.md +++ b/Test-coverage-guide.md @@ -1,14 +1 @@ -### 1.The benefits of unit testing - * Unit test code can help everyone to go into details and understand the function of the code. - * We can find bugs by test case, and then enhance the robustness of the code. - * Test case code is also the demo usage of the core code. -### 2.Some design principle of unit test case - * Steps, fine-grained and combination conditions should be well designed. - * Attention to boundary condition test - * Test code should also be designed without writing useless code. - * When you find a `method` that is hard to write unit test, if you can be sure the `method` is "smelly code", then refactor it with the committer. - * The mock framework in dubbo is: [mockito](http://site.mockito.org/). Some tutorials:[mockito tutorial](http://www.baeldung.com/bdd-mockito),[mockito refcard](https://dzone.com/refcardz/mockito) - * TDD（optional）：When you start a new issue, you can try to write test case at first -### 3.The specified value of the test coverage - * In the stage, the test coverage specified value of delta changed codes is ：>=60%. The higher, the better. - * We can see the coverage report in this page: https://codecov.io/gh/apache/incubator-dubbo \ No newline at end of file +Test coverage guide has bean migrated http://dubbo.apache.org/en-us/docs/developers/contributor-guide/test-coverage-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated New contributor guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new 244ee1f Updated New contributor guide (markdown) 244ee1f is described below commit 244ee1f672a873bd47a3858a6e274e8cf9f96500 Author: Xin Wang AuthorDate: Mon Nov 19 22:37:14 2018 +0800 Updated New contributor guide (markdown) --- New-contributor-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/New-contributor-guide.md b/New-contributor-guide.md index f291f9a..457c397 100644 --- a/New-contributor-guide.md +++ b/New-contributor-guide.md @@ -1 +1 @@ - New contributor guide is moved to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file + New contributor guide has been migrated to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file
[incubator-dubbo.wiki] branch master updated: Updated New contributor guide (markdown)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.wiki.git The following commit(s) were added to refs/heads/master by this push: new ae6ecfd Updated New contributor guide (markdown) ae6ecfd is described below commit ae6ecfda63f13fe1ed24f0fd6c1d158a2f153139 Author: Xin Wang AuthorDate: Mon Nov 19 22:36:47 2018 +0800 Updated New contributor guide (markdown) --- New-contributor-guide.md | 33 + 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/New-contributor-guide.md b/New-contributor-guide.md index f49593c..f291f9a 100644 --- a/New-contributor-guide.md +++ b/New-contributor-guide.md @@ -1,32 +1 @@ -This is a guide for new comers who wants to contribute to Dubbo. - -### Subscribe to the mailing list - -The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [issue](https://github.com/apache/incubator-dubbo/issues/1393) for detailed documentation on how to subscribe. - -* d...@dubbo.incubator.apache.org: the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo. -* comm...@dubbo.incubator.apache.org: all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development. -* iss...@dubbo.incubator.apache.org: all the JIRA [issues](https://issues.apache.org/jira/projects/DUBBO/issues) and updates will be sent to this mailing list. The Dubbo community has decided to use github issues rather than JIRA issues, therefore it is expected that most of the issues will be tracked by github issues. The JIRA issues are used to track ASF related issues. - - -### Reporting issue - -### Sending pull request - -* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md) -* Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below: - -```sh -git remote add upstream g...@github.com:apache/incubator-dubbo.git -git fetch upstream -git rebase upstream/master -git checkout -b your_awesome_patch -... add some work -git push origin your_awesome_patch -``` - - -### Code convention - -Please check the [CONTRIBUTING.md](https://github.com/apache/incubator-dubbo/blob/master/CONTRIBUTING.md) for code convention. - + New contributor guide is moved to http://dubbo.apache.org/en-us/docs/developers/contributor-guide/new-contributor-guide_dev.html \ No newline at end of file
[incubator-dubbo] branch master updated: [REFACTOR]:[fix typo] (#2804)
This is an automated email from the ASF dual-hosted git repository.
carryxyh 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 026fa0b [REFACTOR]:[fix typo] (#2804)
026fa0b is described below
commit 026fa0b9f257d5186dadabf0a821a063f784ebd9
Author: Yangki Zhang
AuthorDate: Mon Nov 19 18:51:51 2018 +0800
[REFACTOR]:[fix typo] (#2804)
fix typos
---
dubbo-common/src/main/java/org/apache/dubbo/common/Version.java | 8
.../test/java/org/apache/dubbo/common/version/VersionTest.java| 8
.../main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
index 983cbb9..5c0ab76 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
@@ -41,9 +41,9 @@ public final class Version {
/**
* For protocol compatibility purpose.
- * Because {@link #isSupportResponseAttatchment} is checked for every
call, int compare expect to has higher performance than string.
+ * Because {@link #isSupportResponseAttachment} is checked for every call,
int compare expect to has higher performance than string.
*/
-private static final int LOWEST_VERSION_FOR_RESPONSE_ATTATCHMENT = 20002;
// 2.0.2
+private static final int LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT = 20002;
// 2.0.2
private static final Map VERSION2INT = new
HashMap();
static {
@@ -62,7 +62,7 @@ public final class Version {
return VERSION;
}
-public static boolean isSupportResponseAttatchment(String version) {
+public static boolean isSupportResponseAttachment(String version) {
if (version == null || version.length() == 0) {
return false;
}
@@ -72,7 +72,7 @@ public final class Version {
return false;
}
-return iVersion >= LOWEST_VERSION_FOR_RESPONSE_ATTATCHMENT;
+return iVersion >= LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT;
}
public static int getIntVersion(String version) {
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
index d03e698..a129f53 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
@@ -30,9 +30,9 @@ public class VersionTest {
}
@Test
-public void testSupportResponseAttatchment() {
-Assert.assertTrue(Version.isSupportResponseAttatchment("2.0.2"));
-Assert.assertTrue(Version.isSupportResponseAttatchment("2.0.3"));
-Assert.assertFalse(Version.isSupportResponseAttatchment("2.0.0"));
+public void testSupportResponseAttachment() {
+Assert.assertTrue(Version.isSupportResponseAttachment("2.0.2"));
+Assert.assertTrue(Version.isSupportResponseAttachment("2.0.3"));
+Assert.assertFalse(Version.isSupportResponseAttachment("2.0.0"));
}
}
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
index 60b36ee..d6a8e14 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
@@ -191,7 +191,7 @@ public class DubboCodec extends ExchangeCodec implements
Codec2 {
protected void encodeResponseData(Channel channel, ObjectOutput out,
Object data, String version) throws IOException {
Result result = (Result) data;
// currently, the version value in Response records the version of
Request
-boolean attach = Version.isSupportResponseAttatchment(version);
+boolean attach = Version.isSupportResponseAttachment(version);
Throwable th = result.getException();
if (th == null) {
Object ret = result.getValue();
[incubator-dubbo-website] branch asf-site updated: Update prepare-an-apache-release.md
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new d75270a Update prepare-an-apache-release.md d75270a is described below commit d75270a8a9d465d56b9b77a77e98948cb8fe63bd Author: ken.lj AuthorDate: Mon Nov 19 16:33:29 2018 +0800 Update prepare-an-apache-release.md --- blog/en-us/prepare-an-apache-release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blog/en-us/prepare-an-apache-release.md b/blog/en-us/prepare-an-apache-release.md index 8ed1f0d..4669958 100644 --- a/blog/en-us/prepare-an-apache-release.md +++ b/blog/en-us/prepare-an-apache-release.md @@ -322,7 +322,7 @@ The Apache Dubbo (Incubating) Team ## Official Release 1. Commit release package of https://dist.apache.org/repos/dist/dev/incubator/dubbo to https://dist.apache.org/repos/dist/release/incubator/dubbo/, complete official release。 -2. Send mail to d...@dubbo.apache.org and gene...@apache.org, notify the community that the release is completed. +2. Send mail to d...@dubbo.apache.org and gene...@incubator.apache.org, notify the community that the release is completed. ## Complete Maven Convenient Binary release（Optional）
[incubator-dubbo-website] branch asf-site updated: Update prepare-an-apache-release.md
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 67e7b4a Update prepare-an-apache-release.md
67e7b4a is described below
commit 67e7b4a3687342603955ddb2baed676754293f28
Author: ken.lj
AuthorDate: Mon Nov 19 16:32:44 2018 +0800
Update prepare-an-apache-release.md
---
blog/zh-cn/prepare-an-apache-release.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blog/zh-cn/prepare-an-apache-release.md
b/blog/zh-cn/prepare-an-apache-release.md
index 023c714..793d955 100644
--- a/blog/zh-cn/prepare-an-apache-release.md
+++ b/blog/zh-cn/prepare-an-apache-release.md
@@ -282,7 +282,7 @@ $ shasum -c
apache-dubbo-incubating-${release_version}-bin-release.zip.sha512
投票分两个阶段：
1.
Dubbo社区投票，发起投票邮件到d...@dubbo.apache.org。在社区开发者Review，并统计到3个同意发版的binding票后，即可进入下一阶段的投票。
-2. Apache社区投票，发起投票邮件到gene...@apache.org。在Apache PMC
Review，并统计到3个统一发版的binding票后，即可进行正式发布。
+2. Apache社区投票，发起投票邮件到gene...@incubator.apache.org。在Apache PMC
Review，并统计到3个统一发版的binding票后，即可进行正式发布。
Dubbo社区投票邮件模板：
