replace map with json node (#622)

Author: DC2-DanielKrueger

ext/hivemq-edge-openapi-2024.8-SNAPSHOT.yaml

@@ -4240,11 +4240,7 @@ components:
       type: object
       properties:
         config:
-          type: object
-          additionalProperties:
-            type: object
-            description: The adapter configuration associated with this instance
-          description: The adapter configuration associated with this instance
+          $ref: '#/components/schemas/JsonNode'
         id:
           type: string
           format: string

hivemq-edge/src/main/java/com/hivemq/api/model/adapters/Adapter.java

@@ -17,14 +17,13 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.hivemq.api.model.status.Status;
 import com.hivemq.edge.HiveMQEdgeConstants;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import java.util.Map;
-
 public class Adapter {
 
     @JsonProperty("id")
@@ -45,7 +44,7 @@ public class Adapter {
     @JsonProperty("config")
     @Schema(name = "config",
             description = "The adapter configuration associated with this instance")
-    private final @NotNull Map<String, Object>  config;
+    private final @NotNull JsonNode config;
 
     @JsonProperty("status")
     @Schema(name = "status",
@@ -56,7 +55,7 @@ public class Adapter {
     public Adapter(
             @JsonProperty("id") final @NotNull String id,
             @JsonProperty("type") final @NotNull String protocolAdapterType,
-            @JsonProperty("config") final @NotNull Map<String, Object>  config,
+            @JsonProperty("config") final @NotNull JsonNode config,
             @JsonProperty("status") final @Nullable Status status) {
         this.id = id;
         this.protocolAdapterType = protocolAdapterType;
@@ -76,7 +75,7 @@ public Adapter(
         return protocolAdapterType;
     }
 
-    public @NotNull Map<String, Object> getConfig() {
+    public @NotNull JsonNode getConfig() {
         return config;
     }
 }

hivemq-edge/src/main/java/com/hivemq/api/resources/impl/ProtocolAdaptersResourceImpl.java

@@ -15,6 +15,7 @@
  */
 package com.hivemq.api.resources.impl;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
@@ -190,7 +191,7 @@ public ProtocolAdaptersResourceImpl(
         }
         return new Adapter(value.getId(),
                 value.getAdapterInformation().getProtocolId(),
-                configObject,
+                objectMapper.valueToTree(configObject),
                 getStatusInternal(value.getId()));
     }
 
@@ -265,7 +266,10 @@ public int getDepth() {
             return ApiErrorUtils.badRequest(errorMessages);
         }
         try {
-            protocolAdapterManager.addAdapter(adapterType, adapter.getId(), adapter.getConfig());
+            final Map<String, Object> config =
+                    objectMapper.convertValue(adapter.getConfig(), new TypeReference<Map<String, Object>>() {
+                    });
+            protocolAdapterManager.addAdapter(adapterType, adapter.getId(), config);
         } catch (final IllegalArgumentException e) {
             if (e.getCause() instanceof UnrecognizedPropertyException) {
                 ApiErrorUtils.addValidationError(errorMessages,
@@ -295,7 +299,10 @@ public int getDepth() {
         if (logger.isDebugEnabled()) {
             logger.debug("Updating adapter \"{}\".", adapterId);
         }
-        protocolAdapterManager.updateAdapter(adapterId, adapter.getConfig());
+        final Map<String, Object> config =
+                objectMapper.convertValue(adapter.getConfig(), new TypeReference<>() {
+                });
+        protocolAdapterManager.updateAdapter(adapterId, config);
         return Response.ok().build();
     }