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
Load testing (#858)
Rich Turner2f849c44a748
diff --git a/.ci_cd/aws/cloudformation-create-ec2.yml b/.ci_cd/aws/cloudformation-create-ec2.ymlindex d28a75626..ca0461f2b 100644--- a/.ci_cd/aws/cloudformation-create-ec2.yml+++ b/.ci_cd/aws/cloudformation-create-ec2.yml@@ -748,39 +748,3 @@ Resources:Value: !Ref ImageId- Name: InstanceTypeValue: !Ref InstanceType-- HealthCheckAlarm:- Type: AWS::CloudWatch::Alarm- Condition: CreateHealthChecks- Properties:- Namespace: AWS/Route53- MetricName: HealthCheckStatus- Statistic: Sum- Period: 60- EvaluationPeriods: 15- ComparisonOperator: LessThanThreshold- Threshold: 1- AlarmActions:- - !Ref SnsTopic- OKActions:- - !Ref SnsTopic- Dimensions:- - Name: HealthCheckId- Value: !Ref HealthCheck-- HealthCheck:- Type: AWS::Route53::HealthCheck- Condition: CreateHealthChecks- DependsOn: EC2Instance- Properties:- HealthCheckConfig:- Port: 443- Type: HTTPS- ResourcePath: '/api/master/info'- FullyQualifiedDomainName: !Sub ${Host}- RequestInterval: 30- FailureThreshold: 10- HealthCheckTags:- - Key: Name- Value: !Sub ${Host}-diff --git a/.ci_cd/aws/cloudformation-healthcheck-alarm.yml b/.ci_cd/aws/cloudformation-healthcheck-alarm.ymlnew file mode 100644index 000000000..6edc5cc9d--- /dev/null+++ b/.ci_cd/aws/cloudformation-healthcheck-alarm.yml@@ -0,0 +1,56 @@+# ---------------------------------------------------------------------------------------------------------------------+# Creates an alarm for Route53 health check - must be run in the us-east-1 region+# ---------------------------------------------------------------------------------------------------------------------+AWSTemplateFormatVersion: '2010-09-09'+Description: 'Route 53 Healthcheck alarm'++Parameters:+ Host:+ Description: FQDN for host+ Type: String++Resources:++ HealthCheck:+ Type: AWS::Route53::HealthCheck+ Properties:+ HealthCheckConfig:+ Port: 443+ Type: HTTPS+ ResourcePath: '/api/master/info'+ FullyQualifiedDomainName: !Sub ${Host}+ RequestInterval: 30+ FailureThreshold: 10+ HealthCheckTags:+ - Key: Name+ Value: !Sub ${Host}++ EmailSubscription:+ Type: AWS::SNS::Subscription+ Properties:+ Endpoint: [email protected]+ Protocol: email+ TopicArn: !Ref SnsTopic++ SnsTopic:+ Type: AWS::SNS::Topic+ Properties:+ DisplayName: !Ref Host++ HealthCheckAlarm:+ Type: AWS::CloudWatch::Alarm+ Properties:+ Namespace: AWS/Route53+ MetricName: HealthCheckStatus+ Statistic: Sum+ Period: 60+ EvaluationPeriods: 15+ ComparisonOperator: LessThanThreshold+ Threshold: 1+ AlarmActions:+ - !Ref SnsTopic+ OKActions:+ - !Ref SnsTopic+ Dimensions:+ - Name: HealthCheckId+ Value: !Ref HealthCheckdiff --git a/.ci_cd/aws/provision_host.sh b/.ci_cd/aws/provision_host.shindex 78f4b1d93..bcc46743c 100644--- a/.ci_cd/aws/provision_host.sh+++ b/.ci_cd/aws/provision_host.sh@@ -2,9 +2,15 @@# Provisions the standard stack of resources using CloudFormation template (cloudformation-create-ec2.yml) in the# specified AWS member account; if no account specified then the account of the authenticated user will be used.-# The account must already exist and be provisioned in the standard way (see provision_account.sh). To access the-# account the $AWS_ROLE_NAME role in that account will be assumed (this role must exist and must have sufficient-# privileges to run the commands contained in this script). This script will determine the DNS hosted+# The account must already exist and be provisioned in the standard way (see provision_account.sh).+# Also provisions an SMTP user in the caller account using CloudFormation template (cloudformation-create-smtp-user.yml)+# so this user can be used to send emails from the newly provisioned host (credentials are injected into the host+# environment variables).+# Also provisions a Route 53 Healthcheck alarm using CloudFormation template (cloudformation-healthcheck-alarm.yml) in+# the same AWS member account but in the us-east-1 region (this is the region where Route 53 health checks are+# automatically created).+# To access the account the $AWS_ROLE_NAME role in that account will be assumed (this role must exist and must have+# sufficient privileges to run the commands contained in this script). This script will determine the DNS hosted# zone into which the A record for the host should be inserted by searching up the domain levels of the hosts FQDN.# Will also provision an S3 bucket with the name of host (periods replaced with hyphens) unless set to false.#@@ -59,6 +65,7 @@ fiSTACK_NAME=$(tr '.' '-' <<< "$HOST")SMTP_STACK_NAME="$STACK_NAME-smtp"+HEALTH_STACK_NAME="$STACK_NAME-healthcheck"# Provision SMTP user using cloud formation (if stack doesn't already exist)echo "Provisioning SMTP user"@@ -271,3 +278,54 @@ if [ "$PROVISION_S3_BUCKET" != 'false' ]; thenfififi++# Provision Route 53 healthcheck alarm cloud formation (if stack doesn't already exist) - must be in the us-east-1 region+echo "Provisioning Healthcheck Alarm"+STATUS=$(aws cloudformation describe-stacks --stack-name $HEALTH_STACK_NAME --query "Stacks[0].StackStatus" --output text $ACCOUNT_PROFILE --region us-east-1 2>/dev/null)++if [ -n "$STATUS" ] && [ "$STATUS" != 'DELETE_COMPLETE' ]; then+ echo "Stack already exists for this host's Healthcheck '$HEALTH_STACK_NAME' current status is '$STATUS'"+ STACK_ID=$(aws cloudformation describe-stacks --stack-name $HEALTH_STACK_NAME --query "Stacks[0].StackId" --output text $ACCOUNT_PROFILE --region us-east-1 2>/dev/null)+else++ if [ -f "${awsDir}cloudformation-healthcheck-alarm.yml" ]; then+ HEALTH_TEMPLATE_PATH="${awsDir}cloudformation-healthcheck-alarm.yml"+ elif [ -f ".ci_cd/aws/cloudformation-healthcheck-alarm.yml" ]; then+ HEALTH_TEMPLATE_PATH=".ci_cd/aws/cloudformation-healthcheck-alarm.yml"+ elif [ -f "openremote/.ci_cd/aws/cloudformation-healthcheck-alarm.yml" ]; then+ HEALTH_TEMPLATE_PATH="openremote/.ci_cd/aws/cloudformation-healthcheck-alarm.yml"+ else+ echo "Cannot determine location of cloudformation-healthcheck-alarm.yml"+ exit 1+ fi++ #Configure parameters+ PARAMS="ParameterKey=Host,ParameterValue='$HOST'"++ # Create standard stack resources in specified account in us-east-1 region+ STACK_ID=$(aws cloudformation create-stack --stack-name $HEALTH_STACK_NAME --template-body file://$HEALTH_TEMPLATE_PATH --parameters $PARAMS --output text $ACCOUNT_PROFILE --region us-east-1)++ if [ $? -ne 0 ]; then+ echo "Create stack failed"+ exit 1+ fi++ if [ "$WAIT_FOR_STACK" != 'false' ]; then+ # Wait for cloud formation stack status to be CREATE_*+ echo "Waiting for stack to be created"+ STATUS=$(aws cloudformation describe-stacks --stack-name $HEALTH_STACK_NAME --query "Stacks[?StackId=='$STACK_ID'].StackStatus" --output text $ACCOUNT_PROFILE --region us-east-1 2>/dev/null)++ while [[ "$STATUS" == 'CREATE_IN_PROGRESS' ]]; do+ echo "Stack creation is still in progress .. Sleeping 30 seconds"+ sleep 30+ STATUS=$(aws cloudformation describe-stacks --stack-name $HEALTH_STACK_NAME --query "Stacks[?StackId=='$STACK_ID'].StackStatus" --output text $ACCOUNT_PROFILE --region us-east-1 2>/dev/null)+ done++ if [ "$STATUS" != 'CREATE_COMPLETE' ]; then+ echo "Stack creation has failed status is '$STATUS'"+ exit 1+ else+ echo "Stack creation is complete"+ fi+ fi+fidiff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.javaindex 9665b5254..a4d981c0b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java@@ -21,8 +21,8 @@ package org.openremote.agent.protocol;import org.apache.camel.ProducerTemplate;import org.apache.camel.builder.RouteBuilder;+import org.apache.camel.impl.DefaultCamelContext;import org.openremote.container.concurrent.GlobalLock;-import org.openremote.container.message.MessageBrokerContext;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.timer.TimerService;import org.openremote.model.Container;@@ -76,7 +76,7 @@ public abstract class AbstractProtocol<T extends Agent<T, ?, U>, U extends Agentprivate static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, AbstractProtocol.class);protected final Map<AttributeRef, Attribute<?>> linkedAttributes = new HashMap<>();protected final Set<AttributeRef> dynamicAttributes = new HashSet<>();- protected MessageBrokerContext messageBrokerContext;+ protected DefaultCamelContext messageBrokerContext;protected ProducerTemplate producerTemplate;protected TimerService timerService;protected ScheduledExecutorService executorService;diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.javaindex 6127eb4b1..9a54cd8ac 100644--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIOClient.java@@ -363,6 +363,7 @@ public abstract class AbstractNettyIOClient<T, U extends SocketAddress> implemenworkerGroup = null;}}+ LOG.finer("Disconnect done: " + getClientUri());}@Override@@ -469,14 +470,16 @@ public abstract class AbstractNettyIOClient<T, U extends SocketAddress> implemenprotected void onConnectionStatusChanged(ConnectionStatus connectionStatus) {this.connectionStatus = connectionStatus;-+ if (connectionStatusConsumers.size() > 0) {+ LOG.finest("Notifying connection status consumers: count=" + connectionStatusConsumers.size());+ }executorService.submit(() -> {connectionStatusConsumers.forEach(consumer -> {try {consumer.accept(connectionStatus);} catch (Exception e) {- LOG.log(Level.WARNING, "Connection status change handler threw an exception: " + getClientUri(), e);+ LOG.log(Level.INFO, "Connection status change handler threw an exception: " + getClientUri(), e);}});});diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.javaindex 57e21c259..abc7236dd 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java@@ -125,14 +125,8 @@ public class SimulatorProtocol extends AbstractProtocol<SimulatorAgent, Simulato* Call this to simulate a sensor update using the specified timestamp*/public void updateSensor(AttributeRef attributeRef, Object value, long timestamp) {- Attribute<?> attribute = getLinkedAttributes().get(attributeRef);AttributeState state = new AttributeState(attributeRef, value);- if (attribute == null) {- LOG.info("Attempt to update unlinked attribute: " + state);- return;- }-updateLinkedAttribute(state, timestamp);}diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.javaindex 6300fc17e..e1f524f94 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java@@ -93,13 +93,6 @@ public class StorageSimulatorProtocol extends AbstractProtocol<StorageSimulatorA}updateLinkedAttribute(new AttributeState(event.getAttributeRef(), processedValue));-- // Push write value into the asset and update- String assetId = event.getAssetId();- ((Attribute<Object>) attribute).setValue(processedValue);- ElectricityStorageAsset asset = assetService.findAsset(assetId, ElectricityStorageAsset.class);- asset.addOrReplaceAttributes(attribute);- updateStorageAsset(asset);}protected void updateStorageAsset(ElectricityStorageAsset storageAsset) {diff --git a/container/build.gradle b/container/build.gradleindex 9ef3948cf..b354a9e84 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -45,6 +45,7 @@ dependencies {api "org.apache.camel:camel-core:$camelVersion"api "org.apache.camel:camel-jackson:$camelVersion"api "org.apache.camel:camel-snmp:$camelVersion"+ api "org.apache.camel:camel-health:$camelVersion"api("com.fasterxml.uuid:java-uuid-generator:$uuidGeneratorVersion") {exclude group: "log4j"diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerContext.java b/container/src/main/java/org/openremote/container/message/MessageBrokerContext.javadeleted file mode 100644index 93fd62e40..000000000--- a/container/src/main/java/org/openremote/container/message/MessageBrokerContext.java+++ /dev/null@@ -1,39 +0,0 @@-/*- * 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.container.message;--import org.apache.camel.impl.DefaultCamelContext;-import org.apache.camel.impl.PropertyPlaceholderDelegateRegistry;-import org.apache.camel.impl.SimpleRegistry;-import org.apache.camel.spi.Registry;--@SuppressWarnings("unchecked")-public class MessageBrokerContext extends DefaultCamelContext {-- @Override- protected Registry createRegistry() {- return new SimpleRegistry();- }-- @Override- public SimpleRegistry getRegistry() {- return (SimpleRegistry) ((PropertyPlaceholderDelegateRegistry) super.getRegistry()).getRegistry();- }-}diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex 35f6176ca..dd0db8109 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -19,22 +19,35 @@*/package org.openremote.container.message;-import org.apache.camel.Processor;+import org.apache.camel.CamelContext;+import org.apache.camel.FluentProducerTemplate;import org.apache.camel.ProducerTemplate;+import org.apache.camel.builder.DefaultErrorHandlerBuilder;import org.apache.camel.component.snmp.SnmpComponent;-import org.apache.camel.impl.DefaultStreamCachingStrategy;-import org.apache.camel.spi.*;+import org.apache.camel.health.HealthCheckRegistry;+import org.apache.camel.impl.DefaultCamelContext;+import org.apache.camel.impl.engine.DefaultHealthCheckResolver;+import org.apache.camel.impl.engine.DefaultStreamCachingStrategy;+import org.apache.camel.impl.health.ConsumersHealthCheckRepository;+import org.apache.camel.impl.health.ContextHealthCheck;+import org.apache.camel.impl.health.DefaultHealthCheckRegistry;+import org.apache.camel.impl.health.RoutesHealthCheckRepository;+import org.apache.camel.spi.ExecutorServiceManager;+import org.apache.camel.spi.StreamCachingStrategy;+import org.apache.camel.spi.ThreadPoolFactory;+import org.apache.camel.spi.ThreadPoolProfile;+import org.apache.camel.support.DefaultRegistry;+import org.apache.camel.support.SimpleRegistry;import org.apache.camel.util.StringHelper;import org.apache.camel.util.concurrent.CamelThreadFactory;-import org.openremote.model.Container;-import org.openremote.model.ContainerService;import org.openremote.container.concurrent.ContainerExecutor;import org.openremote.container.concurrent.ContainerScheduledExecutor;-import org.openremote.container.security.IdentityService;import org.openremote.container.web.DefaultWebsocketComponent;-import org.openremote.container.web.WebService;import org.openremote.container.web.socket.WebsocketComponent;+import org.openremote.model.Container;+import org.openremote.model.ContainerService;+import java.util.Map;import java.util.concurrent.ExecutorService;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.ThreadFactory;@@ -50,7 +63,8 @@ public class MessageBrokerService implements ContainerService {public static final int PRIORITY = ContainerService.HIGH_PRIORITY;protected ProducerTemplate producerTemplate;- protected MessageBrokerContext context;+ protected FluentProducerTemplate fluentProducerTemplate;+ protected DefaultCamelContext context;@Overridepublic int getPriority() {@@ -61,7 +75,7 @@ public class MessageBrokerService implements ContainerService {@Overridepublic void init(Container container) throws Exception {- context = new MessageBrokerContext();+ context = new DefaultCamelContext();final ExecutorServiceManager executorServiceManager = context.getExecutorServiceManager();executorServiceManager.setThreadNamePattern("#counter# #name#");@@ -113,6 +127,15 @@ public class MessageBrokerService implements ContainerService {// Don't use JMS, we do our own correlationcontext.setUseBreadcrumb(false);+ // Enable health checks - Have to manually add built in ones for some reason+ context.setLoadHealthChecks(true);+ final var checkRegistry = new DefaultHealthCheckRegistry();+ checkRegistry.setExposureLevel("full");+ checkRegistry.register(new RoutesHealthCheckRepository());+ checkRegistry.register(new ConsumersHealthCheckRepository());+ checkRegistry.register(new ContextHealthCheck());+ context.setExtension(HealthCheckRegistry.class, checkRegistry);+// Force a quick shutdown of routes with in-flight exchangescontext.getShutdownStrategy().setTimeout(1);context.getShutdownStrategy().setSuppressLoggingOnTimeout(true);@@ -122,15 +145,9 @@ public class MessageBrokerService implements ContainerService {streamCachingStrategy.setSpoolThreshold(524288); // Half megabytecontext.setStreamCachingStrategy(streamCachingStrategy);- context.setErrorHandlerBuilder(new org.apache.camel.builder.LoggingErrorHandlerBuilder() {- @Override- public Processor createErrorHandler(RouteContext routeContext, Processor processor) {- // TODO: Custom error handler?- return super.createErrorHandler(routeContext, processor);- }- });+ context.setErrorHandlerFactory(new DefaultErrorHandlerBuilder());- context.getRegistry().put(Container.class.getName(), container);+ ((SimpleRegistry)((DefaultRegistry)context.getRegistry()).getFallbackRegistry()).put("OpenRemote", Map.of(Container.class, container));String allowedOrigin = getString(container.getConfig(), MESSAGE_SESSION_ALLOWED_ORIGIN, MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT);WebsocketComponent websocketComponent = new DefaultWebsocketComponent(@@ -145,6 +162,7 @@ public class MessageBrokerService implements ContainerService {@Overridepublic void start(Container container) throws Exception {producerTemplate = context.createProducerTemplate();+ fluentProducerTemplate = context.createFluentProducerTemplate();LOG.info("Starting Camel message broker");context.start();}@@ -156,7 +174,7 @@ public class MessageBrokerService implements ContainerService {}}- public MessageBrokerContext getContext() {+ public DefaultCamelContext getContext() {return context;}@@ -164,6 +182,10 @@ public class MessageBrokerService implements ContainerService {return producerTemplate;}+ public FluentProducerTemplate getFluentProducerTemplate() {+ return fluentProducerTemplate;+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.javaindex d2386dda1..14cad6545 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java@@ -40,7 +40,6 @@ public class PersistenceHealthStatusProvider implements HealthStatusProvider, Coprivate static final Logger LOG = Logger.getLogger(PersistenceHealthStatusProvider.class.getName());public static final String NAME = "db";- public static final String VERSION = "1.0";protected PersistenceService persistenceService;@Override@@ -68,11 +67,6 @@ public class PersistenceHealthStatusProvider implements HealthStatusProvider, Coreturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {if (persistenceService.persistenceUnitProperties == null) {diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex c4c35109e..e181597ca 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,7 @@package org.openremote.container.persistence;import org.apache.camel.ExchangePattern;+import org.apache.camel.FluentProducerTemplate;import org.apache.camel.Predicate;import org.apache.camel.ProducerTemplate;import org.flywaydb.core.Flyway;@@ -457,14 +458,12 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc// Fire persistence event although we don't use database for Realm CUD but call Keycloak APIPersistenceEvent<?> persistenceEvent = new PersistenceEvent<>(cause, entity, propertyNames, currentState, previousState);- if (messageBrokerService.getProducerTemplate() != null) {- messageBrokerService.getProducerTemplate().sendBodyAndHeader(- PERSISTENCE_TOPIC,- ExchangePattern.InOnly,- persistenceEvent,- HEADER_ENTITY_TYPE,- persistenceEvent.getEntity().getClass()- );+ if (messageBrokerService.getFluentProducerTemplate() != null) {+ messageBrokerService.getFluentProducerTemplate()+ .withBody(persistenceEvent)+ .withHeader(HEADER_ENTITY_TYPE, persistenceEvent.getEntity().getClass())+ .to(PERSISTENCE_TOPIC)+ .asyncSend();}}@@ -526,16 +525,14 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc@Overridepublic void accept(PersistenceEvent<?> persistenceEvent) {- ProducerTemplate producerTemplate = messageBrokerService.getProducerTemplate();+ FluentProducerTemplate producerTemplate = messageBrokerService.getFluentProducerTemplate();if (producerTemplate != null) {- producerTemplate.sendBodyAndHeader(- PersistenceService.PERSISTENCE_TOPIC,- ExchangePattern.InOnly,- persistenceEvent,- PersistenceService.HEADER_ENTITY_TYPE,- persistenceEvent.getEntity().getClass()- );+ producerTemplate+ .withBody(persistenceEvent)+ .withHeader(HEADER_ENTITY_TYPE, persistenceEvent.getEntity().getClass())+ .to(PERSISTENCE_TOPIC)+ .asyncSend();}}diff --git a/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java b/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.javaindex 7b1dd89c2..f9cb48573 100644--- a/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java+++ b/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java@@ -46,12 +46,12 @@ public class MemoryWebsocketSessions extends ConcurrentHashMap<String, Session>}@Override- public void start() throws Exception {+ public void start() {// noop}@Override- public void stop() throws Exception {+ public void stop() {clear();}}diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketComponent.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketComponent.javaindex 9970e7f46..595aae21d 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketComponent.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketComponent.java@@ -20,8 +20,8 @@package org.openremote.container.web.socket;import org.apache.camel.Endpoint;-import org.apache.camel.impl.DefaultComponent;-import org.apache.camel.util.ServiceHelper;+import org.apache.camel.support.DefaultComponent;+import org.apache.camel.support.service.ServiceHelper;import java.util.HashMap;import java.util.Map;diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.javaindex 3dd6d79d2..6d31d06cf 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketConsumer.java@@ -21,7 +21,7 @@ package org.openremote.container.web.socket;import org.apache.camel.Exchange;import org.apache.camel.Processor;-import org.apache.camel.impl.DefaultConsumer;+import org.apache.camel.support.DefaultConsumer;import java.util.function.Consumer;diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketEndpoint.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketEndpoint.javaindex db3e6480a..221ff0dcc 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketEndpoint.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketEndpoint.java@@ -22,7 +22,7 @@ package org.openremote.container.web.socket;import org.apache.camel.Consumer;import org.apache.camel.Processor;import org.apache.camel.Producer;-import org.apache.camel.impl.DefaultEndpoint;+import org.apache.camel.support.DefaultEndpoint;import org.apache.camel.spi.Metadata;import org.apache.camel.spi.UriEndpoint;import org.apache.camel.spi.UriParam;@@ -37,7 +37,7 @@ public class WebsocketEndpoint extends DefaultEndpoint {private WebsocketComponent component;@UriPath- @Metadata(required = "true")+ @Metadata(required = true)private String resourceUri;@UriParamdiff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.javaindex 18c875f64..9f1a755ff 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java@@ -22,7 +22,7 @@ package org.openremote.container.web.socket;import org.apache.camel.CamelExchangeException;import org.apache.camel.Exchange;import org.apache.camel.Message;-import org.apache.camel.impl.DefaultProducer;+import org.apache.camel.support.DefaultProducer;import org.openremote.container.web.ConnectionConstants;import javax.websocket.Session;diff --git a/gradle.properties b/gradle.propertiesindex 30d272b90..6b9191966 100644--- a/gradle.properties+++ b/gradle.properties@@ -24,7 +24,7 @@ junitVersion = 4.13.2spockVersion = 2.0-groovy-3.0byteBuddyVersion = 1.11.0objenesisVersion = 3.2-camelVersion = 2.25.4+camelVersion = 3.19.0sunriseSunsetCalculatorVersion = 1.2easyRulesVersion = 4.1.0quartzVersion= 2.3.2diff --git a/manager/Dockerfile b/manager/Dockerfileindex ff9288325..1dc4bd6e6 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -55,11 +55,10 @@ ENV OR_RULE_EVENT_EXPIRES ${OR_RULE_EVENT_EXPIRES:-PT1H}ENV OR_IDENTITY_PROVIDER ${OR_IDENTITY_PROVIDER:-keycloak}ENV OR_IDENTITY_SESSION_MAX_MINUTES ${OR_IDENTITY_SESSION_MAX_MINUTES:-1440}ENV OR_IDENTITY_SESSION_OFFLINE_TIMEOUT_MINUTES ${OR_IDENTITY_SESSION_OFFLINE_TIMEOUT_MINUTES:-2628000}-ENV OR_JAVA_OPTS ${OR_JAVA_OPTS:--Xms400m -Xmx400m \- -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m \- -XX:InitialCodeCacheSize=50m -XX:ReservedCodeCacheSize=50m \- -XX:MaxDirectMemorySize=25m -XX:NativeMemoryTracking=summary \- -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof}+ENV OR_JAVA_OPTS ${OR_JAVA_OPTS:--Xms500m -Xmx2g \+ -XX:NativeMemoryTracking=summary \+ -Xlog:all=warning:stdout:uptime,level,tags \+ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dump.hprof}RUN mkdir -p /deployment/manager/extensionsdiff --git a/manager/build.gradle b/manager/build.gradleindex 7fcb69a6c..ba8848a61 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -35,6 +35,7 @@ dependencies {implementation("org.apache.activemq:artemis-mqtt-protocol:$activeMQVersion") {exclude group: "org.osgi"+ exclude group: "org.jboss.logging"}// Needed for reference in testsdiff --git a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.javaindex 2363dc6c3..ef0bb3a3a 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicInteger;public class AgentHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "agents";- public static final String VERSION = "1.0";protected AgentService agentService;@Override@@ -60,11 +59,6 @@ public class AgentHealthStatusProvider implements HealthStatusProvider, Containereturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {AtomicInteger connectedCount = new AtomicInteger(0);diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 24d71b619..0f4cc74de 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -566,12 +566,11 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse.map(agentLink -> {LOG.finer("Attribute write for agent linked attribute: agent=" + agentLink.getId() + ", asset=" + asset.getId() + ", attribute=" + attribute.getName());- messageBrokerService.getProducerTemplate().sendBodyAndHeader(- ACTUATOR_TOPIC,- attributeEvent,- Protocol.ACTUATOR_TOPIC_TARGET_PROTOCOL,- getProtocolInstance(agentLink.getId())- );+ messageBrokerService.getFluentProducerTemplate()+ .withBody(attributeEvent)+ .withHeader(Protocol.ACTUATOR_TOPIC_TARGET_PROTOCOL, getProtocolInstance(agentLink.getId()))+ .to(ACTUATOR_TOPIC)+ .asyncSend();return true; // Processing complete, skip other processors}).orElse(false) // This is a regular attribute so allow the processing to continue);diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex ef3239ce3..5d3da840e 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -20,6 +20,7 @@package org.openremote.manager.asset;import org.apache.camel.Exchange;+import org.apache.camel.FluentProducerTemplate;import org.apache.camel.Processor;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;@@ -167,7 +168,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer}// Make the exception available if MEP is InOut- exchange.getOut().setBody(exception);+ exchange.getMessage().setBody(exception);};}@@ -439,7 +440,11 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerif (attributeEvent.getTimestamp() <= 0) {attributeEvent.setTimestamp(timerService.getCurrentTimeMillis());}- messageBrokerService.getProducerTemplate().sendBodyAndHeader(ASSET_QUEUE, attributeEvent, HEADER_SOURCE, source);+ messageBrokerService.getFluentProducerTemplate()+ .withHeader(HEADER_SOURCE, source)+ .withBody(attributeEvent)+ .to(ASSET_QUEUE)+ .asyncSend();}/**diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex de82a89f8..22e9b4afe 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -596,8 +596,11 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour}// Process synchronously- Object result = messageBrokerService.getProducerTemplate().requestBodyAndHeader(- AssetProcessingService.ASSET_QUEUE, event, AttributeEvent.HEADER_SOURCE, CLIENT);+ Object result = messageBrokerService.getFluentProducerTemplate()+ .withBody(event)+ .withHeader(AttributeEvent.HEADER_SOURCE, CLIENT)+ .to(AssetProcessingService.ASSET_QUEUE)+ .request();if (result instanceof AssetProcessingException) {AssetProcessingException processingException = (AssetProcessingException) result;diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.javaindex 66f2692d5..1ef7af997 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java@@ -28,7 +28,6 @@ import org.openremote.model.util.ValueUtil;public class AssetDatapointHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "datapoints";- public static final String VERSION = "1.0";protected AssetDatapointService assetDatapointService;@Override@@ -56,11 +55,6 @@ public class AssetDatapointHealthStatusProvider implements HealthStatusProvider,return NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {ObjectNode value = ValueUtil.JSON.createObjectNode();diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.javaindex 41f537432..1f2930231 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointHealthStatusProvider.java@@ -27,7 +27,6 @@ import org.openremote.model.util.ValueUtil;public class AssetPredictedDatapointHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "predicted";- public static final String VERSION = "1.0";protected AssetPredictedDatapointService assetPredictedDatapointService;@Override@@ -55,11 +54,6 @@ public class AssetPredictedDatapointHealthStatusProvider implements HealthStatusreturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {ObjectNode value = ValueUtil.JSON.createObjectNode();diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex cef3d8e51..3a20f3654 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -26,6 +26,7 @@ import org.openremote.container.security.AuthContext;import org.openremote.container.timer.TimerService;import org.openremote.container.web.ConnectionConstants;import org.openremote.manager.gateway.GatewayService;+import org.openremote.manager.mqtt.DefaultMQTTHandler;import org.openremote.manager.mqtt.MQTTBrokerService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;@@ -42,10 +43,10 @@ import java.util.Set;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ConcurrentMap;import java.util.concurrent.CopyOnWriteArraySet;+import java.util.concurrent.ExecutorService;import java.util.function.Consumer;import java.util.logging.Logger;-import static org.apache.camel.builder.Builder.header;import static org.apache.camel.builder.PredicateBuilder.or;import static org.openremote.container.web.ConnectionConstants.SESSION_TERMINATOR;@@ -91,7 +92,7 @@ import static org.openremote.container.web.ConnectionConstants.SESSION_TERMINATO* </p></dd>* </dl>*/-public class ClientEventService implements ContainerService {+public class ClientEventService extends RouteBuilder implements ContainerService {protected static class SessionInfo {String connectionType;@@ -115,13 +116,16 @@ public class ClientEventService implements ContainerService {// TODO: Some of these options should be configurable depending on expected load etc.public static final String CLIENT_EVENT_TOPIC = "seda://ClientEventTopic?multipleConsumers=true&concurrentConsumers=1&waitForTaskToComplete=NEVER&purgeWhenStopping=true&discardIfNoConsumers=true&limitConcurrentConsumers=false&size=1000";- public static final String CLIENT_EVENT_QUEUE = "seda://ClientEventQueue?multipleConsumers=false&waitForTaskToComplete=NEVER&purgeWhenStopping=true&discardIfNoConsumers=true&size=25000";+// public static final String CLIENT_EVENT_QUEUE = "seda://ClientEventQueue?multipleConsumers=false&waitForTaskToComplete=NEVER&purgeWhenStopping=true&discardIfNoConsumers=true&size=25000";+ // A direct endpoint with threading which then makes it async+ public static final String CLIENT_EVENT_QUEUE = "direct://ClientEventQueue";final protected Collection<EventSubscriptionAuthorizer> eventSubscriptionAuthorizers = new CopyOnWriteArraySet<>();final protected Collection<EventAuthorizer> eventAuthorizers = new CopyOnWriteArraySet<>();final protected Collection<Consumer<Exchange>> exchangeInterceptors = new CopyOnWriteArraySet<>();protected ConcurrentMap<String, SessionInfo> sessionKeyInfoMap = new ConcurrentHashMap<>();protected TimerService timerService;+ protected ExecutorService executorService;protected MessageBrokerService messageBrokerService;protected ManagerIdentityService identityService;protected EventSubscriptions eventSubscriptions;@@ -133,11 +137,11 @@ public class ClientEventService implements ContainerService {* Method to stop further processing of the exchange*/public static void stopMessage(Exchange exchange) {- exchange.setProperty(Exchange.ROUTE_STOP, Boolean.TRUE);+ exchange.setRouteStop(true);}public static boolean isInbound(Exchange exchange) {- return header(HEADER_CONNECTION_TYPE).isNotNull().matches(exchange);+ return org.apache.camel.builder.Builder.header(HEADER_CONNECTION_TYPE).isNotNull().matches(exchange);}public static String getSessionKey(Exchange exchange) {@@ -163,6 +167,7 @@ public class ClientEventService implements ContainerService {messageBrokerService = container.getService(MessageBrokerService.class);identityService = container.getService(ManagerIdentityService.class);gatewayService = container.getService(GatewayService.class);+ executorService = container.getExecutorService();eventSubscriptions = new EventSubscriptions(container.getService(TimerService.class)@@ -172,131 +177,7 @@ public class ClientEventService implements ContainerService {new EventTypeConverters());- // TODO: Remove prefix and just use event type then use a subscription wrapper to pass subscription ID around- messageBrokerService.getContext().addRoutes(new RouteBuilder() {- @Override- public void configure() throws Exception {-- from("websocket://" + WEBSOCKET_EVENTS)- .routeId("FromClientWebsocketEvents")- .process(exchange -> {- exchange.getIn().setHeader(HEADER_CONNECTION_TYPE, HEADER_CONNECTION_TYPE_WEBSOCKET);-- // Do basic formatting of exchange- EventRequestResponseWrapper<?> requestResponse = null;- if (exchange.getIn().getBody() instanceof EventRequestResponseWrapper) {- requestResponse = exchange.getIn().getBody(EventRequestResponseWrapper.class);- } else if (exchange.getIn().getBody() instanceof String && exchange.getIn().getBody(String.class).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)) {- requestResponse = exchange.getIn().getBody(EventRequestResponseWrapper.class);- }- if (requestResponse != null) {- SharedEvent event = requestResponse.getEvent();- exchange.getIn().setHeader(HEADER_REQUEST_RESPONSE_MESSAGE_ID, requestResponse.getMessageId());- exchange.getIn().setBody(event);- }-- if (exchange.getIn().getBody() instanceof String) {- String bodyStr = exchange.getIn().getBody(String.class);- if (bodyStr.startsWith(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX)) {- exchange.getIn().setBody(exchange.getIn().getBody(EventSubscription.class));- } else if (bodyStr.startsWith(CancelEventSubscription.MESSAGE_PREFIX)) {- exchange.getIn().setBody(exchange.getIn().getBody(CancelEventSubscription.class));- } else if (bodyStr.startsWith(SharedEvent.MESSAGE_PREFIX)) {- exchange.getIn().setBody(exchange.getIn().getBody(SharedEvent.class));- }- }-- // Perform authorisation- if (exchange.getIn().getBody() instanceof SharedEvent) {- SharedEvent event = exchange.getIn().getBody(SharedEvent.class);- AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);- String realm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);-- if (!authorizeEventWrite(realm, authContext, event)) {- stopMessage(exchange);- }- } else if (exchange.getIn().getBody() instanceof EventSubscription<?>) {- EventSubscription<?> subscription = exchange.getIn().getBody(EventSubscription.class);- AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);- String realm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);- String sessionKey = getSessionKey(exchange);-- if (!authorizeEventSubscription(realm, authContext, subscription)) {- sendToSession(sessionKey, new UnauthorizedEventSubscription<>(subscription));- stopMessage(exchange);- }- }- })- .to(ClientEventService.CLIENT_EVENT_QUEUE)- .end();-- from(ClientEventService.CLIENT_EVENT_QUEUE)- .routeId("ClientEvents")- .choice()- .when(header(ConnectionConstants.SESSION_OPEN))- .process(exchange -> {- String sessionKey = getSessionKey(exchange);- sessionKeyInfoMap.put(sessionKey, createSessionInfo(sessionKey, exchange));- passToInterceptors(exchange);- })- .stop()- .when(or(- header(ConnectionConstants.SESSION_CLOSE),- header(ConnectionConstants.SESSION_CLOSE_ERROR)- ))- .process(exchange -> {- String sessionKey = getSessionKey(exchange);- sessionKeyInfoMap.remove(sessionKey);- eventSubscriptions.cancelAll(sessionKey);- passToInterceptors(exchange);- })- .stop()- .end()- .process(exchange -> {- // Set timestamp if not set- if (exchange.getIn().getBody() instanceof SharedEvent) {- SharedEvent event = exchange.getIn().getBody(SharedEvent.class);- // If there is no timestamp in event, set to system time- if (event.getTimestamp() <= 0) {- event.setTimestamp(timerService.getCurrentTimeMillis());- }- }- })- .process(exchange -> passToInterceptors(exchange))- .choice()- .when(body().isInstanceOf(EventSubscription.class))- .process(exchange -> {- String sessionKey = getSessionKey(exchange);- EventSubscription<?> subscription = exchange.getIn().getBody(EventSubscription.class);- eventSubscriptions.createOrUpdate(sessionKey, subscription);- subscription.setSubscribed(true);- sendToSession(sessionKey, subscription);- })- .stop()- .when(body().isInstanceOf(CancelEventSubscription.class))- .process(exchange -> {- String sessionKey = getSessionKey(exchange);- eventSubscriptions.cancel(sessionKey, exchange.getIn().getBody(CancelEventSubscription.class));- })- .stop()- .when(body().isInstanceOf(SharedEvent.class))- .choice()- .when(header(HEADER_CONNECTION_TYPE).isNotNull()) // Inbound messages from client- .to(ClientEventService.CLIENT_EVENT_TOPIC)- .stop()- .when(header(HEADER_CONNECTION_TYPE).isNull()) // Outbound message to clients- .split(method(eventSubscriptions, "splitForSubscribers"))- .process(exchange -> {- String sessionKey = getSessionKey(exchange);- sendToSession(sessionKey, exchange.getIn().getBody());- })- .stop()- .endChoice()- .otherwise()- .process(exchange -> LOG.fine("Unsupported message body: " + exchange.getIn().getBody()))- .end();- }- });+ messageBrokerService.getContext().addRoutes(this);// Add pending internal subscriptionsif (!pendingInternalSubscriptions.isEmpty()) {@@ -307,6 +188,132 @@ public class ClientEventService implements ContainerService {pendingInternalSubscriptions = null;}+ // TODO: Remove prefix and just use event type then use a subscription wrapper to pass subscription ID around+ @Override+ public void configure() throws Exception {+ from("websocket://" + WEBSOCKET_EVENTS)+ .routeId("FromClientWebsocketEvents")+ .process(exchange -> {+ exchange.getIn().setHeader(HEADER_CONNECTION_TYPE, HEADER_CONNECTION_TYPE_WEBSOCKET);++ // Do basic formatting of exchange+ EventRequestResponseWrapper<?> requestResponse = null;+ if (exchange.getIn().getBody() instanceof EventRequestResponseWrapper) {+ requestResponse = exchange.getIn().getBody(EventRequestResponseWrapper.class);+ } else if (exchange.getIn().getBody() instanceof String && exchange.getIn().getBody(String.class).startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)) {+ requestResponse = exchange.getIn().getBody(EventRequestResponseWrapper.class);+ }+ if (requestResponse != null) {+ SharedEvent event = requestResponse.getEvent();+ exchange.getIn().setHeader(HEADER_REQUEST_RESPONSE_MESSAGE_ID, requestResponse.getMessageId());+ exchange.getIn().setBody(event);+ }++ if (exchange.getIn().getBody() instanceof String) {+ String bodyStr = exchange.getIn().getBody(String.class);+ if (bodyStr.startsWith(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX)) {+ exchange.getIn().setBody(exchange.getIn().getBody(EventSubscription.class));+ } else if (bodyStr.startsWith(CancelEventSubscription.MESSAGE_PREFIX)) {+ exchange.getIn().setBody(exchange.getIn().getBody(CancelEventSubscription.class));+ } else if (bodyStr.startsWith(SharedEvent.MESSAGE_PREFIX)) {+ exchange.getIn().setBody(exchange.getIn().getBody(SharedEvent.class));+ }+ }++ // Perform authorisation+ if (exchange.getIn().getBody() instanceof SharedEvent) {+ SharedEvent event = exchange.getIn().getBody(SharedEvent.class);+ AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);+ String realm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);++ if (!authorizeEventWrite(realm, authContext, event)) {+ stopMessage(exchange);+ }+ } else if (exchange.getIn().getBody() instanceof EventSubscription<?>) {+ EventSubscription<?> subscription = exchange.getIn().getBody(EventSubscription.class);+ AuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);+ String realm = exchange.getIn().getHeader(Constants.REALM_PARAM_NAME, String.class);+ String sessionKey = getSessionKey(exchange);++ if (!authorizeEventSubscription(realm, authContext, subscription)) {+ sendToSession(sessionKey, new UnauthorizedEventSubscription<>(subscription));+ stopMessage(exchange);+ }+ }+ })+ .to(ClientEventService.CLIENT_EVENT_QUEUE)+ .end();++ from(ClientEventService.CLIENT_EVENT_QUEUE)+ .routeId("ClientEvents")+ .threads().executorService(executorService)+ .choice()+ .when(header(ConnectionConstants.SESSION_OPEN))+ .process(exchange -> {+ String sessionKey = getSessionKey(exchange);+ LOG.fine("Adding session: " + sessionKey);+ sessionKeyInfoMap.put(sessionKey, createSessionInfo(sessionKey, exchange));+ passToInterceptors(exchange);+ })+ .stop()+ .when(or(+ header(ConnectionConstants.SESSION_CLOSE),+ header(ConnectionConstants.SESSION_CLOSE_ERROR)+ ))+ .process(exchange -> {+ String sessionKey = getSessionKey(exchange);+ LOG.fine("Removing session: " + sessionKey);+ sessionKeyInfoMap.remove(sessionKey);+ eventSubscriptions.cancelAll(sessionKey);+ passToInterceptors(exchange);+ })+ .stop()+ .end()+ .process(exchange -> {+ // Set timestamp if not set+ if (exchange.getIn().getBody() instanceof SharedEvent) {+ SharedEvent event = exchange.getIn().getBody(SharedEvent.class);+ // If there is no timestamp in event, set to system time+ if (event.getTimestamp() <= 0) {+ event.setTimestamp(timerService.getCurrentTimeMillis());+ }+ }+ })+ .process(this::passToInterceptors)+ .choice()+ .when(body().isInstanceOf(EventSubscription.class))+ .process(exchange -> {+ String sessionKey = getSessionKey(exchange);+ EventSubscription<?> subscription = exchange.getIn().getBody(EventSubscription.class);+ eventSubscriptions.createOrUpdate(sessionKey, subscription);+ subscription.setSubscribed(true);+ sendToSession(sessionKey, subscription);+ })+ .stop()+ .when(body().isInstanceOf(CancelEventSubscription.class))+ .process(exchange -> {+ String sessionKey = getSessionKey(exchange);+ eventSubscriptions.cancel(sessionKey, exchange.getIn().getBody(CancelEventSubscription.class));+ })+ .stop()+ .when(body().isInstanceOf(SharedEvent.class))+ .choice()+ .when(header(HEADER_CONNECTION_TYPE).isNotNull()) // Inbound messages from client+ .to(ClientEventService.CLIENT_EVENT_TOPIC)+ .stop()+ .when(header(HEADER_CONNECTION_TYPE).isNull()) // Outbound message to clients+ .split(method(eventSubscriptions, "splitForSubscribers"))+ .process(exchange -> {+ String sessionKey = getSessionKey(exchange);+ sendToSession(sessionKey, exchange.getIn().getBody());+ })+ .stop()+ .endChoice()+ .otherwise()+ .process(exchange -> LOG.fine("Unsupported message body: " + exchange.getIn().getBody()))+ .end();+ }+/*** Make an internal subscription to {@link SharedEvent}s sent on the client event bus*/@@ -404,18 +411,20 @@ public class ClientEventService implements ContainerService {return;}- if (messageBrokerService != null && messageBrokerService.getProducerTemplate() != null) {+ if (messageBrokerService != null && messageBrokerService.getFluentProducerTemplate() != null) {// Don't log that we are publishing a syslog event,if (!(event instanceof SyslogEvent)) {LOG.finer("Publishing: " + event);}- messageBrokerService.getProducerTemplate()- .sendBody(CLIENT_EVENT_QUEUE, event);+ messageBrokerService.getFluentProducerTemplate()+ .withBody(event)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();}}public void sendToSession(String sessionKey, Object data) {- if (messageBrokerService != null && messageBrokerService.getProducerTemplate() != null) {+ if (messageBrokerService != null && messageBrokerService.getFluentProducerTemplate() != null) {LOG.finer("Sending to session '" + sessionKey + "': " + data);SessionInfo sessionInfo = sessionKeyInfoMap.get(sessionKey);if (sessionInfo == null) {@@ -423,17 +432,17 @@ public class ClientEventService implements ContainerService {return;}if (sessionInfo.connectionType.equals(HEADER_CONNECTION_TYPE_WEBSOCKET)) {- messageBrokerService.getProducerTemplate().sendBodyAndHeader(- "websocket://" + WEBSOCKET_EVENTS,- data,- ConnectionConstants.SESSION_KEY, sessionKey- );+ messageBrokerService.getFluentProducerTemplate()+ .withBody(data)+ .withHeader(ConnectionConstants.SESSION_KEY, sessionKey)+ .to("websocket://" + WEBSOCKET_EVENTS)+ .asyncSend();} else if (sessionInfo.connectionType.equals(HEADER_CONNECTION_TYPE_MQTT)) {- messageBrokerService.getProducerTemplate().sendBodyAndHeader(- MQTTBrokerService.MQTT_CLIENT_QUEUE,- data,- ConnectionConstants.SESSION_KEY, sessionKey- );+ messageBrokerService.getFluentProducerTemplate()+ .withBody(data)+ .withHeader(ConnectionConstants.SESSION_KEY, sessionKey)+ .to(DefaultMQTTHandler.CLIENT_QUEUE)+ .asyncSend();}}}@@ -453,7 +462,7 @@ public class ClientEventService implements ContainerService {// Pass to each interceptor and stop if any interceptor marks the exchange as stop routingif (exchangeInterceptors.stream().anyMatch(interceptor -> {interceptor.accept(exchange);- boolean stop = exchange.getProperty(Exchange.ROUTE_STOP, false, Boolean.class);+ boolean stop = exchange.isRouteStop();if (stop) {LOG.finer("Client event interceptor marked exchange as `stop routing`");}diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.javaindex 726ff82cf..f83d940cf 100644--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java@@ -21,7 +21,7 @@ package org.openremote.manager.event;import org.apache.camel.Exchange;import org.apache.camel.Message;-import org.apache.camel.impl.DefaultMessage;+import org.apache.camel.support.DefaultMessage;import org.openremote.container.timer.TimerService;import org.openremote.container.web.ConnectionConstants;import org.openremote.model.event.TriggeredEventSubscription;diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.javaindex 264715a19..5362c6ae4 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java@@ -150,11 +150,14 @@ public class GatewayConnector {/*** Start the connector and initiate synchronisation of assets*/- synchronized public void connect(Consumer<Object> gatewayMessageConsumer, Runnable disconnectRunnable) {- if (this.gatewayMessageConsumer != null) {- return;+ public void connect(Consumer<Object> gatewayMessageConsumer, Runnable disconnectRunnable) {+ synchronized (this) {+ if (this.gatewayMessageConsumer != null) {+ return;+ }+ this.gatewayMessageConsumer = gatewayMessageConsumer;}- this.gatewayMessageConsumer = gatewayMessageConsumer;+this.disconnectRunnable = disconnectRunnable;initialSyncInProgress = true;@@ -175,14 +178,15 @@ public class GatewayConnector {/*** Stop the connector and prevent further communication with the gateway*/- synchronized public void disconnect() {- if (this.gatewayMessageConsumer == null) {- return;+ public void disconnect() {+ synchronized (this) {+ if (this.gatewayMessageConsumer == null) {+ return;+ }+ this.gatewayMessageConsumer = null;}LOG.fine("Gateway connector disconnected: Gateway ID=" + gatewayId);-- this.gatewayMessageConsumer = null;Runnable disconnectRunnable = this.disconnectRunnable;this.disconnectRunnable = null;initialSyncInProgress = false;diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.javaindex cfad8cd37..0c3640507 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java@@ -42,7 +42,6 @@ import java.util.logging.Level;import java.util.logging.Logger;import static org.apache.activemq.artemis.core.remoting.CertificateUtil.getCertsFromConnection;-import static org.openremote.manager.mqtt.MQTTBrokerService.connectionToString;import static org.openremote.model.syslog.SyslogCategory.API;/**@@ -181,7 +180,7 @@ public class ActiveMQORSecurityManager extends ActiveMQJAASSecurityManager {// See if a custom handler wants to handle authorisation for this topic pub/subfor (MQTTHandler handler : brokerService.getCustomHandlers()) {if (handler.handlesTopic(topic)) {- LOG.fine("Passing topic to handler for " + (isWrite ? "pub" : "sub") + ": handler=" + handler.getName() + ", topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Passing topic to handler for " + (isWrite ? "pub" : "sub") + ": handler=" + handler.getName() + ", topic=" + topic + ", " + brokerService.connectionToString(connection));boolean result;if (isWrite) {@@ -191,16 +190,16 @@ public class ActiveMQORSecurityManager extends ActiveMQJAASSecurityManager {}if (LOG.isLoggable(Level.FINE)) {if (result) {- LOG.fine("Handler has authorised " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Handler has authorised " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + brokerService.connectionToString(connection));} else {- LOG.fine("Handler has not authorised " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Handler has not authorised " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + brokerService.connectionToString(connection));}}return result;}}- LOG.fine("No handler has allowed " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("No handler has allowed " + (isWrite ? "pub" : "sub") + ": topic=" + topic + ", " + brokerService.connectionToString(connection));return false;}diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.javaindex 0bc0bf506..c40328c49 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java@@ -20,9 +20,9 @@package org.openremote.manager.mqtt;import io.netty.buffer.ByteBuf;-import io.netty.channel.ChannelId;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;+import org.apache.camel.builder.RouteBuilder;import org.keycloak.KeycloakSecurityContext;import org.openremote.container.security.AuthContext;import org.openremote.container.web.ConnectionConstants;@@ -33,6 +33,7 @@ import org.openremote.model.Container;import org.openremote.model.asset.AssetEvent;import org.openremote.model.asset.AssetFilter;import org.openremote.model.attribute.AttributeEvent;+import org.openremote.model.event.TriggeredEventSubscription;import org.openremote.model.event.shared.CancelEventSubscription;import org.openremote.model.event.shared.EventSubscription;import org.openremote.model.event.shared.SharedEvent;@@ -42,13 +43,14 @@ import org.openremote.model.util.ValueUtil;import java.nio.charset.StandardCharsets;import java.util.*;import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.atomic.AtomicInteger;+import java.util.concurrent.ConcurrentMap;import java.util.function.Consumer;import java.util.function.Function;import java.util.logging.Logger;import java.util.regex.Pattern;-import static org.openremote.manager.mqtt.MQTTBrokerService.connectionToString;+import static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_QUEUE;+import static org.openremote.manager.mqtt.MQTTBrokerService.getConnectionIDString;import static org.openremote.model.Constants.ASSET_ID_REGEXP;import static org.openremote.model.syslog.SyslogCategory.API;@@ -58,6 +60,25 @@ import static org.openremote.model.syslog.SyslogCategory.API;*/public class DefaultMQTTHandler extends MQTTHandler {+ public static class SubscriberInfo {+ protected Map<String, Consumer<SharedEvent>> topicSubscriptionMap;++ public SubscriberInfo(String topic, Consumer<SharedEvent> subscriptionConsumer) {+ this.topicSubscriptionMap = new HashMap<>();+ this.topicSubscriptionMap.put(topic, subscriptionConsumer);+ }++ protected void add(String topic, Consumer<SharedEvent> subscriptionConsumer) {+ topicSubscriptionMap.put(topic, subscriptionConsumer);+ }++ protected int remove(String topic) {+ topicSubscriptionMap.remove(topic);+ return topicSubscriptionMap.size();+ }+ }++ public static final String CLIENT_QUEUE = "seda://MQTTDefaultHandlerQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";public static final int PRIORITY = Integer.MIN_VALUE + 1000;public static final String ASSET_TOPIC = "asset";public static final String ATTRIBUTE_TOPIC = "attribute";@@ -65,7 +86,7 @@ public class DefaultMQTTHandler extends MQTTHandler {public static final String ATTRIBUTE_VALUE_WRITE_TOPIC = "writeattributevalue";private static final Logger LOG = SyslogCategory.getLogger(API, DefaultMQTTHandler.class);protected AssetStorageService assetStorageService;- protected final Map<RemotingConnection, Integer> subscribedConnections = new HashMap<>();+ protected final ConcurrentMap<String, SubscriberInfo> connectionSubscriberInfoMap = new ConcurrentHashMap<>();@Overridepublic int getPriority() {@@ -73,6 +94,42 @@ public class DefaultMQTTHandler extends MQTTHandler {return PRIORITY;}+ @Override+ public void init(Container container) throws Exception {+ super.init(container);+ messageBrokerService.getContext().addRoutes(new RouteBuilder() {+ @Override+ public void configure() throws Exception {+ from(CLIENT_QUEUE)+ .routeId("MQTTDefaultHandlerQueue")+ .choice()+ .when(body().isInstanceOf(TriggeredEventSubscription.class))+ .process(exchange -> {+ // Get the subscriber consumer+ String connectionID = exchange.getIn().getHeader(ConnectionConstants.SESSION_KEY, String.class);+ if (connectionID == null) {+ LOG.warning("No connection ID for triggered subscription so cannot deliver");+ } else {+ SubscriberInfo subscriberInfo = connectionSubscriberInfoMap.get(connectionID);+ if (subscriberInfo != null) {+ TriggeredEventSubscription<?> triggeredEventSubscription = exchange.getIn().getBody(TriggeredEventSubscription.class);+ String topic = triggeredEventSubscription.getSubscriptionId();+ // Should only be a single event in here+ SharedEvent event = triggeredEventSubscription.getEvents().get(0);+ Consumer<SharedEvent> eventConsumer = subscriberInfo.topicSubscriptionMap.get(topic);+ if (eventConsumer != null) {+ eventConsumer.accept(event);+ }+ }+ }+ })+ .otherwise()+ .process(exchange -> LOG.fine("Unsupported message body: " + exchange.getIn().getBody()))+ .end();+ }+ });+ }+@Overridepublic void start(Container container) throws Exception {super.start(container);@@ -88,11 +145,15 @@ public class DefaultMQTTHandler extends MQTTHandler {// Put a close connection runnable into the headers for the client event serviceRunnable closeRunnable = () -> {if (mqttBrokerService != null) {+ LOG.fine("Calling client session closed force disconnect runnable: " + mqttBrokerService.connectionToString(connection));mqttBrokerService.doForceDisconnect(connection);}};headers.put(ConnectionConstants.SESSION_TERMINATOR, closeRunnable);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();return true;}@@ -102,8 +163,11 @@ public class DefaultMQTTHandler extends MQTTHandler {Map<String, Object> headers = prepareHeaders(null, connection);headers.put(ConnectionConstants.SESSION_CLOSE, true);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);- subscribedConnections.remove(connection);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();+ connectionSubscriberInfoMap.remove(getConnectionIDString(connection));}@Override@@ -111,8 +175,11 @@ public class DefaultMQTTHandler extends MQTTHandler {super.onConnectionLost(connection);Map<String, Object> headers = prepareHeaders(null, connection);headers.put(ConnectionConstants.SESSION_CLOSE_ERROR, true);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);- subscribedConnections.remove(connection);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();+ connectionSubscriberInfoMap.remove(getConnectionIDString(connection));}@Override@@ -137,7 +204,7 @@ public class DefaultMQTTHandler extends MQTTHandler {AuthContext authContext = getAuthContextFromSecurityContext(securityContext);if (authContext == null) {- LOG.fine("Anonymous connection not supported: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Anonymous connection not supported: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}@@ -145,58 +212,58 @@ public class DefaultMQTTHandler extends MQTTHandler {boolean isAssetTopic = isAssetTopic(topic);if (!isAssetTopic && !isAttributeTopic) {- LOG.fine("Topic must have 3 or more tokens and third token must be 'asset, attribute or attributevalue': topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Topic must have 3 or more tokens and third token must be 'asset, attribute or attributevalue': topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (isAssetTopic) {if (topic.getTokens().size() < 4 || topic.getTokens().size() > 5) {- LOG.fine("Asset subscribe token count should be 4 or 5: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Asset subscribe token count should be 4 or 5: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (topic.getTokens().size() == 4) {if (!Pattern.matches(ASSET_ID_REGEXP, topicTokenIndexToString(topic, 3))&& !TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 3))&& !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 3))) {- LOG.fine("Asset subscribe forth token must be an asset ID or wildcard: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Asset subscribe forth token must be an asset ID or wildcard: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}} else if (topic.getTokens().size() == 5) {if (!Pattern.matches(ASSET_ID_REGEXP, topicTokenIndexToString(topic, 3))) {- LOG.fine("Asset subscribe forth token must be an asset ID: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Asset subscribe forth token must be an asset ID: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (!TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 4))&& !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 4))) {- LOG.fine("Asset subscribe fifth token must be a wildcard: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Asset subscribe fifth token must be a wildcard: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}}} else {// Attribute topicif (topic.getTokens().size() < 5 || topic.getTokens().size() > 6) {- LOG.fine("Attribute subscribe token count should be 5 or 6: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Attribute subscribe token count should be 5 or 6: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (topic.getTokens().size() == 5) {if (TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 3))) {- LOG.fine("Attribute subscribe multi level wildcard must be last token: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Attribute subscribe multi level wildcard must be last token: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (!Pattern.matches(ASSET_ID_REGEXP, topicTokenIndexToString(topic, 4))&& !TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 4))&& !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 4))) {- LOG.fine("Attribute subscribe fifth token must be an asset ID or a wildcard: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Attribute subscribe fifth token must be an asset ID or a wildcard: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}} else if (topic.getTokens().size() == 6) {if (!Pattern.matches(ASSET_ID_REGEXP, topicTokenIndexToString(topic, 4))) {- LOG.fine("Attribute subscribe fifth token must be an asset ID: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Attribute subscribe fifth token must be an asset ID: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (!TOKEN_MULTI_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 5))&& !TOKEN_SINGLE_LEVEL_WILDCARD.equals(topicTokenIndexToString(topic, 5))) {- LOG.fine("Attribute subscribe sixth token must be a wildcard: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Attribute subscribe sixth token must be a wildcard: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}}@@ -206,7 +273,7 @@ public class DefaultMQTTHandler extends MQTTHandler {AssetFilter<?> filter = buildAssetFilter(topic);if (filter == null) {- LOG.fine("Failed to process subscription topic: topic=" + topic + ", " + connectionToString(connection));+ LOG.fine("Failed to process subscription topic: topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}@@ -257,13 +324,13 @@ public class DefaultMQTTHandler extends MQTTHandler {AuthContext authContext = getAuthContextFromSecurityContext(securityContext);if (authContext == null) {- LOG.fine("Anonymous publish not supported: topic=" + topic + ", connection=" + connectionToString(connection));+ LOG.fine("Anonymous publish not supported: topic=" + topic + ", connection=" + mqttBrokerService.connectionToString(connection));return false;}if (isAttributeValueWriteTopic(topic)) {if (topic.getTokens().size() != 5 || !Pattern.matches(ASSET_ID_REGEXP, topicTokenIndexToString(topic, 4))) {- LOG.fine("Publish attribute value topic should be {realm}/{clientId}/writeattributevalue/{attributeName}/{assetId}: topic=" + topic + ", connection=" + connectionToString(connection));+ LOG.fine("Publish attribute value topic should be {realm}/{clientId}/writeattributevalue/{attributeName}/{assetId}: topic=" + topic + ", connection=" + mqttBrokerService.connectionToString(connection));return false;}} else {@@ -299,25 +366,30 @@ public class DefaultMQTTHandler extends MQTTHandler {EventSubscription subscription = new EventSubscription(subscriptionClass,filter,- subscriptionId,- eventConsumer+ subscriptionId);Map<String, Object> headers = prepareHeaders(topicRealm(topic), connection);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, subscription, headers);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .withBody(subscription)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();// Track connection subscriptions for restricted user asset link changes (to determine if the client should be disconnected)- synchronized (subscribedConnections) {- subscribedConnections.compute(connection, (existingConnection, subscriptionCount) -> {- if (subscriptionCount == null) {- subscriptionCount = 0;+ synchronized (connectionSubscriberInfoMap) {+ connectionSubscriberInfoMap.compute(getConnectionIDString(connection), (connectionID, subscriberInfo) -> {+ if (subscriberInfo == null) {+ return new SubscriberInfo(topic.getString(), eventConsumer);+ } else {+ subscriberInfo.add(topic.getString(), eventConsumer);+ return subscriberInfo;}- return subscriptionCount + 1;});}}- @SuppressWarnings({"unchecked", "rawtypes", "ConstantConditions"})+ @SuppressWarnings({"unchecked", "rawtypes"})@Overridepublic void onUnsubscribe(RemotingConnection connection, Topic topic) {String subscriptionId = topic.toString();@@ -325,15 +397,19 @@ public class DefaultMQTTHandler extends MQTTHandler {Map<String, Object> headers = prepareHeaders(topicRealm(topic), connection);Class<SharedEvent> subscriptionClass = (Class) (isAssetTopic ? AssetEvent.class : AttributeEvent.class);CancelEventSubscription cancelEventSubscription = new CancelEventSubscription(subscriptionClass, subscriptionId);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, cancelEventSubscription, headers);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .withBody(cancelEventSubscription)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();// Track connection subscriptions for restricted user asset link changes (to determine if the client should be disconnected)- synchronized (subscribedConnections) {- subscribedConnections.compute(connection, (existingConnection, subscriptionCount) -> {- if (subscriptionCount == 1) {+ synchronized (connectionSubscriberInfoMap) {+ connectionSubscriberInfoMap.computeIfPresent(getConnectionIDString(connection), (connectionID, subscriberInfo) -> {+ if (subscriberInfo.remove(topic.getString()) == 0) {return null;}- return subscriptionCount - 1;+ return subscriberInfo;});}}@@ -352,13 +428,17 @@ public class DefaultMQTTHandler extends MQTTHandler {Object value = ValueUtil.parse(payloadContent).orElse(null);AttributeEvent attributeEvent = buildAttributeEvent(topicTokens, value);Map<String, Object> headers = prepareHeaders(topicRealm(topic), connection);- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, attributeEvent, headers);+ messageBrokerService.getFluentProducerTemplate()+ .withHeaders(headers)+ .withBody(attributeEvent)+ .to(CLIENT_EVENT_QUEUE)+ .asyncSend();}@Overridepublic void onUserAssetLinksChanged(RemotingConnection connection) {- if (subscribedConnections.containsKey(connection)) {- LOG.fine("User asset links have changed for a connected user with active subscriptions so force disconnecting them: " + connectionToString(connection));+ if (connectionSubscriberInfoMap.containsKey(getConnectionIDString(connection))) {+ LOG.fine("User asset links have changed for a connected user with active subscriptions so force disconnecting them: " + mqttBrokerService.connectionToString(connection));mqttBrokerService.doForceDisconnect(connection);}}@@ -518,7 +598,7 @@ public class DefaultMQTTHandler extends MQTTHandler {protected static Map<String, Object> prepareHeaders(String requestRealm, RemotingConnection connection) {Map<String, Object> headers = new HashMap<>();- headers.put(ConnectionConstants.SESSION_KEY, MQTTBrokerService.getConnectionIDString(connection));+ headers.put(ConnectionConstants.SESSION_KEY, getConnectionIDString(connection));headers.put(ClientEventService.HEADER_CONNECTION_TYPE, ClientEventService.HEADER_CONNECTION_TYPE_MQTT);headers.put(Constants.REALM_PARAM_NAME, requestRealm);return headers;diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.javaindex 4f413c72b..1feda1afd 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java@@ -19,6 +19,8 @@*/package org.openremote.manager.mqtt;+import com.google.common.cache.Cache;+import com.google.common.cache.CacheBuilder;import io.netty.channel.ChannelId;import io.netty.handler.codec.mqtt.MqttQoS;import org.apache.activemq.artemis.api.core.ActiveMQException;@@ -43,6 +45,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;import org.apache.activemq.artemis.spi.core.security.jaas.GuestLoginModule;import org.apache.activemq.artemis.spi.core.security.jaas.PrincipalConversionLoginModule;import org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal;+import org.apache.activemq.artemis.spi.core.security.jaas.UserPrincipal;import org.apache.camel.builder.RouteBuilder;import org.apache.commons.lang3.tuple.Triple;import org.apache.http.client.utils.URIBuilder;@@ -70,10 +73,12 @@ import org.openremote.model.util.ValueUtil;import javax.security.auth.Subject;import javax.security.auth.login.AppConfigurationEntry;+import java.security.Principal;import java.util.*;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ConcurrentMap;import java.util.concurrent.ScheduledExecutorService;+import java.util.concurrent.TimeUnit;import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.Collectors;@@ -91,9 +96,9 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,public static final String MQTT_FORCE_USER_DISCONNECT_DEBOUNCE_MILLIS = "MQTT_FORCE_USER_DISCONNECT_DEBOUNCE_MILLIS";public static int MQTT_FORCE_USER_DISCONNECT_DEBOUNCE_MILLIS_DEFAULT = 5000;public static final int PRIORITY = MED_PRIORITY;- public static final String MQTT_CLIENT_QUEUE = "seda://MqttClientQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";public static final String MQTT_SERVER_LISTEN_HOST = "MQTT_SERVER_LISTEN_HOST";public static final String MQTT_SERVER_LISTEN_PORT = "MQTT_SERVER_LISTEN_PORT";+ public static final String ANONYMOUS_USERNAME = "anonymous";protected final WildcardConfiguration wildcardConfiguration = new WildcardConfiguration();protected static final Logger LOG = SyslogCategory.getLogger(API, MQTTBrokerService.class);@@ -105,10 +110,13 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,protected TimerService timerService;protected List<MQTTHandler> customHandlers = new ArrayList<>();protected ConcurrentMap<String, RemotingConnection> clientIDConnectionMap = new ConcurrentHashMap<>();+ protected ConcurrentMap<String, RemotingConnection> connectionIDConnectionMap = new ConcurrentHashMap<>();// TODO: Make auto provisioning clients disconnect and reconnect with credentials// Temp to prevent breaking existing auto provisioning APIprotected ConcurrentMap<Object, Triple<String, String, String>> transientCredentials = new ConcurrentHashMap<>();protected Debouncer<String> userAssetDisconnectDebouncer;+ // Stores disconnected connections for a short period to allow last will publishes to be processed+ protected Cache<String, RemotingConnection> disconnectedConnectionCache;protected boolean active;protected String host;@@ -134,6 +142,10 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,executorService = container.getExecutorService();timerService = container.getService(TimerService.class);userAssetDisconnectDebouncer = new Debouncer<>(executorService, this::processUserAssetLinkChange, debounceMillis);+ disconnectedConnectionCache = CacheBuilder.newBuilder()+ .maximumSize(10000)+ .expireAfterWrite(10000, TimeUnit.MILLISECONDS)+ .build();if (!identityService.isKeycloakEnabled()) {LOG.warning("MQTT connections are not supported when not using Keycloak identity provider");@@ -143,6 +155,21 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,identityProvider = (ManagerKeycloakIdentityProvider) identityService.getIdentityProvider();container.getService(MessageBrokerService.class).getContext().addRoutes(this);}++ // Load custom handlers+ this.customHandlers = stream(ServiceLoader.load(MQTTHandler.class).spliterator(), false)+ .sorted(Comparator.comparingInt(MQTTHandler::getPriority))+ .collect(Collectors.toList());++ // Init each custom handler+ for (MQTTHandler handler : customHandlers) {+ try {+ handler.init(container);+ } catch (Exception e) {+ LOG.log(Level.WARNING, "MQTT custom handler threw an exception whilst initialising: handler=" + handler.getName(), e);+ throw e;+ }+ }}@Override@@ -172,13 +199,13 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,server.setSecurityManager(new ActiveMQORSecurityManager(authorisationService, this, realm -> identityProvider.getKeycloakDeployment(realm, KEYCLOAK_CLIENT_ID), "", new SecurityConfiguration() {@Overridepublic AppConfigurationEntry[] getAppConfigurationEntry(String name) {- return new AppConfigurationEntry[] {- new AppConfigurationEntry(GuestLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, Map.of("debug", "true", "credentialsInvalidate", "true")),- new AppConfigurationEntry(MultiTenantClientCredentialsGrantsLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.REQUISITE, Map.of(- MultiTenantClientCredentialsGrantsLoginModule.INCLUDE_REALM_ROLES_OPTION, "true",- AbstractKeycloakLoginModule.ROLE_PRINCIPAL_CLASS_OPTION, RolePrincipal.class.getName()- )),- new AppConfigurationEntry(PrincipalConversionLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.REQUISITE, Map.of(PrincipalConversionLoginModule.PRINCIPAL_CLASS_LIST, KeycloakPrincipal.class.getName()))+ return new AppConfigurationEntry[]{+ new AppConfigurationEntry(GuestLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, Map.of("debug", "true", "credentialsInvalidate", "true", "org.apache.activemq.jaas.guest.user", ANONYMOUS_USERNAME, "org.apache.activemq.jaas.guest.role", ANONYMOUS_USERNAME)),+ new AppConfigurationEntry(MultiTenantClientCredentialsGrantsLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.REQUISITE, Map.of(+ MultiTenantClientCredentialsGrantsLoginModule.INCLUDE_REALM_ROLES_OPTION, "true",+ AbstractKeycloakLoginModule.ROLE_PRINCIPAL_CLASS_OPTION, RolePrincipal.class.getName()+ )),+ new AppConfigurationEntry(PrincipalConversionLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.REQUISITE, Map.of(PrincipalConversionLoginModule.PRINCIPAL_CLASS_LIST, KeycloakPrincipal.class.getName()))};}}));@@ -220,11 +247,6 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,// Create producerproducer = internalSession.createProducer();- // Load custom handlers- this.customHandlers = stream(ServiceLoader.load(MQTTHandler.class).spliterator(), false)- .sorted(Comparator.comparingInt(MQTTHandler::getPriority))- .collect(Collectors.toList());-// Start each custom handlerfor (MQTTHandler handler : customHandlers) {try {@@ -240,39 +262,39 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,@Overridepublic void configure() throws Exception {from(PERSISTENCE_TOPIC)- .routeId("UserPersistenceChanges")- .filter(body().isInstanceOf(PersistenceEvent.class))- .process(exchange -> {- PersistenceEvent<?> persistenceEvent = (PersistenceEvent<?>)exchange.getIn().getBody(PersistenceEvent.class);-- if (persistenceEvent.getEntity() instanceof User user) {-- if (!user.isServiceAccount()) {- return;- }-- boolean forceDisconnect = persistenceEvent.getCause() == PersistenceEvent.Cause.DELETE;-- if (persistenceEvent.getCause() == PersistenceEvent.Cause.UPDATE) {- // Force disconnect if certain properties have changed- forceDisconnect = Arrays.stream(persistenceEvent.getPropertyNames()).anyMatch((propertyName) ->- (propertyName.equals("enabled") && !user.getEnabled())- || propertyName.equals("username")- || propertyName.equals("secret"));+ .routeId("UserPersistenceChanges")+ .filter(body().isInstanceOf(PersistenceEvent.class))+ .process(exchange -> {+ PersistenceEvent<?> persistenceEvent = (PersistenceEvent<?>) exchange.getIn().getBody(PersistenceEvent.class);++ if (persistenceEvent.getEntity() instanceof User user) {++ if (!user.isServiceAccount()) {+ return;+ }++ boolean forceDisconnect = persistenceEvent.getCause() == PersistenceEvent.Cause.DELETE;++ if (persistenceEvent.getCause() == PersistenceEvent.Cause.UPDATE) {+ // Force disconnect if certain properties have changed+ forceDisconnect = Arrays.stream(persistenceEvent.getPropertyNames()).anyMatch((propertyName) ->+ (propertyName.equals("enabled") && !user.getEnabled())+ || propertyName.equals("username")+ || propertyName.equals("secret"));+ }++ if (forceDisconnect) {+ LOG.fine("User modified or deleted so force closing any sessions for this user: " + user);+ // Find existing connection for this user+ getUserConnections(user.getId()).forEach(this::doForceDisconnect);+ }++ } else if (persistenceEvent.getEntity() instanceof UserAssetLink userAssetLink) {+ String userID = userAssetLink.getId().getUserId();+ // Debounce force disconnect check of this user's sessions as there could be many asset links changing+ userAssetDisconnectDebouncer.call(userID);}-- if (forceDisconnect) {- LOG.fine("User modified or deleted so force closing any sessions for this user: " + user);- // Find existing connection for this user- getUserConnections(user.getId()).forEach(this::doForceDisconnect);- }-- } else if (persistenceEvent.getEntity() instanceof UserAssetLink userAssetLink) {- String userID = userAssetLink.getId().getUserId();- // Debounce force disconnect check of this user's sessions as there could be many asset links changing- userAssetDisconnectDebouncer.call(userID);- }- });+ });}@Override@@ -284,20 +306,20 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,LOG.fine("Stopped MQTT broker");stream(ServiceLoader.load(MQTTHandler.class).spliterator(), false)- .sorted(Comparator.comparingInt(MQTTHandler::getPriority).reversed())- .forEach(handler -> {- try {- handler.stop();- } catch (Exception e) {- LOG.log(Level.WARNING, "MQTT custom handler threw an exception whilst stopping: handler=" + handler.getName(), e);- }- });+ .sorted(Comparator.comparingInt(MQTTHandler::getPriority).reversed())+ .forEach(handler -> {+ try {+ handler.stop();+ } catch (Exception e) {+ LOG.log(Level.WARNING, "MQTT custom handler threw an exception whilst stopping: handler=" + handler.getName(), e);+ }+ });}@Overridepublic void afterCreateConnection(RemotingConnection connection) throws ActiveMQException {- LOG.fine("New client connection: "+ connectionToString(connection));+ LOG.info("Client connection created: " + connectionToString(connection));// MQTT seems to only use failure callback even if closed gracefully (need to look at the exception for details)connection.addFailureListener(new FailureListener() {@@ -312,35 +334,46 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,if (exception.getType() == ActiveMQExceptionType.REMOTE_DISCONNECT) {// Seems to be the type for graceful close of connection// Notify handlers of connection close+ LOG.info("Client connection closed: " + connectionToString(connection));for (MQTTHandler handler : getCustomHandlers()) {handler.onDisconnect(connection);}} else {// Notify handlers of connection failure+ LOG.info("Client connection failed: " + connectionToString(connection));for (MQTTHandler handler : getCustomHandlers()) {handler.onConnectionLost(connection);}}+ connectionIDConnectionMap.remove(getConnectionIDString(connection));+if (connection.getClientID() != null) {- clientIDConnectionMap.remove(connection.getClientID());+ RemotingConnection remotingConnection = clientIDConnectionMap.remove(connection.getClientID());+ if (remotingConnection != null) {+ disconnectedConnectionCache.put(connection.getClientID(), remotingConnection);+ }}}});}+ // We do this here as connection plugin afterCreateConnection callback fires before client ID and subject are populated+ // For each connection multiple sessions are created but we only want to call custom handlers onConnect once@Overridepublic void afterCreateSession(ServerSession session) throws ActiveMQException {RemotingConnection remotingConnection = session.getRemotingConnection();- if (remotingConnection == null || remotingConnection.getClientID() == null) {+ // Ignore internal connections or ones without a client ID+ if (remotingConnection == null || remotingConnection.getClientID() == null || remotingConnection.getTransportConnection() instanceof InVMConnection) {return;}- if (!clientIDConnectionMap.containsKey(remotingConnection.getClientID())) {- clientIDConnectionMap.put(remotingConnection.getClientID(), remotingConnection);+ String connectionID = getConnectionIDString(remotingConnection);+ clientIDConnectionMap.put(remotingConnection.getClientID(), remotingConnection);- // We do this here as connection plugin afterCreateConnection callback fires before client ID and subject are populated+ if (!connectionIDConnectionMap.containsKey(connectionID)) {+ connectionIDConnectionMap.put(connectionID, remotingConnection);for (MQTTHandler handler : getCustomHandlers()) {handler.onConnect(remotingConnection);}@@ -349,7 +382,6 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,@Overridepublic void afterDestroyConnection(RemotingConnection connection) throws ActiveMQException {- LOG.fine("Destroyed client connection: " + connectionToString(connection));}public void onSubscribe(RemotingConnection connection, String topicStr) {@@ -359,6 +391,7 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,if (handler.handlesTopic(topic)) {LOG.fine("Handler has handled subscribe: handler=" + handler.getName() + ", topic=" + topic + ", " + connectionToString(connection));handler.onSubscribe(connection, topic);+ LOG.info("Client subscribed '" + topicStr + "': " + connectionToString(connection));break;}}@@ -371,6 +404,7 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,if (handler.handlesTopic(topic)) {LOG.fine("Handler has handled unsubscribe: handler=" + handler.getName() + ", topic=" + topic + ", " + connectionToString(connection));handler.onUnsubscribe(connection, topic);+ LOG.info("Client unsubscribed '" + topicStr + "': " + connectionToString(connection));break;}}@@ -422,17 +456,20 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,}protected void doForceDisconnect(RemotingConnection connection) {- LOG.fine("Force disconnecting client connection: " + connectionToString(connection));+ LOG.info("Force disconnecting client connection: " + connectionToString(connection));connection.disconnect(false);}public void publishMessage(String topic, Object data, MqttQoS qoS) {try {if (internalSession != null) {- ClientMessage message = internalSession.createMessage(false);- message.putIntProperty(MQTT_QOS_LEVEL_KEY, qoS.value());- message.writeBodyBufferBytes(ValueUtil.asJSON(data).map(String::getBytes).orElseThrow(() -> new IllegalStateException("Failed to convert payload to JSON string: " + data)));- producer.send(MQTTUtil.convertMqttTopicFilterToCoreAddress(topic, server.getConfiguration().getWildcardConfiguration()), message);+ // Artemis' sessions are not threadsafe+ synchronized (internalSession) {+ ClientMessage message = internalSession.createMessage(false);+ message.putIntProperty(MQTT_QOS_LEVEL_KEY, qoS.value());+ message.writeBodyBufferBytes(ValueUtil.asJSON(data).map(String::getBytes).orElseThrow(() -> new IllegalStateException("Failed to convert payload to JSON string: " + data)));+ producer.send(MQTTUtil.convertMqttTopicFilterToCoreAddress(topic, server.getConfiguration().getWildcardConfiguration()), message);+ }}} catch (Exception e) {LOG.log(Level.WARNING, "Couldn't send AttributeEvent to MQTT client", e);@@ -449,14 +486,33 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,}Object ID = connection.getID();- return ID instanceof ChannelId ? ((ChannelId)ID).asLongText() : ID.toString();+ return ID instanceof ChannelId ? ((ChannelId) ID).asLongText() : ID.toString();}- public static String connectionToString(RemotingConnection connection) {+ public String connectionToString(RemotingConnection connection) {if (connection == null) {return "";}- return "connection=" + connection.getRemoteAddress() + ", clientID=" + connection.getClientID() + ", subject=" + connection.getSubject();++ String username = null;+ Subject subject = connection.getSubject();++ if (subject != null) {+ username = getSubjectName(subject);+ }++ if (username == null || ANONYMOUS_USERNAME.equals(username)) {+ // Check if there are transient credentials for this connection+ Triple<String, String, String> userIDNameAndPassword = transientCredentials.get(connection.getID());+ if (userIDNameAndPassword != null) {+ username = userIDNameAndPassword.getMiddle();+ }+ }+ return "connection=" + connection.getRemoteAddress() + ", clientID=" + connection.getClientID() + ", subject=" + username;+ }++ public static String getSubjectName(Subject subject) {+ return subject.getPrincipals().stream().filter(principal -> principal instanceof UserPrincipal).findFirst().map(Principal::getName).orElse(KeycloakIdentityProvider.getSubjectName(subject));}public RemotingConnection getConnectionFromClientID(String clientID) {@@ -478,10 +534,16 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,}}+ if (connection == null) {+ // Look in the recently disconnected cache+ connection = disconnectedConnectionCache.getIfPresent(clientID);+ }+return connection;}// TODO: Remove this if/when ActiveMQ implements https://issues.apache.org/jira/browse/ARTEMIS-4059+/*** Tries to find the correct {@link RemotingConnection} for the specified subject with the assumption that the* client ID is contained in the address (this is important for multiple connections from the same subject)@@ -495,23 +557,23 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,return server.getActiveMQServer().getRemotingService().getConnections().stream().filter(connection ->connection.getSubject() == subject && Objects.equals(clientID, connection.getClientID())- )- .findFirst()- .orElse(null);+ )+ .findFirst()+ .orElse(null);}// TODO: Remove thispublic void addTransientCredentials(RemotingConnection connection, Triple<String, String, String> userIDNameAndPassword) {LOG.fine("Adding transient user credentials: connection ID=" + connection.getID() + " ,username=" + userIDNameAndPassword.getMiddle());transientCredentials.put(connection.getID(), userIDNameAndPassword);- ((SecurityStoreImpl)server.getActiveMQServer().getSecurityStore()).invalidateAuthenticationCache();+ ((SecurityStoreImpl) server.getActiveMQServer().getSecurityStore()).invalidateAuthenticationCache();}// TODO: Remove thispublic void removeTransientCredentials(RemotingConnection connection) {LOG.fine("Removing transient user credentials: connection ID=" + connection.getID());transientCredentials.remove(connection.getID());- ((SecurityStoreImpl)server.getActiveMQServer().getSecurityStore()).invalidateAuthenticationCache();- ((SecurityStoreImpl)server.getActiveMQServer().getSecurityStore()).invalidateAuthorizationCache();+ ((SecurityStoreImpl) server.getActiveMQServer().getSecurityStore()).invalidateAuthenticationCache();+ ((SecurityStoreImpl) server.getActiveMQServer().getSecurityStore()).invalidateAuthorizationCache();}}diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/MQTTHandler.javaindex f33c33269..0ae2a95ca 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MQTTHandler.java@@ -44,7 +44,7 @@ import java.util.Set;import java.util.logging.Level;import java.util.logging.Logger;-import static org.openremote.manager.mqtt.MQTTBrokerService.connectionToString;+import static org.openremote.manager.mqtt.MQTTBrokerService.LOG;/*** This allows custom handlers to be discovered by the {@link MQTTBrokerService} during system startup using the@@ -79,7 +79,7 @@ public abstract class MQTTHandler {/*** Called when the system starts to allow for initialisation.*/- public void start(Container container) throws Exception {+ public void init(Container container) throws Exception {mqttBrokerService = container.getService(MQTTBrokerService.class);clientEventService = container.getService(ClientEventService.class);messageBrokerService = container.getService(MessageBrokerService.class);@@ -92,7 +92,12 @@ public abstract class MQTTHandler {isKeycloak = true;identityProvider = (ManagerKeycloakIdentityProvider) identityService.getIdentityProvider();}+ }+ /**+ * Called when the system starts to allow for initialisation.+ */+ public void start(Container container) throws Exception {Set<String> publishListenerTopics = getPublishListenerTopics();if (publishListenerTopics != null) {publishListenerTopics.forEach(this::addPublishConsumer);@@ -109,7 +114,14 @@ public abstract class MQTTHandler {Topic publishTopic = Topic.parse(MQTTUtil.convertCoreAddressToMqttTopicFilter(message.getAddress(), mqttBrokerService.wildcardConfiguration));String clientID = message.getStringProperty(MessageUtil.CONNECTION_ID_PROPERTY_NAME);RemotingConnection connection = mqttBrokerService.getConnectionFromClientID(clientID);++ if (connection == null) {+ LOG.warning("Failed to find connection for connected client so dropping publish to topic '" + topic + "': clientID=" + clientID);+ return;+ }+onPublish(connection, publishTopic, message.getReadOnlyBodyBuffer().byteBuf());+ getLogger().info("Client published '" + topic + "': " + mqttBrokerService.connectionToString(connection));});} catch (ActiveMQException e) {getLogger().log(Level.WARNING, "Failed to create handler consumer for topic '" + topic + "': handler=" + getName(), e);@@ -167,11 +179,11 @@ public abstract class MQTTHandler {*/public boolean checkCanSubscribe(RemotingConnection connection, KeycloakSecurityContext securityContext, Topic topic) {if (securityContext == null) {- getLogger().finest("Anonymous connection subscriptions not supported by this handler, topic=" + topic + ", " + connectionToString(connection));+ getLogger().finest("Anonymous connection subscriptions not supported by this handler, topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (!topicRealmAllowed(securityContext, topic) || !topicClientIdMatches(connection, topic)) {- getLogger().fine("Topic realm and client ID tokens must match the connection, topic=" + topic + ", " + connectionToString(connection));+ getLogger().fine("Topic realm and client ID tokens must match the connection, topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}return canSubscribe(connection, securityContext, topic);@@ -183,11 +195,11 @@ public abstract class MQTTHandler {*/public boolean checkCanPublish(RemotingConnection connection, KeycloakSecurityContext securityContext, Topic topic) {if (securityContext == null) {- getLogger().fine("Anonymous connection publishes not supported by this handler, topic=" + topic + ", " + connectionToString(connection));+ getLogger().fine("Anonymous connection publishes not supported by this handler, topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}if (!topicRealmAllowed(securityContext, topic) || !topicClientIdMatches(connection, topic)) {- getLogger().fine("Topic realm and client ID tokens must match the connection, topic=" + topic + ", " + connectionToString(connection));+ getLogger().fine("Topic realm and client ID tokens must match the connection, topic=" + topic + ", " + mqttBrokerService.connectionToString(connection));return false;}return canPublish(connection, securityContext, topic);diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.javaindex f9b747b1f..f23225789 100644--- a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java@@ -113,8 +113,11 @@ public class NotificationResourceImpl extends WebResource implements Notificatioheaders.put(Constants.AUTH_CONTEXT, getAuthContext());}- boolean success = messageBrokerService.getProducerTemplate().requestBodyAndHeaders(- NotificationService.NOTIFICATION_QUEUE, notification, headers, Boolean.class);+ boolean success = messageBrokerService.getFluentProducerTemplate()+ .withBody(notification)+ .withHeaders(headers)+ .to(NotificationService.NOTIFICATION_QUEUE)+ .request(Boolean.class);if (!success) {throw new WebApplicationException(BAD_REQUEST);diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.javaindex d8253840f..82accaed9 100644--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java@@ -99,7 +99,7 @@ public class NotificationService extends RouteBuilder implements ContainerServiclogger.log(Level.WARNING, error.toString(), exception);}- exchange.getOut().setBody(false);+ exchange.getMessage().setBody(false);};}@@ -292,7 +292,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic});- exchange.getOut().setBody(success.get());+ exchange.getMessage().setBody(success.get());}).endDoTry().doCatch(NotificationProcessingException.class)@@ -307,7 +307,7 @@ public class NotificationService extends RouteBuilder implements ContainerServicMap<String, Object> headers = new HashMap<>();headers.put(Notification.HEADER_SOURCE, source);headers.put(Notification.HEADER_SOURCE_ID, sourceId);- return messageBrokerService.getProducerTemplate().requestBodyAndHeaders(NotificationService.NOTIFICATION_QUEUE, notification, headers, Boolean.class);+ return messageBrokerService.getFluentProducerTemplate().withBody(notification).withHeaders(headers).to(NotificationService.NOTIFICATION_QUEUE).request(Boolean.class);}public void setNotificationDelivered(long id) {diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex d9ca33588..bcbd7a283 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -58,7 +58,6 @@ import java.util.logging.Logger;import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;-import static org.openremote.manager.mqtt.MQTTBrokerService.connectionToString;import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;import static org.openremote.model.syslog.SyslogCategory.API;@@ -219,7 +218,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {ProvisioningMessage provisioningMessage = ValueUtil.parse(payloadContent, ProvisioningMessage.class).orElseGet(() -> {- LOG.fine("Failed to parse message from client: topic=" + topic+ connectionToString(connection));+ LOG.fine("Failed to parse message from client: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.MESSAGE_INVALID), MqttQoS.AT_MOST_ONCE);return null;});@@ -263,10 +262,10 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {protected void processX509ProvisioningMessage(RemotingConnection connection, Topic topic, X509ProvisioningMessage provisioningMessage) {- LOG.finer("Processing provisioning message on: topic=" + topic + connectionToString(connection));+ LOG.finer("Processing provisioning message on: topic=" + topic + mqttBrokerService.connectionToString(connection));if (TextUtil.isNullOrEmpty(provisioningMessage.getCert())) {- LOG.info("Certificate is missing from X509 provisioning message: topic=" + topic + connectionToString(connection));+ LOG.info("Certificate is missing from X509 provisioning message: topic=" + topic + mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.CERTIFICATE_INVALID), MqttQoS.AT_MOST_ONCE);return;}@@ -276,7 +275,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {try {clientCertificate = ProvisioningUtil.getX509Certificate(provisioningMessage.getCert());} catch (CertificateException e) {- LOG.log(Level.INFO, "Failed to parse client X.509 certificate: topic=" + topic+ connectionToString(connection), e);+ LOG.log(Level.INFO, "Failed to parse client X.509 certificate: topic=" + topic+ mqttBrokerService.connectionToString(connection), e);mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.CERTIFICATE_INVALID), MqttQoS.AT_MOST_ONCE);return;}@@ -284,14 +283,14 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {X509ProvisioningConfig matchingConfig = getMatchingX509ProvisioningConfig(connection, clientCertificate);if (matchingConfig == null) {- LOG.fine("No matching provisioning config found for client certificate: topic=" + topic+ connectionToString(connection));+ LOG.fine("No matching provisioning config found for client certificate: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNAUTHORIZED), MqttQoS.AT_MOST_ONCE);return;}// Check if config is disabledif (matchingConfig.isDisabled()) {- LOG.fine("Matching provisioning config is disabled for client certificate: topic=" + topic+ connectionToString(connection));+ LOG.fine("Matching provisioning config is disabled for client certificate: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.CONFIG_DISABLED), MqttQoS.AT_MOST_ONCE);return;}@@ -301,13 +300,13 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {String uniqueId = topicTokenIndexToString(topic, 1);if (TextUtil.isNullOrEmpty(certUniqueId)) {- LOG.info("Client X.509 certificate missing unique ID in subject CN: topic=" + topic+ connectionToString(connection));+ LOG.info("Client X.509 certificate missing unique ID in subject CN: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNIQUE_ID_MISMATCH), MqttQoS.AT_MOST_ONCE);return;}if (TextUtil.isNullOrEmpty(uniqueId) || !certUniqueId.equals(uniqueId)) {- LOG.info("Client X.509 certificate unique ID doesn't match topic unique ID: topic=" + topic+ connectionToString(connection));+ LOG.info("Client X.509 certificate unique ID doesn't match topic unique ID: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.UNIQUE_ID_MISMATCH), MqttQoS.AT_MOST_ONCE);return;}@@ -327,7 +326,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {if (serviceUser != null) {if (!serviceUser.getEnabled()) {- LOG.info("Client service user has been disabled: topic=" + topic+ connectionToString(connection));+ LOG.info("Client service user has been disabled: topic=" + topic+ mqttBrokerService.connectionToString(connection));mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.USER_DISABLED), MqttQoS.AT_MOST_ONCE);return;}@@ -335,7 +334,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {serviceUser = createClientServiceUser(realm, serviceUsername, matchingConfig);}} catch (Exception e) {- LOG.log(Level.WARNING, "Failed to retrieve/create service user: topic=" + topic+ connectionToString(connection), e);+ LOG.log(Level.WARNING, "Failed to retrieve/create service user: topic=" + topic+ mqttBrokerService.connectionToString(connection), e);mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.SERVER_ERROR), MqttQoS.AT_MOST_ONCE);return;}@@ -344,17 +343,17 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {// Prepend realm name to unique ID to generate asset ID to further improve uniquenessString assetId = UniqueIdentifierGenerator.generateId(matchingConfig.getRealm() + uniqueId);- LOG.fine("Client unique ID '" + uniqueId + "' mapped to asset ID '" + assetId + "': topic=" + topic+ connectionToString(connection));+ LOG.fine("Client unique ID '" + uniqueId + "' mapped to asset ID '" + assetId + "': topic=" + topic+ mqttBrokerService.connectionToString(connection));try {// Look for existing assetasset = assetStorageService.find(assetId);if (asset != null) {- LOG.finer("Client asset found: topic=" + topic+ connectionToString(connection) + ", assetId=" + assetId);+ LOG.finer("Client asset found: topic=" + topic+ mqttBrokerService.connectionToString(connection) + ", assetId=" + assetId);if (!matchingConfig.getRealm().equals(asset.getRealm())) {- LOG.info("Client asset realm mismatch : topic=" + topic+ connectionToString(connection) + ", assetId=" + assetId);+ LOG.info("Client asset realm mismatch : topic=" + topic+ mqttBrokerService.connectionToString(connection) + ", assetId=" + assetId);mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.ASSET_ERROR), MqttQoS.AT_MOST_ONCE);return;}@@ -362,12 +361,12 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {asset = createClientAsset(realm, assetId, uniqueId, serviceUser, matchingConfig);}} catch (Exception e) {- LOG.log(Level.WARNING, "Failed to retrieve/create asset: topic=" + topic+ connectionToString(connection) + ", config=" + matchingConfig, e);+ LOG.log(Level.WARNING, "Failed to retrieve/create asset: topic=" + topic+ mqttBrokerService.connectionToString(connection) + ", config=" + matchingConfig, e);mqttBrokerService.publishMessage(getResponseTopic(topic), new ErrorResponseMessage(ErrorResponseMessage.Error.SERVER_ERROR), MqttQoS.AT_MOST_ONCE);return;}- LOG.fine("Client successfully initialised: topic=" + topic+ connectionToString(connection) + ", config=" + matchingConfig);+ LOG.fine("Client successfully initialised: topic=" + topic+ mqttBrokerService.connectionToString(connection) + ", config=" + matchingConfig);// Update connection with service user credentialsmqttBrokerService.addTransientCredentials(connection, new ImmutableTriple<>(serviceUser.getId(), realm + ":" + serviceUser.getUsername(), serviceUser.getSecret()));@@ -489,6 +488,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {// Force disconnect of each connection and the disconnect handler will remove the connection from the mapconnections.forEach(connection -> {try {+ LOG.finer("Force disconnecting client that is using provisioning config ID '" + provisioningConfigId + "': " + mqttBrokerService.connectionToString(connection));connection.disconnect(false);} catch (Exception e) {getLogger().log(Level.INFO, "Failed to disconnect client: connection=" + connection, e);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.javaindex e8d42f02c..e83b92591 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java@@ -30,8 +30,6 @@ import org.openremote.model.util.ValueUtil;public class RulesHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "rules";- public static final String VERSION = "1.0";-protected RulesService rulesService;@Override@@ -59,11 +57,6 @@ public class RulesHealthStatusProvider implements HealthStatusProvider, Containereturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {int totalEngines = rulesService.realmEngines.size() + rulesService.assetEngines.size();diff --git a/manager/src/main/java/org/openremote/manager/system/CamelHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/CamelHealthStatusProvider.javanew file mode 100644index 000000000..765223d6e--- /dev/null+++ b/manager/src/main/java/org/openremote/manager/system/CamelHealthStatusProvider.java@@ -0,0 +1,87 @@+/*+ * Copyright 2022, 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.manager.system;++import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;+import org.apache.camel.Endpoint;+import org.apache.camel.component.seda.SedaEndpoint;+import org.apache.camel.health.HealthCheck;+import org.apache.camel.health.HealthCheckHelper;+import org.apache.camel.support.service.BaseService;+import org.openremote.container.message.MessageBrokerService;+import org.openremote.model.Container;+import org.openremote.model.ContainerService;+import org.openremote.model.system.HealthStatusProvider;+import org.openremote.model.util.ValueUtil;++import java.util.HashMap;+import java.util.Map;++public class CamelHealthStatusProvider implements HealthStatusProvider, ContainerService {++ public static final String NAME = "camel";+ protected MessageBrokerService brokerService;++ @Override+ public void init(Container container) throws Exception {+ brokerService = container.getService(MessageBrokerService.class);+ // Add mixin for health check results+ ValueUtil.JSON.addMixIn(HealthCheck.Result.class, HealthCheckResultMixin.class);+ }++ @Override+ public void start(Container container) throws Exception {++ }++ @Override+ public void stop(Container container) throws Exception {++ }++ @Override+ public String getHealthStatusName() {+ return NAME;+ }++ @Override+ public Object getHealthStatus() {+ Map<String, Object> result = new HashMap<>();+ ArrayNode endpointInfos = ValueUtil.JSON.createArrayNode();++ for (Endpoint endpoint : brokerService.getContext().getEndpoints()) {+ ObjectNode endpointInfo = ValueUtil.createJsonObject();+ endpointInfo.put("uri", endpoint.getEndpointUri());+ if (endpoint instanceof BaseService baseService) {+ endpointInfo.put("status", baseService.getStatus().name());+ }+ if (endpoint instanceof SedaEndpoint sedaEndpoint) {+ endpointInfo.put("queueSize", sedaEndpoint.getCurrentQueueSize());+ endpointInfo.put("queueMax", sedaEndpoint.getSize());+ }+ endpointInfos.add(endpointInfo);+ }++ result.put("healthChecks", HealthCheckHelper.invoke(brokerService.getContext()));+ result.put("endpoints", endpointInfos);+ return result;+ }+}diff --git a/manager/src/main/java/org/openremote/manager/system/HealthCheckResultMixin.java b/manager/src/main/java/org/openremote/manager/system/HealthCheckResultMixin.javanew file mode 100644index 000000000..2c08099cf--- /dev/null+++ b/manager/src/main/java/org/openremote/manager/system/HealthCheckResultMixin.java@@ -0,0 +1,64 @@+/*+ * Copyright 2022, 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.manager.system;++import com.fasterxml.jackson.annotation.JsonInclude;+import com.fasterxml.jackson.annotation.JsonProperty;+import com.fasterxml.jackson.core.JsonGenerator;+import com.fasterxml.jackson.databind.SerializerProvider;+import com.fasterxml.jackson.databind.annotation.JsonSerialize;+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;+import org.apache.camel.health.HealthCheck;++import java.io.IOException;+import java.util.Map;+import java.util.Optional;++@JsonInclude(JsonInclude.Include.NON_NULL)+public interface HealthCheckResultMixin {++ class HealthCheckSerializer extends StdScalarSerializer<HealthCheck> {+ public HealthCheckSerializer() {+ super(HealthCheck.class, false);+ }++ @Override+ public void serialize(HealthCheck value, JsonGenerator g, SerializerProvider provider) throws IOException+ {+ g.writeString(value.getClass().getSimpleName());+ }+ }++ @JsonSerialize(using = HealthCheckSerializer.class)+ @JsonProperty("type")+ HealthCheck getCheck();++ @JsonProperty+ HealthCheck.State getState();++ @JsonProperty+ Optional<String> getMessage();++ @JsonProperty+ Optional<Throwable> getError();++ @JsonProperty+ Map<String, Object> getDetails();+}diff --git a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.javaindex 4cd1d972e..9fc8f785f 100644--- a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java@@ -33,7 +33,6 @@ import java.lang.management.ThreadMXBean;public class JvmHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "jvm";- public static final String VERSION = "1.0";@Overridepublic int getPriority() {@@ -60,11 +59,6 @@ public class JvmHealthStatusProvider implements HealthStatusProvider, ContainerSreturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {ObjectNode objectValue = ValueUtil.createJsonObject();diff --git a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.javaindex 3cd1372ed..1d138344e 100644--- a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java@@ -43,7 +43,6 @@ import static org.openremote.container.util.MapAccess.getString;public class SslHealthStatusProvider implements X509TrustManager, HealthStatusProvider, ContainerService {public static final String NAME = "ssl";- public static final String VERSION = "1.0";protected static final Logger LOG = Logger.getLogger(SslHealthStatusProvider.class.getName());protected String host;protected int SSLPort;@@ -85,11 +84,6 @@ public class SslHealthStatusProvider implements X509TrustManager, HealthStatusPrreturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {if (SSLContext == null) {diff --git a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.javaindex b106fa4c1..7504516ea 100644--- a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java@@ -69,7 +69,6 @@ public class StatusResourceImpl implements StatusResource {healthStatusProviderList.forEach(healthStatusProvider -> {ObjectNode providerValue = ValueUtil.JSON.createObjectNode();- providerValue.put("version", healthStatusProvider.getHealthStatusVersion());providerValue.putPOJO("data", healthStatusProvider.getHealthStatus());objectValue.set(healthStatusProvider.getHealthStatusName(), providerValue);}diff --git a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.javaindex bca6cafa7..5b9575da3 100644--- a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java@@ -31,7 +31,6 @@ import java.lang.management.ManagementFactory;public class SystemHealthStatusProvider implements HealthStatusProvider, ContainerService {public static final String NAME = "system";- public static final String VERSION = "1.0";@Overridepublic int getPriority() {@@ -58,11 +57,6 @@ public class SystemHealthStatusProvider implements HealthStatusProvider, Containreturn NAME;}- @Override- public String getHealthStatusVersion() {- return VERSION;- }-@Overridepublic Object getHealthStatus() {ObjectNode objectValue = ValueUtil.JSON.createObjectNode();diff --git a/manager/src/main/resources/META-INF/services/org.openremote.model.system.HealthStatusProvider b/manager/src/main/resources/META-INF/services/org.openremote.model.system.HealthStatusProviderindex 88c14ee45..bdbbc87f0 100644--- a/manager/src/main/resources/META-INF/services/org.openremote.model.system.HealthStatusProvider+++ b/manager/src/main/resources/META-INF/services/org.openremote.model.system.HealthStatusProvider@@ -5,3 +5,4 @@ org.openremote.manager.rules.RulesHealthStatusProviderorg.openremote.manager.agent.AgentHealthStatusProviderorg.openremote.manager.datapoint.AssetDatapointHealthStatusProviderorg.openremote.manager.datapoint.AssetPredictedDatapointHealthStatusProvider+org.openremote.manager.system.CamelHealthStatusProviderdiff --git a/manager/src/main/resources/logging.properties b/manager/src/main/resources/logging.propertiesindex ac3433fe6..4cef6ba20 100644--- a/manager/src/main/resources/logging.properties+++ b/manager/src/main/resources/logging.properties@@ -79,3 +79,5 @@ org.apache.camel.impl.converter.DefaultTypeConverter.level=WARNINGorg.apache.camel.impl.DefaultShutdownStrategy.level=SEVEREorg.jeasy.rules.level=WARNINGorg.postgresql.jdbc.level=INFO+org.apache.activemq.audit.resource.level=INFO+org.apache.activemq.audit.level=INFOdiff --git a/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java b/model/src/main/java/org/openremote/model/event/shared/EventSubscription.javaindex 5938a162b..a8faab0df 100644--- a/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java+++ b/model/src/main/java/org/openremote/model/event/shared/EventSubscription.java@@ -21,7 +21,6 @@ package org.openremote.model.event.shared;import com.fasterxml.jackson.annotation.JsonIgnore;import org.openremote.model.event.Event;-import org.openremote.model.event.TriggeredEventSubscription;import java.util.function.Consumer;diff --git a/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java b/model/src/main/java/org/openremote/model/event/shared/SharedEvent.javaindex 386ebebc8..e94b547cf 100644--- a/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java+++ b/model/src/main/java/org/openremote/model/event/shared/SharedEvent.java@@ -19,7 +19,6 @@*/package org.openremote.model.event.shared;-import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import org.openremote.model.asset.*;diff --git a/model/src/main/java/org/openremote/model/system/HealthStatusProvider.java b/model/src/main/java/org/openremote/model/system/HealthStatusProvider.javaindex 96ca239e1..f6a0fb95a 100644--- a/model/src/main/java/org/openremote/model/system/HealthStatusProvider.java+++ b/model/src/main/java/org/openremote/model/system/HealthStatusProvider.java@@ -26,7 +26,5 @@ public interface HealthStatusProvider {String getHealthStatusName();- String getHealthStatusVersion();-Object getHealthStatus();}diff --git a/profile/deploy.yml b/profile/deploy.ymlindex 9ce0913c5..120cc0954 100644--- a/profile/deploy.yml+++ b/profile/deploy.yml@@ -295,12 +295,13 @@ services:# API key for the API of ForecastSolar: https://forecast.solar# OR_FORECAST_SOLAR_API_KEY- # Custom JVM options (increase heap size if required)- OR_JAVA_OPTS: ${OR_JAVA_OPTS:--Xms400m -Xmx400m- -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m- -XX:InitialCodeCacheSize=50m -XX:ReservedCodeCacheSize=50m- -XX:MaxDirectMemorySize=25m -XX:NativeMemoryTracking=summary- -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/javadump.core.hprof}+ # Custom JVM options (override default manager options)+# OR_JAVA_OPTS: ${OR_JAVA_OPTS:--Xms500m -Xmx2g+# -XX:NativeMemoryTracking=summary+# -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10+# -XX:GCLogFileSize=50M -Xloggc:/gc.log+# -XX:OnOutOfMemoryError="shutdown -r" -d64+# -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dump.hprof}# Custom JVM tool options (for remote debugging)#JAVA_TOOL_OPTIONS: '-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n'diff --git a/setup/src/load1/java/org/openremote/setup/load1/AttributeValueGeneratorService.java b/setup/src/load1/java/org/openremote/setup/load1/AttributeValueGeneratorService.javanew file mode 100644index 000000000..610748d33--- /dev/null+++ b/setup/src/load1/java/org/openremote/setup/load1/AttributeValueGeneratorService.java@@ -0,0 +1,104 @@+/*+ * Copyright 2022, 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.setup.load1;++import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;+import org.apache.camel.builder.RouteBuilder;+import org.openremote.container.message.MessageBrokerService;+import org.openremote.manager.asset.AssetProcessingService;+import org.openremote.model.Container;+import org.openremote.model.ContainerService;+import org.openremote.model.PersistenceEvent;+import org.openremote.model.asset.Asset;+import org.openremote.model.asset.impl.WeatherAsset;+import org.openremote.model.attribute.AttributeEvent;++import java.util.Set;+import java.util.concurrent.ScheduledExecutorService;+import java.util.concurrent.ScheduledFuture;+import java.util.concurrent.TimeUnit;+import java.util.logging.Logger;++import static org.apache.camel.builder.PredicateBuilder.and;+import static org.openremote.container.persistence.PersistenceService.PERSISTENCE_TOPIC;+import static org.openremote.container.persistence.PersistenceService.isPersistenceEventForEntityType;++/**+ * This service listens for {@link org.openremote.model.asset.impl.WeatherAsset}s to be added to the system then+ * it generates attribute updates for the {@link WeatherAsset#RAINFALL} and {@link WeatherAsset#TEMPERATURE} attributes+ * periodically+ */+public class AttributeValueGeneratorService extends RouteBuilder implements ContainerService {++ protected final int UPDATE_MILLIS = 5000;+ protected static final Logger LOG = Logger.getLogger(AttributeValueGeneratorService.class.getName());+ protected AssetProcessingService assetProcessingService;+ protected ScheduledExecutorService executorService;+ protected Set<String> assetIds = new ConcurrentHashSet<>();+ protected ScheduledFuture<?> updater;++ @Override+ public void init(Container container) throws Exception {+ assetProcessingService = container.getService(AssetProcessingService.class);+ executorService = container.getExecutorService();+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);+ }++ @Override+ public void start(Container container) throws Exception {+ updater = executorService.scheduleWithFixedDelay(this::sendValues, UPDATE_MILLIS, UPDATE_MILLIS, TimeUnit.MILLISECONDS);+ }++ @Override+ public void stop(Container container) throws Exception {+ if (updater != null) {+ updater.cancel(true);+ }+ updater = null;+ }++ @SuppressWarnings("unchecked")+ @Override+ public void configure() throws Exception {+ // If any asset was modified in the database, detect changed attributes+ from(PERSISTENCE_TOPIC)+ .routeId("WeatherAssetChanges")+ .filter(and(isPersistenceEventForEntityType(Asset.class), exchange -> {+ PersistenceEvent<Asset<?>> persistenceEvent = exchange.getIn().getBody(PersistenceEvent.class);+ return persistenceEvent.getEntity() instanceof WeatherAsset && persistenceEvent.getCause() == PersistenceEvent.Cause.CREATE;+ }))+ .process(exchange -> {+ PersistenceEvent<Asset<?>> persistenceEvent = exchange.getIn().getBody(PersistenceEvent.class);+ onAssetCreated((WeatherAsset)persistenceEvent.getEntity());+ });+ }++ protected void onAssetCreated(WeatherAsset weatherAsset) {+ assetIds.add(weatherAsset.getId());+ }++ protected void sendValues() {+ for (String assetId : assetIds) {+ LOG.fine("Updating attributes on asset ID: " + assetId);+ assetProcessingService.sendAttributeEvent(new AttributeEvent(assetId, WeatherAsset.TEMPERATURE, Math.random()*40));+ assetProcessingService.sendAttributeEvent(new AttributeEvent(assetId, WeatherAsset.RAINFALL, Math.random()*10));+ }+ }+}diff --git a/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.java b/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.javaindex 9cd0a159c..d51f42da9 100644--- a/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.java+++ b/setup/src/load1/java/org/openremote/setup/load1/ManagerSetup.java@@ -22,12 +22,14 @@ package org.openremote.setup.load1;import org.apache.commons.io.IOUtils;import org.openremote.manager.provisioning.ProvisioningService;+import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.asset.impl.WeatherAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;import org.openremote.model.provisioning.X509ProvisioningConfig;import org.openremote.model.provisioning.X509ProvisioningData;+import org.openremote.model.rules.RealmRuleset;import org.openremote.model.security.ClientRole;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemType;@@ -36,6 +38,7 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import static org.openremote.manager.provisioning.UserAssetProvisioningMQTTHandler.UNIQUE_ID_PLACEHOLDER;+import static org.openremote.model.rules.Ruleset.Lang.GROOVY;import static org.openremote.model.value.ValueType.NUMBER;public class ManagerSetup extends org.openremote.manager.setup.ManagerSetup {@@ -88,5 +91,13 @@ public class ManagerSetup extends org.openremote.manager.setup.ManagerSetup {});provisioningConfig = provisioningService.merge(provisioningConfig);++ RealmRuleset ruleset = new RealmRuleset(+ Constants.MASTER_REALM,+ "Weather calculations",+ GROOVY,+ IOUtils.toString(getClass().getResource("/org/openremote/setup/load1/WeatherAssetCalculations.groovy"), StandardCharsets.UTF_8)+ );+ ruleset = rulesetStorageService.merge(ruleset);}}diff --git a/setup/src/load1/resources/META-INF/services/org.openremote.model.ContainerService b/setup/src/load1/resources/META-INF/services/org.openremote.model.ContainerServicenew file mode 100644index 000000000..f0d4d9cf8--- /dev/null+++ b/setup/src/load1/resources/META-INF/services/org.openremote.model.ContainerService@@ -0,0 +1 @@+org.openremote.setup.load1.AttributeValueGeneratorServicediff --git a/setup/src/load1/resources/org/openremote/setup/load1/WeatherAssetCalculations.groovy b/setup/src/load1/resources/org/openremote/setup/load1/WeatherAssetCalculations.groovynew file mode 100644index 000000000..f1a955259--- /dev/null+++ b/setup/src/load1/resources/org/openremote/setup/load1/WeatherAssetCalculations.groovy@@ -0,0 +1,63 @@+package org.openremote.setup.load1++import org.openremote.manager.rules.RulesBuilder+import org.openremote.model.asset.impl.WeatherAsset+import org.openremote.model.attribute.AttributeEvent+import org.openremote.model.query.AssetQuery+import org.openremote.model.rules.AssetState+import org.openremote.model.rules.Assets+import org.openremote.model.rules.Notifications+import org.openremote.model.rules.Users++import java.util.logging.Logger+import java.util.stream.Collectors++Logger LOG = binding.LOG+RulesBuilder rules = binding.rules+Users users = binding.users+Notifications notifications = binding.notifications+Assets assets = binding.assets++// This rule updates an attribute called calculated for WeatherAssets by adding the rainfall and temperature attributes+// (no practical use for this calculation, it is just for testing purposes). Whenever either of these values change+// for an asset then the calculated attribute is updated.++rules.add()+ .name("Calculate weather asset calculated attribute")+ .when(+ { facts ->++ List<AttributeEvent> updates = []++ // Get weather asset rainfall and/or temperature states that have changed value+ facts.matchAssetState(+ new AssetQuery()+ .types(WeatherAsset)+ .attributeNames(WeatherAsset.TEMPERATURE.name, WeatherAsset.RAINFALL.name)+ ).collect(Collectors.groupingBy{AssetState<?> state -> state.id})+ .forEach{id, states ->+ // See if either attribute has changed for this asset+ if (states.any {state -> !Objects.equals(state.value.orElse(null), state.oldValue.orElse(null))}) {+ def value1 = states[0].value.orElse(0) as float+ def value2 = states[1].value.orElse(0) as float+ def calculated = value1+value2+ LOG.fine("Calculated new value for '$id': $calculated")+ updates.add(new AttributeEvent(id, "calculated", calculated))+ }+ }++ if (!updates.isEmpty()) {+ facts.bind("updates", updates)+ }++ // Trigger the rule action if we have one or more changes to process+ return !updates.isEmpty()+ })+ .then(+ { facts ->+ def updates = facts.bound("updates") as List<AttributeEvent>++ updates.forEach {+ assets.dispatch(it)+ }+ })diff --git a/setup/src/load1/resources/org/openremote/setup/load1/ca.srl b/setup/src/load1/resources/org/openremote/setup/load1/ca.srlnew file mode 100644index 000000000..6dc742638--- /dev/null+++ b/setup/src/load1/resources/org/openremote/setup/load1/ca.srl@@ -0,0 +1 @@+542AE76EF6F52D185F1EF1332339AD042EDA348Ddiff --git a/test/load1/.gitignore b/test/load1/.gitignorenew file mode 100644index 000000000..497f205c9--- /dev/null+++ b/test/load1/.gitignore@@ -0,0 +1,2 @@+output/**+jmeter.logdiff --git a/test/load1/README.md b/test/load1/README.mdnew file mode 100644index 000000000..8413801cb--- /dev/null+++ b/test/load1/README.md@@ -0,0 +1,27 @@+# Load Test+A load test that uses [Taurus](https://gettaurus.org/) to simulate:++* 1 x Realm (master)+* 1 x Auto provisioning config (WeatherAsset with a custom `calculated` attribute)+* 1 x Realm rule that performs a simple calculation to calculate the `calculated` attribute value of WeatherAssets based+on changes to `rainfall` and `temperature` attributes+* N x auto provisioning MQTT devices connecting to the MQTT broker and:+ * Subscribing to the auto provisioning response topic (1-N devices in M minutes)+ * Publishing their provisioning config requests (1-N devices in M minutes with initial delay of 10s)+ * Publishing two attribute values (temperature and rainfall)++# Prerequisites++* Bash shell+* Java 17++* Taurus++# Usage++1. Run the `device_generator.sh COUNT` script to generate auto provisioning device X.509 certificates which are output to `tmp/devices.csv`+the COUNT value is the number of devices to generate certificates for (default: 100)+3. Run the manager using the `load1` setup+4. Run Taurus:+```+bzt mqtt_auto_provision.yml+```diff --git a/test/load1/device_generator.sh b/test/load1/device_generator.shnew file mode 100644index 000000000..4ee1ece57--- /dev/null+++ b/test/load1/device_generator.sh@@ -0,0 +1,47 @@+#!/bin/bash++# Generates a CSV file of devices with device ID and X509 cert for each++CA_KEY_PATH=../../setup/src/load1/resources/org/openremote/setup/load1/ca.key+CA_PEM_PATH=../../setup/src/load1/resources/org/openremote/setup/load1/ca.pem+DEVICE_PREFIX=device+TEMP_CERT_DIR=tmp+CSV_PATH="$TEMP_CERT_DIR/devices.csv"+COUNT=${1,,}++if [ -z "$COUNT" ]; then+ COUNT=100+fi++if [ -f "$CSV_PATH" ]; then+ echo "CSV file '$CSV_PATH' already exists"+ exit 1+fi++if [ -d "$TEMP_CERT_DIR" ]; then+ rm -f $TEMP_CERT_DIR+fi++mkdir $TEMP_CERT_DIR+touch $CSV_PATH++echo "Generating CSV file '$CSV_NAME' for $COUNT devices..."++ i=1+ while [ $i -le $COUNT ]; do+ echo "Generating $DEVICE_PREFIX$i..."+ openssl req -nodes --newkey rsa:4096 -keyout $TEMP_CERT_DIR/$DEVICE_PREFIX$i.key -subj "/C=NL/ST=North Brabant/O=OpenRemote/CN=$DEVICE_PREFIX$i" -out $TEMP_CERT_DIR/$DEVICE_PREFIX$i.csr+ openssl x509 -req -in $TEMP_CERT_DIR/$DEVICE_PREFIX$i.csr -CA $CA_PEM_PATH -CAkey $CA_KEY_PATH -CAcreateserial -out $TEMP_CERT_DIR/$DEVICE_PREFIX$i.pem -days 500 -sha256++ if [ $? -ne 0 ]; then+ echo "Failed to sign device certificate"+ exit 1+ fi++ echo -n "$DEVICE_PREFIX$i," >> $CSV_PATH+ awk 'NF {sub(/\r/, ""); printf "%s\\n",$0;}' $TEMP_CERT_DIR/$DEVICE_PREFIX$i.pem >> $CSV_PATH+ echo "" >> $CSV_PATH+ i=$((i+1))+ done++diff --git a/test/load1/devices.csv b/test/load1/devices.csvdeleted file mode 100644index 83fbb01ac..000000000--- a/test/load1/devices.csv+++ /dev/null@@ -1,10 +0,0 @@-device1,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECraMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTExWhcNMjQwMzA4MTMzNTExWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL3aC2do\nRh0U5OvxfFMgmwp6Y7itfv6uE8d0KU18PBsh+rxwcsqlesW/i/q3+ZFa8L/Q6Zuj\n8X3JmALYK3H917arNIz59WVr7cwrWkON9AJHhFMlip1YiN8mudF9IVRa1WQpVmJa\nubR4NgtFhOrSYS2wkFDQZ2VJ7aNYE54k8HVSOGFo6izHHG979X2JBu5xNP9xSHwr\nXV17IEzEVQ/78tIV6vRjliQ0s9nzsFmR5D5n6A53Mi2d9+PyAHUAIlakeKmoIj3c\nYZUy2IKBARVNzatW86arMZwb3SwFlB5ceZHN+syK+QGGmW7ofQT1DLYsmXIINapV\n4dBrAOn4KzusNWzmBBguIP4ondZG7/hcawcJEE+6yzhLcpk0JuEwlgOG+7FUTQtS\nhzkRM/CEf/A75KD2xG3ARDXs7UROicHf1flmqCDT2lutMxBetqQls8BWRnt/S+PK\n105gLoXZ+7tOyJmQlf8IYzRziEqet2559Of9XcvsRX+01AJvSCSftQwaihYZE82P\neg8Uk2Y5XOq9N+y/T11IhfsQsdItV8srVvn7uQzgGvx4642eLwPRKzWdMtii5rnA\nJk/2TTzmWw1IgdB7GizekyRUh9GVPNh8Ks1Ue8vZjdAlv0qEg6cObLUPjXG4XiZ1\nyKnT6hH8t/16/UkEG9U5roLeE112FDODNgdvAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBADHYwEqs3b5P3fpIp1rYVYf5mdiLZnMUsj9gDEtF74Wb/gITt5md3gp4LSU2\n43z+zbXS+52cz7gQouHzOf25nq/mMKSxjGyUCXSgBjcD4kCyADflWFOF4+ZQcyBy\nGbfmyj97cU/5N35xLDU7lb+knRaKIiGzyNt6Y0lXMcPULZe5fOdRJ3i+1Wne5U7g\nglnax9wkAPZhM0b/vzlqQ54vHUWbma1fQNkEh6EvjSMrwCfNW9FvzalFE9OMrt3r\nNoSBDsvVpxi7824Ot23/CugriOcLdU9Z6BbsHkV2E7abdkHRWsI8fsAZI6e1WbWo\n4bUpyvg3bcQVdIPS4zw5z4LV5zl8+6n+odPFWXlf8B+4HmCstPIiqr8XavgDWHhb\n81fCGzFx4iYjxKpM3Dy0VHp0E7fjnXIMi+3+WU6CiQgbksClfh+g2xJ6mQ3eAqxx\niMwblqbVDOXtCNPCdSFtvPTpt5nfrGdSb2Jt9eYUbVuafHEAkWAeNedIjIjcspJs\nakA9T1/p5rjMtpPmxk0lZw6LJOJaZ/6g9+eASgWN6j8zXcwF2gQfQCSY+QukydNi\njujeaDyp1fWnDDBe65V61tHziAOXiLyH4VpF+pfSEoObPPDLziZu84Lm/rv2Adak\nxaJlTcM/g3QgIoMWxVglYfvRpNDS6mGAX1nf/15ylQIwViP1\n-----END CERTIFICATE-----\n-device2,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrbMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEyWhcNMjQwMzA4MTMzNTEyWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMx0rpVW\n0BkmpI26Z/UeXHFqnojcW1M3SwtlouFT0pxAwLdrpoGsWeWO5jDYIndc1LPhaGrf\n5V1xhz9tbdaeFRWVAWg/CUbVR/jS09Y1HFQoELmj06TeOHW53S0x4FMkk5EKnOvi\n8NEC4y7A9MXhSf+tTJBjrY91FQalU5Vo7bnG0XNsIGGW5k23qRhx4K7u8NMip1OH\nWp0tO0HhmxnlajT4Vml7MngUiMpDj/kr4OXYuAvkPGw9DC9yWWy8CBUKkSDxeFui\nPVk1qqp4g8SpUkc4n53D1ta9C3nraoP+5me+C0NVWFrBiAxZ9Q93LgOhdPLJY3GT\nmyVVXgjKfwuOTsgtlEhdZJb98m5rXLZpM8IotlEBv1FBRT/GKhX1VrdmAHm6RApU\nsVLIs0Vkhz3XkWVaH8vND4YRSfIT/0Gk09xofo8j3yNMpOAw3Dx7hoiRXehPYWS5\nAJSCqNvL2INFNGvpVi4aovEeKyHgVnNACKP1T/zBUQs+rG2l9fY1fxhl5xJ44sup\nbj+i9Wnrvonmqqnt/vngh59r2uuXQQfU3MfmTnCeL5DsY7J6mX/GJKN6qNgXCJ4b\nQKb47wpKhrrJULNuDo8mIhI3Ik35kFeZ1CMrzv852PdSFjBY8+Jc+dFT0hC8rHyL\nIevDDCm9VNRYkEHe6iLfqXKK6kiD2Hr2E81PAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAHwnTd9tvJPa4R6N5gKaOxYC3yxiPMO6K8UFlWHDQCAB68dUHV7tSMY5IElT\n9+XglXPW4K7+UHbZZol/SQmk2MFgNrOHwaFyiLl3+9YcDAAfl2j1Q6iKI/sIxoet\nCAlewPCa1gbyol1639zrsi/S4UYYy3qEeArRP+Z4IdcvnT03dzo7JMk+JOANC4x1\nIKgrUinYVINt7Xt56Hv5ey+jUMU4sa5c5KQ3v7CDlu7YbLgQq+/Z35mhxDLJJRdl\nLfNHfKkeQRk3t96wYpncIlTTdJnCHNDJk+nEglnEliNsC24giNYJ0OOw/Jg8hQCJ\nBlirP3vWcVurvnvSU/aykV3GdZ6qEkf1LQT1b/StL69XHRkaVxBHI/IOcmxRITy+\nKjpfFsPR1EqxH3V/m83r6FMM34swTCnwSKGCwSXI9Kaz5HoOwAB6xlcj+xzTmMZ3\nXTUo4T7g+7tHamQ6QXbIsFt/YJNjOk1Mhn5V9ZeuJZHdfiAmzg9H3R0uwf2/cUrt\nlzSvWZb12av54ChMCI2hH30sjvsLPVDvb+EIOXrH+GED0GqgRXCjB5sa9rIUkQ1d\nbJ53BIwsUq9JiMkDsD92Q00MkIPalJniVXpLAXsFzfP3cgA8IrbvxhhzHCSChbst\nJ0Lnd4i4rs9HdjAYRu6ZUYskbNN9Oqr+gy05cfq8KeV5+SpP\n-----END CERTIFICATE-----\n-device3,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrcMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEzWhcNMjQwMzA4MTMzNTEzWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN0ovdr6\ntLvedO3BIspvCwhk05F1ke8qNSuztKbShNbnC2olZSv6e/qlliSqS80CMNTza3b5\npnw4NveJ/2Xv+cZxvWHqTMQFIkSSaixPGpjN4Shs7TE0lfYiqjl+NOMolpSETztJ\nS/tvdKpZyefFPDtw19jdjh43bUoipIw0H75KtAxVA8uQvBYaDwzX5B2NzNyGVH7p\ncafyHxDBBsxdWNpxkixS8vgCIuO4bBZy21eH2+MTqm9Xl7+z20bWtfihJlLY+WQ2\nXBBqCt0u+8N51dffF/Oq/g5gUc1/OybhDVQLaw4Vkkwe10VDdskwBG38hoP2jKuf\nysv5j0TsC6QmQ2nq/MbD2rZZfaRl3pZYkobZTR/Vbur0UWjc+0T+x6JkDLROJkVH\nDdfqIxBT5Z3/WcLPszdrf0AwSX3SDjjckRItnuEw6W7JBgoUTj1CEdv3RLrSq616\ngbZwwJ3EyoCHMazdGwjcTEU3WArAFSwp2iL6jG+CFn4YGvJlYy8XVJcR9hPfJmZM\nNiVCU4WbJv83cRjcZszm/+peW1TqW28iOx4P1PpjPcvAZ/oMDdPZzUkUBpV1XpbY\n6bjKugEk/UEAVWMX9yyx0tGeCEeZS/uF7bowWe6XbWd+ENMk3WQe3v09PtVOKX/5\n1A/9MqLft0AJ14r+BEQSk7tGT56D0AHAwP53AgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAHVsYNgt8BQsBLHZfH2+lLWxRnVhSZg/w7+ktU2TS3ZjRSqsESuU+P79H1ZC\nqX+xDkki+Nme5jMg6wWkUdq1/Cd0XmFo2Q8MrP82bY7dL9lkKKRWP8uz3P/fQk4g\nK4xGyly6r0oTECZPypO+lx6yh+/RY5MIVoI/4eo2X3ujs6KgsCWzB4a01Zp6ZgxL\nEomu2NwIgduDVxQfPGz991hbW0zsBWDkrIf7IVdWMm8/HQgm5xrNfj5fNzJepTvD\naBkGrZL4QTygMw3gUhnKGcZa1R1v6GCnowZBnRuah4/BfdIGv5YX6DdmQRaztFQp\n0ZCspMLwsFKymqbPV4Rc+TRAowYTzmOcdpWXaCz1iQRbrpYNFWefjh3SL554PHRm\nhqXgAGh+UiM6Nh0deBRNjoHhztlo8osdrnYvtO0sEX9B2fKDq91Z9cIm/H2Cnbrq\ndYrVLiEPsvqvgPOaLgm1t8GbzQXMg82iMHAcpC5WIh1W3eIsgZdn52qnIWn98Uni\nyfu5xoYwB7jzWnZp4FJcnqVvV0dfcGSTCKFnXhdQTtJEqtgmQv0QkORF9wH07oLN\nRfJGeXv94zyfijv4up96MO9mkKXHYk5uWXDLp3NxWx/KQuG13K+zAxyak2WAnvPr\nH3eZ2Psj0Gr49lTZEbNiSWdK1EfSmz0vSQEISIa9DOcclQSk\n-----END CERTIFICATE-----\n-device4,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrdMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTEzWhcNMjQwMzA4MTMzNTEzWjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANWQS4M4\nvvNAs+cTao7itamSBUTH27nFhqa4ON0Jmx6Zd5D2bbrfrczMcFK+2gGv/hJuBM0W\nuypEaozaEoizW+0+7POZWC7nQvUcE1pmtCnw635flIpY4n4eAgltSPYQ9zBu4j4P\nQ40UxZPVKThPK6eDc5FCdNdLMDg+wpenDPwPAYfpsM+6t3uYC8uOAxeT4Y9gNyUU\nR7iTTyxjnxf5WGfG8Juag2KL/2GxUYFWGs9Q4mmbJ5DV+owGI0N34GsNpRUkbvpe\nY61XBFoBkcA5Vvy3Lw8S9dCrlGYEkjJr2XzqF+ovZ4pRuMico5P83HYc6xTPTlEs\ngF5NyercJtWrg5mqyxUpiGinRtay/8tualq7sb/GFJIV+3aXnMzV8kui/z8lH6/M\nlUJwsQD93kt4+qu+iWyNhByABpnDX9GltOY0jbsAAfjjMCtg4YrH0gjSwtxi4fjc\nqARpeaSjjlZ6L8jNhRF7LRxNxI5u2QGKboGMGlJjmVAcK8yZhEUs0ALb7VJBhPWA\nD4zQx5KybJttKMQ0FisrhbhmFEolKfsonhxQBaiAPAJgPH2W6e54ee2+/klXpIQW\nadu/4ADg/Ik03rkT+9AM0VRYZu/48IkBKobRNSmxjwPD6gF2DTvPwbnbx2IK/p0d\nQJnByduIuC0nAm2nanbd4vFO4eMs9rygx0tLAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAGyVd5vexRrxYoXE68WK25bW1cm6Fwn9VMDoxsoxyZfaMsY1RGXsujNiR8nY\nffH3DWdcmU8vkmXB4dwJ2P1D0Xqcl7OpO4hT7lJwMTitSQsMvcLH38CLD2Jed9vy\n3aJL532RoIIrJq+IN95mRVZFDXcTuGZOV8SGBc8JUjNN7QRc/YBNdOJOjCKUmK5h\n89uUGGeTRdgcXdiOYwce+jYVoy9RJpeWfFF307ghgfCgqN4vBvZBnZ62KCWlmCGD\nYy8su3XKfZKEqydDXFlN7pyCWnIBWlHhqvO2+4VbYL1y59Ap71tgNGpQXfaUVW99\noKxr+xAbGDsrUkGOhG7L0XLr0fgsvBJArFN23Oou38V6fR6vZryz0bei6zuYQYin\n4jMYcu70GeBkrpNvk5tX8KV38kfP9BNdOp5Wc9VPCmwtju13d6ywX3EqjlZb0TAZ\nP+kYY7EeWCQ5ltR4rdrobIIjCkveHY1pHcTXakGhJ2XhJh7+IgS9IGAx03enkYAK\nXDEu+LgX/DCilzAK4DL7p5p+VtDGGM2ojzZpCwK4cS1lddPigMJsXGuY72Hu5cIw\ny6uegmBaB4S4SaWXEzvOBxp8kY7z+RnrQd5Env5cE+izb3Al3F61kDElLUmv0hRV\nqjJlHfBiZ8ZXKT+lPv2V1BfWnJrh67hL3/a65W/LOkCKhatK\n-----END CERTIFICATE-----\n-device5,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECreMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE0WhcNMjQwMzA4MTMzNTE0WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANWs3GNL\nBizfdNwvt2UwnNoqPSJu26EAXiNL4//OQ+s7shHpmb866G+GBmw1a7cgjiB4L61e\n32xEsYJrFIJy/6jiROnf0O9A88ZHd7gBW4VoL3l6YyRkm8CJ+rItijPAHO15BgL5\nHq6pVOCPnQAb9gWoLbwZAT9Me3Dq5cn3W3gOz6XakTzH/yjnWEqOarg6+Uh1PtGf\nokv0jOEnMEifZAMWUAZJnCcoyeqPx38HxNm0To6ohsQNh4Vt/HHNbw5lu6YELCO7\nGlm8xQpbKGgp/HFHokqAwImlWwwBvVScWw4GhAWsRjicIRetE3KNodH6GGy9uVwr\nrLfi2wfoAk5CxXTZK0FnQM2zepaQuW4SSWKIjli+8rrpP+/CTsqMFMkrlIZWYa+Q\nNViOdQuVKcptAp/BTzx3nbyyoy6Vt+nLAK8CpT0VmHENGUqF1w6I7+HUz+vbbRAZ\ntiUj4o//Ppj9DajwDq4DMeJGVEo/e1nu9VdKiBXSh+KrOFZ8ytI+WPTJcq2ET9/0\nAmTNGSYuZlo/NtlYHDozQaBc2R0KgJ6tk6qAj5Yn4p5N4fbDQ4tH0QGfOTvT94Al\nVDb3XMs3UKZQbH0/OGA9stdY3gc+/M31wYCJqy3KBnR0wBubz0y2nozhAyJ5tnQ/\n581BBnyw5Zh8aQzG2x2HIV9oPrhiDy3rbjkzAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAJTKfS63xBjUP2vU0SWRDlkthMPvqUIRQ88BUs/PLAbJjuI2iK8Wt5W1+JY2\nKj4Q5Db2mZTAHwJxT5xCRdHG8YjY51/zLyuvU49MVeugfz4zVesU05y+yqn/vrJ+\niVsShGARo8J8Wwvr+gqdM0tKPS/tQ4lfUOvAoj85z+1+X5WJECUVyFI6xhDDSoU7\ngF2zoa1dUAu52m6+mwfu/ynU3sQcJkuWsG+4oKBQFdWCyVNhbxC1J6LnUHUiIW+j\nac0BX9GmnqGCjdIxa89FtaSVfwpiFsGfclIHGp9h4axGjd6z15IBhngQgj955rAv\nIfAI0BhPkxRubdvnFG7Nr7fDunqfxFd5BRkajOkECb6aBjM1Rbnq+ZXFHElSi3AU\n9/e4PyqekP5wWU+aLbU6L0nfwH4CzDeMONmwodhJWdI3jeimyaom2Iz4x8i7RmqW\nb5rrf3MIEatd2OZleqx1EzRtku7jBh87OjdyvLEgwDOx6wuwzdIXK+uTqD2E2zlk\nkL/2XQhM4sgjeWYl/s9+EPDKa5H7bjKvRBmrOm3Burgmof8ja4QU79N5eL6VSR6R\nja6llSGTnyztoyjNV2a1fPWtS8ka16D1p4rwikLVmJ1dZs6IaR6g5QL6lli/Sgbb\nB7qB5ECJnleHLdjj4264gLdARrLHJbMMwbaJuvHKdpm9Aol1\n-----END CERTIFICATE-----\n-device6,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrfMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE1WhcNMjQwMzA4MTMzNTE1WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMFIyQjR\nkQEtDSGiTs4FCXRn9DL4X/4uQEUxO4/M8BkRAbAhLFWb1vr2vE9sDvGGdw3erE+k\nUS+an/g9r2/qDiXk1hh3D4CTnSMZIHT6w9Gj8F5kN6SXC5Zj88ELM0Afv99CExEu\nRr94xshjWp1Tzi8qdaDUZ4xjgq3UymNVeL5t7ov7uQme/3ljttqtcgLsIfuRUgR1\nVg7S0di/wb4N96Rvuok3LfimLOKV1Vqrlgb5hN23dvab7kLeEJ4HdHS1VRdHtLIy\n89AcgYyWU0v+mffKv1m8UpPLJkrCrsr7jnyi2zGtZ/O/KDW/h8nolVMyJYXtbC2K\ng7JmJt4dB3ddDSLBhynCQCulGMTiMLcY0YKQLpR5gQNxo19s6PHan2UL4wgWTytM\ngIo7dTGK/yxMz9/u+8q5qN78QuVRT3K5i5fm0JBrSHdCkPDJWc8hK5LalZthIDkj\nTU7DMkn6nYD+5lcZb0mmrlrdOeh0Pmf7aUztujW8Nd7LCqR3jO0xIjk+1wZwMliz\n+HM0X762/qLgTJC79Bnrbn+Jko9EdvlQ2OSeFKyIzIbg+t8VQg7KEFD+UmNb6oza\noTf4xQEaiHnd0fCJObXQgbGSLK5sli8pN1sL5TbV2W7BL4EDbSgBZc+yS5znz3q/\nYDbCFYbMUGCS446dyVUD0FgcnAHnAOljKzN5AgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAKPIb1M/oNP1ZhIy0RjHjZBqm/lhD1DB+bZO1cAudzcg1yaT+OC3BgKyHvYd\nfoOXSvX/RuPB2Nwd26wM82UB7P5a3h92LKLjWLgJDaYETmKNpl2Jbl3ujyAqXEr/\nTRZ+2BnEZs6+Zurcj0qh6OY57eVntci5u2xVW994fffKOHsAVXqRWjBB+mF2nPJx\nF5Y60t7p0s51DqffK8OCaTGsu0kvZcdTOIADPHumkzBGHO0qg5v87x5J+ZdZsE7G\n6As3wdNkitjNZpNxT3G6/FgshlQF0FAYZ+zhSmvRXeE+uuNxCsOzt6K8z1gcZ4V1\nbZvHSmSEOnGAchIA5hFCapg4QryqDP6bsRir69F4si+xVEvHul6koQEiZ7xpo3rf\ntRQNUl1Y6cwG/53i6K78Jztrq7PbxPKMZPNAYG+uTiGQq6bo1E5YwyPIFiG1yLM/\nI6E6BrwVqRA8LYFnSfXKAyj+5EWCoKgs5wTyXGqkhO1bsxd2qtkgXYpSJEVBwqt1\nv6q87bmBddXuXG0UTcUzwQ1Y63hl9cPaNc7tggd7XPqMSHsdsJj8HUW8OYz/TpLo\ntwPYt5tCDO1EHRsepmICiGLX1R1lYRlAVNOIt3Q3Cf1l4ffLeBZ1cUKDcluP6jCX\nOpYXDgfXplooHkNmY8Tf+REjQRzZ1Bie+OInOS+ZKXgBdPgN\n-----END CERTIFICATE-----\n-device7,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrgMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE2WhcNMjQwMzA4MTMzNTE2WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlNzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOiVRvlJ\nuK3fJ9Gn9xT/62WmHe2HbtnIqodqus/1bfL/A6wBvQ5yH1tZHuCMS9XWFP+sjw3p\n604dF+yIHD4rWU1sDzSyn9AY+KmMd5zhp+joet4BdqDIKDx40KZVrA7KEu0wqpNs\n2297wYUIG9ZhX7wwpAkrfEfNxzDzVibIOQowKYpaVH+mWbwuvbBzAQY4F9iZ+5kW\nBNVyjG186pDhRylDyv65uJa7/i3mSnyxA1gh5UNBcSQbnwTCum5XMkiKA5AIBGFb\nOi3cvIrarwiP2V7OZJO8PhYlj3CwT5/zWXvbYvRv+K4CruSRx/rb0JPOz/+buf/Y\nCKorf+c9K98DXUetSp6Bw/IpLF6+wG7cGAiPgHIyYkSCCp2ro3cTIm1+xjlv5WV+\n1IOTBI9pWwcGP+D71GJG8BTppfCaYumZ6Y3cnWP0KewLdjHS/EU3SAyAcSTI6Iba\nA4l5GmRbcbunL8QLr0qP6G333XXd8Vi3SBFJoFI0CwmatOsi+yYIe4m6o7K13TWP\nFY3ook430nMSr9cMAIjbK6kZZntl3P/TceGiIa3GBB/p7VHnZP5x5M18WEujuPlg\nOP3L69JltPmrX8CR0HOXiYomdVvg7RHjqXv25ZHU6jlYLIxu/SlsvZiMPVlXkgZ5\n0F+MOkpbDg1g+/7J0MetVkzst2SYCvl7u2VRAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAI5C2PjCTv4E92omZJm3uTt3suFgWrmcyMykwcAoVEpSxKXnuo1vuQoG0tw3\nrQTFA+HynFv2Wd+BJE9zFqnkVHKK7x1LIzqzlgEQQQDgFE1aLmf+mNIp3E5CQhgT\nXBukkfttLmypCOAeRhWKDey2VDr0djBGVjXEIb7pQ0eWtS0xn584yVukgJf/XPpv\njFcqRcyfhoWtHrKsHQvd4IIam+EpHs/wfRjvpfM+dFybEOhWDAtSfn1OUi2Zvyjw\n0Mh7V35PvwWmu7d+Z8m3+ArtohKrqk1f2tqSnLwrZEpoOQ90CvZKT9dONB1sVRiu\n+K+aClco/lcAefkX0AKQO6RobaIDjFk2g+4IIfCqUx2CUDkuyG0mWL4NlFK21h2E\njHOAq+xUQF4grQcB4jq7Jy+HuSrdya1ttMXaQmZSfgebZ2oWdf6UCK6Ffe1p/K4y\nMOdql4xS8mMMF2NUeSjGKF8ikQgqFUMAbum2DCDjgMzZYnyIdKQ24+5e6ZQrQuNi\nV0ZssGLyA1coJkG0rTimuOEBKTZfKsQMxu4sJyH6aiw9uiou9G5PKH5mg5Q+8/IZ\nYqc9S/A4V9+N+G+x9MbhNkpYyScaYf342Ve0lwgn2HP+zthH57U+Xda6zTGCHNUS\nM4WmZETKlRPPbJ+shQ3X4w5IxXKzrXhy6i0xFy6nmhrm8a2k\n-----END CERTIFICATE-----\n-device8,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECrhMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE3WhcNMjQwMzA4MTMzNTE3WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALSnfHlW\n8VQQcuqOovg/ciypfvEYzqRiuVY+jYEeDIvCQ30nYhRYGhkq7D785QsGj9UxMX5B\n6h8XW90WBZLuG7OkYxAKYPPfN6IiTVFTxraRrNr9OA08eGCQuwLK1vlvPmTYC2Jn\nzObmZcFCAWp7c0vMFh3hdPl/dySr1kOrQY8XpSNP4ty2m6ttCIWyTgDakOcQaxN9\nCNNzPBJPZ41tKD5IYob3dqjk6GtzDBVdwd6tGixgtw62zbPgEVoBbGFPQ/xt7aqO\nlMYiDTKazyljRtkicNIO9VkEUkb8N6DYNL9K586sLdQl9RBbYNhxVPPsUPojeSJO\nYQOczZz5SLmZJknfdtGobDKHxju+0wZRm6OIpQuC3LuXXu744xmqoIlMdDDOAV93\nF5W2aL+bpbT5939veQ+qBc4nF2AqnmDTrzfdj35qI5k5UFVAO/B615b2TcVX8Mfs\nuaoP0lPIwwHw+qOxRRvEuZB6PavzXXsQyW76xSaVNwFxzgZHA3a8icwET4rdIVy1\nHgWd4OTY+uwWv+PfcuYeXSmHac66gEtH803zwbwbcKj6fJ3Eg57cN1hpYDpTXWIF\nKy4MczRmy4mlntRnjlA5gDRCujpcvm7d2fT5qXud1O9Voj2eaVgiPWeFTdaG9WOy\n9Wv3RaPc/5tOSbrSSUrnITJzIQ5hC0GOfWelAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAAOmMvP68lbcJ6/qzQWpqBwyW1UaVuxaqnvFwsoxmupxXjl8rKSfnfRn75uf\ncO4e8dd3wweSjqxS3gTuH3SQLaVDpQoEE4JBHTL1gKsC0g9uqeH49QzSuV0uEmaO\nLF+PLrWDJesRmuliNTljncNIG3nX0oEmkTedD/zabBu5hXRikaFk6ElSTxIe1lRU\nCTaUQbh1UbtrAREoybM6QzRBuPQLRplI1js+C02fUFuzr2is3jy8si8RHTZXCzdu\nBRsD1YUT84AHbMF/nX1aBS24Piem0C+iRFnQtDZCHzX8oSeOgapCHHWWMIxsHX04\njNQin1DJjX/OEQGDt2GA7qXgi0b48EVuSiKq26eIBwPqEgAbM0/4nKm4+qx69ygF\nrztnkO+hH+065/8w6mBet9LezfM31A/wpAAzwgkMJq24FAHfnrRAXBo6cWkgh5SD\nbZ62b5OIXgggFL04m/w0nwkNj9YEPnDpY+jxdrua9drFcIcSCIJ+xnMFhkM2rd5c\nRx48rOVzFgH7r2r+nOu2Vf2/Ftr9JjM+98QzYVO5bCTPR6bhClKSLKCRqOJLqJ7+\nlbkNXVr7AXXs/qOedBbl76WnvHBVpffB3ezF5PYzn3Dgi6+NrQ08YRSCyLHlDQWo\neW9ZSH3WeIg4WAvgvjQ0rXn6IToZ1t7gErZTiLI2/SE5j3Wv\n-----END CERTIFICATE-----\n-device9,-----BEGIN CERTIFICATE-----\nMIIFYDCCA0gCFAFINYMIOiLOII64AG+rMJ6/ECriMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE4WhcNMjQwMzA4MTMzNTE4WjBMMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTEQMA4GA1UE\nAwwHZGV2aWNlOTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKzu5mH9\ncbuy6YS/Vu9Frp3f5cW72s/+dVuTzvEn2TMS2GgjIEHtdysTLUoEYwEBcpgn4Vyz\nq7CPiGTMSQbmhhyd1mvOwT5DBOOS3KRiuVLKe+G0oda9MKjo9NPu0lN6uBnkGLO9\n034ZdMknVDrPoT/inri268BgwBHUIHIA80CuD2L6CcITG5yqqBzbLpeOyIOpnmlm\nCUfZJ/FaAmq97igmKnAJ4my2MKHNJhj5m3dgyhRzo4mseg6uhczyAEz6aL7CjiLb\nvh84oxoF+hs050e+mOl5NGsgdmqC8pIG94rjli5DCO7pQISyipcrVQhzkp27Yjgx\n8ZmpSB4xRyKtIVcj4Y+shuE5XDRchkui4nsSwsAVz/DcSuen0TLb6GaKrYzUaCt2\n0LqyRf7Rtg/4QaNZBWkPbRQU+bJO4AU85J4iVirqtnGj5mdjktoLTh0RErPqWqYi\nBDIwrEhqtAi9qb7wDcTFBS73W6aei9+X3K7+NAFxBfrtjDhduTcD4hW9eh7YrmnR\nSLOK5dc6JFGAx74aKPt5DbfSavIsEhdHbG98F0hhv2qBxoWDI+t1PmtyGtL6rQC+\nyn7x3WloeNpaZjny8Qo2jXz19cuP3nH3xGH0yKS+7VZ3qBRk+DVgs08QekHK0Fiz\nKMJOtX2s5Zyxyc6cU+G8Toy5DbqcNJ03dYcRAgMBAAEwDQYJKoZIhvcNAQELBQAD\nggIBAFCpvy5HQxralTSpqMMoXfu+BRB9z6Sg+lt7c5laqQf12mlSaW7TFSKHEWN8\n5zlFGRqy4CztjEWACxTfdK9kqGaScoG99GC6vEPlR8P4JUJkIK4fdIi7FgnN1oXy\nv7ua2/bvo0a0xeeNva+SQ+UREbfqbiOnka9+S+A7LIrsL4+yy/0WMYcrrHSo35V2\n4agPM0j7QpQAhGo69YxOqmmOlHiIQprz+EHOPDswnIrLHElH3zMhegamJjtKSImi\nD5drZ2Ce8U0VGvAhZk8B4cpHDKzTmg7wePVyGBzWKlMtOwLiAXo1215iR1161znQ\nPz+s2bouBD31WRMA/04zgc1gac0+KQVTe8a2AHsn4D8l47mqgKD82h87siBHdyIR\nJFsuf//F3YPhOyK5+flnIGA0xjNjKe9q8QksNNUPsXRjLr+UskXS875S8kiOZdsX\nnFQl+veMJtu/JJ6ufWuu/TwmnhhoAaJ+DGnCc3c8YCxU+SK/hSjuRXGrPdvs+uwd\ndcD+4s1RQYdam/+zgUqS9RJrlIVd1UryNqNMbaXeF1zBij0W0WEAyYnIKN/6WO8q\nnLsZGW+fXce4I/I/+Ml7dUghPPQzNpPoBflepJHyEWQPo908CRCRNr47P9+vC1MB\n0WoJiM4RuyhUsuv+e/cVN5Z82nHSeU9lyr6+PkigFTX/v36l\n-----END CERTIFICATE-----\n-device10,-----BEGIN CERTIFICATE-----\nMIIFYTCCA0kCFAFINYMIOiLOII64AG+rMJ6/ECrjMA0GCSqGSIb3DQEBCwUAMIGM\nMQswCQYDVQQGEwJOTDEWMBQGA1UECAwNTm9ydGggQnJhYmFudDESMBAGA1UEBwwJ\nRWluZGhvdmVuMRMwEQYDVQQKDApPcGVuUmVtb3RlMRYwFAYDVQQDDA1vcGVucmVt\nb3RlLmlvMSQwIgYJKoZIhvcNAQkBFhVzdXBwb3J0QG9wZW5yZW1vdGUuaW8wHhcN\nMjIxMDI1MTMzNTE5WhcNMjQwMzA4MTMzNTE5WjBNMQswCQYDVQQGEwJOTDEWMBQG\nA1UECAwNTm9ydGggQnJhYmFudDETMBEGA1UECgwKT3BlblJlbW90ZTERMA8GA1UE\nAwwIZGV2aWNlMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDDpWaI\nJSXgbJZxrE/fhBimS9DF8YBWY4RFj4KSDrQMgj4htSULuTmDHynXsfBX0a1UBUtS\nwlovgqY5EjI0jnTrKzELjBhraMkPVNH5SY66tBLeAIshl6sVS8Kq6Y+85itoITNS\nub2g3FPNDF/DIDwpE9XJuxaXD4ZZA2Ot+LV0zMJI2dEN7I367X0Gyo7i0rrqNU+a\n0W6UuHyd4TFz+h5OwrakzYYcPOkGK3ETrKHu5b9Za1nJ15sOQT398GwVzsEzIjGT\nEmfZ6YTSTX+uGe9+qsSh7MEvd4R3TbWksEPgxs1oYGTQ481ccyjZ3hxdkmhXNE5D\noYqUsbY9AzYVWkQkBjj5PPG4HxNuyyMSgELD8uu3S/P+ZU8j7g0Mv473B/vryd5+\nZmEzABQ13AljBMu8Y/fZGieW279EzP6tl1fFY1hPyl6K0hlxgvpNSG846CWySFWG\noRYQ4hoNi8aUlTKj90XT07RbVED5pre90arxYd3G+uyl5IxwotZrXg6gajwZbzSd\n46DJ2qClZ3ijDT/6iHNfuwPql2Yz8KxIAHyvKvDgKTpTAZEUdZatnkiaIQGPxP3I\npNDpVLoEs89CG6fk8KiKG6Wymru2MXzhNfbe9EsjogA77zafrR7zIWIx7xE4mWMW\ni4xNlCgZfy6Z3ZnKfFaX7jvZjPBcitaRM4ZXjwIDAQABMA0GCSqGSIb3DQEBCwUA\nA4ICAQCcqqHYr6ozu8Mm1ZGLIV3CG+rRQj6uPwi1+TPxKTE6d7IqEtu3qsxZg/5n\nJNRzwtFvOeDU00Jbix/d52FvQHYKMBe8UQC7lHX0kChiVbUOVarU3ETi018lWexJ\nAHwhNr0bweV5QEITpuGRRX0lCc52onsb+VKbdsDJjNcMpEoZfjS/UCc5x/s1+8h3\nx8N16vOW6m3/OwqPBdrIIb4SV1L/8VjDMXTGn+hqE13G4y4qz1PbJsrOONZ3YQh7\n1YqGl5gbIUIlkxKl1aD8IS4fMsUj7+NKqIlQWkjEYzUhrwPxcXe8bUdPPeeH6DNL\nF1/gFXipzBWYRuaPlw1s2OL29FXMbVhtYwt1QnyHA+iriOMlBiIGj/uOWRtSjJXH\ncy0emozcKLcg527K6FKJH/nS1q+jM15TgHLb89Q0XHlDjROUVEb54vNAa3XmjUwi\n8C2NVYrGy+zq3EwdxJomTlpCTFggWRIvQpoph8IDz/0E875/W0BXe5wOwyOtulRJ\n0zAvCsn8SHSDyjm1dAZDKYnjqXZxaPCWKZ1P6x3iKBDtkiCqmKUUYQoYnImIaMsz\nwWBpz3N9/uHdLq7abQTxZOB/WGFWSDIorRAfqr39M2p/Q/pPVWvp1F6R1uSU7ncq\najPjjcJyD+Dq6hs2wWTRZiltYVavc0dQrsfxnWdl9Aj9/nli1w==\n-----END CERTIFICATE-----\ndiff --git a/test/load1/mqtt_auto_provision.yml b/test/load1/mqtt_auto_provision.ymlindex bf144ae1b..b7c7f67a5 100644--- a/test/load1/mqtt_auto_provision.yml+++ b/test/load1/mqtt_auto_provision.yml@@ -1,49 +1,40 @@+settings:+ artifacts-dir: ./output/%Y-%m-%d_%H-%M-%S.%f++modules:+ jmeter:+ properties:+ logfile: ./output/jmeter.log+execution:-- concurrency: 1- ramp-up: 1m- hold-for: 5m- scenario: mqtt-client-auto-provision-sub-- concurrency: 1- hold-for: 15s+- concurrency: 20+ ramp-up: 40s+ iterations: 1scenario: mqtt-client-auto-provision-pubscenarios:- mqtt-client-auto-provision-sub:+ mqtt-client-auto-provision-pub:protocol: mqttrequests:- cmd: connect- addr: 127.0.0.1+ addr: localhost+ clientId: ${id}+ - cmd: publish+ topic: provisioning/${id}/request+ message: "{\"type\":\"x509\",\"cert\":\"${cert}\"}"- cmd: subscribe- topic: provisioning/${id}/response- time: 5s+ topic: master/${id}/attributevalue/+/#+ time: 10smin-count: 1+ think-time: 10s- cmd: disconnectdata-sources:- - devices.csv+ - path: ./tmp/devices.csvdelimiter: ','quoted: falseencoding: "utf-8"- loop: true+ loop: falsevariable-names: id,certrandom-order: false-- mqtt-client-auto-provision-pub:- protocol: mqtt- requests:- - cmd: connect- addr: 127.0.0.1- - cmd: publish- topic: provisioning/${id}/request- message: { "type" : "x509", "cert" : "${cert}"}- - cmd: disconnect-- data-sources:- - devices.csv- delimiter: ','- quoted: false- encoding: "utf-8"- loop: true- variable-names: id,cert- random-order: false\ No newline at end of filediff --git a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovyindex c0809414b..2e576f7d9 100644--- a/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AttributeLinkingTest.groovy@@ -82,6 +82,7 @@ class AttributeLinkingTest extends Specification implements ManagerContainerTrainew AttributeState(new AttributeRef(asset1.id, "button"), "PRESSED"))assetProcessingService.sendAttributeEvent(buttonPressed)+ Thread.sleep(200)advancePseudoClock(1, TimeUnit.SECONDS, container)def buttonReleased = new AttributeEvent(new AttributeState(new AttributeRef(asset1.id, "button"), "RELEASED")diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex 2f7dee89a..a676d3846 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -436,7 +436,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContathen: "the connection should be removed from the broker"conditions.eventually {- assert mqttBrokerService.getConnectionFromClientID(mqttDeviceNClientId) == null+ assert mqttBrokerService.clientIDConnectionMap.get(mqttDeviceNClientId) == nullassert deviceNClient.getConnectionStatus() == ConnectionStatus.DISCONNECTED}@@ -485,7 +485,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContathen: "the connection should be removed from the broker"conditions.eventually {- assert mqttBrokerService.getConnectionFromClientID(mqttDeviceNClientId) == null+ assert mqttBrokerService.clientIDConnectionMap.get(mqttDeviceNClientId) == nullassert deviceNClient.getConnectionStatus() == ConnectionStatus.DISCONNECTED}@@ -538,7 +538,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContathen: "the connection should be removed from the broker"conditions.eventually {- assert mqttBrokerService.getConnectionFromClientID(mqttDeviceNClientId) == null+ assert mqttBrokerService.clientIDConnectionMap.get(mqttDeviceNClientId) == nullassert deviceNClient.getConnectionStatus() == ConnectionStatus.DISCONNECTED}@@ -617,7 +617,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContathen: "the connection should be removed from the broker"conditions.eventually {- assert mqttBrokerService.getConnectionFromClientID(mqttDeviceNClientId) == null+ assert mqttBrokerService.clientIDConnectionMap.get(mqttDeviceNClientId) == nullassert deviceNClient.getConnectionStatus() == ConnectionStatus.DISCONNECTED}diff --git a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovyindex 81f256ed7..7762b21fb 100644--- a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy@@ -200,6 +200,17 @@ trait ContainerTrait {}}+ // Wait for system to settle down+ def assetProcessingService = container.hasService(AssetProcessingService.class) ? container.getService(AssetProcessingService.class) : null+ if (assetProcessingService != null) {+ println("Waiting for the system to settle down")+ def j=0+ while (j < 100 && !noEventProcessedIn(assetProcessingService, 300)) {+ Thread.sleep(100)+ j+++ }+ }+// Reset assetsif (container.hasService(AgentService.class) && container.hasService(AssetStorageService.class)) {def currentAssets = getAssets().collect { it.getId() }