Merge master branch to 3.x dev branch #3718
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release resource after use in ConfigParserTest
add javadoc for registry and optimize code
* code optimization * useless import * optimization
code optimization
Add javadoc for dubbo-serialization module(apache#3002).
* optimize log output * Separate logs for reconnect and close * remove reconnect exception log
* modify some log describe * use java8 lambda expression
* fix telnet trace times is always 1 * use StringUtils determine if the string is empty * Fix 3105 , make invoke command with Json string parameter without "class" key * Fix 3105 ，Keep the class key to support overloaded methods * optimize InvokerTelnetHandlerTest
* 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
…backService method issue. (apache#3199) * Optimize the code: fix url to null, NullPointerException, change private variable to camel mode. * Optimize the code: exportOrUnexportCallbackService method camel mode. * Optimize the code: fix method:encodeInvocationArgument private callbackStatus is camel writing. * Optimize the code: fix name issue * Exporter is a noun, we should use a verb here, like Export. * The generics that can be inferred automatically are also deleted.
* refactor telnet invoke command * add select command for telnet * fix test case
…w method to replace. (apache#3232)
* keep TagRouter consistent with 2.6.x * refactor filterUsingStaticTag using lambda in tagRouter
* wrong event setting * modify event seeting * modify
* Code optimization, call the util method * mofidy * modify * * import package
* qos heart question fix apache#3165 * modify * judge if it's a IdleStateEvent * add UT * modify
…n from dubbo.jar in shading mode , and change to dependency way. * just for modify comments and imports * remove gson from dubbo.jar in shading mode, add dependency
…esponsible for provide priority. (apache#3240) something is waiting for us to disscuss: 1. Every Route implement should set a priority? 2.apache#3249
add default method into Protocol .
* modify some typos * fix some other addionalParameterKeys and paramter typos
* Merge 2.6.6 source code into 2.7 * Fixed logging level for apache#3241 (comment) * Change the implementation for apache#3241 * Remove the implementation Ordered, because it does not work in Spring Framework : apache#3241 * Remove the implementation Ordered, because it does not work in Spring Framework : apache#3241 * Only Optimize Imports
* fix when qos is disable,log will print every time. * change qos server boos thread number 1
* add openjdk to travis * add openjdk to travis
* add metrics integration * add license
… MethodConfig. Fixes apache#2045
…on with registry. Fixes apache#3288
* Minor refactor, no functinoal change. * Separate ConnectionStateListener * Simplify code * Fix typo * Support get external config from etcd config center * Polish diamond operator * Initial etcd support as config center * Add a put interface for JEtcdClient * Enhanced Etcd config center support with the ability to watch and cancel watch * Polish code * Distinguish modification event and delete event * Add etcd registry and configcenter to dubbo-all * Watch again when connection is re-established
It looks good.
Codecov Report
@@ Coverage Diff @@
## 3.x-dev #3718 +/- ##
============================================
- Coverage 63.78% 63.6% -0.18%
+ Complexity 75 71 -4
============================================
Files 656 703 +47
Lines 28454 31001 +2547
Branches 4812 5022 +210
============================================
+ Hits 18150 19719 +1569
- Misses 8015 9016 +1001
+ Partials 2289 2266 -23
Continue to review full report at Codecov.
|
chickenlj
added a commit
that referenced
this pull request
Mar 26, 2019
This reverts commit 897b80d.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of the change
Sync changes between these two branches.
Brief changelog
merge and resolve conflicts
Verifying this change
No commits lost.
Follow this checklist to help us incorporate your contribution quickly and easily:
[Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.mvn clean install -DskipTests=false&mvn clean test-compile failsafe:integration-testto make sure unit-test and integration-test pass.