mark old implementation as deprecated and revert test cases

Author: arjavdongaonkar

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepository.java

@@ -47,7 +47,15 @@ public class KubernetesEnvironmentRepository implements EnvironmentRepository, O
 
 	private final String namespace;
 
-	private int order;
+	private int order = KubernetesConfigServerProperties.DEFAULT_ORDER;
+
+	@Deprecated
+	public KubernetesEnvironmentRepository(CoreV1Api coreApi,
+			List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers, String namespace) {
+		this.coreApi = coreApi;
+		this.kubernetesPropertySourceSuppliers = kubernetesPropertySourceSuppliers;
+		this.namespace = namespace;
+	}
 
 	public KubernetesEnvironmentRepository(CoreV1Api coreApi,
 			List<KubernetesPropertySourceSupplier> kubernetesPropertySourceSuppliers, String namespace,

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesEnvironmentRepositoryTests.java

@@ -169,7 +169,7 @@ public void testApplicationCase() throws ApiException {
 				eq(null), eq(null), eq(null), eq(null), eq(null)))
 			.thenReturn(CONFIGMAP_DEV_LIST);
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default", new KubernetesConfigServerProperties());
+				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default");
 		Environment environment = environmentRepository.findOne("application", "", "");
 		assertThat(environment.getPropertySources().size()).isEqualTo(2);
 		environment.getPropertySources().forEach(propertySource -> {
@@ -203,7 +203,7 @@ public void testStoresCase() throws ApiException {
 				eq(null), eq(null), eq(null), eq(null), eq(null)))
 			.thenReturn(SECRET_LIST);
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default", new KubernetesConfigServerProperties());
+				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default");
 		Environment environment = environmentRepository.findOne("stores", "", "");
 		assertThat(environment.getPropertySources().size()).isEqualTo(4);
 		environment.getPropertySources().forEach(propertySource -> {
@@ -250,7 +250,7 @@ public void testStoresProfileCase() throws ApiException {
 				eq(null), eq(null), eq(null), eq(null), eq(null)))
 			.thenReturn(CONFIGMAP_DEV_LIST);
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default", new KubernetesConfigServerProperties());
+				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default");
 		Environment environment = environmentRepository.findOne("stores", "dev", "");
 		assertThat(environment.getPropertySources().size()).isEqualTo(6);
 		environment.getPropertySources().forEach(propertySource -> {
@@ -314,7 +314,7 @@ public void testApplicationPropertiesAnSecretsOverride() throws ApiException {
 				eq(null), eq(null), eq(null), eq(null), eq(null)))
 			.thenReturn(CONFIGMAP_DEV_LIST);
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default", new KubernetesConfigServerProperties());
+				KUBERNETES_PROPERTY_SOURCE_SUPPLIER, "default");
 		Environment environment = environmentRepository.findOne("stores-dev", "", "");
 		environment.getPropertySources()
 			.stream()
@@ -362,7 +362,7 @@ public void testSingleConfigMapMultipleSources() throws ApiException {
 			return propertySources;
 		});
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi, suppliers,
-				"default", new KubernetesConfigServerProperties());
+				"default");
 		Environment environment = environmentRepository.findOne("storessingle", "", "");
 		assertThat(environment.getPropertySources().size()).isEqualTo(1);
 		assertThat(environment.getPropertySources().get(0).getName())

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/KubernetesPropertySourceSupplierTests.java

@@ -102,8 +102,7 @@ void whenCurrentAndExtraNamespacesAddedThenAllConfigMapsAreIncluded() {
 			.configMapPropertySourceSupplier(kubernetesConfigServerProperties);
 
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				Collections.singletonList(kubernetesPropertySourceSupplier), "default",
-				new KubernetesConfigServerProperties());
+				Collections.singletonList(kubernetesPropertySourceSupplier), "default");
 
 		Environment environmentGateway = environmentRepository.findOne("gateway", "", "");
 		assertThat(environmentGateway.getPropertySources().size()).isEqualTo(1);
@@ -124,8 +123,7 @@ void whenExtraNamespacesAddedThenConfigMapsInCurrentNamespaceAreNotIncluded() {
 			.configMapPropertySourceSupplier(kubernetesConfigServerProperties);
 
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				Collections.singletonList(kubernetesPropertySourceSupplier), "default",
-				new KubernetesConfigServerProperties());
+				Collections.singletonList(kubernetesPropertySourceSupplier), "default");
 
 		Environment environmentGateway = environmentRepository.findOne("gateway", "", "");
 		assertThat(environmentGateway.getPropertySources().size()).isEqualTo(0);
@@ -146,8 +144,7 @@ void whenCurrentAndExtraNamespacesAddedThenAllSecretsAreIncluded() {
 			.secretsPropertySourceSupplier(kubernetesConfigServerProperties);
 
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				Collections.singletonList(kubernetesPropertySourceSupplier), "default",
-				new KubernetesConfigServerProperties());
+				Collections.singletonList(kubernetesPropertySourceSupplier), "default");
 
 		Environment environmentGateway = environmentRepository.findOne("gateway", "", "");
 		assertThat(environmentGateway.getPropertySources().size()).isEqualTo(1);
@@ -168,8 +165,7 @@ void whenExtraNamespacesAddedThenSecretsInCurrentNamespaceAreNotIncluded() {
 			.secretsPropertySourceSupplier(kubernetesConfigServerProperties);
 
 		KubernetesEnvironmentRepository environmentRepository = new KubernetesEnvironmentRepository(coreApi,
-				Collections.singletonList(kubernetesPropertySourceSupplier), "default",
-				new KubernetesConfigServerProperties());
+				Collections.singletonList(kubernetesPropertySourceSupplier), "default");
 
 		Environment environmentGateway = environmentRepository.findOne("gateway", "", "");
 		assertThat(environmentGateway.getPropertySources().size()).isEqualTo(0);