-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
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
add a config adjust the property source overriden behavior #4377
add a config adjust the property source overriden behavior #4377
Conversation
CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅ |
I have read the CLA Document and I hereby sign the CLA |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution! This looks good to me.
However, I think this config should also work for non-spring-boot environment, so we need to rename the config name(apollo.bootstrap is for configs only applicable to spring boot).
Also we need to tell the user how to config it in java-sdk-user-guide(zh, en).
…non-spring-boot project
|
...rc/main/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
Outdated
Show resolved
Hide resolved
...-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesProcessor.java
Outdated
Show resolved
Hide resolved
apollo-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Outdated
Show resolved
Hide resolved
apollo-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Outdated
Show resolved
Hide resolved
…nfiguration-metadata.json Co-authored-by: Jason Song <nobodyiam@gmail.com>
sure, i will do it |
ApolloClientSystemPropertyInitializerTest.testSystemPropertyNames
Codecov Report
@@ Coverage Diff @@
## master #4377 +/- ##
=========================================
Coverage 53.18% 53.18%
- Complexity 2674 2676 +2
=========================================
Files 489 489
Lines 15277 15291 +14
Branches 1580 1585 +5
=========================================
+ Hits 8125 8133 +8
- Misses 6597 6603 +6
Partials 555 555
Continue to review full report at Codecov.
|
As 2.1.0 is released, please rebase the code and also update the CHANGES.md.
|
Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](google/gson@gson-parent-2.8.0...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
i did something wrong with rebase , and i don't know how to fix it , may i need to create another pr to fix it ? |
If rebase doesn't work for you, you may use squash, see the CONTRIBUTING guide. |
What's the purpose of this PR
add a config adjust the property source overriden behavior
Which issue(s) this PR fixes:
Fixes #4367 (comment)
Brief changelog
add property
apollo.bootstrap.overrideSystemProperties
change apollo property source overriden behaviorFollow this checklist to help us incorporate your contribution quickly and easily:
mvn clean test
to make sure this pull request doesn't break anything.CHANGES
log.