From 8a43f03a16c45c017c60b4a95209c1ce2858aa20 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 8 Apr 2025 23:42:50 +0300 Subject: [PATCH] dirty Signed-off-by: wind57 --- .../kubernetes/commons/config/MultipleSourcesContainer.java | 2 ++ .../cloud/kubernetes/commons/config/ConfigUtilsTests.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MultipleSourcesContainer.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MultipleSourcesContainer.java index 892171f7..7d2d4fea 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MultipleSourcesContainer.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/MultipleSourcesContainer.java @@ -24,6 +24,8 @@ import java.util.Map; * * Container that stores multiple sources, to be exact their names and their flattenned * data. We force a LinkedHashSet on purpose, to preserve the order of sources. + * @apiNote in a future major release, instead of taking two arguments as input, we will + * take only one: {@code LinkedHashMap> } */ public record MultipleSourcesContainer(LinkedHashSet names, Map data) { diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java index f14f8941..c826889a 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java @@ -226,6 +226,7 @@ class ConfigUtilsTests { } @Test + @SuppressWarnings("unchecked") void testIssue1757() { StrippedSourceContainer containerA = new StrippedSourceContainer(Map.of("load", "true"), "client-1", @@ -238,7 +239,7 @@ class ConfigUtilsTests { new MockEnvironment(), Map.of("load", "true"), "default", Set.of(), false); System.out.println(container); - assertThat(container.names()).containsExactly("client-1", "client-2"); + assertThat(container.names()).containsExactlyInAnyOrder("client-1", "client-2"); Map client1Data = (Map) container.data().get("client-1"); assertThat(client1Data)