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
Asset model updates: path now implemented using ltree and always loaded, removed parent name and parent type info AssetQuery select exclusions removed (attributes can still be excluded using empty attributeNames array)
Rich Turner9b2265c86c72
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.javaindex 8659b7b46..0ee800528 100644--- a/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java@@ -19,7 +19,7 @@*/package org.openremote.agent.protocol;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.model.ContainerService;import org.openremote.model.asset.Asset;import org.openremote.model.asset.agent.Agent;diff --git a/container/src/main/java/org/openremote/container/persistence/Database.java b/container/src/main/java/org/openremote/container/persistence/Database.javaindex 4d267855c..d81971fe4 100644--- a/container/src/main/java/org/openremote/container/persistence/Database.java+++ b/container/src/main/java/org/openremote/container/persistence/Database.java@@ -22,7 +22,8 @@ package org.openremote.container.persistence;import com.zaxxer.hikari.HikariConfig;import com.zaxxer.hikari.HikariDataSource;import org.hibernate.cfg.AvailableSettings;-import org.hibernate.dialect.PostgreSQL95Dialect;+import org.hibernate.dialect.PostgreSQL10Dialect;+import org.openremote.container.PostgreSQL10LTreeDialect;import org.openremote.container.concurrent.ContainerThreadFactory;import java.util.Properties;@@ -54,7 +55,7 @@ public interface Database {@Overridepublic Properties createProperties() {Properties properties = new Properties();- properties.put(AvailableSettings.DIALECT, PostgreSQL95Dialect.class.getName());+ properties.put(AvailableSettings.DIALECT, PostgreSQL10LTreeDialect.class.getName());return properties;}diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.javaindex c90d83a99..bd428f5c5 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java@@ -26,12 +26,14 @@ import org.hibernate.EmptyInterceptor;import org.hibernate.Transaction;import org.hibernate.type.Type;import org.openremote.container.message.MessageBrokerService;+import org.openremote.model.PersistenceEvent;import javax.transaction.Status;import javax.transaction.Synchronization;import java.io.Serializable;import java.util.HashSet;import java.util.Set;+import java.util.function.Consumer;import java.util.logging.Level;import java.util.logging.Logger;@@ -41,16 +43,14 @@ import java.util.logging.Logger;public class PersistenceEventInterceptor extends EmptyInterceptor {private static final Logger LOG = Logger.getLogger(PersistenceEventInterceptor.class.getName());-- protected MessageBrokerService messageBrokerService;+ protected Consumer<PersistenceEvent<?>> eventConsumer;protected Set<PersistenceEvent<?>> persistenceEvents = new HashSet<>();- public void setMessageBrokerService(MessageBrokerService messageBrokerService) {- this.messageBrokerService = messageBrokerService;+ public void setEventConsumer(Consumer<PersistenceEvent<?>> eventConsumer) {+ this.eventConsumer = eventConsumer;}@Override- @SuppressWarnings("unchecked")public boolean onSave(Object entity, Serializable id,Object[] state, String[] propertyNames, Type[] types)throws CallbackException {@@ -64,7 +64,6 @@ public class PersistenceEventInterceptor extends EmptyInterceptor {}@Override- @SuppressWarnings("unchecked")public boolean onFlushDirty(Object entity, Serializable id,Object[] currentState, Object[] previousState,String[] propertyNames, Type[] types)@@ -80,7 +79,6 @@ public class PersistenceEventInterceptor extends EmptyInterceptor {}@Override- @SuppressWarnings("unchecked")public void onDelete(Object entity, Serializable id,Object[] state,String[] propertyNames,@@ -106,20 +104,14 @@ public class PersistenceEventInterceptor extends EmptyInterceptor {if (status != Status.STATUS_COMMITTED)return;- if (messageBrokerService.getProducerTemplate() == null) {- // Message broker not started yet+ if (eventConsumer == null) {+ // Event consumer not setreturn;}for (PersistenceEvent<?> persistenceEvent : persistenceEvents) {try {- messageBrokerService.getProducerTemplate().sendBodyAndHeader(- PersistenceEvent.PERSISTENCE_TOPIC,- ExchangePattern.InOnly,- persistenceEvent,- PersistenceEvent.HEADER_ENTITY_TYPE,- persistenceEvent.getEntity().getClass()- );+ eventConsumer.accept(persistenceEvent);} catch (CamelExecutionException ex) {// TODO Better error handling?LOG.log(Level.SEVERE, "Error dispatching: " + persistenceEvent + " - " + ex, ex);@@ -135,9 +127,4 @@ public class PersistenceEventInterceptor extends EmptyInterceptor {@Overridepublic void afterTransactionCompletion(Transaction tx) {}-- @Override- public int[] findDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) {- return super.findDirty(entity, id, currentState, previousState, propertyNames, types);- }}diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex 21358abb6..1a94fef5f 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -20,6 +20,8 @@package org.openremote.container.persistence;import org.apache.camel.ExchangePattern;+import org.apache.camel.Predicate;+import org.apache.camel.ProducerTemplate;import org.flywaydb.core.Flyway;import org.flywaydb.core.api.MigrationInfo;import org.flywaydb.core.api.output.MigrateResult;@@ -28,10 +30,9 @@ import org.hibernate.cfg.AvailableSettings;import org.hibernate.engine.spi.SharedSessionContractImplementor;import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;import org.hibernate.jpa.boot.internal.PersistenceUnitInfoDescriptor;+import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.model.Container;-import org.openremote.model.ContainerService;-import org.openremote.model.EntityClassProvider;+import org.openremote.model.*;import org.openremote.model.apps.ConsoleAppConfig;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;@@ -68,7 +69,7 @@ import java.util.stream.IntStream;import static org.openremote.container.util.MapAccess.*;-public class PersistenceService implements ContainerService {+public class PersistenceService implements ContainerService, Consumer<PersistenceEvent<?>> {/*** Programmatic definition of OpenRemotePU for hibernate@@ -182,6 +183,11 @@ public class PersistenceService implements ContainerService {}}+ // TODO: Make configurable+ public static final String PERSISTENCE_TOPIC =+ "seda://PersistenceTopic?multipleConsumers=true&concurrentConsumers=1&waitForTaskToComplete=NEVER&purgeWhenStopping=true&discardIfNoConsumers=true&limitConcurrentConsumers=false&size=25000";+ public static final String HEADER_ENTITY_TYPE = PersistenceEvent.class.getSimpleName() + ".ENTITY_TYPE";+private static final Logger LOG = Logger.getLogger(PersistenceService.class.getName());/**@@ -221,12 +227,18 @@ public class PersistenceService implements ContainerService {protected String persistenceUnitName;protected Properties persistenceUnitProperties;protected EntityManagerFactory entityManagerFactory;-protected Flyway flyway;protected boolean forceClean;protected Set<String> defaultSchemaLocations = new HashSet<>();protected Set<String> schemas = new HashSet<>();+ public static Predicate isPersistenceEventForEntityType(Class<?> type) {+ return exchange -> {+ Class<?> entityType = exchange.getIn().getHeader(HEADER_ENTITY_TYPE, Class.class);+ return type.isAssignableFrom(entityType);+ };+ }+@Overridepublic int getPriority() {return PRIORITY;@@ -261,13 +273,16 @@ public class PersistenceService implements ContainerService {if (messageBrokerService != null) {persistenceUnitProperties.put(- org.hibernate.cfg.AvailableSettings.SESSION_SCOPED_INTERCEPTOR,+ AvailableSettings.SESSION_SCOPED_INTERCEPTOR,PersistenceEventInterceptor.class.getName());}persistenceUnitProperties.put(AvailableSettings.DEFAULT_SCHEMA, dbSchema);+ // Add custom integrator so we can register a custom flush entity event listener+ persistenceUnitProperties.put(EntityManagerFactoryBuilderImpl.INTEGRATOR_PROVIDER, IntegratorProvider.class.getName());+persistenceUnitName = getString(container.getConfig(), PERSISTENCE_UNIT_NAME, PERSISTENCE_UNIT_NAME_DEFAULT);forceClean = getBoolean(container.getConfig(), SETUP_WIPE_CLEAN_INSTALL, container.isDevMode());@@ -353,7 +368,7 @@ public class PersistenceService implements ContainerService {Session session = entityManager.unwrap(Session.class);PersistenceEventInterceptor persistenceEventInterceptor =(PersistenceEventInterceptor) ((SharedSessionContractImplementor) session).getInterceptor();- persistenceEventInterceptor.setMessageBrokerService(messageBrokerService);+ persistenceEventInterceptor.setEventConsumer(this);}return entityManager;@@ -439,10 +454,10 @@ public class PersistenceService implements ContainerService {if (messageBrokerService.getProducerTemplate() != null) {messageBrokerService.getProducerTemplate().sendBodyAndHeader(- PersistenceEvent.PERSISTENCE_TOPIC,+ PERSISTENCE_TOPIC,ExchangePattern.InOnly,persistenceEvent,- PersistenceEvent.HEADER_ENTITY_TYPE,+ HEADER_ENTITY_TYPE,persistenceEvent.getEntity().getClass());}@@ -502,6 +517,22 @@ public class PersistenceService implements ContainerService {schemas.addAll(this.schemas);}+ @Override+ public void accept(PersistenceEvent<?> persistenceEvent) {++ ProducerTemplate producerTemplate = messageBrokerService.getProducerTemplate();++ if (producerTemplate != null) {+ producerTemplate.sendBodyAndHeader(+ PersistenceService.PERSISTENCE_TOPIC,+ ExchangePattern.InOnly,+ persistenceEvent,+ PersistenceService.HEADER_ENTITY_TYPE,+ persistenceEvent.getEntity().getClass()+ );+ }+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/container/src/main/java/org/openremote/container/persistence/package-info.java b/container/src/main/java/org/openremote/container/persistence/package-info.javaindex 216430354..405a026e5 100644--- a/container/src/main/java/org/openremote/container/persistence/package-info.java+++ b/container/src/main/java/org/openremote/container/persistence/package-info.java@@ -10,6 +10,10 @@@TypeDef(name = EpochMillisInstantType.TYPE_NAME,typeClass = EpochMillisInstantType.class+ ),+ @TypeDef(+ name = LTreeType.TYPE,+ typeClass = LTreeType.class)})diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex a1c090717..ec48b51b2 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -19,11 +19,10 @@*/package org.openremote.manager.agent;-import groovy.util.MapEntry;import org.apache.camel.builder.RouteBuilder;import org.openremote.agent.protocol.ProtocolAssetService;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingException;import org.openremote.manager.asset.AssetProcessingService;@@ -69,8 +68,8 @@ import static java.util.stream.Collectors.mapping;import static java.util.stream.Collectors.toList;import static org.openremote.container.concurrent.GlobalLock.withLock;import static org.openremote.container.concurrent.GlobalLock.withLockReturning;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.manager.asset.AssetProcessingService.ASSET_QUEUE;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;import static org.openremote.model.asset.agent.Protocol.ACTUATOR_TOPIC;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex 6b5609d10..58132279b 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -221,6 +221,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer}+ @SuppressWarnings("rawtypes")@Overridepublic void configure() throws Exception {@@ -293,8 +294,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer}switch (source) {- case CLIENT:-+ case CLIENT -> {AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);if (authContext == null) {// Check attribute has public write flag@@ -327,17 +327,16 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer}}}- break;-- case SENSOR:+ }+ case SENSOR -> {Optional<Protocol<?>> protocol = oldAttribute.getMetaValue(AGENT_LINK).map(agentLink -> agentService.getProtocolInstance(agentLink.getId()));// Sensor event must be for an attribute linked to an agent- if (!protocol.isPresent()) {+ if (protocol.isEmpty()) {throw new AssetProcessingException(INVALID_AGENT_LINK);}- break;+ }}// For executable attributes, non-sensor sources can set a writable attribute execute status@@ -375,45 +374,38 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer// });// });- // Either use the timestamp of the event or set event time to processing time+ // Either use the timestamp of the event or set event time to processing time or (old event time + 1)+ // We need a different timestamp for Attribute.equals() check+ long oldEventTime = oldAttribute.getTimestamp().orElse(0L);+ long eventTime = event.getTimestamp();long processingTime = timerService.getCurrentTimeMillis();- long eventTime = event.getTimestamp() > 0 ? event.getTimestamp() : processingTime;-- // Ensure timestamp of event is not in the future as that would essentially block access to- // the attribute until after that time (maybe that is desirable behaviour)- if (eventTime - processingTime > 0) {- // TODO: Decide how to handle update events in the future - ignore or change timestamp- throw new AssetProcessingException(- EVENT_IN_FUTURE,- "current time: " + new Date(processingTime) + "/" + processingTime- + ", event time: " + new Date(eventTime) + "/" + eventTime- );++ if (eventTime > 0) {+ // If it's less than previous event but within 10ms then just bump the time to old+1+ if (oldEventTime - eventTime > 0 && oldEventTime - eventTime < 10) {+ eventTime = oldEventTime + 1;+ }+ } else {+ eventTime = Math.max(oldEventTime + 1, processingTime);}// Check the last update timestamp of the attribute, ignoring any event that is older than last update- // TODO This means we drop out-of-sequence events but accept events with the same source timestamp- // TODO Several attribute events can occur in the same millisecond, then order of application is undefined- oldAttribute.getTimestamp().filter(t -> t >= 0 && eventTime < t).ifPresent(+ long finalEventTime = eventTime;+ oldAttribute.getTimestamp().filter(t -> t >= 0 && finalEventTime < t).ifPresent(lastStateTime -> {throw new AssetProcessingException(EVENT_OUTDATED,"last asset state time: " + new Date(lastStateTime) + "/" + lastStateTime- + ", event time: " + new Date(eventTime) + "/" + eventTime);+ + ", event time: " + new Date(finalEventTime) + "/" + finalEventTime);});// Create a copy of the attribute and set the new value and timestamp- @SuppressWarnings("rawtypes")Attribute updatedAttribute = ValueUtil.clone(oldAttribute);updatedAttribute.setValue(value, eventTime);// Push through all processors- boolean consumedCompletely = processAssetUpdate(em, asset, updatedAttribute, source);-- // Publish a new event for clients if no processor consumed the update completely- if (!consumedCompletely) {- publishClientEvent(asset, updatedAttribute);- }+ processAssetUpdate(em, asset, updatedAttribute, source);});})).endDoTry()@@ -479,39 +471,17 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerif (!complete) {LOG.fine("No processor consumed the update completely, storing: " + attributeStr);- storeAttributeValue(em, asset, attribute);+ if (!assetStorageService.updateAttributeValue(em, asset, attribute)) {+ throw new AssetProcessingException(+ STATE_STORAGE_FAILED, "database update failed, no rows updated"+ );+ }}LOG.fine("<<< Processing complete: " + attributeStr);return complete;}- protected void storeAttributeValue(EntityManager em, Asset<?> asset, Attribute<?> attribute) throws AssetProcessingException {-- if (!assetStorageService.updateAttributeValue(em, asset, attribute)) {- throw new AssetProcessingException(- STATE_STORAGE_FAILED, "database update failed, no rows updated"- );- }- }-- protected void publishClientEvent(Asset<?> asset, Attribute<?> attribute) {- // TODO Catch "queue full" exception (e.g. when producing thousands of INFO messages in rules)?- clientEventService.publishEvent(- new AttributeEvent(- asset.getId(),- attribute.getName(),- attribute.getValue().orElse(null),- timerService.getCurrentTimeMillis()- )- .setParentId(asset.getParentId())- .setRealm(asset.getRealm())- .setPath(asset.getPath())- .setAccessRestrictedRead(attribute.getMetaValue(MetaItemType.ACCESS_RESTRICTED_READ).orElse(false))- .setAccessPublicRead(attribute.getMetaValue(MetaItemType.ACCESS_PUBLIC_READ).orElse(false))- );- }-@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 196a6ace7..1d1cda852 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -50,7 +50,6 @@ import java.util.stream.IntStream;import static javax.ws.rs.core.Response.Status.*;import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;import static org.openremote.model.query.AssetQuery.Access;-import static org.openremote.model.query.AssetQuery.Select.selectExcludeAll;import static org.openremote.model.value.MetaItemType.*;public class AssetResourceImpl extends ManagerWebResource implements AssetResource {@@ -75,8 +74,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourreturn new Asset<?>[0];}- AssetQuery assetQuery = new AssetQuery()- .select(AssetQuery.Select.selectExcludePathAndParentInfo());+ AssetQuery assetQuery = new AssetQuery();if (!isRestrictedUser()) {assetQuery@@ -157,7 +155,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourList<Asset<?>> assets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludeParentInfo(true).excludePath(true).excludeAttributes(true))+ .select(new AssetQuery.Select().excludeAttributes()).tenant(new TenantPredicate(realm)).ids(assetIds));@@ -533,7 +531,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourthrow new WebApplicationException(FORBIDDEN);}- List<Asset<?>> assets = assetStorageService.findAll(new AssetQuery().ids(assetIds.toArray(new String[0])).select(selectExcludeAll()));+ List<Asset<?>> assets = assetStorageService.findAll(new AssetQuery().ids(assetIds.toArray(new String[0])).select(new AssetQuery.Select().excludeAttributes()));if (assets == null || assets.size() != assetIds.size()) {LOG.fine("Request to delete one or more invalid assets");throw new WebApplicationException(BAD_REQUEST);diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 57f190264..89e060245 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;import org.hibernate.Session;import org.hibernate.jdbc.AbstractReturningWork;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.security.AuthContext;import org.openremote.container.timer.TimerService;@@ -34,9 +33,7 @@ import org.openremote.manager.event.EventSubscriptionAuthorizer;import org.openremote.manager.gateway.GatewayService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;-import org.openremote.model.Constants;-import org.openremote.model.Container;-import org.openremote.model.ContainerService;+import org.openremote.model.*;import org.openremote.model.asset.*;import org.openremote.model.asset.impl.GroupAsset;import org.openremote.model.attribute.Attribute;@@ -63,7 +60,6 @@ import javax.persistence.Query;import javax.persistence.TypedQuery;import javax.validation.ConstraintViolation;import javax.validation.ConstraintViolationException;-import java.lang.reflect.Field;import java.sql.*;import java.util.*;import java.util.concurrent.atomic.AtomicInteger;@@ -75,12 +71,11 @@ import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.Collectors;import java.util.stream.IntStream;-import java.util.stream.Stream;import static java.util.stream.Collectors.groupingBy;import static org.apache.camel.builder.PredicateBuilder.or;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_TOPIC;import static org.openremote.model.attribute.Attribute.getAddedOrModifiedAttributes;import static org.openremote.model.query.AssetQuery.*;@@ -125,20 +120,20 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicprivate static final Logger LOG = Logger.getLogger(AssetStorageService.class.getName());public static final int PRIORITY = MED_PRIORITY;- protected static final Field assetParentNameField;- protected static final Field assetParentTypeField;-- static {- try {- assetParentNameField = Asset.class.getDeclaredField("parentName");- assetParentNameField.setAccessible(true);- assetParentTypeField = Asset.class.getDeclaredField("parentType");- assetParentTypeField.setAccessible(true);- } catch (NoSuchFieldException e) {- LOG.log(Level.SEVERE, "Failed to find Asset parentName and/or parentType fields in the Asset class", e);- throw new IllegalStateException();- }- }+// protected static final Field assetParentNameField;+// protected static final Field assetParentTypeField;+//+// static {+// try {+// assetParentNameField = Asset.class.getDeclaredField("parentName");+// assetParentNameField.setAccessible(true);+// assetParentTypeField = Asset.class.getDeclaredField("parentType");+// assetParentTypeField.setAccessible(true);+// } catch (NoSuchFieldException e) {+// LOG.log(Level.SEVERE, "Failed to find Asset parentName and/or parentType fields in the Asset class", e);+// throw new IllegalStateException();+// }+// }@SuppressWarnings("unchecked")public static <T extends SharedEvent & AssetInfo> EventSubscriptionAuthorizer assetInfoAuthorizer(ManagerIdentityService identityService, AssetStorageService assetStorageService) {@@ -396,8 +391,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicString requestRealm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);AssetQuery assetQuery = new AssetQuery()- .ids(assetId)- .select(new Select().excludePath(false).excludeParentInfo(true));+ .ids(assetId);assetQuery = prepareAssetQuery(assetQuery, authContext, requestRealm);@@ -553,7 +547,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicpublic Asset<?> find(String assetId, boolean loadComplete) {if (assetId == null)throw new IllegalArgumentException("Can't query null asset identifier");- return find(new AssetQuery().select(loadComplete ? null : Select.selectExcludeAll()).ids(assetId));+ return find(new AssetQuery().select(loadComplete ? null : new Select().excludeAttributes()).ids(assetId));}@SuppressWarnings("unchecked")@@ -582,7 +576,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn find(new AssetQuery().select(loadComplete? null- : Select.selectExcludePathAndAttributes())+ : new Select().excludeAttributes()).ids(assetId).access(access));}@@ -670,7 +664,12 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicpublic <T extends Asset<?>> T merge(T asset, boolean overrideVersion, boolean skipGatewayCheck, String userName) throws IllegalStateException, ConstraintViolationException {return persistenceService.doReturningTransaction(em -> {- T existingAsset = TextUtil.isNullOrEmpty(asset.getId()) ? null : (T)em.find(Asset.class, asset.getId());+ String gatewayId = gatewayService.getLocallyRegisteredGatewayId(asset.getId(), asset.getParentId());++ if (!skipGatewayCheck && gatewayId != null) {+ LOG.fine("Sending asset merge request to gateway: Gateway ID=" + gatewayId);+ return gatewayService.mergeGatewayAsset(gatewayId, asset);+ }// Do standard JSR-380 validation on the asset (includes custom validation)Set<ConstraintViolation<Asset<?>>> validationFailures = ValueUtil.validate(asset, Asset.AssetSave.class);@@ -682,6 +681,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicthrow ex;}+ T existingAsset = TextUtil.isNullOrEmpty(asset.getId()) ? null : (T)em.find(Asset.class, asset.getId());+if (existingAsset != null) {// Verify type has not been changed@@ -697,12 +698,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicthrow new IllegalStateException(msg);}- // Update timestamp on modified attributes+ // Update timestamp on modified attributes this allows fast equality checkingasset.getAttributes().stream().forEach(attr -> {existingAsset.getAttribute(attr.getName()).ifPresent(existingAttr -> {// If attribute is modified make sure the timestamp is also updated to allow simple equalityif (!attr.deepEquals(existingAttr) && attr.getTimestamp().orElse(0L) <= existingAttr.getTimestamp().orElse(0L)) {- attr.setTimestamp(timerService.getCurrentTimeMillis());+ // In the unlikely situation that we are in the same millisecond as last update+ // we will always ensure a delta of >= 1ms+ attr.setTimestamp(Math.max(existingAttr.getTimestamp().orElse(0L)+1, timerService.getCurrentTimeMillis()));}});});@@ -715,26 +718,46 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- // Validate parent- if (asset.getParentId() != null) {- // If this is a not a root asset...+ // Validate realm+ if (asset.getRealm() == null) {+ String msg = "Asset realm must be set : asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }++ if (!identityService.getIdentityProvider().tenantExists(asset.getRealm())) {+ String msg = "Asset realm not found or is inactive: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }++ if (asset.getParentId() != null && asset.getParentId().equals(asset.getId())) {+ String msg = "Asset parent cannot be the asset: asset=" + asset;+ LOG.info(msg);+ throw new IllegalStateException(msg);+ }++ // Validate parent only if asset is new or parent has changed+ if ((existingAsset == null && asset.getParentId() != null)+ || (existingAsset != null && asset.getParentId() != null && !asset.getParentId().equals(existingAsset.getParentId()))) {+Asset<?> parent = find(em, asset.getParentId(), true);- // .. the parent must exist+ // The parent must existif (parent == null) {String msg = "Asset parent not found: asset=" + asset;LOG.info(msg);throw new IllegalStateException(msg);}- // ... the parent can not be a child of the asset+ // The parent can not be a child of the assetif (parent.pathContains(asset.getId())) {String msg = "Asset parent cannot be a descendant of the asset: asset=" + asset;LOG.info(msg);throw new IllegalStateException(msg);}- // .. the parent should be in the same realm+ // The parent should be in the same realmif (!parent.getRealm().equals(asset.getRealm())) {String msg = "Asset parent must be in the same realm: asset=" + asset;LOG.info(msg);@@ -767,19 +790,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- // Validate realm- if (asset.getRealm() == null) {- String msg = "Asset realm must be set : asset=" + asset;- LOG.info(msg);- throw new IllegalStateException(msg);- }-- if (!identityService.getIdentityProvider().tenantExists(asset.getRealm())) {- String msg = "Asset realm not found or is inactive: asset=" + asset;- LOG.info(msg);- throw new IllegalStateException(msg);- }-// Validate group child asset type attributeif (asset instanceof GroupAsset) {String childAssetType = ((GroupAsset)asset).getChildAssetType()@@ -825,15 +835,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- T updatedAsset;- String gatewayId = gatewayService.getLocallyRegisteredGatewayId(asset.getId(), asset.getParentId());-- if (!skipGatewayCheck && gatewayId != null) {- LOG.fine("Sending asset merge request to gateway: Gateway ID=" + gatewayId);- updatedAsset = gatewayService.mergeGatewayAsset(gatewayId, asset);- } else {- updatedAsset = em.merge(asset);- }+ T updatedAsset = em.merge(asset);if (user != null) {storeUserAssetLinks(em, Collections.singletonList(new UserAssetLink(user.getRealm(), user.getId(), updatedAsset.getId())));@@ -1041,11 +1043,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}public boolean isDescendantAssets(String parentAssetId, List<String> assetIds) {- return persistenceService.doReturningTransaction(entityManager -> entityManager.unwrap(Session.class).doReturningWork(new AbstractReturningWork<Boolean>() {+ return persistenceService.doReturningTransaction(entityManager -> entityManager.unwrap(Session.class).doReturningWork(new AbstractReturningWork<>() {@Overridepublic Boolean execute(Connection connection) throws SQLException {- try (PreparedStatement st = connection.prepareStatement("select count(*) from Asset a where ? = ANY(get_asset_tree_path(a.ID)) AND a.id = ANY(?)")) {- st.setString(1, parentAssetId);+ try (PreparedStatement st = connection.prepareStatement("select count(*) from Asset a where a.path ~ lquery(?) AND a.id = ANY(?)")) {+ st.setString(1, "*." + parentAssetId + ".*");st.setArray(2, st.getConnection().createArrayOf("text", assetIds.toArray()));ResultSet rs = st.executeQuery();return rs.next() && rs.getInt(1) == assetIds.size();@@ -1199,7 +1201,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicnew AssetQuery().select(loadComplete? null- : Select.selectExcludePathAndAttributes())+ : new Select().excludeAttributes()).ids(assetId).access(access));@@ -1219,42 +1221,49 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicPreparedAssetQuery querySql = queryAndContainsCalendarPredicate.key;boolean containsCalendarPredicate = queryAndContainsCalendarPredicate.value;- if (containsCalendarPredicate && (query.select != null && (query.select.excludeAttributes))) {+ if (containsCalendarPredicate && (query.select != null && (query.select.attributes == null))) {LOG.info("Asset query contains a calendar event predicate which requires the attribute values and types to be included in the select (as calendar event predicate is applied post DB query)");throw new IllegalArgumentException("Asset query contains a calendar event predicate which requires the attribute values and types to be included in the select (as calendar event predicate is applied post DB query)");}- // Use a SqlResultSetMapping to allow auto hydration with retrieval of transient data as well- // Using hibernate query object rather than JPA as postgres array parameter support doesn't work in JPQL without specifying the data type- org.hibernate.query.Query<Object[]> jpql = em.createNativeQuery(querySql.querySql, "AssetMapping").unwrap(org.hibernate.query.Query.class);+ // RT: No longer used as parent info removed for simplicity and security reasons+// // Use a SqlResultSetMapping to allow auto hydration with retrieval of transient data as well+// // Using hibernate query object rather than JPA as postgres array parameter support doesn't work in JPQL without specifying the data type+// org.hibernate.query.Query<Object[]> jpql = em.createNativeQuery(querySql.querySql, "AssetMapping").unwrap(org.hibernate.query.Query.class);+// querySql.apply(em, jpql);+// List<Object[]> results = jpql.getResultList();+// Stream<Asset<?>> assetStream = results.stream().map(objArr -> {+// Asset<?> asset = (Asset<?>)objArr[0];+//+// if (objArr.length == 3) {+// // We have transient parent info+// String parentName = (String)objArr[1];+// String parentType = (String)objArr[2];+// try {+// assetParentNameField.set(asset, parentName);+// assetParentTypeField.set(asset, parentType);+// } catch (IllegalAccessException e) {+// LOG.log(Level.WARNING, "Failed to set asset parent name and/or type fields", e);+// }+// }+// return asset;+// });++ org.hibernate.query.Query<Object[]> jpql = em.createNativeQuery(querySql.querySql, Asset.class).unwrap(org.hibernate.query.Query.class);querySql.apply(em, jpql);-- List<Object[]> results = jpql.getResultList();-- Stream<Asset<?>> assetStream = results.stream().map(objArr -> {- Asset<?> asset = (Asset<?>)objArr[0];-- if (objArr.length == 3) {- // We have transient parent info- String parentName = (String)objArr[1];- String parentType = (String)objArr[2];- try {- assetParentNameField.set(asset, parentName);- assetParentTypeField.set(asset, parentType);- } catch (IllegalAccessException e) {- LOG.log(Level.WARNING, "Failed to set asset parent name and/or type fields", e);- }- }- return asset;- });+ List<Asset<?>> assets = (List<Asset<?>>)(Object)jpql.getResultList();if (containsCalendarPredicate) {- assetStream = assetStream.filter(asset -> calendarEventPredicateMatches(timerService::getCurrentTimeMillis, query, asset));+ return assets.stream().filter(asset -> calendarEventPredicateMatches(timerService::getCurrentTimeMillis, query, asset)).toList();}- return assetStream.collect(Collectors.toList());+ return assets;}+ /**+ * This does a low level JDBC update so hibernate event interceptor doesn't get called and we 'manually'+ * generate the {@link AttributeEvent}+ */protected boolean updateAttributeValue(EntityManager em, Asset<?> asset, Attribute<?> attribute) {try {@@ -1265,7 +1274,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicObject value = attribute.getValue();long timestamp = attribute.getTimestamp().orElseGet(timerService::getCurrentTimeMillis);- return em.unwrap(Session.class).doReturningWork(connection -> {+ boolean success = em.unwrap(Session.class).doReturningWork(connection -> {String jpql = "update Asset" +" set attributes = jsonb_set(jsonb_set(attributes, ?, ?, true), ?, ?, true)" +" where id = ? and attributes -> ? is not null";@@ -1308,12 +1317,35 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn updatedRows == 1;}});++ if (success) {+ publishAttributeEvent(asset, attribute);+ }++ return success;+} catch (Exception e) {LOG.log(Level.WARNING, "Failed to store attribute value", e);return false;}}+ protected void publishAttributeEvent(Asset<?> asset, Attribute<?> attribute) {+ clientEventService.publishEvent(+ new AttributeEvent(+ asset.getId(),+ attribute.getName(),+ attribute.getValue().orElse(null),+ attribute.getTimestamp().orElse(timerService.getCurrentTimeMillis())+ )+ .setParentId(asset.getParentId())+ .setRealm(asset.getRealm())+ .setPath(asset.getPath())+ .setAccessRestrictedRead(attribute.getMetaValue(MetaItemType.ACCESS_RESTRICTED_READ).orElse(false))+ .setAccessPublicRead(attribute.getMetaValue(MetaItemType.ACCESS_PUBLIC_READ).orElse(false))+ );+ }+protected void publishModificationEvents(PersistenceEvent<Asset<?>> persistenceEvent) {Asset<?> asset = persistenceEvent.getEntity();switch (persistenceEvent.getCause()) {@@ -1389,16 +1421,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicgetAddedOrModifiedAttributes(oldAttributes.values(),newAttributes.values()).forEach(newOrModifiedAttribute ->- clientEventService.publishEvent(- new AttributeEvent(- asset.getId(),- newOrModifiedAttribute.getName(),- newOrModifiedAttribute.getValue().orElse(null),- newOrModifiedAttribute.getTimestamp().orElse(0L))- .setParentId(asset.getParentId()).setRealm(asset.getRealm())- .setAccessRestrictedRead(newOrModifiedAttribute.getMetaValue(MetaItemType.ACCESS_RESTRICTED_READ).orElse(false))- .setAccessPublicRead(newOrModifiedAttribute.getMetaValue(MetaItemType.ACCESS_PUBLIC_READ).orElse(false))- ));+ publishAttributeEvent(asset, newOrModifiedAttribute)+ );}break;case DELETE:@@ -1469,25 +1493,13 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicsb.append(", A.CREATED_ON AS CREATED_ON, A.TYPE AS TYPE, A.PARENT_ID AS PARENT_ID");sb.append(", A.REALM AS REALM, A.VERSION as VERSION");- if (level == 3) {- sb.append(", A.PARENT_NAME as PARENT_NAME, A.PARENT_TYPE as PARENT_TYPE");- } else {- if (select == null || !select.excludeParentInfo) {- sb.append(", P.NAME as PARENT_NAME, P.TYPE as PARENT_TYPE");- } else {- sb.append(", NULL as PARENT_NAME, NULL as PARENT_TYPE");- }- }-if (!query.recursive || level == 3) {- if (select == null || !select.excludePath) {- sb.append(", get_asset_tree_path(A.ID) as PATH");- } else {- sb.append(", NULL as PATH");- }+ sb.append(", A.PATH as PATH");+ } else {+ sb.append(", NULL as PATH");}- if (select == null || !select.excludeAttributes) {+ if (select == null || select.attributes == null || select.attributes.length > 0) {if (query.recursive && level != 3) {sb.append(", A.ATTRIBUTES as ATTRIBUTES");} else {@@ -1542,10 +1554,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (level == 1) {sb.append(" from Asset A ");-- if (requiresParentJoin(query)) {- sb.append("left outer join Asset P on A.PARENT_ID = P.id ");- }} else if (level == 2) {sb.append(" from top_level_assets P ");sb.append("join Asset A on A.PARENT_ID = P.ID ");@@ -1656,25 +1664,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicfinal int pos = binders.size() + 1;sb.append("A.PARENT_ID = ?").append(pos);binders.add((em, st) -> st.setParameter(pos, pred.id));- } else if (level == 1 && pred.noParent) {+ } else if (level == 1) {sb.append("A.PARENT_ID is null");- } else if (pred.type != null || pred.name != null) {- if (pred.type != null) {- String[] resolvedTypes = getResolvedAssetTypes(new Class[]{pred.type});- final int pos = binders.size() + 1;- sb.append("P.TYPE = ANY(?")- .append(pos)- .append(")");- binders.add((em, st) -> st.setParameter(pos, resolvedTypes, StringArrayType.INSTANCE));- }- if (pred.name != null) {- if (pred.type != null) {- sb.append(" and ");- }- final int pos = binders.size() + 1;- sb.append("P.NAME = ?").append(pos);- binders.add((em, st) -> st.setParameter(pos, pred.name));- }} else {sb.append("true");}@@ -1685,22 +1676,17 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicsb.append(")");}- if (level == 1 && hasPathConstraint(query.paths)) {+ if (level == 1 && query.paths != null && query.paths.length > 0) {sb.append(" and (");- boolean isFirst = true;-- for (PathPredicate pred : query.paths) {- if (!isFirst) {- sb.append(" or ");- }- isFirst = false;-- final int pos = binders.size() + 1;- sb.append("?").append(pos).append(" <@ get_asset_tree_path(A.id)");- binders.add((em, st) -> st.setParameter(pos, pred.path, StringArrayType.INSTANCE));- }+ Arrays.stream(query.paths)+ .map(p -> String.join(".", p.path))+ .forEach(lqueryStr -> {+ int pos = binders.size() + 1;+ sb.append("A.PATH ~ lquery(?").append(pos).append(") or ");+ binders.add((em, st) -> st.setParameter(pos, "*." + lqueryStr + ".*"));+ });- sb.append(")");+ sb.append("false)");}if (!recursive || level == 3) {@@ -1841,29 +1827,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn containsCalendarPredicate;}- protected static boolean hasPathConstraint(PathPredicate[] pathPredicates) {- if (pathPredicates == null || pathPredicates.length == 0) {- return false;- }-- return Arrays.stream(pathPredicates).anyMatch(p -> p.path != null);- }-- protected static boolean requiresParentJoin(AssetQuery query) {- ParentPredicate[] parentPredicates = query.parents;-- if (query.select == null || !query.select.excludeParentInfo) {- return true;- }-- if (parentPredicates == null || parentPredicates.length == 0) {- return false;- }-- return Arrays.stream(parentPredicates)- .anyMatch(p -> !p.noParent && (p.type != null || p.name != null));- }-protected static String buildNameValuePredicateFilter(NameValuePredicate nameValuePredicate, String jsonObjName, List<ParameterBinder> binders, Supplier<Long> timeProvider) {if (nameValuePredicate.name == null && nameValuePredicate.value == null) {return "TRUE";diff --git a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.javaindex 3cab8efcb..a0e80c4a3 100644--- a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java@@ -151,9 +151,9 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe// Look for a group asset with a child type of console in the realm rootGroupAsset consoleParent = (GroupAsset) assetStorageService.find(new AssetQuery()- .select(AssetQuery.Select.selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).names(CONSOLE_PARENT_ASSET_NAME)- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)).types(GroupAsset.class).tenant(new TenantPredicate(tenant.getRealm())).attributes(new AttributePredicate("childAssetType", new StringPredicate(ConsoleAsset.DESCRIPTOR.getName())))diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.javaindex 59e9aae95..5e2fd1772 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java@@ -29,6 +29,7 @@ import java.time.Instant;import java.time.LocalDateTime;import java.time.temporal.ChronoUnit;import java.util.ArrayList;+import java.util.Date;import java.util.List;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.ScheduledFuture;@@ -390,10 +391,10 @@ public abstract class AbstractDatapointService<T extends Datapoint> implements Cprotected abstract Logger getLogger();- protected void doPurge(String whereClause, LocalDateTime dateTime) {+ protected void doPurge(String whereClause, Date date) {persistenceService.doTransaction(em -> em.createQuery("delete from " + getDatapointClass().getSimpleName() + " dp " + whereClause- ).setParameter("dt", dateTime).executeUpdate());+ ).setParameter("dt", date).executeUpdate());}protected long getFirstPurgeMillis(Instant currentTime) {diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.javaindex 1c7a9d171..2bddb85a8 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java@@ -139,8 +139,7 @@ public class AssetDatapointService extends AbstractDatapointService<AssetDatapoi.attributes(new AttributePredicate().meta(new NameValuePredicate(MetaItemType.DATA_POINTS_MAX_AGE_DAYS, null)- ))- .select(AssetQuery.Select.selectExcludePathAndParentInfo()));+ )));List<Pair<String, Attribute<?>>> attributes = assets.stream().map(asset -> assetdiff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.javaindex 33189fdde..7414b01b6 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointService.java@@ -27,13 +27,12 @@ import org.openremote.manager.web.ManagerWebService;import org.openremote.model.Container;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.datapoint.AssetPredictedDatapoint;-import org.openremote.model.datapoint.Datapoint;import org.openremote.model.util.Pair;import java.time.Duration;import java.time.Instant;import java.time.LocalDateTime;-import java.time.ZoneId;+import java.util.Date;import java.util.List;import java.util.concurrent.TimeUnit;import java.util.logging.Level;@@ -109,7 +108,7 @@ public class AssetPredictedDatapointService extends AbstractDatapointService<Asstry {// Purge data points not in the above list using default durationLOG.finer("Purging predicted data points older than now");- doPurge("where dp.timestamp < :dt", LocalDateTime.ofInstant(timerService.getNow().truncatedTo(HOURS), ZoneId.systemDefault()));+ doPurge("where dp.timestamp < :dt", Date.from(timerService.getNow().truncatedTo(HOURS)));} catch (Exception e) {LOG.log(Level.WARNING, "Failed to run data points purge", e);}diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.javaindex cf5461ec9..e1b163e27 100644--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java@@ -21,7 +21,7 @@ package org.openremote.manager.energy;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;@@ -64,8 +64,8 @@ import java.util.stream.Collectors;import java.util.stream.IntStream;import static java.time.temporal.ChronoUnit.HOURS;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;/**@@ -125,7 +125,6 @@ public class EnergyOptimisationService extends RouteBuilder implements ContainerList<EnergyOptimisationAsset> energyOptimisationAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludeParentInfo(true)).types(EnergyOptimisationAsset.class)).stream()@@ -379,7 +378,6 @@ public class EnergyOptimisationService extends RouteBuilder implements ContainerList<ElectricitySupplierAsset> supplierAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true)).types(ElectricitySupplierAsset.class).recursive(true).parents(optimisationAssetId)@@ -409,7 +407,6 @@ public class EnergyOptimisationService extends RouteBuilder implements ContainerList<ElectricityStorageAsset> optimisableStorageAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true).excludeParentInfo(true)).recursive(true).parents(optimisationAssetId).types(ElectricityStorageAsset.class)@@ -500,7 +497,6 @@ public class EnergyOptimisationService extends RouteBuilder implements ContainerAtomicInteger count = new AtomicInteger(0);assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true).excludeParentInfo(true)).recursive(true).parents(optimisationAssetId).types(ElectricityConsumerAsset.class, ElectricityProducerAsset.class)@@ -519,7 +515,6 @@ public class EnergyOptimisationService extends RouteBuilder implements Container// Get power of storage assets that don't support neither import or export (treat them as plain consumers/producers)List<ElectricityStorageAsset> plainStorageAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true).excludeParentInfo(true)).recursive(true).parents(optimisationAssetId).types(ElectricityStorageAsset.class)diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javaindex c4fbd3223..e60a691ee 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java@@ -5,7 +5,7 @@ import org.apache.camel.builder.RouteBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;@@ -39,8 +39,8 @@ import java.util.logging.Logger;import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.container.web.WebTargetBuilder.createClient;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;@@ -136,7 +136,6 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServiList<ElectricityProducerSolarAsset> electricityProducerSolarAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludeParentInfo(true)).types(ElectricityProducerSolarAsset.class)).stream()diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.javaindex 7713aecbf..0dd27f9e2 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java@@ -5,7 +5,7 @@ import org.apache.camel.builder.RouteBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.datapoint.AssetPredictedDatapointService;@@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit;import java.util.logging.Level;import java.util.logging.Logger;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.container.web.WebTargetBuilder.createClient;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;@@ -172,7 +172,6 @@ public class ForecastWindService extends RouteBuilder implements ContainerServicList<ElectricityProducerWindAsset> electricityProducerWindAssets = assetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludeParentInfo(true)).types(ElectricityProducerWindAsset.class)).stream()diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.javaindex 37c936180..05620ffef 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java@@ -29,7 +29,7 @@ import org.openremote.agent.protocol.io.AbstractNettyIOClient;import org.openremote.agent.protocol.websocket.WebsocketIOClient;import org.openremote.model.ContainerService;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingService;@@ -58,8 +58,8 @@ import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.Collectors;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.model.syslog.SyslogCategory.GATEWAY;/**diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.javaindex d11717099..5edb28d28 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java@@ -48,7 +48,6 @@ import java.util.stream.Collectors;import java.util.stream.IntStream;import java.util.stream.Stream;-import static org.openremote.model.query.AssetQuery.Select.selectExcludeAll;import static org.openremote.model.syslog.SyslogCategory.GATEWAY;/**@@ -273,7 +272,7 @@ public class GatewayConnector {expectedSyncResponseName = ASSET_READ_EVENT_NAME_INITIAL;sendMessageToGateway(new EventRequestResponseWrapper<>(ASSET_READ_EVENT_NAME_INITIAL,- new ReadAssetsEvent(new AssetQuery().select(selectExcludeAll()).recursive(true))));+ new ReadAssetsEvent(new AssetQuery().select(new AssetQuery.Select().excludeAttributes()).recursive(true))));syncProcessorFuture = executorService.schedule(this::onSyncAssetsTimeout, SYNC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);}@@ -330,7 +329,6 @@ public class GatewayConnector {expectedSyncResponseName,new ReadAssetsEvent(new AssetQuery()- .select(new AssetQuery.Select().excludeParentInfo(true).excludePath(true)).ids(requestAssetIds)))@@ -475,7 +473,7 @@ public class GatewayConnector {// Find obsolete local assetsList<Asset<?>> localAssets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).recursive(true).parents(gatewayId));diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex c6b33e6cc..b0dc39994 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -23,7 +23,7 @@ import org.apache.camel.Exchange;import org.apache.camel.Predicate;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.web.ConnectionConstants;import org.openremote.manager.asset.AssetProcessingException;import org.openremote.manager.asset.AssetProcessingService;@@ -60,8 +60,8 @@ import java.util.stream.IntStream;import static org.apache.camel.builder.PredicateBuilder.and;import static org.apache.camel.builder.PredicateBuilder.or;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.manager.gateway.GatewayConnector.mapAssetId;import static org.openremote.model.syslog.SyslogCategory.GATEWAY;@@ -206,7 +206,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As.findAll(new AssetQuery().parents(gateway.getId())- .select(AssetQuery.Select.selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).recursive(true));gatewayAssets.forEach(asset -> assetIdGatewayIdMap.put(asset.getId(), gateway.getId()));@@ -234,11 +234,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, AsPersistenceEvent<Asset<?>> persistenceEvent = exchange.getIn().getBody(PersistenceEvent.class);Asset<?> eventAsset = persistenceEvent.getEntity();- if (persistenceEvent.getCause() != PersistenceEvent.Cause.DELETE) {- eventAsset = assetStorageService.find(eventAsset.getId(), true);- }-- if (eventAsset == null) {+ if (!(eventAsset instanceof GatewayAsset) && gatewayConnectorMap.isEmpty()) {return;}@@ -246,15 +242,29 @@ public class GatewayService extends RouteBuilder implements ContainerService, Asif (eventAsset instanceof GatewayAsset&& (isLocallyRegisteredGateway(eventAsset.getId()) || getLocallyRegisteredGatewayId(eventAsset.getId(), eventAsset.getParentId()) == null)) {+ if (persistenceEvent.getCause() != PersistenceEvent.Cause.DELETE) {+ eventAsset = assetStorageService.find(eventAsset.getId(), true);+ if (eventAsset == null) {+ return;+ }+ }+processGatewayChange((GatewayAsset)eventAsset, persistenceEvent);} else {String gatewayId = getLocallyRegisteredGatewayId(eventAsset.getId(), eventAsset.getParentId());if (gatewayId != null) {++ if (persistenceEvent.getCause() != PersistenceEvent.Cause.DELETE) {+ eventAsset = assetStorageService.find(eventAsset.getId(), true);+ if (eventAsset == null) {+ return;+ }+ }+processGatewayChildAssetChange(gatewayId, eventAsset, persistenceEvent);}-}});}diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex 33033997c..de147e54e 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -32,7 +32,7 @@ import io.netty.handler.codec.mqtt.MqttPublishMessage;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.event.ClientEventService;@@ -57,8 +57,8 @@ import java.util.logging.Logger;import java.util.stream.Collectors;import static java.util.stream.StreamSupport.stream;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getInteger;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.model.syslog.SyslogCategory.API;diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.javaindex a509ee9d2..721e46a6c 100644--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java@@ -187,7 +187,7 @@ public class EmailNotificationHandler implements NotificationHandler {// Find descendant assets with email attributeList<Asset<?>> assets = assetStorageService.findAll(new AssetQuery()- .select(AssetQuery.Select.selectExcludePathAndParentInfo()+ .select(new AssetQuery.Select().attributes(Asset.EMAIL.getName())).paths(new PathPredicate(targetId)).attributes(new AttributePredicate(diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.javaindex e5da7ce07..9c00c2384 100644--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java@@ -27,7 +27,8 @@ import com.google.firebase.FirebaseOptions;import com.google.firebase.messaging.*;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;+import org.openremote.container.persistence.PersistenceService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.gateway.GatewayService;import org.openremote.manager.security.ManagerIdentityService;@@ -58,7 +59,6 @@ import java.util.stream.Collectors;import java.util.stream.StreamSupport;import static org.openremote.container.concurrent.GlobalLock.withLock;-import static org.openremote.container.persistence.PersistenceEvent.*;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;import static org.openremote.manager.security.ManagerKeycloakIdentityProvider.KEYCLOAK_USER_ATTRIBUTE_PUSH_NOTIFICATIONS_DISABLED;import static org.openremote.model.notification.PushNotificationMessage.TargetType.*;@@ -130,8 +130,7 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio// Find all console assets that use this adapterassetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true)- .attributes(ConsoleAsset.CONSOLE_PROVIDERS.getName()))+ .select(new AssetQuery.Select().attributes(ConsoleAsset.CONSOLE_PROVIDERS.getName())).types(ConsoleAsset.class).attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, null, false, new NameValuePredicate.Path(PushNotificationMessage.TYPE))@@ -150,9 +149,9 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio@Overridepublic void configure() throws Exception {// If any console asset was modified in the database, detect push provider changes- from(PERSISTENCE_TOPIC)+ from(PersistenceService.PERSISTENCE_TOPIC).routeId("PushNotificationAssetChanges")- .filter(isPersistenceEventForEntityType(ConsoleAsset.class))+ .filter(PersistenceService.isPersistenceEventForEntityType(ConsoleAsset.class)).filter(isNotForGateway(gatewayService)).process(exchange -> {@SuppressWarnings("unchecked")@@ -209,7 +208,7 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio// Get all console assets with a push provider defined within the specified tenantList<Asset<?>> consoleAssets = assetStorageService.findAll(new AssetQuery()- .select(AssetQuery.Select.selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).tenant(new TenantPredicate(targetId)).types(ConsoleAsset.class).attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, null, false, new NameValuePredicate.Path(PushNotificationMessage.TYPE))));@@ -256,7 +255,7 @@ public class PushNotificationHandler extends RouteBuilder implements NotificatiomappedTargets.addAll(assetStorageService.findAll(new AssetQuery()- .select(AssetQuery.Select.selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).ids(ids).types(ConsoleAsset.class).attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, null, false, new NameValuePredicate.Path(PushNotificationMessage.TYPE))))@@ -274,7 +273,7 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatiocase ASSET:// Find all console descendants of the specified assetconsoleAssets = assetStorageService.findAll(new AssetQuery()- .select(AssetQuery.Select.selectExcludeAll())+ .select(new AssetQuery.Select().excludeAttributes()).paths(new PathPredicate(targetId)).types(ConsoleAsset.class).attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, null, false, new NameValuePredicate.Path(PushNotificationMessage.TYPE))));diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex 114aa5856..83d40f703 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -27,7 +27,7 @@ import io.moquette.interception.messages.InterceptUnsubscribeMessage;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.container.util.UniqueIdentifierGenerator;import org.openremote.manager.asset.AssetStorageService;@@ -41,7 +41,6 @@ import org.openremote.model.asset.Asset;import org.openremote.model.asset.UserAssetLink;import org.openremote.model.provisioning.*;import org.openremote.model.security.ClientRole;-import org.openremote.model.security.Role;import org.openremote.model.security.User;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;@@ -55,10 +54,9 @@ import java.security.cert.X509Certificate;import java.util.*;import java.util.logging.Level;import java.util.logging.Logger;-import java.util.stream.Collectors;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;import static org.openremote.model.syslog.SyslogCategory.API;diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.javaindex 50b1f6ecb..274d1a6d1 100644--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java@@ -32,10 +32,7 @@ import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaHolder;import org.openremote.model.value.NameValueHolder;-import java.util.ArrayList;-import java.util.Arrays;-import java.util.Collection;-import java.util.List;+import java.util.*;import java.util.concurrent.atomic.AtomicReference;import java.util.function.Function;import java.util.function.Predicate;@@ -123,10 +120,7 @@ public class AssetQueryPredicate implements Predicate<AssetState<?>> {public static Predicate<AssetState<?>> asPredicate(ParentPredicate predicate) {return assetState ->- (predicate.id == null || predicate.id.equals(assetState.getParentId()))- && (predicate.type == null || predicate.type.getSimpleName().equals(assetState.getParentType()))- && (predicate.name == null || predicate.name.equals(assetState.getParentName()))- && (!predicate.noParent || assetState.getParentId() == null);+ Objects.equals(predicate.id, assetState.getParentId());}public static Predicate<String[]> asPredicate(PathPredicate predicate) {diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex be0365d7a..48fbc4774 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -22,7 +22,7 @@ package org.openremote.manager.rules;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.databind.node.ObjectNode;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.model.asset.Asset;@@ -818,7 +818,7 @@ public class JsonRulesBuilder extends RulesBuilder {Collection<String> ids = getRuleActionTargetIds(ruleAction.target, useUnmatched, ruleState, assetsFacade, usersFacade, facts);if (ids == null || ids.isEmpty()) {- log(Level.FINEST, "No targets for write attribute rule action so skipping: " + rule.name + " '" + actionsName + "' action index " + index);+ log(Level.INFO, "No targets for write attribute rule action so skipping: " + rule.name + " '" + actionsName + "' action index " + index);return null;}@@ -866,7 +866,7 @@ public class JsonRulesBuilder extends RulesBuilder {}if (matchingAssetIds.isEmpty()) {- log(Level.WARNING, "No assets matched to apply update attribute action to");+ log(Level.INFO, "No targets for update attribute rule action so skipping: " + rule.name + " '" + actionsName + "' action index " + index);return null;}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 27c709149..3766f2ac4 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -21,7 +21,7 @@ package org.openremote.manager.rules;import org.jeasy.rules.api.RulesEngineParameters;import org.jeasy.rules.core.InferenceRulesEngine;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.javaindex 4c8e0a319..292235d39 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java@@ -407,7 +407,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResourasset = assetStorageService.find(new AssetQuery()- .select(AssetQuery.Select.selectExcludePathAndAttributes())+ .select(new AssetQuery.Select().excludeAttributes()).ids(assetId));if (asset == null)diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex ce996892f..470df4a2c 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -21,7 +21,7 @@ package org.openremote.manager.rules;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetProcessingException;@@ -67,8 +67,8 @@ import static java.util.logging.Level.SEVERE;import static java.util.stream.Collectors.toList;import static org.openremote.container.concurrent.GlobalLock.withLock;import static org.openremote.container.concurrent.GlobalLock.withLockReturning;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;import static org.openremote.model.attribute.Attribute.getAddedOrModifiedAttributes;diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.javaindex fcefd05c0..38138d6a9 100644--- a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java+++ b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java@@ -79,11 +79,7 @@ public class AssetsFacade<T extends Ruleset> extends Assets {}AssetQuery.Select oldValue = assetQuery.select;-- if (assetQuery.select == null)- assetQuery.select = AssetQuery.Select.selectExcludePathAndAttributes();-- assetQuery.select = AssetQuery.Select.selectExcludeAll();+ assetQuery.select = new AssetQuery.Select().excludeAttributes();try {return assetStorageService.findAll(assetQuery).stream();diff --git a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.javaindex a928c0301..164dafb3e 100644--- a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java+++ b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java@@ -22,7 +22,7 @@ package org.openremote.manager.rules.geofence;import com.fasterxml.jackson.databind.node.ObjectNode;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.gateway.GatewayService;import org.openremote.manager.notification.NotificationService;@@ -51,8 +51,8 @@ import java.util.stream.Collectors;import java.util.stream.IntStream;import static org.openremote.container.concurrent.GlobalLock.withLock;-import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;-import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;import static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP_METHOD;import static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrl;@@ -105,8 +105,7 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements GeofeassetStorageService.findAll(new AssetQuery()- .select(new AssetQuery.Select().excludePath(true)- .attributes(ConsoleAsset.CONSOLE_PROVIDERS.getName()))+ .select(new AssetQuery.Select().attributes(ConsoleAsset.CONSOLE_PROVIDERS.getName())).types(ConsoleAsset.class).attributes(new AttributePredicate(ConsoleAsset.CONSOLE_PROVIDERS, new ValueEmptyPredicate().negate(true), false, new NameValuePredicate.Path("geofence")))).stream()diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 1707d8e4a..3b7f085d6 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -26,7 +26,7 @@ import org.keycloak.admin.client.resource.*;import org.keycloak.common.enums.SslRequired;import org.keycloak.representations.idm.*;import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.persistence.PersistenceEvent;+import org.openremote.model.PersistenceEvent;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.security.AuthContext;import org.openremote.container.security.keycloak.KeycloakIdentityProvider;diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sqlindex 0c1048113..699d3cfb1 100644--- a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql@@ -3,7 +3,7 @@*/create extension if not exists POSTGIS;create extension if not exists POSTGIS_TOPOLOGY;-+create extension if not exists ltree;/*############################# SEQUENCES #############################*/@@ -21,8 +21,9 @@ create table ASSET (CREATED_ON timestamp with time zone not null,NAME varchar(1023) not null,PARENT_ID varchar(22),+ PATH ltree,REALM varchar(255) not null,- TYPE varchar(255) not null,+ TYPE varchar(500) not null,ACCESS_PUBLIC_READ boolean not null,VERSION int8 not null,primary key (ID),@@ -153,6 +154,23 @@ create table PROVISIONING_CONFIG (/*############################# FUNCTIONS #############################*/+CREATE OR REPLACE FUNCTION update_asset_parent_info() RETURNS TRIGGER AS $$+DECLARE+ ppath ltree;+BEGIN+ IF NEW.parent_id IS NULL THEN+ NEW.path = NEW.id::ltree;+ ELSEIF TG_OP = 'INSERT' OR OLD.parent_id IS NULL OR OLD.parent_id != NEW.parent_id THEN+ SELECT A.path || NEW.id::text INTO ppath FROM ASSET A WHERE id = NEW.parent_id;+ IF ppath IS NULL THEN+ RAISE EXCEPTION 'Invalid parent_id %', NEW.parent_id;+ END IF;+ NEW.path = ppath;+ END IF;+ RETURN NEW;+END;+$$ LANGUAGE plpgsql;+create or replace function GET_ASSET_TREE_PATH(ASSET_ID text)returns text [] as$$@@ -178,6 +196,14 @@ end;$$language plpgsql;+/*+ ############################# TRIGGERS #############################+ */++CREATE TRIGGER asset_parent_info_tgr+ BEFORE INSERT OR UPDATE ON ASSET+ FOR EACH ROW EXECUTE PROCEDURE update_asset_parent_info();+/*############################# CONSTRAINTS #############################*/@@ -213,5 +239,5 @@ alter table PROVISIONING_CONFIG############################# INDICES #############################*/-create index ASSET_PARENT_ID on ASSET(PARENT_ID);-+CREATE INDEX SECTION_PARENT_PATH_IDX ON ASSET USING GIST (path);+CREATE INDEX SECTION_PARENT_ID_IDX ON ASSET (parent_id);diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 8c59acbb5..e360eb9d9 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -47,6 +47,7 @@ public interface Constants {String PERSISTENCE_UNIQUE_ID_GENERATOR = "UNIQUE_ID_GENERATOR";String PERSISTENCE_JSON_VALUE_TYPE = "jsonb";String PERSISTENCE_STRING_ARRAY_TYPE = "string-array";+ String PERSISTENCE_LTREE_TYPE = "ltree";String SETUP_EMAIL_USER = "SETUP_EMAIL_USER";String SETUP_EMAIL_HOST = "SETUP_EMAIL_HOST";diff --git a/model/src/main/java/org/openremote/model/PersistenceEvent.java b/model/src/main/java/org/openremote/model/PersistenceEvent.javanew file mode 100644index 000000000..05e6a2c2e--- /dev/null+++ b/model/src/main/java/org/openremote/model/PersistenceEvent.java@@ -0,0 +1,98 @@+/*+ * Copyright 2016, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.model;++import java.util.Arrays;++public class PersistenceEvent<T> {++ public enum Cause {+ CREATE, UPDATE, DELETE+ }++ final protected Cause cause;+ final protected T entity;+ final protected String[] propertyNames;+ final protected Object[] currentState;+ final protected Object[] previousState;++ public PersistenceEvent(Cause cause, T entity, String[] propertyNames, Object[] currentState, Object[] previousState) {+ this.cause = cause;+ this.entity = entity;+ this.propertyNames = propertyNames;+ this.currentState = currentState;+ this.previousState = previousState;+ }++ public PersistenceEvent(Cause cause, T entity, String[] propertyNames, Object[] currentState) {+ this(cause, entity, propertyNames, currentState, null);+ }++ public Cause getCause() {+ return cause;+ }++ public T getEntity() {+ return entity;+ }++ public String[] getPropertyNames() {+ return propertyNames;+ }++ public Object[] getCurrentState() {+ return currentState;+ }++ public Object[] getPreviousState() {+ return previousState;+ }++ @SuppressWarnings("unchecked")+ public <E> E getPreviousState(String propertyName) {+ return getPreviousState() != null ? (E) getPreviousState()[getPropertyIndex(propertyName)] : null;+ }++ @SuppressWarnings("unchecked")+ public <E> E getCurrentState(String propertyName) {+ return (E) getCurrentState()[getPropertyIndex(propertyName)];+ }++ protected int getPropertyIndex(String propertyName) {+ for (int i = 0; i < getPropertyNames().length; i++) {+ String property = getPropertyNames()[i];+ if (property.equals(propertyName)) {+ return i;+ }+ }+ throw new IllegalArgumentException("Property not found: " + propertyName);+ }++ @Override+ public String toString() {+ return getClass().getSimpleName() + "{" ++ "cause=" + cause ++ ", entity=" + entity ++ ", propertyNames=" + Arrays.toString(propertyNames) ++ ", currentState=" + Arrays.toString(currentState) ++ ", previousState=" + Arrays.toString(previousState) ++ '}';+ }+}diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 4583fd5d9..1b4b5b074 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -21,9 +21,7 @@ package org.openremote.model.asset;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;-import org.hibernate.annotations.Check;-import org.hibernate.annotations.DynamicUpdate;-import org.hibernate.annotations.Formula;+import org.hibernate.annotations.*;import org.openremote.model.Constants;import org.openremote.model.IdentifiableEntity;import org.openremote.model.asset.impl.ThingAsset;@@ -34,21 +32,22 @@ import org.openremote.model.attribute.MetaMap;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.jackson.AssetTypeIdResolver;import org.openremote.model.util.TsIgnore;+import org.openremote.model.util.ValueUtil;import org.openremote.model.validation.AssetValid;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import org.openremote.model.util.ValueUtil;import javax.persistence.*;+import javax.persistence.Entity;+import javax.persistence.Table;import javax.validation.Valid;import javax.validation.constraints.*;import java.util.*;import java.util.stream.Collectors;import static javax.persistence.DiscriminatorType.STRING;-import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;-import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;+import static org.openremote.model.Constants.*;// @formatter:off@@ -59,9 +58,6 @@ import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;* through a <code>null</code> {@link #parentId} property for root assets, and a valid parent identifier for* sub-assets.* <p>- * The properties {@link #parentName} and {@link #parentType} are transient, not required for storing assets, and only- * resolved and usable when the asset is loaded from storage.- * <p>* An asset is stored in and therefore access-controlled through a {@link #realm}.* <p>* The {@link #createdOn} value is milliseconds since the Unix epoch.@@ -213,26 +209,6 @@ import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;* }</pre></blockquote>*/// @formatter:on-@SqlResultSetMapping(- name = "AssetMapping",- entities = @EntityResult(- entityClass = Asset.class,- discriminatorColumn = "type",- fields = {- @FieldResult(name = "id", column = "id"),- @FieldResult(name = "type", column = "type"),- @FieldResult(name = "version", column = "version"),- @FieldResult(name = "accessPublicRead", column = "access_public_read"),- @FieldResult(name = "attributes", column = "attributes"),- @FieldResult(name = "createdOn", column = "created_on"),- @FieldResult(name = "parentId", column = "parent_id"),- @FieldResult(name = "realm", column = "realm"),- @FieldResult(name = "path", column = "path"),- @FieldResult(name = "name", column = "name")}),- columns = {- @ColumnResult(name = "parent_name", type = String.class),- @ColumnResult(name = "parent_type", type = String.class)- })@Entity@Table(name = "ASSET")@Inheritance(strategy = InheritanceType.SINGLE_TABLE)@@ -293,24 +269,18 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>@NotBlank(message = "{Asset.realm.NotBlank}")@Size(min = 1, max = 255, message = "{Asset.realm.Size}")- @Column(name = "REALM", nullable = false)+ @Column(name = "REALM", nullable = false, updatable = false)protected String realm;- @Transient- protected String parentName;-- @Transient- protected String parentType;-@Column(name = "TYPE", nullable = false, updatable = false, insertable = false)protected String type = getClass().getSimpleName();- // The following are expensive to query, so if they are null, they might not have been loaded- @Formula("get_asset_tree_path(ID)")- @org.hibernate.annotations.Type(type = Constants.PERSISTENCE_STRING_ARRAY_TYPE)+ @Column(name = "PATH", updatable = false, insertable = false, columnDefinition = PERSISTENCE_LTREE_TYPE)+ @Type(type = PERSISTENCE_LTREE_TYPE)+ @Generated(GenerationTime.ALWAYS)protected String[] path;- @Column(name = "ATTRIBUTES", columnDefinition = "jsonb")+ @Column(name = "ATTRIBUTES", columnDefinition = PERSISTENCE_JSON_VALUE_TYPE)@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)@Validprotected AttributeMap attributes;@@ -360,7 +330,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>return name;}-public T setName(@NotNull String name) throws IllegalArgumentException {Objects.requireNonNull(name);this.name = name;@@ -383,12 +352,8 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>public T setParent(Asset<?> parent) {if (parent == null) {parentId = null;- parentName = null;- parentType = null;} else {parentId = parent.id;- parentName = parent.name;- parentType = parent.getType();realm = parent.realm;}return (T) this;@@ -404,19 +369,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>return (T) this;}- /**- * NOTE: This is a transient and optional property, set only in database query results.- */- public String getParentName() {- return parentName;- }-- /**- * NOTE: This is a transient and optional property, set only in database query results.- */- public String getParentType() {- return parentType;- }public String getRealm() {return realm;@@ -437,30 +389,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>return path;}- protected T setPath(String[] path) {- this.path = path;- return (T) this;- }-- /**- * NOTE: This is a transient and optional property, set only in database query results.- * <p>- * The identifiers of all parents representing the path in the tree. The first element is the root asset without a- * parent, the last is the identifier of this instance.- */- public String[] getReversePath() {- if (path == null)- return null;-- String[] newArray = new String[path.length];- int j = 0;- for (int i = path.length; i > 0; i--) {- newArray[j] = path[i - 1];- j++;- }- return newArray;- }-public boolean pathContains(String assetId) {return path != null && Arrays.asList(getPath()).contains(assetId);}@@ -546,8 +474,6 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>", type='" + type + '\'' +", accessPublicRead='" + accessPublicRead + '\'' +", parentId='" + parentId + '\'' +- ", parentName='" + parentName + '\'' +- ", parentType='" + parentType + '\'' +", realm='" + realm + '\'' +", path=" + Arrays.toString(path) +", attributes=" + getAttributesString() +diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.javaindex af283ef8a..d29aeac6d 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java@@ -283,12 +283,6 @@ public class ElectricVehicleAsset extends ElectricityBatteryAsset {return this;}- @Override- protected ElectricityStorageAsset setPath(String[] path) {- super.setPath(path);- return this;- }-@Overridepublic ElectricVehicleAsset setAttributes(AttributeMap attributes) {super.setAttributes(attributes);diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeMap.java b/model/src/main/java/org/openremote/model/attribute/AttributeMap.javaindex e46cf9287..03d49d321 100644--- a/model/src/main/java/org/openremote/model/attribute/AttributeMap.java+++ b/model/src/main/java/org/openremote/model/attribute/AttributeMap.java@@ -19,6 +19,7 @@*/package org.openremote.model.attribute;+import org.checkerframework.checker.nullness.qual.Nullable;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;@@ -68,4 +69,13 @@ public class AttributeMap extends NamedMap<Attribute<?>> {public <T> void setValue(AttributeDescriptor<T> descriptor, T value) {getOrCreate(descriptor).setValue(value);}++ /**+ * Need to declare equals here as {@link com.vladmihalcea.hibernate.type.json.internal.JsonTypeDescriptor} uses+ * {@link Class#getDeclaredMethod} to find it...+ */+ @Override+ public boolean equals(@Nullable Object object) {+ return super.equals(object);+ }}diff --git a/model/src/main/java/org/openremote/model/attribute/MetaMap.java b/model/src/main/java/org/openremote/model/attribute/MetaMap.javaindex 0e8676cf4..a9cf76c76 100644--- a/model/src/main/java/org/openremote/model/attribute/MetaMap.java+++ b/model/src/main/java/org/openremote/model/attribute/MetaMap.java@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.fasterxml.jackson.databind.deser.std.StdDeserializer;import com.fasterxml.jackson.databind.exc.InvalidFormatException;+import org.checkerframework.checker.nullness.qual.Nullable;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.*;@@ -117,4 +118,13 @@ public class MetaMap extends NamedMap<MetaItem<?>> {MetaItem<T> metaItem = get(descriptor).orElse(new MetaItem<>(descriptor, null));metaItem.setValue(value);}++ /**+ * Need to declare equals here as {@link com.vladmihalcea.hibernate.type.json.internal.JsonTypeDescriptor} uses+ * {@link Class#getDeclaredMethod} to find it...+ */+ @Override+ public boolean equals(@Nullable Object object) {+ return super.equals(object);+ }}diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.javaindex 8aab81f05..515c3b71f 100644--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java@@ -36,62 +36,26 @@ import java.util.stream.Collectors;/*** Encapsulate asset query restriction, projection, and ordering of results.*/-// TODO: Add AssetQuery support for arbitrary attribute property path and value (e.g. attributes.consoleProviders.geofence.version == "ORConsole")+// TODO: Add AssetQuery support for arbitrary attribute property path and value (e.g. consoleProviders.geofence.version == "ORConsole")public class AssetQuery implements Serializable {public static class Select {-+ protected static final String[] EMPTY_ATTRIBUTES = new String[0];public String[] attributes;- public boolean excludePath;- public boolean excludeAttributes;- public boolean excludeParentInfo;-- public static Select selectExcludePathAndParentInfo() {- return new Select()- .excludeAttributes(false)- .excludePath(true)- .excludeParentInfo(true);- }-- public static Select selectExcludePathAndAttributes() {- return new Select()- .excludePath(true)- .excludeAttributes(true);- }-- public static Select selectExcludeAll() {- return new Select()- .excludeAttributes(true)- .excludePath(true)- .excludeParentInfo(true);- }public Select attributes(String... attributeNames) {this.attributes = attributeNames;return this;}- public Select excludeAttributes(boolean exclude) {- this.excludeAttributes = exclude;- return this;- }-- public Select excludePath(boolean exclude) {- this.excludePath = exclude;- return this;- }-- public Select excludeParentInfo(boolean exclude) {- this.excludeParentInfo = exclude;+ public Select excludeAttributes() {+ this.attributes = EMPTY_ATTRIBUTES;return this;}@Overridepublic String toString() {return getClass().getSimpleName() + "{" +- "excludeAttributes=" + excludeAttributes +- ", excludePath=" + excludePath +- ", excludeParentInfo=" + excludeParentInfo +", attributeNames=" + Arrays.toString(attributes) +'}';}@@ -303,25 +267,6 @@ public class AssetQuery implements Serializable {return this;}- @SafeVarargs- public final AssetQuery parents(Class<? extends Asset<?>>...assetTypes) {- if (assetTypes == null || assetTypes.length == 0) {- this.names = null;- return this;- }- this.parents = Arrays.stream(assetTypes).map(assetType -> new ParentPredicate().type(assetType)).toArray(ParentPredicate[]::new);- return this;- }-- public AssetQuery parents(AssetDescriptor<?>... assetTypes) {- if (assetTypes == null || assetTypes.length == 0) {- this.names = null;- return this;- }- this.parents = Arrays.stream(assetTypes).map(assetType -> new ParentPredicate().type(assetType)).toArray(ParentPredicate[]::new);- return this;- }-public AssetQuery parents(ParentPredicate... parentPredicates) {this.parents = parentPredicates;return this;diff --git a/model/src/main/java/org/openremote/model/query/filter/ParentPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ParentPredicate.javaindex 71f6a8ed3..592b0e2a4 100644--- a/model/src/main/java/org/openremote/model/query/filter/ParentPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ParentPredicate.java@@ -19,20 +19,9 @@*/package org.openremote.model.query.filter;-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;-import com.fasterxml.jackson.databind.annotation.JsonSerialize;-import org.openremote.model.asset.Asset;-import org.openremote.model.asset.AssetDescriptor;-import org.openremote.model.query.AssetQuery;-public class ParentPredicate {public String id;- @JsonSerialize(converter = AssetQuery.AssetClassToStringConverter.class)- @JsonDeserialize(converter = AssetQuery.StringToAssetClassConverter.class)- public Class<? extends Asset<?>> type;- public String name;- public boolean noParent;public ParentPredicate() {}@@ -41,40 +30,15 @@ public class ParentPredicate {this.id = id;}- public ParentPredicate(boolean noParent) {- this.noParent = noParent;- }-public ParentPredicate id(String id) {this.id = id;return this;}- public ParentPredicate type(Class<? extends Asset<?>> type) {- this.type = type;- return this;- }-- public ParentPredicate type(AssetDescriptor<?> type) {- return type(type.getType());- }-- public ParentPredicate name(String name) {- this.name = name;- return this;- }-- public ParentPredicate noParent(boolean noParent) {- this.noParent = noParent;- return this;- }-@Overridepublic String toString() {return getClass().getSimpleName() + "{" +"id='" + id + '\'' +- ", type='" + type + '\'' +- ", noParent=" + noParent +'}';}}diff --git a/model/src/main/java/org/openremote/model/rules/AssetState.java b/model/src/main/java/org/openremote/model/rules/AssetState.javaindex 96e2735fc..ca207842d 100644--- a/model/src/main/java/org/openremote/model/rules/AssetState.java+++ b/model/src/main/java/org/openremote/model/rules/AssetState.java@@ -71,10 +71,6 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolderfinal protected String parentId;- final protected String parentName;-- final protected String parentType;-final protected String realm;final protected MetaMap meta;@@ -93,8 +89,6 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolderthis.createdOn = asset.getCreatedOn();this.path = asset.getPath();this.parentId = asset.getParentId();- this.parentName = asset.getParentName();- this.parentType = asset.getParentType();this.realm = asset.getRealm();this.meta = attribute.getMeta();}@@ -161,14 +155,6 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolderreturn parentId;}- public String getParentName() {- return parentName;- }-- public String getParentType() {- return parentType;- }-public String getRealm() {return realm;}@@ -232,7 +218,6 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolderreturn getClass().getSimpleName() + "{" +"id='" + getId() + '\'' +", name='" + getAssetName() + '\'' +- ", parentName='" + getParentName() + '\'' +", type='" + getAssetType() + '\'' +", attributeName='" + getName() + '\'' +", attributeValueDescriptor=" + getType() +diff --git a/model/src/main/java/org/openremote/model/value/ValueType.java b/model/src/main/java/org/openremote/model/value/ValueType.javaindex 73e0bef93..863b45176 100644--- a/model/src/main/java/org/openremote/model/value/ValueType.java+++ b/model/src/main/java/org/openremote/model/value/ValueType.java@@ -149,7 +149,7 @@ public final class ValueType {public static final ValueDescriptor<Integer> DIRECTION = new ValueDescriptor<>("direction", Integer.class,new ValueConstraint.Min(0),- new ValueConstraint.Max(259)+ new ValueConstraint.Max(359));public static final ValueDescriptor<Integer> PORT = new ValueDescriptor<>("TCP_IPPortNumber", Integer.class,diff --git a/setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.java b/setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.javaindex 02aea7a66..4315c5f8b 100644--- a/setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.java+++ b/setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.java@@ -438,7 +438,9 @@ public class ManagerTestSetup extends ManagerSetup {apartment1 = assetStorageService.merge(apartment1);apartment1Id = apartment1.getId();+ apartment2Id = UniqueIdentifierGenerator.generateId(tenantBuilding.getRealm() + "Apartment 2");BuildingAsset apartment2 = new BuildingAsset("Apartment 2");+ apartment2.setId(apartment2Id);apartment2.setParent(smartBuilding);apartment2.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(5.454053, 51.446603)),@@ -450,7 +452,6 @@ public class ManagerTestSetup extends ManagerSetup {));apartment2 = assetStorageService.merge(apartment2);- apartment2Id = apartment2.getId();RoomAsset apartment2Livingroom = new RoomAsset("Living Room 2");apartment2Livingroom.setAccessPublicRead(true);diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex ec58c2477..7931d96df 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -63,7 +63,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -84,7 +84,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -95,7 +95,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -247,14 +247,12 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai// Assets should not be completely loaded (no path or parent info)assets.find {it.id == managerTestSetup.smartOfficeId}.path == nullassets.find {it.id == managerTestSetup.smartOfficeId}.parentId == null- assets.find {it.id == managerTestSetup.smartOfficeId}.parentName == null- assets.find {it.id == managerTestSetup.smartOfficeId}.parentType == nullwhen: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -274,7 +272,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiwhen: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery()- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -286,7 +284,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "a bad request exception should be thrown"@@ -413,14 +411,12 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai// Assets should not be completely loaded (no path or parent info)assets.find {it.id == managerTestSetup.smartBuildingId}.path == nullassets.find {it.id == managerTestSetup.smartBuildingId}.parentId == null- assets.find {it.id == managerTestSetup.smartBuildingId}.parentName == null- assets.find {it.id == managerTestSetup.smartBuildingId}.parentType == nullwhen: "the root assets of a foreign realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "a bad request exception should be thrown"@@ -429,7 +425,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiwhen: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery()- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -441,7 +437,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -558,7 +554,8 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiapartment1.realm == keycloakTestSetup.tenantBuilding.realmapartment1.type == BuildingAsset.DESCRIPTOR.getName()apartment1.parentId == managerTestSetup.smartBuildingId- apartment1.path == null+ apartment1.path[0] == managerTestSetup.smartBuildingId+ apartment1.path[1] == managerTestSetup.apartment1Idapartment1.attributes.size() == 12Asset apartment1Livingroom = assets[1]@@ -585,7 +582,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "a bad request exception should be thrown"@@ -594,7 +591,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiwhen: "the root assets of the authenticated realm are retrieved"assets = assetResource.queryAssets(null,new AssetQuery()- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "result should match"@@ -604,7 +601,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraiassets = assetResource.queryAssets(null,new AssetQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantCity.realm))- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)))then: "a bad request exception should be thrown"diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex 6fdbdcf3f..613b65905 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -6,6 +6,7 @@ import org.openremote.container.persistence.PersistenceServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.setup.SetupService+import org.openremote.model.Constantsimport org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetupimport org.openremote.model.asset.Asset@@ -37,7 +38,6 @@ import static org.openremote.model.query.AssetQuery.Access.PRIVATEimport static org.openremote.model.query.AssetQuery.Access.PROTECTEDimport static org.openremote.model.query.AssetQuery.OrderBy.Property.CREATED_ONimport static org.openremote.model.query.AssetQuery.OrderBy.Property.NAME-import static org.openremote.model.query.AssetQuery.Select.selectExcludePathAndAttributesimport static org.openremote.model.value.MetaItemType.*import static org.openremote.model.value.ValueType.CALENDAR_EVENTimport static org.openremote.model.value.ValueType.TIMESTAMP_ISO8601@@ -66,7 +66,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {}// TODO: Test attribute/meta mustnotexist- // TODO: Test parent predicate noparent// TODO: Test ID and user ID// TODO: Test multiple logic groups with different conditions// TODO: Test Array predicate@@ -76,7 +75,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "an agent filtering query is executed"def assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludePathAndParentInfo()).types(Agent.class).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))@@ -88,15 +86,11 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets[0].name == "Demo Agent"assets[0].type == SimulatorAgent.DESCRIPTOR.nameassets[0].parentId == managerTestSetup.lobbyId- assets[0].parentName == null- assets[0].parentType == nullassets[0].realm == managerTestSetup.masterRealm- assets[0].path == null- when: "a user filtering query is executed that excludes path and parent data"+ when: "a user filtering query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll().excludeAttributes(false)).userIds(keycloakTestSetup.testuser3Id))@@ -115,11 +109,9 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(4).id == managerTestSetup.apartment1Bedroom1Idassets.get(5).id == managerTestSetup.apartment1BathroomId- when: "a user filtering query is executed that excludes path and parent data and limits to protected attributes"+ when: "a user filtering query is executed that limits to protected attributes"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll()- .excludeAttributes(false)).userIds(keycloakTestSetup.testuser3Id).access(PROTECTED))@@ -144,7 +136,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed that returns a protected attribute without any other meta items"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).ids(managerTestSetup.apartment2LivingroomId).access(PROTECTED))@@ -157,11 +148,10 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {!assets.get(0).getAttribute("windowOpen").flatMap{it.value}.orElse(false)!assets.get(0).getAttribute("windowOpen").get().getMeta().isEmpty()- when: "a recursive query is executed to select asset id, name and attribute names for apartment 1 assets"+ when: "a recursive query is executed for apartment 1 assets"assets = assetStorageService.findAll(new AssetQuery().ids(managerTestSetup.smartBuildingId)- .select(Select.selectExcludeAll().excludeAttributes(false)).orderBy(new OrderBy(CREATED_ON)).recursive(true).access(PROTECTED)@@ -175,10 +165,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {apartment1.type == BuildingAsset.DESCRIPTOR.getName()apartment1.createdOn != nullapartment1.parentId == managerTestSetup.smartBuildingId- apartment1.parentName == null- apartment1.parentType == nullapartment1.realm == managerTestSetup.realmBuildingTenant- apartment1.path == nullapartment1.getAttributes().size() == 7apartment1.getAttribute("ventilationAuto").isPresent()apartment1.getAttribute("ventilationLevel").isPresent()@@ -200,32 +187,10 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.find {it.id == managerTestSetup.apartment3Id} != nullassets.find {it.id == managerTestSetup.apartment3LivingroomId} != null- when: "an asset is loaded by identifier through JPA"- def asset = persistenceService.doReturningTransaction(new Function<EntityManager, Asset>() {- @Override- Asset apply(EntityManager em) {- em.find(Asset.class, managerTestSetup.apartment1Id)- }- })-- then: "result should match (and some values should be empty because we need an AssetQuery to get them)"- asset.id == managerTestSetup.apartment1Id- asset.createdOn.time < System.currentTimeMillis()- asset.name == "Apartment 1"- asset.type == BuildingAsset.DESCRIPTOR.getName()- asset.parentId == managerTestSetup.smartBuildingId- asset.parentName == null- asset.parentType == null- asset.realm == keycloakTestSetup.tenantBuilding.realm- asset.path.length == 2- asset.path[0] == managerTestSetup.apartment1Id- asset.path[1] == managerTestSetup.smartBuildingId- asset.attributes.size() > 0-- when: "a query is executed"- asset = assetStorageService.find(+ when: "a query is executed that excludes attributes"+ def asset = assetStorageService.find(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).ids(managerTestSetup.smartOfficeId))@@ -235,10 +200,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {asset.name == "Smart office"asset.type == BuildingAsset.DESCRIPTOR.getName()asset.parentId == null- asset.parentName == null- asset.parentType == nullasset.realm == keycloakTestSetup.masterTenant.realm- asset.path == nullasset.attributes.size() == 0when: "a query is executed"@@ -253,8 +215,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {asset.name == "Smart office"asset.type == BuildingAsset.DESCRIPTOR.getName()asset.parentId == null- asset.parentName == null- asset.parentType == nullasset.realm == keycloakTestSetup.masterTenant.realmasset.path.length == 1asset.path[0] == managerTestSetup.smartOfficeId@@ -263,8 +223,8 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())- .parents(new ParentPredicate(true))+ .select(new Select().excludeAttributes())+ .parents(new ParentPredicate(null)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))@@ -275,16 +235,13 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(0).name == "Smart office"assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()assets.get(0).parentId == null- assets.get(0).parentName == null- assets.get(0).parentType == nullassets.get(0).realm == keycloakTestSetup.masterTenant.realm- assets.get(0).path == nullassets.get(0).attributes.size() == 0when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .parents(new ParentPredicate(true))+ .parents(new ParentPredicate(null)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))@@ -295,8 +252,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(0).name == "Smart office"assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()assets.get(0).parentId == null- assets.get(0).parentName == null- assets.get(0).parentType == nullassets.get(0).realm == keycloakTestSetup.masterTenant.realmassets.get(0).path.length == 1assets.get(0).path[0] == managerTestSetup.smartOfficeId@@ -305,7 +260,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).parents(new ParentPredicate(managerTestSetup.smartBuildingId)))@@ -316,10 +271,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(0).name == "Apartment 1"assets.get(0).type == BuildingAsset.DESCRIPTOR.getName()assets.get(0).parentId == managerTestSetup.smartBuildingId- assets.get(0).parentName == "Smart building"- assets.get(0).parentType == BuildingAsset.DESCRIPTOR.getName()assets.get(0).realm == keycloakTestSetup.tenantBuilding.realm- assets.get(0).path == nullassets.get(0).attributes.size() == 0assets.get(1).id == managerTestSetup.apartment2Idassets.get(2).id == managerTestSetup.apartment3Id@@ -327,7 +279,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).parents(new ParentPredicate(managerTestSetup.smartBuildingId)).tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))@@ -341,7 +293,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).parents(new ParentPredicate(managerTestSetup.smartBuildingId)).tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)).orderBy(new OrderBy(NAME, true))@@ -356,7 +308,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).parents(new ParentPredicate(managerTestSetup.smartBuildingId)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))@@ -367,7 +319,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).paths(new PathPredicate(assetStorageService.find(managerTestSetup.apartment1Id, true).getPath())))@@ -384,7 +336,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).paths(new PathPredicate(assetStorageService.find(managerTestSetup.apartment1Id, true).getPath())).types(RoomAsset.class))@@ -447,7 +399,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"def assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).types(Agent.class))@@ -460,7 +412,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).types(ThingAsset.class).parents(new ParentPredicate(managerTestSetup.agentId)))@@ -472,9 +424,9 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).types(ThingAsset)- .parents(new ParentPredicate().type(Agent))+ .parents(new ParentPredicate(managerTestSetup.agentId)))then: "result should match"@@ -485,7 +437,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate().meta(@@ -502,10 +454,10 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(- new NameValuePredicate(UNITS.name, new ArrayPredicate(org.openremote.model.Constants.UNITS_KILO, 0, 3, null, null, false))+ new NameValuePredicate(UNITS.name, new ArrayPredicate(Constants.UNITS_KILO, 0, 3, null, null, false)))))@@ -517,7 +469,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))))@@ -528,7 +480,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))).names(new StringPredicate(Match.CONTAINS, false, "thing")))@@ -540,7 +492,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))).names(new StringPredicate(Match.CONTAINS, true, "thing")))@@ -551,7 +503,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))).parents(new ParentPredicate(managerTestSetup.agentId)))@@ -563,7 +515,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))).parents(new ParentPredicate(managerTestSetup.apartment1LivingroomId)))@@ -574,7 +526,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).attributes(new AttributePredicate().meta(new NameValuePredicate(AGENT_LINK, new StringPredicate(managerTestSetup.agentId), false, new NameValuePredicate.Path("id")))).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))@@ -597,8 +549,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {asset.name == "Living Room 1"asset.type == RoomAsset.DESCRIPTOR.getName()asset.parentId != null- asset.parentName == "Apartment 1"- asset.parentType == BuildingAsset.DESCRIPTOR.getName()asset.realm == keycloakTestSetup.tenantBuilding.realmasset.path != nullasset.getAttributes().size() == 3@@ -622,9 +572,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {asset.createdOn.time < System.currentTimeMillis()asset.name == "Living Room 1"asset.type == RoomAsset.DESCRIPTOR.getName()- asset.parentId != null- asset.parentName == "Apartment 1"- asset.parentType == BuildingAsset.DESCRIPTOR.getName()+ asset.parentId == managerTestSetup.apartment1Idasset.realm == keycloakTestSetup.tenantBuilding.realmasset.path != nullasset.getAttributes().size() == 1@@ -635,7 +583,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with multiple attribute predicates 'ANDED'"asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new AttributePredicate(new StringPredicate("windowOpen"), new BooleanPredicate(false)),@@ -654,7 +602,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with multiple attribute predicates 'ANDED' where one predicate is false"asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new AttributePredicate(new StringPredicate("windowOpen"), new BooleanPredicate(false)),@@ -672,7 +620,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with and conditions on the same attribute"def asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new AttributePredicate(new StringPredicate("co2Level"), new NumberPredicate(360, Operator.LESS_EQUALS)),@@ -691,7 +639,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with multiple logic groups"asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new LogicGroup<AttributePredicate>(LogicGroup.Operator.AND, [new LogicGroup<AttributePredicate>(LogicGroup.Operator.OR, [new AttributePredicate(@@ -718,7 +666,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with multiple logic groups and one of the groups is false"asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new LogicGroup<AttributePredicate>(LogicGroup.Operator.AND, [new LogicGroup<AttributePredicate>(LogicGroup.Operator.OR, [new AttributePredicate(@@ -741,7 +689,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a query is executed to select an asset with multiple logic groups where the other logic group is false"asset = assetStorageService.find(- new AssetQuery().select(Select.selectExcludePathAndParentInfo()).attributes(+ new AssetQuery().attributes(new LogicGroup<AttributePredicate>(LogicGroup.Operator.AND, [new LogicGroup(LogicGroup.Operator.OR, [new AttributePredicate(@@ -771,7 +719,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a location filtering query is executed"def assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll())+ .select(new Select().excludeAttributes()).attributes(new LocationAttributePredicate(new RadialGeofencePredicate(10, 51.44541688237109d, 5.460315214821094d))).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new OrderBy(NAME))@@ -798,7 +746,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "the same query is run again"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll())+ .select(new Select().excludeAttributes()).attributes(new LocationAttributePredicate(new RadialGeofencePredicate(10, 51.44541688237109d, 5.460315214821094d))).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new OrderBy(NAME))@@ -811,7 +759,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a rectangular region is used that includes previous assets and moved asset"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll())+ .select(new Select().excludeAttributes()).attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44540d, 5.46031d, 51.44594d, 5.46110d))).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new OrderBy(NAME))@@ -828,7 +776,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a rectangular region is used that doesn't cover any assets"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll())+ .select(new Select().excludeAttributes()).attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44542d, 5.46032d, 51.44590d, 5.46100d))).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new OrderBy(NAME))@@ -840,7 +788,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "the same region is used but negated"assets = assetStorageService.findAll(new AssetQuery()- .select(Select.selectExcludeAll())+ .select(new Select().excludeAttributes()).attributes(new LocationAttributePredicate(new RectangularGeofencePredicate(51.44542d, 5.46032d, 51.44590d, 5.46100d).negate())).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new OrderBy(NAME))@@ -896,7 +844,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed for the correct date and time of the event"def assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)) // Need attributes to do calendar filtering.tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517155200000)))) // 28/01/2018 @ 4:00pm (UTC).orderBy(new OrderBy(NAME))@@ -914,7 +861,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed for future event on a correct day but wrong time"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517335200000)))) // 30/01/2018 @ 6:00pm (UTC).orderBy(new OrderBy(NAME))@@ -926,7 +872,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed for a future event on a wrong day but correct time"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517238600000)))) // 29/01/2018 @ 3:10pm (UTC).orderBy(new OrderBy(NAME))@@ -938,7 +883,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed inside a valid future event date and time"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517503800000)))) // 01/02/2018 @ 4:50pm (UTC)).orderBy(new OrderBy(NAME))@@ -954,7 +898,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed inside a valid future event date and time of the lobby asset"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517849400000)))) // 05/02/2018 @ 4:50pm (UTC)).orderBy(new OrderBy(NAME))@@ -968,7 +911,6 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "a calendar event filtering query is executed for some time after the last occurrence"assets = assetStorageService.findAll(new AssetQuery()- .select(new Select().excludePath(true)).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1518017520000)))) // 02/07/2018 @ 3:32pm (UTC).orderBy(new OrderBy(NAME))@@ -991,7 +933,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {def assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributeValue("openingDate",@@ -1007,7 +949,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "the lobby has an opening date and the date is after the filtering date"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributeValue("openingDate",@@ -1022,7 +964,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {when: "the lobby has an opening date and the date is before the filtering date"assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributeValue("openingDate",@@ -1039,7 +981,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets = assetStorageService.findAll(new AssetQuery()- .select(selectExcludePathAndAttributes())+ .select(new Select().excludeAttributes()).tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).attributeValue("openingDate",diff --git a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovyindex c892b9f0c..c0809414b 100644--- a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy@@ -29,9 +29,6 @@ class AttributeLinkingTest extends Specification implements ManagerContainerTraidef assetStorageService = container.getService(AssetStorageService.class)def assetProcessingService = container.getService(AssetProcessingService.class)- and: "the clock is stopped for testing purposes"- stopPseudoClock()-then: "the system should settle down"conditions.eventually {assert noEventProcessedIn(assetProcessingService, 300)diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovyindex 8cb833e11..e4d3b4c87 100644--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy@@ -76,9 +76,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)def identityProvider = container.getService(ManagerIdentityService.class).identityProvider as ManagerKeycloakIdentityProvider- and: "the clock is stopped for testing purposes"- stopPseudoClock()-expect: "the system should settle down"conditions.eventually {assert noEventProcessedIn(assetProcessingService, 300)@@ -154,9 +151,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {assert response.messageId == GatewayConnector.ASSET_READ_EVENT_NAME_INITIALdef localReadAssetsEvent = response.event as ReadAssetsEventassert localReadAssetsEvent.assetQuery != null- assert localReadAssetsEvent.assetQuery.select.excludeAttributes- assert localReadAssetsEvent.assetQuery.select.excludePath- assert localReadAssetsEvent.assetQuery.select.excludeParentInfoassert localReadAssetsEvent.assetQuery.recursive}@@ -171,14 +165,14 @@ class GatewayTest extends Specification implements ManagerContainerTrait {IntStream.rangeClosed(1, 5).forEach {i ->agentAssetIds.add(UniqueIdentifierGenerator.generateId("Test Agent $i"))- agentAssets.add(- new HTTPAgent("Test Agent $i")+ def agent = new HTTPAgent("Test Agent $i").setId(agentAssetIds[i-1]).setBaseURI("https://google.co.uk").setRealm(MASTER_REALM).setCreatedOn(Date.from(timerService.getNow()))- .setPath((String[])[agentAssetIds[i-1]].toArray(new String[0]))- )+ agent.path = (String[])[agentAssetIds[i-1]].toArray(new String[0])++ agentAssets.add(agent)assetIds.add(UniqueIdentifierGenerator.generateId("Test Building $i"))@@ -192,7 +186,8 @@ class GatewayTest extends Specification implements ManagerContainerTrait {.setCreatedOn(Date.from(timerService.getNow())).setParentId(assetIds[(i-1)*5]).setRealm(MASTER_REALM)- .setPath((String[])[assetIds[(i-1)*5+j], assetIds[(i-1)*5]].toArray(new String[0]))++ roomAsset.path = (String[])[assetIds[(i-1)*5+j], assetIds[(i-1)*5]].toArray(new String[0])roomAsset.addOrReplaceAttributes(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addOrReplaceMeta(@@ -217,7 +212,8 @@ class GatewayTest extends Specification implements ManagerContainerTrait {.setId(assetIds[(i-1)*5]).setCreatedOn(Date.from(timerService.getNow())).setRealm(MASTER_REALM)- .setPath((String[])[assetIds[(i-1)*5]].toArray(new String[0]))++ buildingAsset.path = (String[])[assetIds[(i-1)*5]].toArray(new String[0])buildingAsset.addOrReplaceAttributes(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addMeta(@@ -249,8 +245,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {readAssetsEvent = response.event as ReadAssetsEventassert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + "0"assert readAssetsEvent.assetQuery != null- assert readAssetsEvent.assetQuery.select.excludePath- assert readAssetsEvent.assetQuery.select.excludeParentInfoassert readAssetsEvent.assetQuery.ids != nullassert readAssetsEvent.assetQuery.ids.length == GatewayConnector.SYNC_ASSET_BATCH_SIZEassert agentAssetIds.stream().filter{readAssetsEvent.assetQuery.ids.contains(it)}.count() == agentAssetIds.size()@@ -318,8 +312,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {readAssetsEvent = response.event as ReadAssetsEventassert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + GatewayConnector.SYNC_ASSET_BATCH_SIZEassert readAssetsEvent.assetQuery != null- assert readAssetsEvent.assetQuery.select.excludePath- assert readAssetsEvent.assetQuery.select.excludeParentInfoassert readAssetsEvent.assetQuery.ids != nullassert readAssetsEvent.assetQuery.ids.length == agentAssetIds.size() + assetIds.size() - GatewayConnector.SYNC_ASSET_BATCH_SIZEassert assetIds.stream().filter{id -> sendAssets.stream().noneMatch{it.id == id}}.count() == readAssetsEvent.assetQuery.ids.length@@ -383,7 +375,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {.setCreatedOn(Date.from(timerService.getNow())).setParentId(assetIds[0]).setRealm(MASTER_REALM)- .setPath((String[])[building1Room5AssetId, assetIds[0]])+ building1Room5Asset.path = (String[])[building1Room5AssetId, assetIds[0]]building1Room5Asset.addOrReplaceAttributes(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addOrReplaceMeta(@@ -555,7 +547,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {.setCreatedOn(Date.from(timerService.getNow())).setParentId(gateway.id).setRealm(managerTestSetup.realmBuildingTenant)- .setPath((String[])[UniqueIdentifierGenerator.generateId("Failed asset")].toArray(new String[0]))+ failedAsset.path = (String[])[UniqueIdentifierGenerator.generateId("Failed asset")].toArray(new String[0])failedAsset.addOrReplaceAttributes(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addMeta(new MetaItem<>(ACCESS_PUBLIC_READ)@@ -659,8 +651,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {readAssetsEvent = request.event as ReadAssetsEventassert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + "0"assert readAssetsEvent.assetQuery != null- assert readAssetsEvent.assetQuery.select.excludePath- assert readAssetsEvent.assetQuery.select.excludeParentInfoassert readAssetsEvent.assetQuery.ids != nullassert readAssetsEvent.assetQuery.ids.length == GatewayConnector.SYNC_ASSET_BATCH_SIZEassert agentAssetIds.stream().filter{readAssetsEvent.assetQuery.ids.contains(it)}.count() == agentAssetIds.size()@@ -673,7 +663,7 @@ class GatewayTest extends Specification implements ManagerContainerTrait {.setCreatedOn(Date.from(timerService.getNow())).setParentId(assetIds[5]).setRealm(MASTER_REALM)- .setPath((String[])[UniqueIdentifierGenerator.generateId("Test Building 2 Room 5"), assetIds[5]])+ building2Room5Asset.path = (String[])[UniqueIdentifierGenerator.generateId("Test Building 2 Room 5"), assetIds[5]]building2Room5Asset.addOrReplaceAttributes(new Attribute<>(Asset.LOCATION, new GeoJSONPoint(10,11)).addOrReplaceMeta(@@ -714,8 +704,6 @@ class GatewayTest extends Specification implements ManagerContainerTrait {readAssetsEvent = request.event as ReadAssetsEventassert messageId == GatewayConnector.ASSET_READ_EVENT_NAME_BATCH + (GatewayConnector.SYNC_ASSET_BATCH_SIZE - 1)assert readAssetsEvent.assetQuery != null- assert readAssetsEvent.assetQuery.select.excludePath- assert readAssetsEvent.assetQuery.select.excludeParentInfoassert readAssetsEvent.assetQuery.ids != nullassert readAssetsEvent.assetQuery.ids.length == agentAssetIds.size() + assets.size() + 1 - GatewayConnector.SYNC_ASSET_BATCH_SIZE + 1assert assets.stream().filter{asset -> sendAssets.stream().noneMatch{it.id == asset.id}}.count() == readAssetsEvent.assetQuery.ids.lengthdiff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex e29316a89..7da3e914b 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -58,9 +58,6 @@ class NotificationTest extends Specification implements ManagerContainerTrait {def pushNotificationHandler = container.getService(PushNotificationHandler.class)def consoleResource = (ConsoleResourceImpl)container.getService(ManagerWebService.class).apiSingletons.find {it instanceof ConsoleResourceImpl}- and: "the clock is stopped for testing purposes"- stopPseudoClock()-and: "a mock push notification handler"PushNotificationHandler mockPushNotificationHandler = Spy(pushNotificationHandler)mockPushNotificationHandler.isValid() >> truediff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovyindex 515eee6e2..5cd6ae713 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy@@ -83,8 +83,8 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainerassertRulesFired(rulesImport.apartment2Engine, 1)assertRulesFired(rulesImport.apartment2Engine, ["All"])assertRulesFired(rulesImport.apartment3Engine, 0)- assertRulesFired(smartHomeEngine, 8)- assertRulesFired(smartHomeEngine, ["Living Room All", "Kitchen All", "Kitchen Number Attributes", "Parent Type Residence", "Asset Type Room", "Boolean attributes", "String attributes", "Number value types"])+ assertRulesFired(smartHomeEngine, 7)+ assertRulesFired(smartHomeEngine, ["Living Room All", "Kitchen All", "Kitchen Number Attributes", "Asset Type Room", "Boolean attributes", "String attributes", "Number value types"])}when: "an attribute event occurs"@@ -103,8 +103,8 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainerassertRulesFired(rulesImport.apartment2Engine, 1)assertRulesFired(rulesImport.apartment2Engine, ["All"])assertRulesFired(rulesImport.apartment3Engine, 0)- assertRulesFired(smartHomeEngine, 8)- assertRulesFired(smartHomeEngine, ["Living Room All", "Kitchen All", "Kitchen Number Attributes", "Parent Type Residence", "Asset Type Room", "Boolean Attributes", "String attributes", "Number value types"])+ assertRulesFired(smartHomeEngine, 7)+ assertRulesFired(smartHomeEngine, ["Living Room All", "Kitchen All", "Kitchen Number Attributes", "Asset Type Room", "Boolean Attributes", "String attributes", "Number value types"])}cleanup: "the static rules time variable is reset"diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex 96727150f..bebde4880 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -125,7 +125,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerglobalRuleset.id == rulesetIdglobalRuleset.version > 0globalRuleset.createdOn.time < System.currentTimeMillis()- globalRuleset.lastModified.time > lastModified.time+ globalRuleset.lastModified.time >= lastModified.timeglobalRuleset.name == "Renamed test global definition"globalRuleset.rules == "SomeRulesCodeModified"diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex b5c37ad3d..54a5483b4 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -81,9 +81,6 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {def assetProcessingService = container.getService(AssetProcessingService.class)RulesEngine tenantBuildingEngine- and: "the clock is stopped for testing purposes"- stopPseudoClock()-and: "a mock push notification handler"PushNotificationHandler mockPushNotificationHandler = Spy(pushNotificationHandler)mockPushNotificationHandler.isValid() >> truediff --git a/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json b/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.jsonindex 49f406c97..a7f1d1c78 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json+++ b/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json@@ -73,8 +73,7 @@"assets": {"parents": [{- "type": "BuildingAsset",- "name": "Apartment 2"+ "id": "3jm23JN24m6Yk9oviNro3f"}],"types": [@@ -91,8 +90,7 @@"assets": {"parents": [{- "type": "BuildingAsset",- "name": "Apartment 2"+ "id": "3jm23JN24m6Yk9oviNro3f"}],"types": [@@ -117,8 +115,7 @@"assets": {"parents": [{- "type": "BuildingAsset",- "name": "Apartment 2"+ "id": "3jm23JN24m6Yk9oviNro3f"}],"types": [diff --git a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovyindex c99434635..06d8271d2 100644--- a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy+++ b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy@@ -88,19 +88,6 @@ rules.add()facts.put("Number value types", "fired")})-rules.add()- .name("Parent Type Residence")- .when(- { facts ->- !facts.matchFirst("Parent Type Residence").isPresent() &&- facts.matchAssetState(new AssetQuery().parents(BuildingAsset))- .findFirst().isPresent()- })- .then(- { facts ->- facts.put("Parent Type Residence", "fired")- })-rules.add().name("Asset Type Room").when(@@ -119,10 +106,15 @@ rules.add().name("Living Room as Parent").when({ facts ->- !facts.matchFirst("Living Room as Parent").isPresent() &&- facts.matchAssetState(new AssetQuery())- .filter({ assetState -> assetState.parentName == "Living Room"})- .findFirst().isPresent()++ facts.matchAssetState(new AssetQuery().names("Living Room")).findFirst()+ .map{livingRoomState ->+ !facts.matchFirst("Living Room as Parent").isPresent() &&+ facts.matchAssetState(new AssetQuery())+ .filter({ assetState -> assetState.parentId == livingRoomState.id})+ .findFirst().isPresent()+ }.orElse(false)+}).then({ facts ->diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovyindex 10a498116..9557515bc 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy@@ -26,7 +26,6 @@ Notifications notifications = binding.notifications@ToString(includeNames = true)class AlarmTrigger {String residenceId- String residenceNameString roomName}@@ -36,7 +35,6 @@ class AlarmTrigger {@ToString(includeNames = true)class AlertSilence {static String DURATION = "PT30M"- String residenceNameString residenceId}@@ -63,7 +61,6 @@ rules.add()it.get()}.findFirst().map { roomWithPresence ->facts.bind("residenceId", roomWithPresence.parentId)- .bind("residenceName", roomWithPresence.parentName).bind("roomName", roomWithPresence.assetName)true}.orElse(false)@@ -72,7 +69,6 @@ rules.add(){ facts ->AlarmTrigger alarmTrigger = new AlarmTrigger(residenceId: facts.bound("residenceId"),- residenceName: facts.bound("residenceName"),roomName: facts.bound("roomName"))LOG.info("Alarm enabled and presence detected in residence, creating: $alarmTrigger")@@ -173,7 +169,6 @@ rules.add()notifications.send(notification)AlertSilence alertSilence = new AlertSilence(- residenceName: alarmTrigger.residenceName,residenceId: alarmTrigger.residenceId)facts.putTemporary(AlertSilence.DURATION, alertSilence)diff --git a/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovyindex d571feaf1..102234585 100644--- a/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy+++ b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy@@ -69,7 +69,7 @@ rules.add().then({ facts ->AssetState room = facts.bound("room")- LOG.info("Presence detected in residence '" + room.parentName + "', room: " + room.assetName + " [" + room.id + "]")+ LOG.info("Presence detected in room: " + room.assetName + " [" + room.id + "]")facts.updateAssetState(room.id, "presenceDetected", true)})@@ -108,7 +108,7 @@ rules.add().then({ facts ->AssetState room = facts.bound("room")- LOG.info("Presence gone in residence '" + room.parentName + "', room: " + room.assetName + " [" + room.id + "]")+ LOG.info("Presence gone in residence room: " + room.assetName + " [" + room.id + "]")facts.updateAssetState(room.id, "presenceDetected", false)})@@ -144,7 +144,7 @@ rules.add().then({ facts ->AssetState room = facts.bound("room")- LOG.info("Motion sensor triggered, updating last presence in residence '" + room.parentName + "', room: " + room.assetName + " [" + room.id + "]")+ LOG.info("Motion sensor triggered, updating last presence in residence room: " + room.assetName + " [" + room.id + "]")facts.updateAssetState(room.id, "lastPresenceDetected", facts.bound("lastPresenceTimestamp") as Double)})