From 80cc7f98001f79cd287550b1c6789d56b2d17a77 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 27 Feb 2015 15:52:45 +0000 Subject: [PATCH] source->environment --- .../config/client/ConfigServicePropertySourceLocator.java | 4 ++-- .../cloud/config/{source => environment}/Environment.java | 2 +- .../cloud/config/{source => environment}/PropertySource.java | 2 +- .../client/ConfigServicePropertySourceLocatorTests.java | 2 +- .../cloud/config/server/AbstractSCMEnvironmentRepository.java | 4 ++-- .../cloud/config/server/EncryptionController.java | 4 ++-- .../cloud/config/server/EnvironmentController.java | 4 ++-- .../cloud/config/server/EnvironmentRepository.java | 2 +- .../server/EnvironmentRepositoryPropertySourceLocator.java | 2 +- .../cloud/config/server/JGitEnvironmentRepository.java | 2 +- .../config/server/MultipleJGitEnvironmentRepository.java | 2 +- .../cloud/config/server/NativeEnvironmentRepository.java | 4 ++-- .../cloud/config/server/SVNKitEnvironmentRepository.java | 2 +- .../config/server/SpringApplicationEnvironmentRepository.java | 2 +- .../config/server/BootstrapConfigServerIntegrationTests.java | 2 +- .../cloud/config/server/EncryptionControllerTests.java | 4 ++-- .../cloud/config/server/EnvironmentControllerTests.java | 4 ++-- .../server/JGitEnvironmentRepositoryIntegrationTests.java | 2 +- .../cloud/config/server/JGitEnvironmentRepositoryTests.java | 2 +- .../MultipleJGitEnvironmentRepositoryIntegrationTests.java | 2 +- .../config/server/MultipleJGitEnvironmentRepositoryTests.java | 2 +- .../config/server/NativeConfigServerIntegrationTests.java | 2 +- .../server/SVNKitEnvironmentRepositoryIntegrationTests.java | 2 +- .../cloud/config/server/SVNKitEnvironmentRepositoryTests.java | 2 +- .../server/SpringApplicationEnvironmentRepositoryTests.java | 2 +- .../config/server/SubversionConfigServerIntegrationTests.java | 2 +- .../config/server/VanillaConfigServerIntegrationTests.java | 2 +- 27 files changed, 34 insertions(+), 34 deletions(-) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/config/{source => environment}/Environment.java (97%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/config/{source => environment}/PropertySource.java (96%) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java index baa004f5..86550eb8 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.core.annotation.Order; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/Environment.java similarity index 97% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/Environment.java index 9fdabeb4..c1093fb3 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/Environment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.source; +package org.springframework.cloud.config.environment; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java index 746b7e6f..974cabfc 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/environment/PropertySource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.source; +package org.springframework.cloud.config.environment; import java.util.Map; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java index 8d6d3171..af53bd3e 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java @@ -14,7 +14,7 @@ import org.mockito.Matchers; import org.mockito.Mockito; import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; import org.springframework.http.HttpEntity; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java index 93a346f8..8fba81b6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jgit.util.FileUtils; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.UrlResource; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java index 77f251f9..4cbcf4ef 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java @@ -31,8 +31,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.config.encrypt.EncryptorFactory; import org.springframework.cloud.config.encrypt.KeyFormatException; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java index 45147caa..ac520218 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java @@ -13,8 +13,8 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.bind.PropertiesConfigurationFactory; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.http.HttpHeaders; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java index 7ec2d0e1..c354219e 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java @@ -15,7 +15,7 @@ */ package org.springframework.cloud.config.server; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java index 1a33dfed..a02d1018 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java @@ -18,7 +18,7 @@ package org.springframework.cloud.config.server; import java.util.Map; import org.springframework.cloud.config.client.PropertySourceLocator; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java index 6dc0462a..6ad3b19f 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java @@ -40,7 +40,7 @@ import org.eclipse.jgit.transport.OpenSshConfig.Host; import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.util.FileUtils; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.UrlResource; import org.springframework.util.Assert; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java index 03b55c53..102e1ff8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java @@ -20,7 +20,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.PatternMatchUtils; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java index 5d743116..4c127433 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java @@ -24,8 +24,8 @@ import java.util.Set; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.StandardEnvironment; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.web.context.support.StandardServletEnvironment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java index 905da541..848c66b9 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java @@ -21,7 +21,7 @@ import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java index c2627641..8b15fad6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java @@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfigurati import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.config.ConfigFileApplicationListener; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.environment.Environment; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java index 02640448..28a0168f 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerApplication; import org.springframework.cloud.config.server.ConfigServerTestUtils; -import org.springframework.cloud.config.source.Environment; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java index 1d2fbad9..79df7396 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java @@ -23,11 +23,11 @@ import java.util.Collections; import org.junit.Test; import org.springframework.cloud.config.encrypt.KeyFormatException; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.config.server.EncryptionController; import org.springframework.cloud.config.server.InvalidCipherException; import org.springframework.cloud.config.server.KeyNotInstalledException; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; import org.springframework.http.MediaType; import org.springframework.security.rsa.crypto.RsaSecretEncryptor; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java index 0037f9b9..b6062f8b 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java @@ -27,11 +27,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.springframework.cloud.config.environment.Environment; +import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.config.server.EncryptionController; import org.springframework.cloud.config.server.EnvironmentController; import org.springframework.cloud.config.server.EnvironmentRepository; -import org.springframework.cloud.config.source.Environment; -import org.springframework.cloud.config.source.PropertySource; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java index 8633a1a7..789bcc43 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java @@ -30,10 +30,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerConfiguration; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.EnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java index 4b2d8805..1875b562 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java @@ -25,9 +25,9 @@ import java.io.IOException; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.JGitEnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.core.env.StandardEnvironment; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java index 141d9c94..e0634a73 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java @@ -29,10 +29,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerConfiguration; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.EnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java index 7bbfc103..236ce0da 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java @@ -23,10 +23,10 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.MultipleJGitEnvironmentRepository; import org.springframework.cloud.config.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.core.env.StandardEnvironment; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java index dbbf89a5..d39b3165 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java @@ -13,9 +13,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerApplication; import org.springframework.cloud.config.server.ConfigServerTestUtils; -import org.springframework.cloud.config.source.Environment; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java index 2e4404b7..a1095b57 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java @@ -27,10 +27,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerConfiguration; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.EnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java index ef686a06..69253059 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java @@ -21,9 +21,9 @@ import java.io.File; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.cloud.config.server.SVNKitEnvironmentRepository; -import org.springframework.cloud.config.source.Environment; import org.springframework.core.env.StandardEnvironment; import static org.junit.Assert.assertTrue; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java index 695b6ada..1d5ba051 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java @@ -18,8 +18,8 @@ package org.springframework.cloud.config.server; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.SpringApplicationEnvironmentRepository; -import org.springframework.cloud.config.source.Environment; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java index dadf8a95..b059f857 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerApplication; import org.springframework.cloud.config.server.ConfigServerTestUtils; -import org.springframework.cloud.config.source.Environment; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java index 21b5fefa..3a5531ca 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; +import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.server.ConfigServerApplication; import org.springframework.cloud.config.server.ConfigServerTestUtils; -import org.springframework.cloud.config.source.Environment; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration;