You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by "beiwei30 (GitHub)" <gi...@apache.org> on 2018/11/05 03:41:02 UTC

[GitHub] [incubator-dubbo] beiwei30 opened pull request #2734: merge https://github.com/apache/incubator-dubbo/pull/2725

## What is the purpose of the change

merge https://github.com/apache/incubator-dubbo/pull/2725

## Brief changelog

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/com/alibaba/dubbo/config/ProtocolConfig.java
dubbo-config/dubbo-config-spring/pom.xml
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/extension/SpringExtensionFactory.java
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtils.java
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializer.java
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListener.java
dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java
dubbo-container/dubbo-container-spring/pom.xml
dubbo-container/dubbo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java
pom.xml

## Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

- [x] Make sure there is a [GITHUB_issue](https://github.com/apache/incubator-dubbo/issues) filed 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](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test).
- [ ] Run `mvn clean install -DskipTests` & `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](https://github.com/apache/incubator-dubbo/wiki/Software-donation-guide).


[ Full content available at: https://github.com/apache/incubator-dubbo/pull/2734 ]
This message was relayed via gitbox.apache.org for notifications@dubbo.apache.org

[GitHub] [incubator-dubbo] beiwei30 closed pull request #2734: merge https://github.com/apache/incubator-dubbo/pull/2725

Posted by "beiwei30 (GitHub)" <gi...@apache.org>.
[ pull request closed by beiwei30 ]

[ Full content available at: https://github.com/apache/incubator-dubbo/pull/2734 ]
This message was relayed via gitbox.apache.org for notifications@dubbo.apache.org

[GitHub] [incubator-dubbo] codecov-io commented on issue #2734: merge https://github.com/apache/incubator-dubbo/pull/2725

Posted by "codecov-io (GitHub)" <gi...@apache.org>.
# [Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=h1) Report
> Merging [#2734](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=desc) into [2.6.x](https://codecov.io/gh/apache/incubator-dubbo/commit/0b0e8b5c0a4af7d20d77eb98a6c6c261420f61ce?src=pr&el=desc) will **decrease** coverage by `<.01%`.
> The diff coverage is `60%`.

[![Impacted file tree graph](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/graphs/tree.svg?width=650&token=VnEIkiFQT0&height=150&src=pr)](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=tree)

```diff
@@             Coverage Diff              @@
##              2.6.x    #2734      +/-   ##
============================================
- Coverage     47.38%   47.38%   -0.01%     
+ Complexity     4466     4284     -182     
============================================
  Files           564      552      -12     
  Lines         25663    24361    -1302     
  Branches       4535     4311     -224     
============================================
- Hits          12161    11544     -617     
+ Misses        11642    11032     -610     
+ Partials       1860     1785      -75
```


| [Impacted Files](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=tree) | Coverage Δ | Complexity Δ | |
|---|---|---|---|
| [.../java/com/alibaba/dubbo/config/ProtocolConfig.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1hcGkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvUHJvdG9jb2xDb25maWcuamF2YQ==) | `74.61% <ø> (+1.13%)` | `59 <0> (ø)` | :arrow_down: |
| [...libaba/dubbo/container/spring/SpringContainer.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29udGFpbmVyL2R1YmJvLWNvbnRhaW5lci1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb250YWluZXIvc3ByaW5nL1NwcmluZ0NvbnRhaW5lci5qYXZh) | `70.58% <100%> (-4.42%)` | `4 <0> (ø)` | |
| [...onfig/spring/extension/SpringExtensionFactory.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL2V4dGVuc2lvbi9TcHJpbmdFeHRlbnNpb25GYWN0b3J5LmphdmE=) | `83.78% <100%> (+11.36%)` | `9 <1> (+1)` | :arrow_up: |
| [...a/com/alibaba/dubbo/config/spring/ServiceBean.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL1NlcnZpY2VCZWFuLmphdmE=) | `57.69% <100%> (+1.83%)` | `44 <0> (-1)` | :arrow_down: |
| [...aba/dubbo/config/spring/util/BeanFactoryUtils.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3V0aWwvQmVhbkZhY3RvcnlVdGlscy5qYXZh) | `38.46% <38.46%> (ø)` | `1 <1> (?)` | |
| [.../config/spring/status/DataSourceStatusChecker.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3N0YXR1cy9EYXRhU291cmNlU3RhdHVzQ2hlY2tlci5qYXZh) | `71.79% <50%> (-4.68%)` | `6 <4> (ø)` | |
| [...ubbo/config/spring/status/SpringStatusChecker.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3N0YXR1cy9TcHJpbmdTdGF0dXNDaGVja2VyLmphdmE=) | `75.67% <50%> (-5.58%)` | `11 <9> (ø)` | |
| [...a/dubbo/remoting/transport/netty/NettyChannel.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tcmVtb3RpbmcvZHViYm8tcmVtb3RpbmctbmV0dHkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9yZW1vdGluZy90cmFuc3BvcnQvbmV0dHkvTmV0dHlDaGFubmVsLmphdmE=) | `61.25% <0%> (-5%)` | `20% <0%> (-1%)` | |
| [.../com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tbW9uaXRvci9kdWJiby1tb25pdG9yLWRlZmF1bHQvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9tb25pdG9yL2R1YmJvL0R1YmJvTW9uaXRvci5qYXZh) | `87.85% <0%> (-1.87%)` | `15% <0%> (ø)` | |
| [...om/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tcnBjL2R1YmJvLXJwYy1hcGkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9ycGMvZmlsdGVyL0FjdGl2ZUxpbWl0RmlsdGVyLmphdmE=) | `83.33% <0%> (ø)` | `6% <0%> (ø)` | :arrow_down: |
| ... and [13 more](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree-more) | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=footer). Last update [0b0e8b5...9d046ad](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


[ Full content available at: https://github.com/apache/incubator-dubbo/pull/2734 ]
This message was relayed via gitbox.apache.org for notifications@dubbo.apache.org

[GitHub] [incubator-dubbo] codecov-io commented on issue #2734: merge https://github.com/apache/incubator-dubbo/pull/2725

Posted by "codecov-io (GitHub)" <gi...@apache.org>.
# [Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=h1) Report
> Merging [#2734](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=desc) into [2.6.x](https://codecov.io/gh/apache/incubator-dubbo/commit/0b0e8b5c0a4af7d20d77eb98a6c6c261420f61ce?src=pr&el=desc) will **decrease** coverage by `<.01%`.
> The diff coverage is `60%`.

[![Impacted file tree graph](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/graphs/tree.svg?width=650&token=VnEIkiFQT0&height=150&src=pr)](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=tree)

```diff
@@             Coverage Diff              @@
##              2.6.x    #2734      +/-   ##
============================================
- Coverage     47.38%   47.38%   -0.01%     
+ Complexity     4466     4284     -182     
============================================
  Files           564      552      -12     
  Lines         25663    24361    -1302     
  Branches       4535     4311     -224     
============================================
- Hits          12161    11544     -617     
+ Misses        11642    11032     -610     
+ Partials       1860     1785      -75
```


| [Impacted Files](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=tree) | Coverage Δ | Complexity Δ | |
|---|---|---|---|
| [.../java/com/alibaba/dubbo/config/ProtocolConfig.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1hcGkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvUHJvdG9jb2xDb25maWcuamF2YQ==) | `74.61% <ø> (+1.13%)` | `59 <0> (ø)` | :arrow_down: |
| [...libaba/dubbo/container/spring/SpringContainer.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29udGFpbmVyL2R1YmJvLWNvbnRhaW5lci1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb250YWluZXIvc3ByaW5nL1NwcmluZ0NvbnRhaW5lci5qYXZh) | `70.58% <100%> (-4.42%)` | `4 <0> (ø)` | |
| [...onfig/spring/extension/SpringExtensionFactory.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL2V4dGVuc2lvbi9TcHJpbmdFeHRlbnNpb25GYWN0b3J5LmphdmE=) | `83.78% <100%> (+11.36%)` | `9 <1> (+1)` | :arrow_up: |
| [...a/com/alibaba/dubbo/config/spring/ServiceBean.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL1NlcnZpY2VCZWFuLmphdmE=) | `57.69% <100%> (+1.83%)` | `44 <0> (-1)` | :arrow_down: |
| [...aba/dubbo/config/spring/util/BeanFactoryUtils.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3V0aWwvQmVhbkZhY3RvcnlVdGlscy5qYXZh) | `38.46% <38.46%> (ø)` | `1 <1> (?)` | |
| [.../config/spring/status/DataSourceStatusChecker.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3N0YXR1cy9EYXRhU291cmNlU3RhdHVzQ2hlY2tlci5qYXZh) | `71.79% <50%> (-4.68%)` | `6 <4> (ø)` | |
| [...ubbo/config/spring/status/SpringStatusChecker.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tY29uZmlnL2R1YmJvLWNvbmZpZy1zcHJpbmcvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9jb25maWcvc3ByaW5nL3N0YXR1cy9TcHJpbmdTdGF0dXNDaGVja2VyLmphdmE=) | `75.67% <50%> (-5.58%)` | `11 <9> (ø)` | |
| [...a/dubbo/remoting/transport/netty/NettyChannel.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tcmVtb3RpbmcvZHViYm8tcmVtb3RpbmctbmV0dHkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9yZW1vdGluZy90cmFuc3BvcnQvbmV0dHkvTmV0dHlDaGFubmVsLmphdmE=) | `61.25% <0%> (-5%)` | `20% <0%> (-1%)` | |
| [.../com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tbW9uaXRvci9kdWJiby1tb25pdG9yLWRlZmF1bHQvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9tb25pdG9yL2R1YmJvL0R1YmJvTW9uaXRvci5qYXZh) | `87.85% <0%> (-1.87%)` | `15% <0%> (ø)` | |
| [...om/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree#diff-ZHViYm8tcnBjL2R1YmJvLXJwYy1hcGkvc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9kdWJiby9ycGMvZmlsdGVyL0FjdGl2ZUxpbWl0RmlsdGVyLmphdmE=) | `83.33% <0%> (ø)` | `6% <0%> (ø)` | :arrow_down: |
| ... and [13 more](https://codecov.io/gh/apache/incubator-dubbo/pull/2734/diff?src=pr&el=tree-more) | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=footer). Last update [0b0e8b5...9d046ad](https://codecov.io/gh/apache/incubator-dubbo/pull/2734?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


[ Full content available at: https://github.com/apache/incubator-dubbo/pull/2734 ]
This message was relayed via gitbox.apache.org for notifications@dubbo.apache.org