diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java index e5063f68..af9b97a5 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java @@ -20,9 +20,9 @@ import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.configure.client.ConfigClientProperties; -import org.springframework.cloud.configure.client.ConfigServerHealthIndicator; -import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigServerHealthIndicator; +import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java index 569c94bb..ead3ab5d 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.cloud.configure.client.RefreshEndpoint; +import org.springframework.cloud.config.client.RefreshEndpoint; import org.springframework.cloud.context.environment.EnvironmentManager; import org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint; import org.springframework.cloud.context.restart.RestartEndpoint; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index 7bcb4185..b783898f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaD import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor; import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration; -import org.springframework.cloud.configure.client.RefreshEndpoint; +import org.springframework.cloud.config.client.RefreshEndpoint; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.cloud.context.environment.EnvironmentManager; import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java index 8bd249b3..18fac7b7 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java @@ -29,9 +29,9 @@ import org.springframework.boot.bind.PropertySourcesPropertyValues; import org.springframework.boot.bind.RelaxedDataBinder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.BootstrapApplicationListener; -import org.springframework.cloud.configure.client.ConfigClientProperties; -import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; -import org.springframework.cloud.configure.client.PropertySourceLocator; +import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.config.client.PropertySourceLocator; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.cloud.logging.LoggingRebinder; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java index 7d72c527..4751d2d3 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.encrypt.KeyProperties.KeyStore; -import org.springframework.cloud.configure.encrypt.EncryptorFactory; +import org.springframework.cloud.config.encrypt.EncryptorFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java similarity index 99% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java index d80065b0..5994fc04 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import java.net.MalformedURLException; import java.net.URL; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java index cf2e7271..5fa005d8 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java index 09f4ca3b..baa004f5 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import java.io.IOException; import java.util.Arrays; @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.source.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/configure/client/PropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java similarity index 95% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/PropertySourceLocator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java index 16d06d46..a04be177 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/PropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java similarity index 99% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java index ec9f7aa7..9a44c781 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import java.util.Arrays; import java.util.Collection; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java index 481e45c4..cf35be66 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.encrypt; +package org.springframework.cloud.config.encrypt; import org.springframework.security.crypto.encrypt.Encryptors; import org.springframework.security.crypto.encrypt.TextEncryptor; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java similarity index 93% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java index b724914e..d1f0c557 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.encrypt; +package org.springframework.cloud.config.encrypt; @SuppressWarnings("serial") public class KeyFormatException extends RuntimeException { diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java similarity index 97% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java index f10b51d5..9fdabeb4 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/Environment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure; +package org.springframework.cloud.config.source; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java index 4c2ebc3d..746b7e6f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/source/PropertySource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure; +package org.springframework.cloud.config.source; import java.util.Map; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java index 60dbeda1..a6129a17 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java @@ -6,8 +6,8 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration; -import org.springframework.cloud.configure.client.ConfigClientProperties; -import org.springframework.cloud.configure.client.ConfigServerHealthIndicator; +import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigServerHealthIndicator; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index 36148982..49e86987 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -34,8 +34,8 @@ import org.junit.rules.ExpectedException; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.configure.client.ConfigClientProperties; -import org.springframework.cloud.configure.client.PropertySourceLocator; +import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.config.client.PropertySourceLocator; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java similarity index 94% rename from spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java index 30983401..8ec7316f 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.boot.test.EnvironmentTestUtils; -import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java similarity index 93% rename from spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java index 1053fed8..8d6d3171 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.client; +package org.springframework.cloud.config.client; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -12,9 +12,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Matchers; import org.mockito.Mockito; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.client.ConfigClientProperties; -import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.config.source.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; import org.springframework.http.HttpEntity; diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java index 50a545a7..0820e8d6 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; @@ -37,7 +37,7 @@ public class ApplicationTests { String baseDir = ConfigServerTestUtils.getBaseDirectory("spring-cloud-config-sample"); String repo = ConfigServerTestUtils.prepareLocalRepo(baseDir, "target/repos", "config-repo", "target/config"); server = SpringApplication.run( - org.springframework.cloud.configure.server.ConfigServerApplication.class, + org.springframework.cloud.config.server.ConfigServerApplication.class, "--server.port=" + configPort, "--spring.config.name=server", "--spring.cloud.config.server.git.uri=" + repo); configPort = ((EmbeddedWebApplicationContext) server) diff --git a/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java index a23bf501..507fee6c 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java @@ -15,7 +15,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.config.server.ConfigServerTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,7 +41,7 @@ public class ServerNativeApplicationTests { public static void startConfigServer() throws IOException { String repo = ConfigServerTestUtils.prepareLocalRepo(); server = SpringApplication.run( - org.springframework.cloud.configure.server.ConfigServerApplication.class, + org.springframework.cloud.config.server.ConfigServerApplication.class, "--server.port=" + configPort, "--spring.config.name=server", "--spring.cloud.config.server.git.uri=" + repo, "--spring.profiles.active=native"); configPort = ((EmbeddedWebApplicationContext) server) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java similarity index 92% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java index 88526b53..93a346f8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.File; import java.io.IOException; @@ -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.configure.Environment; -import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.source.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/configure/server/ConfigServerApplication.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java similarity index 90% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerApplication.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java index e036b9e2..9fc9e486 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerApplication.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java similarity index 93% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java index fe26311f..a1ce1fbf 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java index 700effad..a7f14baf 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java index 2033e34a..8f5db3d5 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java index 403cdbf9..c1db1de1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java similarity index 98% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java index 46214538..9b5e5228 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.eclipse.jgit.util.FileUtils; import org.springframework.util.FileSystemUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java similarity index 95% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java index 577ee609..47c147e8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java similarity index 96% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java index 137665d8..77f251f9 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -29,10 +29,10 @@ import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.PropertySource; -import org.springframework.cloud.configure.encrypt.EncryptorFactory; -import org.springframework.cloud.configure.encrypt.KeyFormatException; +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.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/configure/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentController.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java index b99286ad..45147caa 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.IOException; import java.util.ArrayList; @@ -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.configure.Environment; -import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.source.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/configure/server/EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java similarity index 87% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java index 57055aca..7ec2d0e1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; -import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.config.source.Environment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java similarity index 91% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java index 706efaf8..1a33dfed 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.Map; -import org.springframework.cloud.configure.PropertySource; -import org.springframework.cloud.configure.client.PropertySourceLocator; +import org.springframework.cloud.config.client.PropertySourceLocator; +import org.springframework.cloud.config.source.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/configure/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java similarity index 98% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/JGitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java index 7ac8ccd6..6dc0462a 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.File; import java.io.IOException; @@ -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.configure.Environment; +import org.springframework.cloud.config.source.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/configure/server/MultipleJGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java index 3ca336cf..03b55c53 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.LinkedHashMap; import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.config.source.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/configure/server/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java similarity index 92% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/NativeEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java index c47b3788..5d743116 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.Arrays; import java.util.HashSet; @@ -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.configure.Environment; -import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.config.source.Environment; +import org.springframework.cloud.config.source.PropertySource; import org.springframework.web.context.support.StandardServletEnvironment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java index f9b0fcb8..905da541 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; 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.configure.Environment; +import org.springframework.cloud.config.source.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/configure/server/SerializableMapPropertySource.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SerializableMapPropertySource.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java index 26d0afc1..b244fed4 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SerializableMapPropertySource.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.Map; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java index 6950ec96..c2627641 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.util.ArrayList; import java.util.Collections; @@ -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.configure.Environment; +import org.springframework.cloud.config.source.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/main/resources/META-INF/spring.factories b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories index 96709c5f..5b4ba62c 100644 --- a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Bootstrap components org.springframework.cloud.bootstrap.BootstrapConfiguration=\ -org.springframework.cloud.configure.server.ConfigServerBootstrapConfiguration \ No newline at end of file +org.springframework.cloud.config.server.ConfigServerBootstrapConfiguration \ No newline at end of file diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java index c65430d8..02640448 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerApplication; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +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/configure/server/EncryptionControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java similarity index 88% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EncryptionControllerTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java index 01531cba..1d2fbad9 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EncryptionControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -22,12 +22,12 @@ import static org.junit.Assert.assertTrue; import java.util.Collections; import org.junit.Test; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.PropertySource; -import org.springframework.cloud.configure.encrypt.KeyFormatException; -import org.springframework.cloud.configure.server.EncryptionController; -import org.springframework.cloud.configure.server.InvalidCipherException; -import org.springframework.cloud.configure.server.KeyNotInstalledException; +import org.springframework.cloud.config.encrypt.KeyFormatException; +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/configure/server/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java similarity index 95% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java index f5419cc9..0037f9b9 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -27,8 +27,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.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/configure/server/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java index fcb8396d..8633a1a7 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerConfiguration; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.EnvironmentRepository; +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/configure/server/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java similarity index 93% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java index 6593d3ff..4b2d8805 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.JGitEnvironmentRepository; +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/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java index 09f182a0..141d9c94 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerConfiguration; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.EnvironmentRepository; +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/configure/server/MultipleJGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java index aef655a8..7bbfc103 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; @@ -23,10 +23,10 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository; -import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository; +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/configure/server/NativeConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java similarity index 89% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/NativeConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java index b8e6cba1..dbbf89a5 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/NativeConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerApplication; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +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/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java index 297816c5..2e4404b7 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.File; import java.io.FileNotFoundException; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerConfiguration; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.EnvironmentRepository; +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/configure/server/SVNKitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java similarity index 91% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java index f9acb308..ef686a06 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import java.io.File; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; -import org.springframework.cloud.configure.server.SVNKitEnvironmentRepository; +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/configure/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java similarity index 91% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java index 8f2fb22d..695b6ada 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.*; import org.junit.Test; -import org.springframework.cloud.configure.Environment; -import org.springframework.cloud.configure.server.SpringApplicationEnvironmentRepository; +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/configure/server/SubversionConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SubversionConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java index f0f84265..dadf8a95 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SubversionConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import org.junit.BeforeClass; import org.junit.Test; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerApplication; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +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/configure/server/VanillaConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/VanillaConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java index 0eef684c..21b5fefa 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/VanillaConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.configure.server; +package org.springframework.cloud.config.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -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.configure.Environment; -import org.springframework.cloud.configure.server.ConfigServerApplication; -import org.springframework.cloud.configure.server.ConfigServerTestUtils; +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;