From 3cff32028a063af2b7539eef1cd1993f49632b4e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 28 Apr 2022 09:32:28 -0400 Subject: [PATCH] Use UTF-8 when getting strings from configmaps. Fixes #1007 --- .../cloud/kubernetes/commons/config/PropertySourceUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/PropertySourceUtils.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/PropertySourceUtils.java index 87353ac2..e019e599 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/PropertySourceUtils.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/PropertySourceUtils.java @@ -19,6 +19,8 @@ package org.springframework.cloud.kubernetes.commons.config; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.UncheckedIOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Properties; import java.util.function.BinaryOperator; @@ -96,7 +98,7 @@ public final class PropertySourceUtils { } return ABSTAIN; }); - yamlFactory.setResources(new ByteArrayResource(s.getBytes())); + yamlFactory.setResources(new ByteArrayResource(s.getBytes(StandardCharsets.UTF_8))); return yamlFactory.getObject(); }; }