Merge branch 'users/svegiraju/spring-pom-update' of https://github.com/siri-varma/java-sdk into users/svegiraju/spring-pom-update

Author: siri-varma

.github/workflows/build.yml

@@ -121,7 +121,7 @@ jobs:
       env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
     - name: Codecov
-      uses: codecov/[email protected].2
+      uses: codecov/[email protected].3
     - name: Install jars
       run: ./mvnw install -q -B -DskipTests
     - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}

.github/workflows/fossa.yml

@@ -35,12 +35,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Run FOSSA Scan"
-        uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
 
       - name: "Run FOSSA Test"
-        uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
           run-tests: true

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

@@ -210,21 +210,19 @@ public DaprContainer withComponent(Path path) {
     try {
       Map<String, Object> component = YAML_MAPPER.loadAs(Files.newInputStream(path), Map.class);
 
-      String type = (String) component.get("type");
       Map<String, Object> metadata = (Map<String, Object>) component.get("metadata");
       String name = (String) metadata.get("name");
 
       Map<String, Object> spec = (Map<String, Object>) component.get("spec");
+      String type = (String) spec.get("type");
       String version = (String) spec.get("version");
       List<Map<String, String>> specMetadata =
-          (List<Map<String, String>>) spec.getOrDefault("metadata", Collections.emptyMap());
+          (List<Map<String, String>>) spec.getOrDefault("metadata", Collections.emptyList());
 
       ArrayList<MetadataEntry> metadataEntries = new ArrayList<>();
 
       for (Map<String, String> specMetadataItem : specMetadata) {
-        for (Map.Entry<String, String> 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));

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

@@ -69,20 +69,14 @@ 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"
-        + "    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);