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
Bug fix for deserializing multi dimensional array value types for attributes
Rich Turner0437f631393b
diff --git a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java b/model/src/main/java/org/openremote/model/util/AssetModelUtil.javaindex fa4db7997..3454b3862 100644--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java@@ -243,14 +243,24 @@ public final class AssetModelUtil {if (assetTypeMap == null) {initialise();}- boolean isArray = name.endsWith("[]");- if (isArray) {+ int arrayDimensions = 0;++ while(name.endsWith("[]")) {name = name.substring(0, name.length() - 2);+ arrayDimensions++;}String finalName = name;- return valueDescriptors.stream().filter(vd -> vd.getName().equals(finalName)).findFirst().map(vd -> isArray ? vd.asArray() : vd);+ int finalArrayDimensions = arrayDimensions;+ return valueDescriptors.stream().filter(vd -> vd.getName().equals(finalName)).findFirst().map(vd -> {+ int dims = finalArrayDimensions;+ while(dims > 0) {+ vd = vd.asArray();+ dims--;+ }+ return vd;+ });}public static ValueDescriptor<?> getValueDescriptorForValue(Object value) {