Commit Graph

63 Commits

Author SHA1 Message Date
LiZhen 9ee2f23036 Fix when qos is disable,log will print every time. (#3397)
* fix when qos is disable,log will print every time.

* change qos server boos thread number 1
2019-03-12 18:46:40 +08:00
Song Kun 19c1af845d [Enhancement] Replace explicit resource management with try-with-resource (#3281) 2019-01-30 10:05:01 +08:00
kexianjun 2308a36475 Fix some unit test failure (#3337) 2019-01-27 16:05:34 +08:00
ken.lj 68fa9c189d Merge branch '2.7.0-release'
# Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/AbstractRouter.java
#	dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java
#	dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
#	dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
#	dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java
#	dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
#	dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
#	dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
#	dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
#	dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
#	dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
#	dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java
#	dubbo-config/dubbo-config-spring/pom.xml
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ConfigCenterBean.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/provider/HelloServiceImpl.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactoryTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/SpringStatusCheckerTest.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/PropertySourcesUtilsTest.java
#	dubbo-metadata-report/dubbo-metadata-report-zookeeper/src/test/java/org/apache/dubbo/metadata/store/zookeeper/ZookeeperMetadataReportTest.java
#	dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporterTest.java
#	dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
#	dubbo-rpc/dubbo-rpc-hessian/pom.xml
#	dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java
2019-01-22 17:33:09 +08:00
Huxing Zhang de4f91b689 [maven-release-plugin] prepare for next development iteration 2019-01-18 11:05:09 +08:00
Huxing Zhang e4f39a3a11 [maven-release-plugin] prepare release dubbo-2.7.0 2019-01-18 11:04:41 +08:00
huazhongming 43d74b35b9 Qos heart (#3170)
* qos heart question fix #3165

* modify

* judge if it's a IdleStateEvent

* add UT

* modify
2019-01-16 15:27:39 +08:00
huazhongming 458a4504dc call the util method (#3230)
* Code optimization, call the util method

* mofidy

* modify *

* import package
2019-01-16 15:11:12 +08:00
huazhongming 66afe96528 Modified to lower camel case (#3003) 2019-01-16 10:05:52 +08:00
Xin Wang 5298afdf40 Upgrade junt to junit5 (#3149)
* upgrade junit to junit5

* modify test

* 批量修改upgrade_junt_to_junit5

* 删除多余的文件

* fi test case

* Disabled soem test case temporarily

* upgrade junit to junit5 and batch modify test case

* copy some code from jupiter5.4.0.M1 for some issues

* 修改rat福泽

* update rat path

* revert case

* add junit-platform-surefire-provider to maven-surefire-plugin

* update dependency

* fix coverage issue (#1)

* use jupiter 5.4.0-M1 and remove junit5 source code
2019-01-11 11:26:04 +08:00
kexianjun 77891b4dc1 replace ‘\n’ with lineSeparator (#3058)
replace \n to System.lineSeparator
2018-12-26 10:25:42 +08:00
ken.lj b1324511d1 Merge branch 'dev-metadata'
# Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mock/MockInvokersSelector.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
#	dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderConsumerRegTable.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
#	dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RuntimeExceptionInvoker.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/service/GenericServiceTest.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationParameter.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationService.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
2018-12-23 20:29:38 +08:00
Ian Luo 678cdb4184
[DUBBO-2988] Unrecognized the other provider (#3013)
*     #2988 [Dubbo - telnet] Unrecognized the other provider

* remove useless files added by accident.

* fix cycle dependency

* fix more cycle dependency

* revert unnecessary change in demo

* make unit test pass

* revert LF to the original CRLF

* change to use lambda

* fix cycle dependency

* remove useless imports

* make unit test stable

* make refactor change according to code review comments

* refactor as review comments suggest.
2018-12-21 22:00:58 +08:00
Sergio Escalante 3e6ae66fde Fixing typos (#3030)
Fixing some typos.
2018-12-21 10:13:41 +08:00
ken.lj dbca54ca23 Merge branch 'master' into dev-metadata
# Conflicts:
#	dubbo-all/pom.xml
#	dubbo-bootstrap/pom.xml
#	dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java
#	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java
#	dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java
2018-11-15 11:33:24 +08:00
Ian Luo 7f5fd469ee
#2762: [Dubbo - qos-http] stopServer should be invoked ? (#2767) 2018-11-09 16:31:42 +08:00
Huang YunKun a7cf737386 add checkstyle rule to check import order (#2745) 2018-11-08 11:44:46 +08:00
ken.lj 596721d08a Fix compiler error after merge master branch 2018-10-30 14:39:35 +08:00
Jeff-Lv 45b3ab4436 Merge pull request #2636, move the classes of model from config to rpc-api for reusing. 2018-10-12 11:40:11 +08:00
Ian Luo ccce69e75f
Issue2583 (#2614)
* update README

*     #2583: ApplicationModel serviceName is not unique
2018-10-09 16:37:28 +08:00
Jexy 038e87e691 format code style (#2475) 2018-09-11 12:54:46 +08:00
时无两丶 ff373a7db7 New ascii logo. (#2395) 2018-08-28 18:06:49 +08:00
Huxing Zhang 7277f5ed18 Qos enhancement (#2153)
* Not to accept foreign ip by default.

* Log if fail to start qos server. #2046

* Fix typo. No functional change.

* Remove redundant declaration.

* Sync dubbo.xsd to compact dubbo.xsd.

* Simplify code and add comments.

* Add log message if qos is not enabled.

* Fix UT failure.
2018-08-16 16:55:52 +08:00
Jerrick Zhu 3a267f86b4
remote dubbo-all javadoc plugin (#2307)
* remote dubbo-all javadoc plugin

* add license to test source

* disable checkstyle and rat plugin
2018-08-16 13:03:04 +08:00
Ian Luo a1b301d50f
[dubbo-1689]: Enhance the test coverage part-10 : dubbo-plugin module (#2001)
*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

* fix unit test failure

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module
2018-06-28 16:18:31 +08:00
Ian Luo 534fd24def
[dubbo-1689]: Enhance the test coverage part-10 : dubbo-plugin module (#1993)
*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

* fix unit test failure

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module
2018-06-27 10:55:30 +08:00
Ian Luo eee0be3939
[dubbo-1689]: Enhance the test coverage part-10 : dubbo-plugin module (#1982)
*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

* fix unit test failure

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module
2018-06-25 19:53:11 +08:00
Ian Luo f186f2bc16
[dubbo-1689]: Enhance the test coverage part-10 : dubbo-plugin module (#1980)
*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

* fix unit test failure
2018-06-25 14:31:23 +08:00
Ian Luo cc79b22e2b
#1689: Enhance the test coverage part-10 : dubbo-plugin module (#1976) 2018-06-21 21:29:23 +08:00
Ian Luo fe38255168
[dubbo-1689]: Enhance the test coverage part-10 : dubbo-plugin module (#1949)
* reformat the code style

*     #1689: Enhance the test coverage part-10 : dubbo-plugin module

* fix unit test failure
2018-06-19 13:53:41 +08:00
Jerrick Zhu c0ca042253 Add compatible module and rename groupId to org.apache.dubbo (#1952)
* remove dubbo-test-examples and dubbo-test-benchmark

* rename package to org.apache.dubbo

* support old SPI file

* remove final for RpcException and URL

* add debug sysout in UT

* add debug info in UT

* ignore 2 cases temporary

* add finally clear for SHUTDOWN_WAIT_KEY property

* clear SHUTDOWN_WAIT_KEY before test

* add dubbo SPI and interface bridge class

* support EchoService and GenericService

* rename groupId to org.apache.dubbo

* add debug info for UT
2018-06-19 11:31:09 +08:00
Ian Luo 27e6fdb729
Revert "reformat the code style (#1948)" (#1951)
This reverts commit 9758809b3a.
2018-06-15 15:48:24 +08:00
Ian Luo 9758809b3a
reformat the code style (#1948) 2018-06-15 15:41:38 +08:00
Jerrick Zhu e92a553646 Repackage to org apache (#1941)
* remove dubbo-test-examples and dubbo-test-benchmark

* rename package to org.apache.dubbo

* support old SPI file

* remove final for RpcException and URL

* add debug sysout in UT

* add debug info in UT

* ignore 2 cases temporary

* add finally clear for SHUTDOWN_WAIT_KEY property

* clear SHUTDOWN_WAIT_KEY before test
2018-06-15 14:10:40 +08:00
Ian Luo d2e5652cb0
#1689: Enhance the test coverage part-10 : dubbo-plugin module, unit (#1936)
test for textui
2018-06-13 14:33:24 +08:00
Ian Luo fc5f60c691
[dubbo-1920] remove commons-lang3 dependency (#1921)
*     #1920: remove commons-lang3 dependency

* fix compilation issue
2018-06-12 15:36:13 +08:00
ken.lj 82905e14da bump version to 2.7.0-SNAPSHOT 2018-06-06 10:30:19 +08:00
ken.lj 1e729afa0a [maven-release-plugin] prepare for next development iteration 2018-05-24 17:52:17 +08:00
ken.lj 5eeb240337 [maven-release-plugin] prepare release dubbo-2.6.2 2018-05-24 17:51:14 +08:00
ken.lj d7b3eaffd9 Go back to 2.6.2-SNAPSHOT to prepare for the next release. 2018-05-21 21:20:46 +08:00
ken.lj a6401e64b5 [maven-release-plugin] prepare for next development iteration 2018-05-14 21:25:37 +08:00
ken.lj afab04c53e [maven-release-plugin] prepare release dubbo-2.6.2 2018-05-14 21:25:19 +08:00
ken.lj a9c975c809 Bump version to 2.6.2-SNAPSHOT 2018-05-14 20:58:39 +08:00
ken.lj 944d5208b4 Bump version to 2.6.2-SNAPSHOT 2018-05-14 20:46:53 +08:00
ken.lj f5de637fcc Bump version to 2.6.2 for release 2018-05-10 17:21:43 +08:00
ken.lj 7f052f18fd upgrade to 2.6.2-SNAPSHOT 2018-04-26 19:26:34 +08:00
ken.lj 1503d6deee We need to change the version to SNAPSHOT to satisfy release:prepare 2018-04-26 19:22:49 +08:00
Ian Luo 20aa3f0b2f manually merge the work made by pull request #1491 on master branch (#1554)
* Manually merge pull request #1486, to make travis ci and codecov work after apache incubator transition.

* update pom license, scm, maillists, issuemanagement, add DISCLAIMER (#1491)
2018-04-04 22:54:17 -05:00
ken.lj 4a5c5e200d
Merge pull request #1389, refactor dubbo deployment process
Fixes #1322
2018-03-06 06:04:31 -06:00
Huang YunKun 7faa3f025e Merge pull request #1391, fix typo of method name in qos module. 2018-02-26 02:23:11 -06:00