Skip to content

Support new delimiters in spring.config.location #1904

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

Merged
merged 4 commits into from
Jun 10, 2021

Conversation

ryanjbaxter
Copy link
Contributor

Fixes #1895
Requires Boot 2.4.7

Copy link
Member

@spencergibb spencergibb left a comment

Choose a reason for hiding this comment

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

how about a test?

@ryanjbaxter ryanjbaxter requested a review from spencergibb June 9, 2021 20:15
Copy link
Member

@spencergibb spencergibb left a comment

Choose a reason for hiding this comment

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

Could delete the hooks from test repo, but LGTM

@philwebb
Copy link

If back compatibility is an issue then you could pick the delimiter based on the presence of the ConfigDataLocation.split() method.

@ryanjbaxter
Copy link
Contributor Author

I think we are fine with not being compatible with releases prior to Boot 2.4.7.

@codecov
Copy link

codecov bot commented Jun 10, 2021

Codecov Report

Merging #1904 (71c8dfe) into main (b1e795d) will increase coverage by 0.03%.
The diff coverage is 70.58%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #1904      +/-   ##
============================================
+ Coverage     78.13%   78.16%   +0.03%     
- Complexity     1325     1329       +4     
============================================
  Files           167      167              
  Lines          4894     4901       +7     
  Branches        657      657              
============================================
+ Hits           3824     3831       +7     
  Misses          807      807              
  Partials        263      263              
Impacted Files Coverage Δ
...erver/environment/NativeEnvironmentRepository.java 81.32% <70.58%> (+0.19%) ⬆️
...oud/config/server/support/AbstractScmAccessor.java 81.44% <0.00%> (+1.03%) ⬆️

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 b1e795d...71c8dfe. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong property source order when properties are in nested folders
3 participants