Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master branch to 3.x dev branch #3718

Merged
merged 221 commits into from
Mar 26, 2019
Merged

Conversation

chickenlj
Copy link
Contributor

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:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

biyuhao and others added 30 commits January 3, 2019 17:42
Release resource after use in ConfigParserTest
add javadoc for registry and optimize code
* code optimization
* useless import
* optimization
* 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
* 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
Daniela Marques de Morais and others added 22 commits March 12, 2019 18:12
* 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
* 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
@codecov-io
Copy link

codecov-io commented Mar 23, 2019

Codecov Report

Merging #3718 into 3.x-dev will decrease coverage by 0.17%.
The diff coverage is 78.6%.

Impacted file tree graph

@@             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
Impacted Files Coverage Δ Complexity Δ
.../org/apache/dubbo/config/MetadataReportConfig.java 92.3% <ø> (+51.28%) 0 <0> (ø) ⬇️
...er/configurator/override/OverrideConfigurator.java 100% <ø> (ø) 0 <0> (ø) ⬇️
...nnotation/AbstractAnnotationConfigBeanBuilder.java 93.33% <ø> (ø) 0 <0> (ø) ⬇️
...notation/ReferenceAnnotationBeanPostProcessor.java 94.36% <ø> (+17.98%) 0 <0> (ø) ⬇️
...ava/org/apache/dubbo/rpc/cluster/Configurator.java 92.3% <ø> (ø) 0 <0> (ø) ⬇️
.../annotation/DubboConfigConfigurationRegistrar.java 100% <ø> (ø) 0 <0> (?)
.../org/apache/dubbo/config/spring/ReferenceBean.java 18.62% <ø> (-16.62%) 0 <0> (ø)
...hema/CompatibleAnnotationBeanDefinitionParser.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...g/context/properties/DefaultDubboConfigBinder.java 100% <ø> (ø) 0 <0> (ø) ⬇️
...beans/factory/annotation/ReferenceBeanBuilder.java 70.58% <ø> (-16.6%) 0 <0> (ø)
... and 353 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 02cca09...e6f473b. Read the comment docs.

Copy link
Contributor

@Jeff-Lv Jeff-Lv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good to me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.