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

[Dubbo-1485] Remove deprecated AnnotationBean. #2676

Closed
wants to merge 60 commits into from

Conversation

chickenlj
Copy link
Contributor

Remove deprecated AnnotationBean, please refer #1485 for the new configuration method to replace.

What is the purpose of the change

AnnotationBean was found to have some problems and has been replaced and marked deprecated since version 2.5.7.

Brief changelog

  • AnnotationBean.java
  • dubbo.xsd

Verifying this change

Check dubbo-spring-boot-project for how the new way to use.

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

  • Make sure there is a GITHUB_issue 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.
  • 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.

@mercyblitz mercyblitz self-requested a review December 12, 2018 06:28
chickenlj and others added 27 commits December 29, 2018 15:13
1. add ConfigManager
2. Reference/Service hold reference of ConfigCenterConfig
3. change from-spring to include-spring-env
# Conflicts:
#	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/ReferenceConfig.java
#	dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
#	dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
…ties format 'dubbo.metadata-report.address=XXx' (apache#3138)

* fix apache#3124 . move RegistryDataConfig configuration into RegistryConfig and remove RegistryDataConfig

* fix apache#3123.  support metadata xml configuration; support configuration format dubbo.metadata-report.address=xxx
…void dup refresh for registry config.

* avoid dup refresh for registry config

* fix unit test

* fix unit test, org.apache.dubbo.config.AbstractInterfaceConfig#convertRegistryIdsToRegistries generates invalid registry config

* should not give RegistryConfig a default value 'RegistryConfig.NO_AVAILABLE'
remove checkApplication for it is invoked before.
chickenlj and others added 29 commits January 8, 2019 10:32
* ../routers/condition
* ../routers/tag
* ../routers/otherRouter
* modify metadata node path in zookeeper

* add licence
/router/condition -> router-codition
* give router rule a more layered extensiable ZK path:
* ../routers/condition
* ../routers/tag
* ../routers/otherRouter

* Fix UT

* Adjust ZK to handle layered routers path

* Remove BlackWhiteListRule

* Adjust code to avoid possible ConcurrentModificationException

* revert router from layered path to flat path:
/router/condition -> router-codition

* adjust router path in UT

* change suffix literal: router-condition to condition-router

* change suffix literal: router-condition to condition-router
… not completed yet. (apache#3185)

* Announce AsyncRpcResult internally use only;
Check future status before get().

* Code review: simplify code
* Provider async enhancement, user doesn't have to use 'async=true' on provider side.

* only keep zero-args constructor

* stop router tag from being transferred in the RPC chain

* Code review: use 'this.future= new Future()''; remove setAsyncContext() from RpcContext

* revert getInternalFuture()

* Fix UT
… zooke… (apache#3182)

* fix apache#3179. Make registry, configcenter, matadata-report share a zookeeper connection

* fix apache#3179. optimize registry, configcenter, matadata-report share a zookeeper connection

* fix apache#3179. add licence

* fix some review issue: just optimize constuctor order and refactor some code

* modify HashMap to ConcurrentHashMap

* add some comments

* remove ZookeeperClientData and originalURLs

* remove ZookeeperClientData and originalURLs

* fix apache#3205 . add group into MetadataReport

* remove SOURCE_URL_KEY from Constants

* fix apache#3179 , apache#3205, apache#3218.  modify review issue; when sharing zookeeper connection, it should judge zookeeperClient.isConnected()
# Conflicts:
#	dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java
#	dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java
@chickenlj chickenlj closed this Jan 15, 2019
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.

6 participants