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 asset update of unkown asset types (#1792)
Rich Turnerf622ee1a90fd
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex f00c6b1ac..1fcb1b28f 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -280,6 +280,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour}}+ // TODO: AssetResource update should not overwrite the existing asset@Overridepublic Asset<?> update(RequestParams requestParams, String assetId, Asset<?> asset) {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex fbb848dfb..36dbf00be 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -47,6 +47,7 @@ import org.openremote.model.asset.*;import org.openremote.model.asset.impl.GatewayAsset;import org.openremote.model.asset.impl.GroupAsset;import org.openremote.model.asset.impl.ThingAsset;+import org.openremote.model.asset.impl.UnknownAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeMap;@@ -787,7 +788,20 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- T updatedAsset = em.merge(asset);+ T updatedAsset;++ if (existingAsset instanceof UnknownAsset && !(asset instanceof UnknownAsset)) {+ // This occurs when an existing asset is merged but the type is unknown+ // We'll copy updates into existing asset+ existingAsset.setAttributes(asset.getAttributes());+ existingAsset.setName(asset.getName());+ existingAsset.setVersion(asset.getVersion());+ existingAsset.setParentId(asset.getParentId());+ existingAsset.setAccessPublicRead(asset.isAccessPublicRead());+ updatedAsset = em.merge(existingAsset);+ } else {+ updatedAsset = em.merge(asset);+ }if (LOG.isLoggable(FINE)) {LOG.fine("Asset merge took: " + (System.currentTimeMillis() - startTime) + "ms");diff --git a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovyindex 4ff22eb70..a6a73694e 100644--- a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy+++ b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy@@ -53,6 +53,8 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {@Sharedstatic AssetModelResource assetModelResource+ @Shared+ static AssetStorageService assetStorageServicestatic String CUSTOM_ASSET_TYPE = "CustomAsset"static ValueDescriptor[] dynamicValueDescriptors = [new ValueDescriptor("dynamicValue", null, ValueConstraint.constraints(new ValueConstraint.AllowedValues("value1", "value2")), null, null, null)]@@ -75,6 +77,7 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {container.getService(AssetModelService).initDynamicModel()ValueUtil.doInitialise()assetModelResource = getClientApiTarget(serverUri(serverPort), MASTER_REALM).proxy(AssetModelResource.class)+ assetStorageService = container.getService(AssetStorageService.class)}def "Check AttributeMap equality checking"() {@@ -388,6 +391,14 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {customAsset.getAttribute("attr1").get().type == ValueType.TIMESTAMPcustomAsset.getAttribute("attr2").get().type == ValueType.POSITIVE_INTEGERcustomAsset.getAttribute("attr2").get().value.orElse(0) == 3++ when: "we make a change to the asset and merge it directly into the asset storage service (bypassing any cloning logic in AssetResource)"+ customAsset.getAttribute("dynamic1").ifPresent {it.setValue("value2")}+ customAsset = assetStorageService.merge(customAsset, false, null, null)++ then: "it should succeed"+ customAsset.getAttribute("dynamic1").flatMap {it.value}.orElse(null) == "value2"+ customAsset.type == "CustomAsset"}def "Retrieving all asset model info"() {