Fix missing information in Json Schema (#450)

Author: DC2-DanielKrueger

hivemq-edge/src/main/java/com/hivemq/edge/modules/adapters/impl/factories/AdapterFactoriesImpl.java

@@ -2,17 +2,11 @@
 
 import com.hivemq.adapter.sdk.api.factories.AdapterFactories;
 import com.hivemq.adapter.sdk.api.factories.DataPointFactory;
-import com.hivemq.adapter.sdk.api.factories.PollingContextFactory;
 import com.hivemq.edge.modules.adapters.data.DataPointImpl;
-import com.hivemq.edge.modules.config.impl.PollingContextImpl;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 
 public class AdapterFactoriesImpl implements AdapterFactories {
 
-    @Override
-    public @NotNull PollingContextFactory pollingContextFactory() {
-        return PollingContextImpl::new;
-    }
 
     @Override
     public @NotNull DataPointFactory dataPointFactory() {

hivemq-edge/src/main/java/com/hivemq/edge/modules/api/events/model/EventImpl.java

@@ -114,6 +114,11 @@ public EventImpl(
         return timestamp;
     }
 
+    @Override
+    public @NotNull Long getCreated() {
+        return created;
+    }
+
     @Override
     public @Nullable TypeIdentifier getAssociatedObject() {
         return associatedObject;

hivemq-edge/src/main/java/com/hivemq/edge/modules/config/impl/UserPropertyImpl.java

@@ -22,8 +22,6 @@
 import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.LogicalType;
-import com.hivemq.adapter.sdk.api.config.UserProperty;
-import com.hivemq.edge.modules.config.impl.UserPropertyImpl;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 
 /**
@@ -41,8 +39,6 @@ public class ProtocolAdapterUtils {
 
         SimpleModule module = new SimpleModule("UserPropertyModule", Version.unknownVersion());
         SimpleAbstractTypeResolver resolver = new SimpleAbstractTypeResolver();
-        resolver.addMapping(UserProperty.class, UserPropertyImpl.class);
-     //   resolver.addMapping(PollingContext.class, PollingContextImpl.class);
 
         module.setAbstractTypes(resolver);
         copyObjectMapper.registerModule(module);

hivemq-edge/src/main/java/com/hivemq/protocols/ProtocolAdapterUtils.java

@@ -26,8 +26,8 @@
 import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField;
 import com.hivemq.adapter.sdk.api.config.PollingContext;
 import com.hivemq.adapter.sdk.api.config.ProtocolAdapterConfig;
+import com.hivemq.adapter.sdk.api.config.UserProperty;
 import com.hivemq.edge.modules.config.impl.PollingContextImpl;
-import com.hivemq.edge.modules.config.impl.UserPropertyImpl;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -58,7 +58,7 @@ public void testUserPropertiesAppearOnSubscription() throws JsonProcessingExcept
 
         AdapterConfiguration entity = new AdapterConfiguration();
         entity.subscriptions = new ArrayList<>();
-        entity.subscriptions.add(new PollingContextImpl("some/path",1,List.of(new UserPropertyImpl("propertyName", "propertyValue"))));
+        entity.subscriptions.add(new PollingContextImpl("some/path",1,List.of(new UserProperty("propertyName", "propertyValue"))));
         String marhslaled = mapper.writeValueAsString(entity);
         System.err.println(marhslaled);
 

hivemq-edge/src/test/java/com/hivemq/adapter/AdapterConfigModelTest.java

@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation;
-import com.hivemq.adapter.sdk.api.config.PollingContext;
 import com.hivemq.adapter.sdk.api.data.DataPoint;
 import com.hivemq.adapter.sdk.api.events.model.Event;
 import com.hivemq.adapter.sdk.api.exceptions.ProtocolAdapterException;
@@ -33,6 +32,7 @@
 import com.hivemq.adapter.sdk.api.services.ModuleServices;
 import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState;
 import com.hivemq.edge.adapters.http.model.HttpData;
+import com.hivemq.edge.adapters.http.model.HttpPollingContextImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -65,7 +65,7 @@
 /**
  * @author HiveMQ Adapter Generator
  */
-public class HttpProtocolAdapter implements PollingProtocolAdapter {
+public class HttpProtocolAdapter implements PollingProtocolAdapter<HttpPollingContextImpl> {
 
     private static final @NotNull Logger log = LoggerFactory.getLogger(HttpProtocolAdapter.class);
 
@@ -80,7 +80,7 @@ public class HttpProtocolAdapter implements PollingProtocolAdapter {
     private final @NotNull ModuleServices moduleServices;
     private final @NotNull AdapterFactories adapterFactories;
     // The http adapter only supports a single endpont to be polled from
-    private final @NotNull PollingContext pollingContext;
+    private final @NotNull HttpPollingContextImpl pollingContext;
 
     private volatile @Nullable HttpClient httpClient = null;
     protected @NotNull
@@ -97,8 +97,7 @@ public HttpProtocolAdapter(
         this.protocolAdapterState = input.getProtocolAdapterState();
         this.moduleServices = input.moduleServices();
         this.adapterFactories = input.adapterFactories();
-        this.pollingContext = adapterFactories.pollingContextFactory()
-                .create(adapterConfig.getDestination(), adapterConfig.getQos(), null);
+        this.pollingContext = new HttpPollingContextImpl(adapterConfig.getDestination(), adapterConfig.getQos(), null);
     }
 
     @Override
@@ -182,7 +181,7 @@ public void poll(
     }
 
     @Override
-    public @NotNull List<? extends PollingContext> getPollingContexts() {
+    public @NotNull List<HttpPollingContextImpl> getPollingContexts() {
         return List.of(pollingContext);
     }
 

modules/hivemq-edge-module-http/src/main/java/com/hivemq/edge/adapters/http/HttpProtocolAdapter.java

@@ -0,0 +1,104 @@
+package com.hivemq.edge.adapters.http.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField;
+import com.hivemq.adapter.sdk.api.config.MessageHandlingOptions;
+import com.hivemq.adapter.sdk.api.config.PollingContext;
+import com.hivemq.adapter.sdk.api.config.UserProperty;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HttpPollingContextImpl implements PollingContext {
+
+    @JsonProperty(value = "destination", required = true)
+    @ModuleConfigField(title = "Destination Topic",
+                       description = "The topic to publish data on",
+                       required = true,
+                       format = ModuleConfigField.FieldType.MQTT_TOPIC)
+    protected @Nullable String destination;
+
+    @JsonProperty(value = "qos", required = true)
+    @ModuleConfigField(title = "QoS",
+                       description = "MQTT Quality of Service level",
+                       required = true,
+                       numberMin = 0,
+                       numberMax = 2,
+                       defaultValue = "0")
+    protected int qos = 0;
+
+    @JsonProperty(value = "messageHandlingOptions")
+    @ModuleConfigField(title = "Message Handling Options",
+                       description = "This setting defines the format of the resulting MQTT message, either a message per changed tag or a message per subscription that may include multiple data points per sample",
+                       enumDisplayValues = {
+                               "MQTT Message Per Device Tag",
+                               "MQTT Message Per Subscription (Potentially Multiple Data Points Per Sample)"},
+                       defaultValue = "MQTTMessagePerTag")
+    protected @NotNull MessageHandlingOptions messageHandlingOptions = MessageHandlingOptions.MQTTMessagePerTag;
+
+    @JsonProperty(value = "includeTimestamp")
+    @ModuleConfigField(title = "Include Sample Timestamp In Publish?",
+                       description = "Include the unix timestamp of the sample time in the resulting MQTT message",
+                       defaultValue = "true")
+    protected @NotNull Boolean includeTimestamp = Boolean.TRUE;
+
+    @JsonProperty(value = "includeTagNames")
+    @ModuleConfigField(title = "Include Tag Names In Publish?",
+                       description = "Include the names of the tags in the resulting MQTT publish",
+                       defaultValue = "false")
+    protected @NotNull Boolean includeTagNames = Boolean.FALSE;
+
+    @JsonProperty(value = "userProperties")
+    @ModuleConfigField(title = "User Properties",
+                       description = "Arbitrary properties to associate with the subscription",
+                       arrayMaxItems = 10)
+    private @NotNull List<UserProperty> userProperties = new ArrayList<>();
+
+    public HttpPollingContextImpl() {
+    }
+
+    @JsonCreator
+    public HttpPollingContextImpl(
+            @JsonProperty("destination") @Nullable final String destination,
+            @JsonProperty("qos") final int qos,
+            @JsonProperty("userProperties") @Nullable List<UserProperty> userProperties) {
+        this.destination = destination;
+        this.qos = qos;
+        if (userProperties != null) {
+            this.userProperties = userProperties;
+        }
+    }
+
+    @Override
+    public @Nullable String getDestinationMqttTopic() {
+        return destination;
+    }
+
+    @Override
+    public int getQos() {
+        return qos;
+    }
+
+    @Override
+    public @NotNull MessageHandlingOptions getMessageHandlingOptions() {
+        return messageHandlingOptions;
+    }
+
+    @Override
+    public @NotNull Boolean getIncludeTimestamp() {
+        return includeTimestamp;
+    }
+
+    @Override
+    public @NotNull Boolean getIncludeTagNames() {
+        return includeTagNames;
+    }
+
+    @Override
+    public @NotNull List<UserProperty> getUserProperties() {
+        return userProperties;
+    }
+}