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

add a config adjust the property source overriden behavior #4409

Merged

Conversation

shenhuaxin
Copy link
Contributor

@shenhuaxin shenhuaxin commented Jun 11, 2022

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 behavior

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

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

(cherry picked from commit e23f628)

feat: add a config adjust the property source overriden behavior

(cherry picked from commit b6dafd2)

feat: add a config adjust the property source overriden behavior

(cherry picked from commit 6d4b5d8)

feat: add a config adjust the property source overriden behavior

(cherry picked from commit 4d1d27d)

feat: add a config adjust the property source overriden behavior

(cherry picked from commit 6e85efa)

feat: add a config adjust the property source overriden behavior for non-spring-boot project

fix: change property name

refactor: remove isOverrideSystemProperties()

refactor: remove isOverrideSystemProperties()

test: remove isOverrideSystemProperties()

Update apollo-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Co-authored-by: Jason Song <nobodyiam@gmail.com>

fix: rename override system properties, original name is not valid
ApolloClientSystemPropertyInitializerTest.testSystemPropertyNames

docs: add apollo.override-system-properties docs
@codecov-commenter
Copy link

Codecov Report

Merging #4409 (ff1a2e9) into master (232aa87) will increase coverage by 0.00%.
The diff coverage is 80.00%.

@@            Coverage Diff            @@
##             master    #4409   +/-   ##
=========================================
  Coverage     53.15%   53.15%           
- Complexity     2671     2675    +4     
=========================================
  Files           489      489           
  Lines         15277    15291   +14     
  Branches       1580     1585    +5     
=========================================
+ Hits           8120     8128    +8     
- Misses         6604     6607    +3     
- Partials        553      556    +3     
Impacted Files Coverage Δ
...ramework/apollo/core/ApolloClientSystemConsts.java 0.00% <ø> (ø)
...apollo/spring/config/PropertySourcesProcessor.java 93.54% <66.66%> (-2.95%) ⬇️
...ring/boot/ApolloApplicationContextInitializer.java 92.98% <75.00%> (-1.36%) ⬇️
...va/com/ctrip/framework/apollo/util/ConfigUtil.java 82.63% <100.00%> (+0.46%) ⬆️
...ework/apollo/internals/RemoteConfigRepository.java 85.27% <0.00%> (-3.07%) ⬇️
.../apollo/internals/RemoteConfigLongPollService.java 78.31% <0.00%> (+1.20%) ⬆️

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 232aa87...ff1a2e9. Read the comment docs.

Copy link
Member

@nobodyiam nobodyiam left a comment

Choose a reason for hiding this comment

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

LGTM

@nobodyiam nobodyiam merged commit 2cc9fc8 into apolloconfig:master Jun 11, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Jun 11, 2022
@nobodyiam nobodyiam added this to the 2.1.0 milestone Feb 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

spring boot的配置优先级顺序
3 participants