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 ability to merge config files #205

Merged
merged 3 commits into from
Feb 3, 2017
Merged

Add ability to merge config files #205

merged 3 commits into from
Feb 3, 2017

Conversation

PtrTeixeira
Copy link
Contributor

Adds a config provider that allows multiple config providers to be
joined. This allows as single configuration POJO to be stored in
separate files on disk, eg for versioning part of it while keeping the
other secret.

Adds a config provider that allows multiple config providers to be
joined. This allows as single configuration POJO to be stored in
seperate files on disk, eg for versioning part of it while keeping the
other secret.
Attaches the merging config provider to the bootstrapper in the
BaragonService in such a way that if the system property
`baragonDefaultConfiguration` is set, then it will use the config file
at that location as the default, overriding those values with any values
that are deployed with the application.

This also includes some changes to how the tests are set up,
specifically by removing Jukito. I wasn't using parameter injection, and
it turned out to be much easier to create the object mapper inline
rather than trying to inject it.
@ssalinas
Copy link
Member

💯

@PtrTeixeira PtrTeixeira changed the title [WIP] Add ability to merge config files Add ability to merge config files Jan 31, 2017
@ssalinas ssalinas merged commit 1af97e5 into master Feb 3, 2017
@ssalinas ssalinas removed the staging label Feb 3, 2017
@ssalinas ssalinas deleted the merge-config-files branch February 3, 2017 20:15
@ssalinas ssalinas modified the milestone: 0.5.0 May 23, 2017
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.

2 participants