From c120b83f0bb3405fd7d7580e7e812c543b0e7ff9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 27 Aug 2021 19:17:10 +0000 Subject: [PATCH] Bumping versions --- ...ubernetesClientEventBasedSecretsChangeDetectorTests.java | 3 ++- .../kubernetes/commons/config/SecretsConfigProperties.java | 2 +- .../kubernetes/commons/config/SecretsPropertySource.java | 4 ++-- .../fabric8/config/Fabric8SecretsPropertySource.java | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java index 61d28876..4827b391 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java @@ -137,7 +137,8 @@ class KubernetesClientEventBasedSecretsChangeDetectorTests { KubernetesMockEnvironment environment = new KubernetesMockEnvironment( mock(KubernetesClientSecretsPropertySource.class)).withProperty("db-password", "p455w0rd"); KubernetesClientSecretsPropertySourceLocator locator = mock(KubernetesClientSecretsPropertySourceLocator.class); - when(locator.locate(environment)).thenAnswer(ignoreMe -> new MockPropertySource().withProperty("db-password", "p455w0rd2")); + when(locator.locate(environment)) + .thenAnswer(ignoreMe -> new MockPropertySource().withProperty("db-password", "p455w0rd2")); ConfigReloadProperties properties = new ConfigReloadProperties(); properties.setMonitoringSecrets(true); KubernetesNamespaceProvider kubernetesNamespaceProvider = mock(KubernetesNamespaceProvider.class); diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java index 20fe9099..0d6beb29 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java @@ -204,7 +204,7 @@ public class SecretsConfigProperties extends AbstractConfigProperties { } SecretsConfigProperties.NormalizedSource other = (SecretsConfigProperties.NormalizedSource) o; return Objects.equals(this.name, other.name) && Objects.equals(this.namespace, other.namespace) - && Objects.equals(this.labels, other.labels); + && Objects.equals(this.labels, other.labels); } @Override diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySource.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySource.java index 6587246f..acab95d4 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySource.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySource.java @@ -36,8 +36,8 @@ public class SecretsPropertySource extends MapPropertySource { } protected static String getSourceName(String name, String namespace) { - return PREFIX + Constants.PROPERTY_SOURCE_NAME_SEPARATOR + name + - Constants.PROPERTY_SOURCE_NAME_SEPARATOR + namespace; + return PREFIX + Constants.PROPERTY_SOURCE_NAME_SEPARATOR + name + Constants.PROPERTY_SOURCE_NAME_SEPARATOR + + namespace; } protected static void putAll(Map data, Map result) { diff --git a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySource.java b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySource.java index 9ac051c9..32f1e570 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySource.java +++ b/spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySource.java @@ -60,12 +60,12 @@ public class Fabric8SecretsPropertySource extends SecretsPropertySource { } client.secrets().inNamespace(namespaceToUse).withLabels(labels).list().getItems() - .forEach(s -> putDataFromSecret(s, result, namespaceToUse)); + .forEach(s -> putDataFromSecret(s, result, namespaceToUse)); } catch (Exception e) { - LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels + "] in namespace: [" + namespaceToUse - + "] (cause: " + e.getMessage() + "). Ignoring"); + LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels + "] in namespace: [" + + namespaceToUse + "] (cause: " + e.getMessage() + "). Ignoring"); } return result;