[dubbo] branch master updated: [DUBBO-3137]: get rid of ConfigConstants, RpcConstatns, RemotingConstants (#4138)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 28bea9c [DUBBO-3137]: get rid of ConfigConstants, RpcConstatns,
RemotingConstants (#4138)
28bea9c is described below
commit 28bea9c1871f65ce98a47bff9b7dd7afa710e338
Author: Ian Luo
AuthorDate: Tue May 28 13:48:50 2019 +0800
[DUBBO-3137]: get rid of ConfigConstants, RpcConstatns, RemotingConstants
(#4138)
* [DUBBO-3137]: get rid of ConfigConstants, RpcConstatns, RemotingConstants
* fix compilation error
* fix compilation issue
* let compatible constants to reference all constants
* use static imports
---
.../cluster/router/condition/ConditionRouter.java | 2 +-
.../dubbo/rpc/cluster/support/ClusterUtils.java| 2 +-
.../rpc/cluster/directory/MockDirInvocation.java | 2 +-
.../rpc/cluster/support/ClusterUtilsTest.java | 4 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 8 +-
.../dubbo/common/config/ConfigurationUtils.java| 4 +-
.../dubbo/common/constants/CommonConstants.java| 10 ++
.../{ConfigConstants.java => QosConstants.java}| 22 +
.../dubbo/common/constants/RemotingConstants.java | 7 --
.../dubbo/common/constants/RpcConstants.java | 103 -
.../org/apache/dubbo/common/utils/NetUtils.java| 2 +-
.../org/apache/dubbo/common/utils/UrlUtils.java| 23 +
.../common/config/ConfigurationUtilsTest.java | 2 +-
.../java/com/alibaba/dubbo/common/Constants.java | 21 -
.../com/alibaba/dubbo/common/utils/UrlUtils.java | 4 +-
.../apache/dubbo/config/ApplicationConfigTest.java | 4 +-
.../apache/dubbo/config/RegistryConfigTest.java| 2 +-
.../org/apache/dubbo/filter/LegacyInvocation.java | 2 +-
.../org/apache/dubbo/service/MockInvocation.java | 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 10 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 8 +-
.../org/apache/dubbo/config/ProtocolConfig.java| 6 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/RegistryConfig.java| 6 +-
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../apache/dubbo/config/annotation/Reference.java | 3 +-
.../apache/dubbo/config/annotation/Service.java| 5 +-
.../dubbo/config/AbstractInterfaceConfigTest.java | 4 +-
.../apache/dubbo/config/ApplicationConfigTest.java | 4 +-
.../apache/dubbo/config/RegistryConfigTest.java| 2 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 2 +-
.../config/spring/SimpleRegistryExporter.java | 4 +-
.../metadata/store/redis/RedisMetadataReport.java | 2 +-
.../org/apache/dubbo/monitor/MonitorService.java | 6 +-
.../dubbo/monitor/support/MonitorFilter.java | 4 +-
.../dubbo/monitor/dubbo/DubboMonitorFactory.java | 2 +-
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 2 +-
.../apache/dubbo/monitor/dubbo/StatisticsTest.java | 2 +-
.../dubbo/qos/protocol/QosProtocolWrapper.java | 6 +-
.../dubbo/qos/protocol/QosProtocolWrapperTest.java | 6 +-
.../registry/integration/RegistryDirectory.java| 2 +-
.../registry/integration/RegistryProtocol.java | 12 +--
.../dubbo/registry/dubbo/DubboRegistryFactory.java | 2 +-
.../registry/dubbo/RegistryDirectoryTest.java | 2 +-
.../registry/dubbo/SimpleRegistryExporter.java | 4 +-
.../dubbo/registry/redis/RedisRegistryTest.java| 2 +-
.../java/org/apache/dubbo/remoting/Constants.java | 5 +
.../support/header/HeaderExchangeClient.java | 4 +-
.../support/header/HeaderExchangeServer.java | 14 +--
.../exchange/support/header/HeartbeatHandler.java | 4 +-
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 27 +++---
.../dubbo/remoting/PerformanceClientFixedTest.java | 2 +-
.../dubbo/remoting/PerformanceClientTest.java | 2 +-
.../exchange/support/header/HeartBeatTaskTest.java | 2 +-
.../support/header/HeartbeatHandlerTest.java | 11 +--
.../transport/netty/ClientReconnectTest.java | 4 +-
.../transport/netty/NettyClientToServerTest.java | 8 +-
.../remoting/transport/netty4/NettyClient.java | 2 +-
.../remoting/transport/netty4/NettyServer.java | 2 +-
.../transport/netty4/ClientReconnectTest.java | 4 +-
.../transport/netty4/NettyClientToServerTest.java | 8 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 18
.../java/org/apache/dubbo/rpc/RpcConstants.java| 6 +-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 2 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 4 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 4 +-
.../dubbo/rpc/model/ConsumerMethodModel.java | 2 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 4
[dubbo-spring-boot-project] 01/01: Merge branch 'master' into master
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/dubbo-spring-boot-project.git commit d75ba20de93488c420ef384acbbd2934b3ee9490 Merge: 2960671 98bcc53 Author: Mercy Ma AuthorDate: Tue May 28 11:05:14 2019 +0800 Merge branch 'master' into master
[dubbo-spring-boot-project] branch master updated (2960671 -> d75ba20)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git.
from 2960671 2.7.x (#520)
add 1494a77 Fix apache/incubator-dubbo-spring-boot-project#169
add 0efa7c9 Merge remote-tracking branch 'upstream/master'
add 58e2c91 correct some wrongly written chinese characters in the
README_CN.md
add 531debd Merge remote-tracking branch 'upstream/master'
add 0f93efb Merge remote-tracking branch 'upstream/master'
add ac98c7b Remove spring.providers file from starter module (#403) (#404)
add d7ff623 add @Override annotation (#409)
add a02d6f1 to method reference (#410)
add e8f6b8f Update README.md
add 5adb2d8 Update README_CN.md
add b03d006 Update README_CN.md
add 9f5024d Update README.md
add d01cf26 0.2.1 (#345)
add 7021e60 0.2.1 (#346)
add 4cadcb6 0.2.1 (#357)
add b5957e5 Remove dubbo-spring-boot-sample-consumer
add dae4913 0.2.1 (#360)
add 4530413 Merge branch 'master' into 0.2.1
add 84ae184 0.2.1 (#367)
add 7ada763 0.2.1 (#372) (#374)
add 64095bc 0.2.1 (#378)
add 79e9fa8 0.2.1 (#389)
add ef626c8 Merge branch 'master' into 0.2.1-release
add 859b7ce Merge branch '0.2.x' into master
add 30154b5 Update README.md
add c98f371 Update README_CN.md
add 2dc44c9 Update README.md
add b77a096 Update README_CN.md
add 9729fa6 0.2.x (#422)
add 7d102eb Merge remote-tracking branch 'upstream/master'
add 73ad6b9 Sync master to 0.2.x (#417)
add d89ef99 Replace ${project.version} to ${revision} in the "pom.xml"
files
add 3de5a51 Update
add c539646 Merge branch 'master' into 0.2.x
add 1fea772 Merge remote-tracking branch 'upstream/0.2.x'
add 3797561 Merge remote-tracking branch 'upstream/master'
add 709d411 Merge branch 'master' into
incubator-dubbo-spring-boot-project-branch
add a14cd34 Merge pull request #1 from
feichangxinfu/incubator-dubbo-spring-boot-project-branch
add 033421d Polish apache/incubator-dubbo-spring-boot-project#449
add fa4c06a Polish apache/incubator-dubbo-spring-boot-project#467 : Set
"spring.main.allow-bean-definition-overriding" property to be true as default
add f705e64 Polish apache/incubator-dubbo-spring-boot-project#468 :
Upgrade Dubbo 2.7.1
add a18ed48 Polish apache/incubator-dubbo-spring-boot-project#437 :
Remove -XX:PermSize=64m -XX:MaxPermSize=128m
add 63d54c1 Fix the issues of test cases
add 367d707 Update Samples
add 31c6771 Update default version using Dubbo's version
add 4c5d205 Polish apache/incubator-dubbo-spring-boot-project#456 :
Update the Zookeeper dependencies
add 49aef0b Polish apache/incubator-dubbo-spring-boot-project#458 :
dubbo.metadata-report.address propertie description not provided
add 9429525 Polish apache/incubator-dubbo-spring-boot-project#458 :
dubbo.metadata-report.address propertie description not provided
add a5815ea Update 2.7.1
add 7bc44d2 Polish apache/incubator-dubbo-spring-boot-project#458 : Add
"override" property
add 7e0816c Polish apache/incubator-dubbo-spring-boot-project#451 :
Duplicate application configs
add fda8aca Bugfix
add 25f0b03 Update SNAPSHOT
add 006cadc Update 2.7.1
add af590e9 Remove uesless files in source code distribution.
add a67a728 2.7.0 release (#436)
add a39ea23 2.7.x (#470)
add bf928e2 Merge branch '2.7.x' into 2.7.x
add eb10705 Merge remote-tracking branch 'origin/2.7.x' into 2.7.x
add 4014a9c Merge pull request #4 from mercyblitz/2.7.x
add a4f21f0 Polish apache/incubator-dubbo-spring-boot-project#488
add 2c7b890 Update ASF License
add 98bcc53 Merge branch 'master' into master
new d75ba20 Merge branch 'master' into master
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.
Summary of changes:
[dubbo] branch 2.7.2-release created (now 3dd261a)
This is an automated email from the ASF dual-hosted git repository. victory pushed a change to branch 2.7.2-release in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 3dd261a [Dubbo-4147] restore the metadata store key change (#4170) No new revisions were added by this update.
[dubbo] branch master updated: [Dubbo-4147] restore the metadata store key change (#4170)
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 3dd261a [Dubbo-4147] restore the metadata store key change (#4170)
3dd261a is described below
commit 3dd261a4362332533dbc5fcac12151c8e334c362
Author: Huxing Zhang
AuthorDate: Mon May 27 17:32:36 2019 +0800
[Dubbo-4147] restore the metadata store key change (#4170)
---
.../org/apache/dubbo/metadata/identifier/MetadataIdentifier.java| 4 ++--
.../apache/dubbo/metadata/identifier/MetadataIdentifierTest.java| 6 ++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
index 3b20bc7..f9b7e4c 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
@@ -61,9 +61,9 @@ public class MetadataIdentifier {
public String getUniqueKey(KeyTypeEnum keyType) {
if (keyType == KeyTypeEnum.PATH) {
-return getFilePathKey() + PATH_SEPARATOR + DEFAULT_PATH_TAG;
+return getFilePathKey();
}
-return getIdentifierKey() + META_DATA_STORE_TAG;
+return getIdentifierKey();
}
public String getIdentifierKey() {
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
index cdb089b..2467571 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
@@ -35,17 +35,15 @@ public class MetadataIdentifierTest {
String group = null;
String application = "vic.zk.md";
MetadataIdentifier providerMetadataIdentifier = new
MetadataIdentifier(interfaceName, version, group, PROVIDER_SIDE, application);
-
System.out.println(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH));
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH),
"metadata" + PATH_SEPARATOR + interfaceName + PATH_SEPARATOR +
(version == null ? "" : (version + PATH_SEPARATOR))
+ (group == null ? "" : (group + PATH_SEPARATOR)) +
PROVIDER_SIDE
-+ PATH_SEPARATOR + application + PATH_SEPARATOR +
"metadata");
-
System.out.println(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY));
++ PATH_SEPARATOR + application);
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY),
interfaceName + MetadataIdentifier.SEPARATOR +
(version == null ? "" : version +
MetadataIdentifier.SEPARATOR)
+ (group == null ? "" : group +
MetadataIdentifier.SEPARATOR)
-+ PROVIDER_SIDE + MetadataIdentifier.SEPARATOR +
application + META_DATA_STORE_TAG);
++ PROVIDER_SIDE + MetadataIdentifier.SEPARATOR +
application);
}
}
[dubbo] branch master updated (9559c4e -> 18eb69e)
This is an automated email from the ASF dual-hosted git repository. victory pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 9559c4e Unify the bean name convention of ServiceBean and ReferenceBean (#4135) add 18eb69e Solve compile problem in java11 (#4172) No new revisions were added by this update. Summary of changes: .../dubbo/rpc/cluster/router/condition/ConditionRouterTest.java | 5 + dubbo-registry/dubbo-registry-nacos/pom.xml | 6 ++ 2 files changed, 11 insertions(+)
