Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modbus was internall casting a PollingContext to the wrong object when trying to determine deltas, breaking delta sending #690

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Modbus was internall casting a PollingContext to the wrong object when trying to determine deltas, breaking delta sending #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6903779
Modbus was internall casting a PollingContext to the wrong object whe…
codepitbull Dec 11, 2024
ee66840
Merge branch 'master' into fix/28848-type-cast
codepitbull Dec 11, 2024
d4445c6
Fix tests
codepitbull Dec 11, 2024
af8d9c7
Merge branch 'master' into fix/28848-type-cast
codepitbull Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...ge-module-modbus/src/main/java/com/hivemq/edge/adapters/modbus/ModbusProtocolAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import com.hivemq.edge.adapters.modbus.config.ModbusAdu;
import com.hivemq.edge.adapters.modbus.config.ModbusDataType;
import com.hivemq.edge.adapters.modbus.config.ModbusSpecificAdapterConfig;
import com.hivemq.edge.adapters.modbus.config.ModbusToMqttMapping;
import com.hivemq.edge.adapters.modbus.config.tag.ModbusTag;
import com.hivemq.edge.adapters.modbus.config.tag.ModbusTagDefinition;
import com.hivemq.edge.adapters.modbus.impl.ModbusClient;
Expand All @@ -45,10 +44,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;

import static com.hivemq.adapter.sdk.api.state.ProtocolAdapterState.ConnectionStatus.CONNECTED;
import static com.hivemq.adapter.sdk.api.state.ProtocolAdapterState.ConnectionStatus.DISCONNECTED;
Expand All @@ -60,7 +59,7 @@ public class ModbusProtocolAdapter implements PollingProtocolAdapter {
private final @NotNull ProtocolAdapterState protocolAdapterState;

private final @NotNull ModbusClient modbusClient;
private final @NotNull Map<ModbusToMqttMapping, List<DataPoint>> lastSamples = new HashMap<>();
private final @NotNull Map<PollingContext, List<DataPoint>> lastSamples = new ConcurrentHashMap<>();
private final @NotNull List<Tag> tags;
private final @NotNull String adapterId;

Expand Down Expand Up @@ -91,6 +90,7 @@ public void start(

@Override
public void stop(final @NotNull ProtocolAdapterStopInput input, final @NotNull ProtocolAdapterStopOutput output) {
lastSamples.clear();
modbusClient.disconnect().whenComplete((unused, t) -> {
if (t == null) {
output.stoppedSuccessfully();
Expand All @@ -114,7 +114,7 @@ public void poll(
}

private void pollModbus(
@NotNull PollingInput pollingInput, @NotNull PollingOutput pollingOutput, @NotNull ModbusTag modbusTag) {
final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput, final @NotNull ModbusTag modbusTag) {
readRegisters(pollingInput.getPollingContext(),
modbusClient,
modbusTag).whenComplete((modbusdata, throwable) -> {
Expand Down Expand Up @@ -183,9 +183,9 @@ protected void captureDataSample(final @NotNull ModBusData modBusData, final @No
}

private void calculateDelta(final @NotNull ModBusData modBusData, final @NotNull PollingOutput pollingOutput) {
final ModbusToMqttMapping subscription = (ModbusToMqttMapping) modBusData.getPollingContext();
final PollingContext pollingContext = modBusData.getPollingContext();

final List<DataPoint> previousSampleDataPoints = lastSamples.put(subscription, modBusData.getDataPoints());
final List<DataPoint> previousSampleDataPoints = lastSamples.put(pollingContext, modBusData.getDataPoints());
final List<DataPoint> currentSamplePoints = modBusData.getDataPoints();
final List<DataPoint> delta =
AdapterDataUtils.mergeChangedSamples(previousSampleDataPoints, currentSamplePoints);
Expand Down
26 changes: 11 additions & 15 deletions ...ge-module-modbus/src/main/java/com/hivemq/edge/adapters/modbus/util/AdapterDataUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,25 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

public class AdapterDataUtils {
public static boolean matches(final @NotNull DataPoint point, final @NotNull List<DataPoint> list) {
return list.stream().filter(dp -> dp.getTagName().equals(point.getTagName())) // First filter by tagName
.anyMatch(dp -> dp.getTagValue().equals(point.getTagValue())); // Then check for tagValue
}

public static @NotNull List<DataPoint> mergeChangedSamples(
final @Nullable List<DataPoint> historicalSamples, final @NotNull List<DataPoint> currentSamples) {
if (historicalSamples == null) {
return currentSamples;
}
List<DataPoint> delta = new ArrayList<>();
for (int i = 0; i < currentSamples.size(); i++) {
DataPoint currentSample = currentSamples.get(i);
// If the current sample does not match any in the historical samples, it has changed
if (!matches(currentSample, historicalSamples)) {
historicalSamples.set(i, currentSample);
delta.add(currentSample);
}
}
return delta;

final Map<String, DataPoint> historicalSamplesMap = historicalSamples.stream()
.collect(Collectors.toMap(DataPoint::getTagName, Function.identity()));

return currentSamples.stream()
.filter(sample ->
!(historicalSamplesMap.containsKey(sample.getTagName()) && historicalSamplesMap.get(sample.getTagName()).getTagValue().equals(sample.getTagValue())))
.collect(Collectors.toList());
}
}
12 changes: 8 additions & 4 deletions ...odule-modbus/src/test/java/com/hivemq/edge/adapters/modbus/ModbusProtocolAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
import com.hivemq.edge.adapters.modbus.model.ModBusData;
import com.hivemq.edge.adapters.modbus.util.AdapterDataUtils;
import com.hivemq.edge.modules.adapters.data.DataPointImpl;
import org.assertj.core.groups.Tuple;
import org.junit.jupiter.api.Test;

import java.util.List;
import java.util.stream.IntStream;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

class ModbusProtocolAdapterTest {
Expand All @@ -51,11 +53,13 @@ void test_mergedSamples() {
final ModBusData data2 = createSampleData();
data2.getDataPoints().set(5, new DataPointImpl("register-5", 777));

AdapterDataUtils.mergeChangedSamples(data1.getDataPoints(), data2.getDataPoints());
final List<DataPoint> dataPoints =
AdapterDataUtils.mergeChangedSamples(data1.getDataPoints(), data2.getDataPoints());

assertEquals(777,
((DataPoint) data1.getDataPoints().get(5)).getTagValue(),
"Merged data should contain new value");
assertThat(dataPoints)
.hasSize(1)
.extracting(DataPoint::getTagValue, DataPoint::getTagName)
.containsExactly(Tuple.tuple(777, "register-5"));
}

protected static ModBusData createSampleData() {
Expand Down
Loading