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
Updated ContainerService priorities and minor fix for GatewayService
Rich Turnereb18297ad310
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.javaindex 9161b9094..7659586df 100644--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java@@ -109,7 +109,7 @@ public abstract class AbstractProtocol implements Protocol {}private static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, AbstractProtocol.class);- public static final int PRIORITY = MessageBrokerService.PRIORITY + 10;+ public static final int PRIORITY = MessageBrokerService.PRIORITY + 100;protected final Map<AttributeRef, AssetAttribute> linkedAttributes = new HashMap<>();protected final Set<AttributeRef> dynamicAttributes = new HashSet<>();protected final Map<AttributeRef, LinkedProtocolInfo> linkedProtocolConfigurations = new HashMap<>();diff --git a/container/src/main/java/org/openremote/container/ContainerService.java b/container/src/main/java/org/openremote/container/ContainerService.javaindex 42d655da9..1baec30fb 100644--- a/container/src/main/java/org/openremote/container/ContainerService.java+++ b/container/src/main/java/org/openremote/container/ContainerService.java@@ -39,7 +39,10 @@ package org.openremote.container;*/public interface ContainerService {- int DEFAULT_PRIORITY = Integer.MAX_VALUE - 100;+ int DEFAULT_PRIORITY = 1000;+ int HIGH_PRIORITY = Integer.MIN_VALUE + 1000;+ int MED_PRIORITY = 0;+ int LOW_PRIORITY = Integer.MAX_VALUE - 1000;/*** Gets the priority of this service which is used to determine initialization order when services are autodiff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex 4f5f081e6..85bd04165 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -29,6 +29,7 @@ import org.openremote.container.Container;import org.openremote.container.ContainerService;import org.openremote.container.concurrent.ContainerExecutor;import org.openremote.container.concurrent.ContainerScheduledExecutor;+import org.openremote.container.persistence.PersistenceService;import org.openremote.container.security.IdentityService;import org.openremote.container.web.DefaultWebsocketComponent;import org.openremote.container.web.WebService;@@ -46,7 +47,7 @@ public class MessageBrokerService implements ContainerService {public static final String MESSAGE_SESSION_ALLOWED_ORIGIN = "MESSAGE_SESSION_ALLOWED_ORIGIN";public static final String MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT = null;private static final Logger LOG = Logger.getLogger(MessageBrokerService.class.getName());- public static final int PRIORITY = ContainerService.DEFAULT_PRIORITY - 100;+ public static final int PRIORITY = ContainerService.HIGH_PRIORITY;protected ProducerTemplate producerTemplate;protected MessageBrokerContext context;diff --git a/container/src/main/java/org/openremote/container/security/IdentityService.java b/container/src/main/java/org/openremote/container/security/IdentityService.javaindex d8a4a7acc..ca3685260 100644--- a/container/src/main/java/org/openremote/container/security/IdentityService.java+++ b/container/src/main/java/org/openremote/container/security/IdentityService.java@@ -35,9 +35,14 @@ import java.util.logging.Logger;import static org.openremote.container.util.MapAccess.*;+/**+ * Needs to run before persistence service because if BASIC identity provider is configured then flyway must be+ * configured to manage PUBLIC schema for user data; that configuration is done by the+ * {@link org.openremote.container.security.basic.BasicIdentityProvider} and must happen before flyway initialisation.+ */public abstract class IdentityService implements ContainerService {- public static final int PRIORITY = PersistenceService.PRIORITY - 10; // Run before persistence service+ public static final int PRIORITY = PersistenceService.PRIORITY - 10;private static final Logger LOG = Logger.getLogger(IdentityService.class.getName());public static final String IDENTITY_NETWORK_SECURE = "IDENTITY_NETWORK_SECURE";diff --git a/container/src/main/java/org/openremote/container/timer/TimerService.java b/container/src/main/java/org/openremote/container/timer/TimerService.javaindex 5109866ce..eb78afd51 100644--- a/container/src/main/java/org/openremote/container/timer/TimerService.java+++ b/container/src/main/java/org/openremote/container/timer/TimerService.java@@ -37,9 +37,9 @@ import static org.openremote.container.util.MapAccess.getString;public class TimerService implements ContainerService {private static final Logger LOG = Logger.getLogger(TimerService.class.getName());-public static final String TIMER_CLOCK_TYPE = "TIMER_CLOCK_TYPE";public static final String TIMER_CLOCK_TYPE_DEFAULT = Clock.REAL.toString();+ public static final int PRIORITY = ContainerService.HIGH_PRIORITY + 300;public enum Clock {REAL {@@ -88,7 +88,7 @@ public class TimerService implements ContainerService {@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex b30afaddc..415a11f2f 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -74,7 +74,6 @@ import static org.openremote.container.concurrent.GlobalLock.withLock;import static org.openremote.container.concurrent.GlobalLock.withLockReturning;import static org.openremote.container.persistence.PersistenceEvent.*;import static org.openremote.manager.asset.AssetProcessingService.ASSET_QUEUE;-import static org.openremote.manager.gateway.GatewayService.GATEWAY_SERVICE_PRIORITY;import static org.openremote.model.AbstractValueTimestampHolder.VALUE_TIMESTAMP_FIELD_NAME;import static org.openremote.model.asset.AssetAttribute.attributesFromJson;import static org.openremote.model.asset.AssetAttribute.getAddedOrModifiedAttributes;@@ -95,7 +94,7 @@ import static org.openremote.model.util.TextUtil.isValidURN;public class AgentService extends RouteBuilder implements ContainerService, AssetUpdateProcessor, ProtocolAssetService {private static final Logger LOG = Logger.getLogger(AgentService.class.getName());- public static final int AGENT_SERVICE_PRIORITY = GATEWAY_SERVICE_PRIORITY + 1; // Start after the gateway service+ public static final int PRIORITY = DEFAULT_PRIORITY + 100; // Start quite late to ensure protocols etc. are initialisedprotected TimerService timerService;protected ManagerIdentityService identityService;protected AssetProcessingService assetProcessingService;@@ -117,7 +116,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse*/@Overridepublic int getPriority() {- return AGENT_SERVICE_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex 646355bfe..f146da45e 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -120,6 +120,7 @@ import static org.openremote.model.attribute.AttributeEvent.Source.*;*/public class AssetProcessingService extends RouteBuilder implements ContainerService {+ public static final int PRIORITY = AssetStorageService.PRIORITY + 1000;private static final Logger LOG = Logger.getLogger(AssetProcessingService.class.getName());// TODO: Some of these options should be configurable depending on expected load etc.@@ -144,7 +145,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 2f0ebee21..de173ef4e 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -121,6 +121,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}private static final Logger LOG = Logger.getLogger(AssetStorageService.class.getName());+ public static final int PRIORITY = MED_PRIORITY;protected static String META_ITEM_RESTRICTED_READ_SQL_FRAGMENT;protected static String META_ITEM_PUBLIC_READ_SQL_FRAGMENT;protected TimerService timerService;@@ -203,7 +204,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.javaindex 1e119d6cc..cf70a0399 100644--- a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java+++ b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java@@ -39,12 +39,12 @@ public class ManagerExecutorService implements ProtocolExecutorService {*/public static final String SCHEDULED_TASKS_THREADS_MAX = "SCHEDULED_TASKS_THREADS_MAX";public static final int SCHEDULED_TASKS_THREADS_MAX_DEFAULT = Math.max(Runtime.getRuntime().availableProcessors(), 2);-+ public static final int PRIORITY = ContainerService.HIGH_PRIORITY + 200;protected ScheduledExecutorService scheduledTasksExecutor;@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.javaindex b7ef2f1d9..20fd26b24 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java@@ -56,6 +56,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProcepublic static final String DATA_POINTS_MAX_AGE_DAYS = "DATA_POINTS_MAX_AGE_DAYS";public static final String DATA_POINTS_MAX_AGE_DAYS_DEFAULT = "31";private static final Logger LOG = Logger.getLogger(AssetDatapointService.class.getName());+ public static final int PRIORITY = AssetStorageService.PRIORITY + 100;protected PersistenceService persistenceService;protected AssetStorageService assetStorageService;protected TimerService timerService;@@ -65,7 +66,7 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex 5954a3b95..2187d99cc 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -27,10 +27,12 @@ import org.openremote.container.message.MessageBrokerService;import org.openremote.container.security.AuthContext;import org.openremote.container.timer.TimerService;import org.openremote.container.web.ConnectionConstants;+import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.concurrent.ManagerExecutorService;import org.openremote.manager.gateway.GatewayService;import org.openremote.manager.mqtt.MqttBrokerService;import org.openremote.manager.security.ManagerIdentityService;+import org.openremote.manager.web.ManagerWebService;import org.openremote.model.Constants;import org.openremote.model.event.shared.*;import org.openremote.model.syslog.SyslogEvent;@@ -93,8 +95,8 @@ import static org.openremote.manager.gateway.GatewayService.isGatewayClientId;*/public class ClientEventService implements ContainerService {+ public static final int PRIORITY = ManagerWebService.PRIORITY - 200;private static final Logger LOG = Logger.getLogger(ClientEventService.class.getName());-public static final String WEBSOCKET_EVENTS = "events";// TODO: Some of these options should be configurable depending on expected load etc.@@ -118,7 +120,7 @@ public class ClientEventService implements ContainerService {@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.javaindex f832293a3..575fe9939 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java@@ -64,6 +64,7 @@ import static org.openremote.model.syslog.SyslogCategory.GATEWAY;*/public class GatewayClientService extends RouteBuilder implements ContainerService {+ public static final int PRIORITY = ManagerWebService.PRIORITY - 300;private static final Logger LOG = SyslogCategory.getLogger(GATEWAY, GatewayClientService.class.getName());public static final String CLIENT_EVENT_SESSION_PREFIX = GatewayClientService.class.getSimpleName() + ":";protected AssetStorageService assetStorageService;diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 000f8337e..702871d85 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -68,7 +68,7 @@ import static org.openremote.model.syslog.SyslogCategory.GATEWAY;public class GatewayService extends RouteBuilder implements ContainerService, AssetUpdateProcessor {- public static final int GATEWAY_SERVICE_PRIORITY = DEFAULT_PRIORITY - 10;+ public static final int PRIORITY = HIGH_PRIORITY + 100;public static final String GATEWAY_CLIENT_ID_PREFIX = "gateway-";private static final Logger LOG = SyslogCategory.getLogger(GATEWAY, GatewayService.class.getName());protected AssetStorageService assetStorageService;@@ -93,7 +93,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As@Overridepublic int getPriority() {- return GATEWAY_SERVICE_PRIORITY;+ return PRIORITY;}@Override@@ -243,6 +243,9 @@ public class GatewayService extends RouteBuilder implements ContainerService, Asboolean disabled = attribute.getValueAsBoolean().orElse(false);boolean isAlreadyDisabled = asset.getAttribute("disabled").flatMap(AssetAttribute::getValueAsBoolean).orElse(false);if (disabled != isAlreadyDisabled) {+ if (disabled) {+ connector.sendMessageToGateway(new GatewayDisconnectEvent(GatewayDisconnectEvent.Reason.DISABLED));+ }connector.setDisabled(disabled);updateGatewayClient(connector, !disabled);}@@ -438,6 +441,9 @@ public class GatewayService extends RouteBuilder implements ContainerService, As// Check if disabledboolean isNowDisabled = gateway.getAttribute("disabled").flatMap(AssetAttribute::getValueAsBoolean).orElse(false);+ if (isNowDisabled) {+ connector.sendMessageToGateway(new GatewayDisconnectEvent(GatewayDisconnectEvent.Reason.DISABLED));+ }connector.setDisabled(isNowDisabled);updateGatewayClient(connector, !isNowDisabled);break;diff --git a/manager/src/main/java/org/openremote/manager/i18n/I18NService.java b/manager/src/main/java/org/openremote/manager/i18n/I18NService.javaindex f727b831b..228ff7953 100644--- a/manager/src/main/java/org/openremote/manager/i18n/I18NService.java+++ b/manager/src/main/java/org/openremote/manager/i18n/I18NService.java@@ -12,7 +12,7 @@ public class I18NService implements ContainerService {@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return ContainerService.HIGH_PRIORITY + 400;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex 072b9ce82..9e751992c 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -34,6 +34,7 @@ import org.openremote.container.message.MessageBrokerService;import org.openremote.manager.event.ClientEventService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.security.ManagerKeycloakIdentityProvider;+import org.openremote.manager.web.ManagerWebService;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.event.TriggeredEventSubscription;import org.openremote.model.value.ObjectValue;@@ -51,6 +52,7 @@ import static org.openremote.manager.event.ClientEventService.getSessionKey;public class MqttBrokerService implements ContainerService {+ public static final int PRIORITY = ManagerWebService.PRIORITY - 100;private static final Logger LOG = Logger.getLogger(MqttBrokerService.class.getName());public static final String MQTT_CLIENT_QUEUE = "seda://MqttClientQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";@@ -76,7 +78,7 @@ public class MqttBrokerService implements ContainerService {@Overridepublic int getPriority() {- return DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.javaindex 19f21ac1d..d760dd96a 100644--- a/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/predicted/AssetPredictedDatapointService.java@@ -50,6 +50,7 @@ import java.util.logging.Logger;public class AssetPredictedDatapointService implements ContainerService, ProtocolPredictedAssetService {+ public static final int PRIORITY = AssetStorageService.PRIORITY + 300;private static final Logger LOG = Logger.getLogger(AssetPredictedDatapointService.class.getName());protected PersistenceService persistenceService;@@ -57,7 +58,7 @@ public class AssetPredictedDatapointService implements ContainerService, Protoco@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 171f11305..67740eda6 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -96,6 +96,7 @@ import static org.openremote.model.asset.AssetAttribute.getAddedOrModifiedAttrib*/public class RulesService extends RouteBuilder implements ContainerService, AssetUpdateProcessor {+ public static final int PRIORITY = AssetProcessingService.PRIORITY + 100;public static final String RULE_EVENT_EXPIRES = "RULE_EVENT_EXPIRES";public static final String RULE_EVENT_EXPIRES_DEFAULT = "1h";private static final Logger LOG = Logger.getLogger(RulesService.class.getName());@@ -127,7 +128,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex 5a96afa56..9bea3be30 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -23,6 +23,7 @@ import org.hibernate.Session;import org.hibernate.jdbc.AbstractReturningWork;import org.openremote.container.Container;import org.openremote.container.ContainerService;+import org.openremote.container.message.MessageBrokerService;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;@@ -62,13 +63,13 @@ public class RulesetStorageService implements ContainerService {}private static final Logger LOG = Logger.getLogger(RulesetStorageService.class.getName());-+ public static final int PRIORITY = AssetStorageService.PRIORITY + 200;protected PersistenceService persistenceService;protected ManagerIdentityService identityService;@Overridepublic int getPriority() {- return ContainerService.DEFAULT_PRIORITY;+ return PRIORITY;}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.javaindex 0e76bf6f3..c008486d8 100644--- a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java+++ b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java@@ -83,7 +83,7 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofe@Overridepublic int getPriority() {- return MessageBrokerService.PRIORITY + 10;+ return MessageBrokerService.PRIORITY + 200; // Start after MessageBrokerService so we can add routes}@Overridediff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.javaindex 9f9e2b527..593d93055 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java@@ -34,6 +34,7 @@ import org.openremote.container.Container;import org.openremote.container.security.IdentityService;import org.openremote.container.web.WebService;import org.openremote.container.web.jsapi.JSAPIServlet;+import org.openremote.manager.asset.AssetStorageService;import javax.ws.rs.WebApplicationException;import javax.ws.rs.core.UriBuilder;@@ -57,6 +58,7 @@ import static org.openremote.model.Constants.REQUEST_HEADER_REALM;public class ManagerWebService extends WebService {+ public static final int PRIORITY = LOW_PRIORITY + 100;public static final String APP_DOCROOT = "APP_DOCROOT";public static final String APP_DOCROOT_DEFAULT = "deployment/build/manager/app";public static final String SHARED_DOCROOT = "SHARED_DOCROOT";@@ -84,7 +86,7 @@ public class ManagerWebService extends WebService {*/@Overridepublic int getPriority() {- return Integer.MAX_VALUE - 1;+ return PRIORITY;}@Overridepublic void init(Container container) throws Exception {