Skip to content

Commit a39ea23

Browse files
authored
2.7.x (#470)
* Fix #169 * 0.2.1 (#345) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * 0.2.1 (#357) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * 0.2.1 (#360) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * 0.2.1 (#367) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * 0.2.1 (#372) (#374) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#378) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#389) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#386) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * Add NOTICE and DISCLAIMER * Remove spring.providers file from starter module (#403) (#404) * remove spring.providers file since it's only used by STS IDE * deep search in project, no useage * add @OverRide annotation (#409) * to method reference (#410) * add @OverRide annotation * modify method reference * Update README.md * Update README_CN.md * Update README_CN.md * Update README.md * Sync master to 0.2.x (#417) * 0.2.1 release (#402) * 0.2.1 (#345) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * 0.2.1 (#357) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * 0.2.1 (#360) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * 0.2.1 (#367) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * 0.2.1 (#372) (#374) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#378) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#389) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#386) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * Add NOTICE and DISCLAIMER * Add Java11 support #383 (#393) * Upgrade jacoco to version 0.8.2 #383 * Update travis setting add openjdk11 remove openjdk10 openjdk9 * Update mailing list address (#380) * Update README [user guide] link (#348) * Remove spring.providers file from starter module (#403) (#404) * remove spring.providers file since it's only used by STS IDE * deep search in project, no useage * add @OverRide annotation (#409) * to method reference (#410) * add @OverRide annotation * modify method reference * Update README.md * Update README_CN.md * Update README_CN.md * Update README.md * Update README.md * Update README_CN.md * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * Update README.md * Update README_CN.md * 0.2.x (#422) * Sync master to 0.2.x (#417) * 0.2.1 release (#402) * 0.2.1 (#345) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * 0.2.1 (#357) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * 0.2.1 (#360) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * 0.2.1 (#367) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * 0.2.1 (#372) (#374) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#378) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#389) * 0.2.1 (#372) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * 0.2.1 (#376) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * 0.2.1 (#386) * Fix #169 * Polish : #324 & #325 * Polish : #315 * Polish : #321 * Polish : #321 * Polish : #321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : #319 * Polish : #226 * Polish : #309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish #341 * Add the samples * Add a license * Add the samples of Zookeeper and Nacos * Update README.md * Fix the test cases * Polish #366 * Polish #370 * Polish #370 * Add NOTICE and DISCLAIMER * Add Java11 support #383 (#393) * Upgrade jacoco to version 0.8.2 #383 * Update travis setting add openjdk11 remove openjdk10 openjdk9 * Update mailing list address (#380) * Update README [user guide] link (#348) * Remove spring.providers file from starter module (#403) (#404) * remove spring.providers file since it's only used by STS IDE * deep search in project, no useage * add @OverRide annotation (#409) * to method reference (#410) * add @OverRide annotation * modify method reference * Update README.md * Update README_CN.md * Update README_CN.md * Update README.md * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * 1.0.0 (#429) * Polish #395 * Polish #395 fixed issues * Polish #395 Update documents * Update the root POM's parent * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * Remove Netty Project * Polish : #427 * Polish : #427 * Polish : #427 * 1.0.0 (#431) * Polish #395 * Polish #395 fixed issues * Polish #395 Update documents * Update the root POM's parent * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * Remove Netty Project * Polish : #427 * Polish : #427 * Polish : #427 * Polish : #427 : Update Documents * 2.7.0 (#433) * Polish #395 * Polish #395 fixed issues * Polish #395 Update documents * Update the root POM's parent * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * Remove Netty Project * Polish : #427 * Polish : #427 * Polish : #427 * Polish : #427 : Update Documents * Polish : #427 : Fixed include pattern * 1.0.0 (#435) * Polish #395 * Polish #395 fixed issues * Polish #395 Update documents * Update the root POM's parent * Replace ${project.version} to ${revision} in the "pom.xml" files * Update <projectId> * Remove Netty Project * Polish : #427 * Polish : #427 * Polish : #427 * Polish : #427 : Update Documents * Polish : #427 : Fixed include pattern * Polish : #427 : Correct words * Update README.md (#445) * Fix typo (#446) * Move png files to subfolder (#448) * Enable flatten plugin by default (#441) (#443) * Polish #449 * Polish #467 : Set "spring.main.allow-bean-definition-overriding" property to be true as default * Polish #468 : Upgrade Dubbo 2.7.1 * Polish #437 : Remove -XX:PermSize=64m -XX:MaxPermSize=128m * Fix the issues of test cases * Update Samples * Update default version using Dubbo's version * Polish #456 : Update the Zookeeper dependencies * Polish #458 : dubbo.metadata-report.address propertie description not provided * Polish #458 : dubbo.metadata-report.address propertie description not provided * Update 2.7.1 * Polish #458 : Add "override" property * Polish #451 : Duplicate application configs * Bugfix * Update SNAPSHOT
1 parent a67a728 commit a39ea23

File tree

43 files changed

+976
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+976
-1208
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project)
55
![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg)
66

