100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
GatewayConnector bug fix for asset ordering during sync
Rich Turnerd53276fa2f4e
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.javaindex 8b62ed576..1aad8c09f 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java@@ -67,7 +67,7 @@ public class GatewayConnector {protected boolean disabled;protected boolean initialSyncInProgress;protected ScheduledFuture<?> syncProcessorFuture;- Set<String> syncAssetIds;+ List<String> syncAssetIds;int syncIndex;int syncErrors;String expectedSyncResponseName;@@ -317,7 +317,7 @@ public class GatewayConnector {.stream().sorted(Comparator.comparingInt(assetLevelExtractor)).map(Asset::getId)- .collect(Collectors.toCollection(LinkedHashSet::new));+ .collect(Collectors.toList());if (syncAssetIds.isEmpty()) {deleteObsoleteLocalAssets();@@ -350,6 +350,11 @@ public class GatewayConnector {return;}+ // Returned asset order may not match request order so re-order+ returnedAssets = returnedAssets.stream()+ .sorted(Comparator.comparingInt(a -> syncAssetIds.indexOf(a.getId())))+ .collect(Collectors.toList());+// Merge returned assets ensuring the latest version of each is mergedreturnedAssets.stream().map(returnedAsset -> {diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 7100ba639..4e9196966 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -590,6 +590,7 @@ public class Asset implements IdentifiableEntity {"id='" + id + '\'' +", name='" + name + '\'' +", type ='" + type + '\'' ++ ", parentId='" + parentId + '\'' +'}';}