bidirectional > changed openAPI

hivemq · Sep 27, 2024 · aec13e5 · aec13e5
1 parent 733fad6
commit aec13e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...-edge-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/OpcUaProtocolAdapter.java b/...-edge-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/OpcUaProtocolAdapter.java
@@ -218,15 +218,15 @@ public void discoverValues(
 
     private @NotNull CompletableFuture<Void> createAllSubscriptions() {
         //noinspection ConstantValue
-        if (adapterConfig.getOpcuaToMqttConfig().getMappings() == null ||
-                adapterConfig.getOpcuaToMqttConfig().getMappings().isEmpty()) {
+        if (adapterConfig.getOpcuaToMqttConfig().getOpcuaToMqttMappings() == null ||
+                adapterConfig.getOpcuaToMqttConfig().getOpcuaToMqttMappings().isEmpty()) {
             return CompletableFuture.completedFuture(null);
         }
 
         final CompletableFuture<Void> resultFuture = new CompletableFuture<>();
         final ImmutableList.Builder<CompletableFuture<Void>> subscribeFutures = ImmutableList.builder();
 
-        for (final OpcUaToMqttMapping subscription : adapterConfig.getOpcuaToMqttConfig().getMappings()) {
+        for (final OpcUaToMqttMapping subscription : adapterConfig.getOpcuaToMqttConfig().getOpcuaToMqttMappings()) {
             subscribeFutures.add(subscribeToNode(subscription));
         }
 

diff --git a/...e-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/config/OpcUaToMqttConfig.java b/...e-module-opcua/src/main/java/com/hivemq/edge/adapters/opcua/config/OpcUaToMqttConfig.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,7 +36,7 @@ public OpcUaToMqttConfig(@JsonProperty("opcuaToMqttMappings") final @Nullable Li
         this.opcuaToMqttMappings = Objects.requireNonNullElse(opcuaToMqttMappings, List.of());
     }
 
-    public @NotNull List<OpcUaToMqttMapping> getMappings() {
+    public @NotNull List<OpcUaToMqttMapping> getOpcuaToMqttMappings() {
         return opcuaToMqttMappings;
     }
 }
diff --git a/...ule-opcua/src/test/java/com/hivemq/edge/adapters/opcua/config/OpcUaAdapterConfigTest.java b/...ule-opcua/src/test/java/com/hivemq/edge/adapters/opcua/config/OpcUaAdapterConfigTest.java
@@ -83,7 +83,7 @@ public void convertConfigObject_fullConfig_valid() throws Exception {
         });
 
         assertThat(config.getOpcuaToMqttConfig()).isNotNull();
-        assertThat(config.getOpcuaToMqttConfig().getMappings()).satisfiesExactly(mapping -> {
+        assertThat(config.getOpcuaToMqttConfig().getOpcuaToMqttMappings()).satisfiesExactly(mapping -> {
             assertThat(mapping.getNode()).isEqualTo("ns=1;i=1004");
             assertThat(mapping.getMqttTopic()).isEqualTo("test/blubb/#");
             assertThat(mapping.getQos()).isEqualTo(1);
@@ -127,7 +127,7 @@ public void convertConfigObject_defaults_valid() throws Exception {
         });
 
         assertThat(config.getOpcuaToMqttConfig()).isNotNull();
-        assertThat(config.getOpcuaToMqttConfig().getMappings()).satisfiesExactly(mapping -> {
+        assertThat(config.getOpcuaToMqttConfig().getOpcuaToMqttMappings()).satisfiesExactly(mapping -> {
             assertThat(mapping.getNode()).isEqualTo("ns=1;i=1004");
             assertThat(mapping.getMqttTopic()).isEqualTo("test/blubb/#");
             assertThat(mapping.getQos()).isEqualTo(0);

diff --git a/.../test/java/com/hivemq/edge/adapters/opcua/config/legacy/LegacyOpcUaAdapterConfigTest.java b/.../test/java/com/hivemq/edge/adapters/opcua/config/legacy/LegacyOpcUaAdapterConfigTest.java
@@ -93,7 +93,7 @@ public void convertConfigObject_fullConfig_valid() throws Exception {
         });
 
         assertThat(config.getOpcuaToMqttConfig()).isNotNull();
-        assertThat(config.getOpcuaToMqttConfig().getMappings()).satisfiesExactly(mapping -> {
+        assertThat(config.getOpcuaToMqttConfig().getOpcuaToMqttMappings()).satisfiesExactly(mapping -> {
             assertThat(mapping.getNode()).isEqualTo("ns=1;i=1004");
             assertThat(mapping.getMqttTopic()).isEqualTo("test/blubb/#");
             assertThat(mapping.getQos()).isEqualTo(1);
@@ -137,7 +137,7 @@ public void convertConfigObject_defaults_valid() throws Exception {
         });
 
         assertThat(config.getOpcuaToMqttConfig()).isNotNull();
-        assertThat(config.getOpcuaToMqttConfig().getMappings()).satisfiesExactly(mapping -> {
+        assertThat(config.getOpcuaToMqttConfig().getOpcuaToMqttMappings()).satisfiesExactly(mapping -> {
             assertThat(mapping.getNode()).isEqualTo("ns=1;i=1004");
             assertThat(mapping.getMqttTopic()).isEqualTo("test/blubb/#");
             assertThat(mapping.getQos()).isEqualTo(0);