7-
[Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it aslo provides
7+
[Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it also provides
88

99
* [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration).
1010
* [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration).
@@ -20,7 +20,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
2020
```xml
2121
<properties>
2222
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
23-
<dubbo.version>2.7.0</dubbo.version>
23+
<dubbo.version>2.7.1</dubbo.version>
2424
</properties>
2525

2626
<dependencyManagement>
@@ -34,7 +34,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
3434
<scope>import</scope>
3535
</dependency>
3636

37-
<!-- Aapche Dubbo -->
37+
<!-- Apache Dubbo -->
3838
<dependency>
3939
<groupId>org.apache.dubbo</groupId>
4040
<artifactId>dubbo-dependencies-bom</artifactId>
@@ -70,7 +70,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi
7070
<dependency>
7171
<groupId>org.apache.dubbo</groupId>
7272
<artifactId>dubbo-spring-boot-starter</artifactId>
73-
<version>2.7.0</version>
73+
<version>2.7.1</version>
7474
</dependency>
7575

7676
<dependency>

README_CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
```xml
2323
<properties>
2424
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
25-
<dubbo.version>2.7.0</dubbo.version>
25+
<dubbo.version>2.7.1</dubbo.version>
2626
</properties>
2727

2828
<dependencyManagement>
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>org.apache.dubbo</groupId>
7474
<artifactId>dubbo-spring-boot-starter</artifactId>
75-
<version>2.7.0</version>
75+
<version>2.7.1</version>
7676
</dependency>
7777

7878
<dependency>

dubbo-spring-boot-actuator/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to your project by ad
2222
<dependency>
2323
<groupId>org.apache.dubbo</groupId>
2424
<artifactId>dubbo-spring-boot-actuator</artifactId>
25-
<version>2.7.0</version>
25+
<version>2.7.1</version>
2626
</dependency>
2727
```
2828

@@ -171,8 +171,8 @@ Actuator endpoint `dubbo` supports Actuator Endpoints :
171171
{
172172
"timestamp": 1516623290166,
173173
"versions": {
174-
"dubbo-spring-boot": "2.7.0",
175-
"dubbo": "2.7.0"
174+
"dubbo-spring-boot": "2.7.1",
175+
"dubbo": "2.7.1"
176176
},
177177
"urls": {
178178
"dubbo": "https://github.com/apache/incubator-dubbo/",

dubbo-spring-boot-actuator/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@
5858
<optional>true</optional>
5959
</dependency>
6060

61-
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
62-
<dependency>
63-
<groupId>org.springframework.boot</groupId>
64-
<artifactId>spring-boot-configuration-processor</artifactId>
65-
<optional>true</optional>
66-
</dependency>
67-
6861
<!-- Dubbo autoconfigure -->
6962
<dependency>
7063
<groupId>org.apache.dubbo</groupId>

dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
*/
1717
package org.apache.dubbo.spring.boot.actuate.autoconfigure;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
2119
import org.apache.dubbo.config.annotation.Service;
2220
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint;
2321
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboMetadataEndpoint;
2422
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesMetadataEndpoint;
2523
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboReferencesMetadataEndpoint;
2624
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboServicesMetadataEndpoint;
2725
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboShutdownEndpoint;
26+
27+
import com.fasterxml.jackson.core.JsonProcessingException;
28+
import com.fasterxml.jackson.databind.ObjectMapper;
2829
import org.junit.Assert;
2930
import org.junit.Test;
3031
import org.junit.runner.RunWith;
@@ -159,7 +160,7 @@ public void testServices() {
159160

160161
Assert.assertEquals(1, services.size());
161162

162-
Map<String, Object> demoServiceMeta = services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
163+
Map<String, Object> demoServiceMeta = services.get("providers:my-protocol:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
163164

164165
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
165166

dubbo-spring-boot-autoconfigure/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project
2323
<dependency>
2424
<groupId>org.apache.dubbo</groupId>
2525
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
26-
<version>2.7.0</version>
26+
<version>2.7.1</version>
2727
</dependency>
2828
```
2929

@@ -213,13 +213,13 @@ If you used advanced IDE tools , for instance [Jetbrains IDEA Ultimate](https://
213213

214214
#### Case 1 - Single Bindings
215215

216-
![](../config-popup-window.png)
216+
![](config-popup-window.png)
217217

218218

219219

220220
#### Case 2 - Mutiple Bindings
221221

222-
![](../mconfig-popup-window.png)
222+
![](mconfig-popup-window.png)
223223

224224
225225

dubbo-spring-boot-autoconfigure/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@
5454
<optional>true</optional>
5555
</dependency>
5656

57-
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
58-
<dependency>
59-
<groupId>org.springframework.boot</groupId>
60-
<artifactId>spring-boot-configuration-processor</artifactId>
61-
<optional>true</optional>
62-
</dependency>
63-
6457
<!-- Dubbo -->
6558
<dependency>
6659
<groupId>org.apache.dubbo</groupId>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.dubbo.spring.boot.autoconfigure;
18+
19+
import org.apache.dubbo.common.utils.Assert;
20+
import org.springframework.core.env.PropertyResolver;
21+
import org.springframework.lang.Nullable;
22+
23+
/**
24+
* Delegating {@link PropertyResolver}
25+
*
26+
* @since 2.7.1
27+
*/
28+
class DelegatingPropertyResolver implements PropertyResolver {
29+
30+
private final PropertyResolver delegate;
31+
32+
DelegatingPropertyResolver(PropertyResolver delegate) {
33+
Assert.notNull(delegate, "The delegate of PropertyResolver must not be null");
34+
this.delegate = delegate;
35+
}
36+
37+
@Override
38+
public boolean containsProperty(String key) {
39+
return delegate.containsProperty(key);
40+
}
41+
42+
@Override
43+
@Nullable
44+
public String getProperty(String key) {
45+
return delegate.getProperty(key);
46+
}
47+
48+
@Override
49+
public String getProperty(String key, String defaultValue) {
50+
return delegate.getProperty(key, defaultValue);
51+
}
52+
53+
@Override
54+
@Nullable
55+
public <T> T getProperty(String key, Class<T> targetType) {
56+
return delegate.getProperty(key, targetType);
57+
}
58+
59+
@Override
60+
public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
61+
return delegate.getProperty(key, targetType, defaultValue);
62+
}
63+
64+
@Override
65+
public String getRequiredProperty(String key) throws IllegalStateException {
66+
return delegate.getRequiredProperty(key);
67+
}
68+
69+
@Override
70+
public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
71+
return delegate.getRequiredProperty(key, targetType);
72+
}
73+
74+
@Override
75+
public String resolvePlaceholders(String text) {
76+
return delegate.resolvePlaceholders(text);
77+
}
78+
79+
@Override
80+
public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
81+
return delegate.resolveRequiredPlaceholders(text);
82+
}
83+
}

dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected void customizePropertySources(MutablePropertySources propertySources)
6161
}
6262
};
6363
ConfigurationPropertySources.attach(propertyResolver);
64-
return propertyResolver;
64+
return new DelegatingPropertyResolver(propertyResolver);
6565
}
6666

6767
@ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = DubboConfigBinder.class)

dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java

+16
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
import org.springframework.beans.factory.annotation.Qualifier;
2828
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2929
import org.springframework.boot.test.context.SpringBootTest;
30+
import org.springframework.core.env.Environment;
3031
import org.springframework.core.env.PropertyResolver;
3132
import org.springframework.test.context.junit4.SpringRunner;
3233
import org.springframework.util.ClassUtils;
3334

35+
import java.util.Collection;
36+
3437
import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
3538
import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME;
3639

@@ -58,13 +61,26 @@ public class DubboRelaxedBinding2AutoConfigurationTest {
5861
@Autowired
5962
private ObjectProvider<ReferenceAnnotationBeanPostProcessor> referenceAnnotationBeanPostProcessor;
6063

64+
@Autowired
65+
private Environment environment;
66+
67+
@Autowired
68+
private Collection<Environment> environments;
69+
6170
@Test
6271
public void testBeans() {
6372
Assert.assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder));
6473
Assert.assertNotNull(serviceAnnotationBeanPostProcessor);
6574
Assert.assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable());
6675
Assert.assertNotNull(referenceAnnotationBeanPostProcessor);
6776
Assert.assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable());
77+
78+
Assert.assertNotNull(environment);
79+
Assert.assertNotNull(environments);
80+
81+
Assert.assertEquals(1, environments.size());
82+
83+
Assert.assertTrue(environments.contains(environment));
6884
}
6985

