From 7c6b433d714ddcfd61e694578d1fda723ac63428 Mon Sep 17 00:00:00 2001 From: Deepak Date: Thu, 15 May 2025 21:28:35 +0530 Subject: [PATCH 1/4] Fix component spec parsing Signed-off-by: Deepak --- .../src/main/java/io/dapr/testcontainers/DaprContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index dd008ed33f..8b57c66a92 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -210,11 +210,11 @@ public DaprContainer withComponent(Path path) { try { Map component = YAML_MAPPER.loadAs(Files.newInputStream(path), Map.class); - String type = (String) component.get("type"); Map metadata = (Map) component.get("metadata"); String name = (String) metadata.get("name"); Map spec = (Map) component.get("spec"); + String type = (String) spec.get("type"); String version = (String) spec.get("version"); List> specMetadata = (List>) spec.getOrDefault("metadata", Collections.emptyMap()); From bb040ab82812e8d29860369cc21fe4fa41042a9c Mon Sep 17 00:00:00 2001 From: Deepak Date: Thu, 15 May 2025 21:37:11 +0530 Subject: [PATCH 2/4] Fix component spec parsing Signed-off-by: Deepak --- .../src/test/java/io/dapr/testcontainers/DaprComponentTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java index d02a6c1cd7..8bc9ea6112 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java @@ -69,7 +69,7 @@ public void withComponentFromPath() { + "metadata:\n" + " name: statestore\n" + "spec:\n" - + " type: null\n" + + " type: state.redis\n" + " version: v1\n" + " metadata:\n" + " - name: name\n" From 16a2aa68dd1b5deeaeaf0e115ac7901f8fa8c010 Mon Sep 17 00:00:00 2001 From: Deepak Date: Thu, 15 May 2025 23:48:25 +0530 Subject: [PATCH 3/4] Fix component spec metadata parsing Signed-off-by: Deepak --- .../java/io/dapr/testcontainers/DaprContainer.java | 6 ++---- .../io/dapr/testcontainers/DaprComponentTest.java | 12 +++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index 8b57c66a92..ff078ff7d3 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -217,14 +217,12 @@ public DaprContainer withComponent(Path path) { String type = (String) spec.get("type"); String version = (String) spec.get("version"); List> specMetadata = - (List>) spec.getOrDefault("metadata", Collections.emptyMap()); + (List>) spec.getOrDefault("metadata", Collections.emptyList()); ArrayList metadataEntries = new ArrayList<>(); for (Map specMetadataItem : specMetadata) { - for (Map.Entry metadataItem : specMetadataItem.entrySet()) { - metadataEntries.add(new MetadataEntry(metadataItem.getKey(), metadataItem.getValue())); - } + metadataEntries.add(new MetadataEntry(specMetadataItem.get("name"), specMetadataItem.get("value"))); } return withComponent(new Component(name, type, version, metadataEntries)); diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java index 8bc9ea6112..3de5ccdf19 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java @@ -72,17 +72,11 @@ public void withComponentFromPath() { + " type: state.redis\n" + " version: v1\n" + " metadata:\n" - + " - name: name\n" - + " value: keyPrefix\n" - + " - name: value\n" + + " - name: keyPrefix\n" + " value: name\n" - + " - name: name\n" - + " value: redisHost\n" - + " - name: value\n" + + " - name: redisHost\n" + " value: redis:6379\n" - + " - name: name\n" - + " value: redisPassword\n" - + " - name: value\n" + + " - name: redisPassword\n" + " value: ''\n"; assertEquals(expectedComponentYaml, componentYaml); From 35b6588f4bb79c6bc12671fdc91397df6f3f2401 Mon Sep 17 00:00:00 2001 From: Deepak Date: Fri, 16 May 2025 17:31:22 +0530 Subject: [PATCH 4/4] fix checkstyle-error Signed-off-by: Deepak --- .../src/main/java/io/dapr/testcontainers/DaprContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index ff078ff7d3..2a1d905fd0 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -222,7 +222,7 @@ public DaprContainer withComponent(Path path) { ArrayList metadataEntries = new ArrayList<>(); for (Map specMetadataItem : specMetadata) { - metadataEntries.add(new MetadataEntry(specMetadataItem.get("name"), specMetadataItem.get("value"))); + metadataEntries.add(new MetadataEntry(specMetadataItem.get("name"), specMetadataItem.get("value"))); } return withComponent(new Component(name, type, version, metadataEntries));