Skip to content

Commit e4cc030

Browse files
iddeepakcicoyleartur-ciocanu
authored
Fix component spec parsing (#1370)
* Fix component spec parsing Signed-off-by: Deepak <[email protected]> * Fix component spec parsing Signed-off-by: Deepak <[email protected]> * Fix component spec metadata parsing Signed-off-by: Deepak <[email protected]> * fix checkstyle-error Signed-off-by: Deepak <[email protected]> --------- Signed-off-by: Deepak <[email protected]> Co-authored-by: Cassie Coyle <[email protected]> Co-authored-by: artur-ciocanu <[email protected]>
1 parent c07e07b commit e4cc030

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,19 @@ public DaprContainer withComponent(Path path) {
210210
try {
211211
Map<String, Object> component = YAML_MAPPER.loadAs(Files.newInputStream(path), Map.class);
212212

213-
String type = (String) component.get("type");
214213
Map<String, Object> metadata = (Map<String, Object>) component.get("metadata");
215214
String name = (String) metadata.get("name");
216215

217216
Map<String, Object> spec = (Map<String, Object>) component.get("spec");
217+
String type = (String) spec.get("type");
218218
String version = (String) spec.get("version");
219219
List<Map<String, String>> specMetadata =
220-
(List<Map<String, String>>) spec.getOrDefault("metadata", Collections.emptyMap());
220+
(List<Map<String, String>>) spec.getOrDefault("metadata", Collections.emptyList());
221221

222222
ArrayList<MetadataEntry> metadataEntries = new ArrayList<>();
223223

224224
for (Map<String, String> specMetadataItem : specMetadata) {
225-
for (Map.Entry<String, String> metadataItem : specMetadataItem.entrySet()) {
226-
metadataEntries.add(new MetadataEntry(metadataItem.getKey(), metadataItem.getValue()));
227-
}
225+
metadataEntries.add(new MetadataEntry(specMetadataItem.get("name"), specMetadataItem.get("value")));
228226
}
229227

230228
return withComponent(new Component(name, type, version, metadataEntries));

testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,14 @@ public void withComponentFromPath() {
6969
+ "metadata:\n"
7070
+ " name: statestore\n"
7171
+ "spec:\n"
72-
+ " type: null\n"
72+
+ " type: state.redis\n"
7373
+ " version: v1\n"
7474
+ " metadata:\n"
75-
+ " - name: name\n"
76-
+ " value: keyPrefix\n"
77-
+ " - name: value\n"
75+
+ " - name: keyPrefix\n"
7876
+ " value: name\n"
79-
+ " - name: name\n"
80-
+ " value: redisHost\n"
81-
+ " - name: value\n"
77+
+ " - name: redisHost\n"
8278
+ " value: redis:6379\n"
83-
+ " - name: name\n"
84-
+ " value: redisPassword\n"
85-
+ " - name: value\n"
79+
+ " - name: redisPassword\n"
8680
+ " value: ''\n";
8781

8882
assertEquals(expectedComponentYaml, componentYaml);

0 commit comments

Comments
 (0)