7086
}

dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfiguration.java

+3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboEndpoint;
2121
import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration;
2222
import org.apache.dubbo.spring.boot.autoconfigure.DubboRelaxedBindingAutoConfiguration;
23+
2324
import org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint;
2425
import org.springframework.boot.actuate.endpoint.Endpoint;
2526
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
29+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2830
import org.springframework.context.annotation.Bean;
2931
import org.springframework.context.annotation.Configuration;
3032

@@ -41,6 +43,7 @@
4143
DubboAutoConfiguration.class,
4244
DubboRelaxedBindingAutoConfiguration.class
4345
})
46+
@EnableConfigurationProperties(DubboEndpoint.class)
4447
public class DubboEndpointAutoConfiguration {
4548

4649
@Bean

dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
*/
1717
package org.apache.dubbo.spring.boot.actuate.autoconfigure;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
2119
import org.apache.dubbo.config.annotation.Service;
2220
import org.apache.dubbo.spring.boot.actuate.endpoint.DubboEndpoint;
2321
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboConfigsMetadata;
2422
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboPropertiesMetadata;
2523
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboReferencesMetadata;
2624
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboServicesMetadata;
2725
import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboShutdownMetadata;
26+
27+
import com.fasterxml.jackson.core.JsonProcessingException;
28+
import com.fasterxml.jackson.databind.ObjectMapper;
2829
import org.junit.Assert;
2930
import org.junit.Test;
3031
import org.junit.runner.RunWith;
@@ -163,7 +164,7 @@ public void testServices() {
163164

164165
Assert.assertEquals(1, services.size());
165166

166-
Map<String, Object> demoServiceMeta = services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0");
167+
Map<String, Object> demoServiceMeta = services.get("providers:my-protocol:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0");
167168

168169
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
169170

dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@
2222
import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
2323
import org.apache.dubbo.config.spring.context.annotation.DubboConfigConfiguration;
2424
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
25+
2526
import org.springframework.beans.factory.annotation.Qualifier;
2627
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
31+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3032
import org.springframework.context.annotation.Bean;
3133
import org.springframework.context.annotation.Configuration;
34+
import org.springframework.context.annotation.Import;
3235
import org.springframework.core.env.PropertyResolver;
3336

3437
import java.util.Set;
@@ -53,6 +56,7 @@
5356
@ConditionalOnProperty(prefix = DUBBO_PREFIX, name = "enabled", matchIfMissing = true)
5457
@Configuration
5558
@AutoConfigureAfter(DubboRelaxedBindingAutoConfiguration.class)
59+
@EnableConfigurationProperties(DubboConfigurationProperties.class)
5660
public class DubboAutoConfiguration {
5761

5862
/**
@@ -87,7 +91,7 @@ public ReferenceAnnotationBeanPostProcessor referenceAnnotationBeanPostProcessor
8791
* @see EnableDubboConfig
8892
* @see DubboConfigConfiguration.Single
8993
*/
90-
@EnableDubboConfig
94+
@Import(DubboConfigConfiguration.Single.class)
9195
protected static class SingleDubboConfigConfiguration {
9296
}
9397

@@ -98,7 +102,7 @@ protected static class SingleDubboConfigConfiguration {
98102
* @see DubboConfigConfiguration.Multiple
99103
*/
100104
@ConditionalOnProperty(prefix = DUBBO_CONFIG_PREFIX, name = MULTIPLE_CONFIG_PROPERTY_NAME, matchIfMissing = true)
101-
@EnableDubboConfig(multiple = true)
105+
@Import(DubboConfigConfiguration.Multiple.class)
102106
protected static class MultipleDubboConfigConfiguration {
103107
}
104108

0 commit comments

Comments
 (0)