Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #595 from ryanjbaxter/composite-envrepo-495
Support for composite environment repos
- Loading branch information
Showing
29 changed files
with
626 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
.../src/main/java/org/springframework/cloud/config/server/config/CompositeConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright 2013-2016 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.cloud.config.server.config; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.cloud.config.server.environment.CompositeEnvironmentRepository; | ||
| import org.springframework.cloud.config.server.environment.EnvironmentRepository; | ||
| import org.springframework.cloud.config.server.environment.SearchPathCompositeEnvironmentRepository; | ||
| import org.springframework.cloud.config.server.environment.SearchPathLocator; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Primary; | ||
|
|
||
| /** | ||
| * @author Ryan Baxter | ||
| */ | ||
| @Configuration | ||
| public class CompositeConfiguration { | ||
|
|
||
| private List<EnvironmentRepository> environmentRepos = new ArrayList<>(); | ||
|
|
||
| @Bean | ||
| @Primary | ||
| @ConditionalOnBean(SearchPathLocator.class) | ||
| public SearchPathCompositeEnvironmentRepository searchPathCompositeEnvironmentRepository() { | ||
| return new SearchPathCompositeEnvironmentRepository(environmentRepos); | ||
| } | ||
|
|
||
| @Bean | ||
| @Primary | ||
| @ConditionalOnMissingBean(SearchPathLocator.class) | ||
| public CompositeEnvironmentRepository compositeEnvironmentRepository() { | ||
| return new CompositeEnvironmentRepository(environmentRepos); | ||
| } | ||
|
|
||
| @Autowired | ||
| public void setEnvironmentRepos(List<EnvironmentRepository> repos) { | ||
| this.environmentRepos = repos; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...a/org/springframework/cloud/config/server/environment/CompositeEnvironmentRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2013-2016 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.cloud.config.server.environment; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import org.springframework.cloud.config.environment.Environment; | ||
| import org.springframework.core.OrderComparator; | ||
|
|
||
| /** | ||
| * An {@link EnvironmentRepository} composed of multiple ordered {@link EnvironmentRepository}s. | ||
| * @author Ryan Baxter | ||
| */ | ||
| public class CompositeEnvironmentRepository implements EnvironmentRepository { | ||
|
|
||
| protected List<EnvironmentRepository> environmentRepositories; | ||
|
|
||
| /** | ||
| * Creates a new {@link CompositeEnvironmentRepository}. | ||
| * @param environmentRepositories The list of {@link EnvironmentRepository}s to create the composite from. | ||
| */ | ||
| public CompositeEnvironmentRepository(List<EnvironmentRepository> environmentRepositories) { | ||
| //Sort the environment repositories by the priority | ||
| Collections.sort(environmentRepositories, OrderComparator.INSTANCE); | ||
| this.environmentRepositories = environmentRepositories; | ||
| } | ||
|
|
||
| @Override | ||
| public Environment findOne(String application, String profile, String label) { | ||
| Environment env = new Environment(application, new String[]{profile}, label, null, null); | ||
| for(EnvironmentRepository repo : environmentRepositories) { | ||
| env.addAll(repo.findOne(application, profile, label).getPropertySources()); | ||
| } | ||
| return env; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.