From 9b8872bfda30402c47a01641aefe54ad66a330e1 Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 19 Jul 2023 15:10:43 +0300 Subject: [PATCH] fix issue (#1386) --- .../commons/config/ConfigMapPropertySourceLocator.java | 5 ++++- .../commons/config/SecretsPropertySourceLocator.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java index 3c23784f..1ca300b5 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java @@ -99,7 +99,10 @@ public abstract class ConfigMapPropertySourceLocator implements PropertySourceLo private void addPropertySourcesFromPaths(Environment environment, CompositePropertySource composite) { Set uniquePaths = new LinkedHashSet<>(properties.paths()); - LOG.warn("path support is deprecated and will be removed in a future release. Please use spring.config.import"); + if (!uniquePaths.isEmpty()) { + LOG.warn( + "path support is deprecated and will be removed in a future release. Please use spring.config.import"); + } LOG.debug("paths property sources : " + uniquePaths); uniquePaths.stream().map(Paths::get).filter(p -> { boolean exists = Files.exists(p); diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java index 235cacb9..cb3ea66a 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsPropertySourceLocator.java @@ -112,7 +112,10 @@ public abstract class SecretsPropertySourceLocator implements PropertySourceLoca protected void putPathConfig(CompositePropertySource composite) { - LOG.warn("path support is deprecated and will be removed in a future release. Please use spring.config.import"); + if (!properties.paths().isEmpty()) { + LOG.warn( + "path support is deprecated and will be removed in a future release. Please use spring.config.import"); + } this.properties.paths().stream().map(Paths::get).filter(Files::exists).flatMap(x -> { try {