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
Improve container trait ruleset re-synchronisation (#1916)
Rich Turnerdeba7583e4cc
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovyindex 8b9edd96c..79a7e6294 100644--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy@@ -238,15 +238,27 @@ trait ContainerTrait {if (!TestFixture.assetRulesets.isEmpty()) {LOG.info("Re-inserting ${TestFixture.assetRulesets.size()} asset ruleset(s)")- TestFixture.assetRulesets.forEach { rulesetStorageService.merge(it) }+ TestFixture.assetRulesets = TestFixture.assetRulesets.stream().map {+ it.id = null+ it.version = 0+ return rulesetStorageService.merge(it)+ }.toList()}if (!TestFixture.realmRulesets.isEmpty()) {LOG.info("Re-inserting ${TestFixture.realmRulesets.size()} realm ruleset(s)")- TestFixture.realmRulesets.forEach { rulesetStorageService.merge(it) }+ TestFixture.realmRulesets = TestFixture.realmRulesets.stream().map {+ it.id = null+ it.version = 0+ return rulesetStorageService.merge(it)+ }.toList()}if (!TestFixture.globalRulesets.isEmpty()) {LOG.info("Re-inserting ${TestFixture.globalRulesets.size()} global ruleset(s)")- TestFixture.globalRulesets.forEach { rulesetStorageService.merge(it) }+ TestFixture.globalRulesets = TestFixture.globalRulesets.stream().map {+ it.id = null+ it.version = 0+ return rulesetStorageService.merge(it)+ }}}