Back to configure->config

The connectors project doesn't use any of the subpackages we do
here so if we movethe Environment and PropertySource into a sub-
package it should be safe.

See gh-91

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;

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;
 

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;

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;

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;
 
 /**

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;

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;
 
 /**

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;

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;

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;

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;
 
 
 /**

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;

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;