From bc0fc13e2812b6a88df6932ec21efa82ebc5cd05 Mon Sep 17 00:00:00 2001 From: eidottermihi Date: Sat, 14 Feb 2015 23:31:49 +0100 Subject: [PATCH] Fix merge mistake in ConfigServerConfiguration. --- .../server/ConfigServerConfiguration.java | 146 ++++++++---------- 1 file changed, 67 insertions(+), 79 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java index fae00082..635f1871 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java @@ -1,80 +1,68 @@ -/* - * Copyright 2013-2014 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; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * @author Dave Syer - * - */ -@Configuration -@ConditionalOnMissingBean(EnvironmentRepository.class) -@EnableConfigurationProperties(ConfigServerProperties.class) -public class ConfigServerConfiguration { - - @Configuration - @Profile("native") - protected static class NativeRepositoryConfiguration { - @Bean - public SpringApplicationEnvironmentRepository EnvironmentRepository() { - return new SpringApplicationEnvironmentRepository(); - } - } - - @Configuration - protected static class GitRepositoryConfiguration { - - @Autowired - private ConfigurableEnvironment environment; - - @Bean - public MultipleJGitEnvironmentRepository EnvironmentRepository() { - return new MultipleJGitEnvironmentRepository(environment); - } - } - - @Configuration - @Profile("subversion") - protected static class SvnRepositoryConfiguration { - @Autowired - private ConfigurableEnvironment environment; - - @Bean - public SVNKitEnvironmentRepository EnvironmentRepository() { - return new SVNKitEnvironmentRepository(environment); - } - } - - @Configuration - @Profile("subversion") - protected static class SvnRepositoryConfiguration { - @Autowired - private ConfigurableEnvironment environment; - - @Bean - public SVNKitEnvironmentRepository EnvironmentRepository() { - return new SVNKitEnvironmentRepository(environment); - } - } - +/* + * Copyright 2013-2014 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; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.core.env.ConfigurableEnvironment; + +/** + * @author Dave Syer + * + */ +@Configuration +@ConditionalOnMissingBean(EnvironmentRepository.class) +@EnableConfigurationProperties(ConfigServerProperties.class) +public class ConfigServerConfiguration { + + @Configuration + @Profile("native") + protected static class NativeRepositoryConfiguration { + @Bean + public SpringApplicationEnvironmentRepository EnvironmentRepository() { + return new SpringApplicationEnvironmentRepository(); + } + } + + @Configuration + protected static class GitRepositoryConfiguration { + + @Autowired + private ConfigurableEnvironment environment; + + @Bean + public MultipleJGitEnvironmentRepository EnvironmentRepository() { + return new MultipleJGitEnvironmentRepository(environment); + } + } + + @Configuration + @Profile("subversion") + protected static class SvnRepositoryConfiguration { + @Autowired + private ConfigurableEnvironment environment; + + @Bean + public SVNKitEnvironmentRepository EnvironmentRepository() { + return new SVNKitEnvironmentRepository(environment); + } + } + } \ No newline at end of file