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
Added service loader support to the Container (includes priority value to control service order)
Rich Turnere2eaab0a65de
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.javaindex e82b731d2..3f0607bb1 100644--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java@@ -23,6 +23,7 @@ import org.apache.camel.ProducerTemplate;import org.apache.camel.builder.RouteBuilder;import org.openremote.agent.protocol.filter.MessageFilter;import org.openremote.container.Container;+import org.openremote.container.ContainerService;import org.openremote.container.concurrent.GlobalLock;import org.openremote.container.message.MessageBrokerContext;import org.openremote.container.message.MessageBrokerService;@@ -107,7 +108,7 @@ public abstract class AbstractProtocol implements Protocol {}private static final Logger LOG = Logger.getLogger(AbstractProtocol.class.getName());-+ public static final int PRIORITY = ContainerService.DEFAULT_PRIORITY - 100;protected final Map<AttributeRef, AssetAttribute> linkedAttributes = new HashMap<>();protected final Map<AttributeRef, LinkedProtocolInfo> linkedProtocolConfigurations = new HashMap<>();protected final Map<AttributeRef, List<MessageFilter>> linkedAttributeFilters = new HashMap<>();@@ -133,6 +134,11 @@ public abstract class AbstractProtocol implements Protocol {);}+ @Override+ public int getPriority() {+ return PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {LOG.info("Initializing protocol: " + getProtocolName());@@ -310,7 +316,7 @@ public abstract class AbstractProtocol implements Protocol {/*** Update the value of a linked attribute. Call this to publish new sensor values. This will apply any- * {@link MessageFilter}s that have been set for the {@link Attribute} against the {@link AttributeState#value}+ * {@link MessageFilter}s that have been set for the {@link Attribute} against the {@link AttributeState#getValue}* before sending on the sensor queue.*/@SuppressWarnings("unchecked")diff --git a/agent/src/main/resources/META-INF/services/org.openremote.agent.protocol.Protocol b/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerServicesimilarity index 100%rename from agent/src/main/resources/META-INF/services/org.openremote.agent.protocol.Protocolrename to agent/src/main/resources/META-INF/services/org.openremote.container.ContainerServicediff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.javaindex a07efd796..06181f8eb 100644--- a/container/src/main/java/org/openremote/container/Container.java+++ b/container/src/main/java/org/openremote/container/Container.java@@ -32,7 +32,9 @@ import org.openremote.container.util.LogUtil;import java.util.*;import java.util.logging.Handler;import java.util.logging.Logger;+import java.util.stream.Collectors;+import static java.util.stream.StreamSupport.stream;import static org.openremote.container.util.MapAccess.getBoolean;/**@@ -76,6 +78,16 @@ public class Container {protected Thread waitingThread;protected final Map<Class<? extends ContainerService>, ContainerService> services = new LinkedHashMap<>();+ /**+ * Discover {@link ContainerService}s using {@link ServiceLoader}; services are then ordered by+ * {@link ContainerService#getPriority}.+ */+ public Container() {+ this(stream(ServiceLoader.load(ContainerService.class).spliterator(), false)+ .sorted(Comparator.comparingInt(ContainerService::getPriority))+ .collect(Collectors.toList()));+ }+public Container(ContainerService... services) {this(Arrays.asList(services));}diff --git a/container/src/main/java/org/openremote/container/ContainerHealthStatusProvider.java b/container/src/main/java/org/openremote/container/ContainerHealthStatusProvider.javanew file mode 100644index 000000000..c645044af--- /dev/null+++ b/container/src/main/java/org/openremote/container/ContainerHealthStatusProvider.java@@ -0,0 +1,26 @@+/*+ * Copyright 2019, 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;++import org.openremote.container.ContainerService;+import org.openremote.model.system.HealthStatusProvider;++public interface ContainerHealthStatusProvider extends HealthStatusProvider, ContainerService {+}diff --git a/container/src/main/java/org/openremote/container/ContainerService.java b/container/src/main/java/org/openremote/container/ContainerService.javaindex ef73e05ed..42d655da9 100644--- a/container/src/main/java/org/openremote/container/ContainerService.java+++ b/container/src/main/java/org/openremote/container/ContainerService.java@@ -20,7 +20,9 @@package org.openremote.container;/**- * The {@link Container} is a registry of services, the order of services in a container is important.+ * The {@link Container} is a registry of services, the order of services in a container is important and is determined+ * by the {@link #getPriority} value; when starting the {@link Container} using the auto service discovery mechanism.+ * If the container is started with an explicit list of services then the insertion order is used.* <p>* Service startup lifecycle:* </p>@@ -37,19 +39,28 @@ package org.openremote.container;*/public interface ContainerService {+ int DEFAULT_PRIORITY = Integer.MAX_VALUE - 100;+/**- * All services are initialized in the order they have been added to container.+ * Gets the priority of this service which is used to determine initialization order when services are auto+ * discovered; services with a lower priority are initialized and started first.+ */+ int getPriority();++ /**+ * All services are initialized in the order they have been added to the container (if container started with+ * explicit list of services) otherwise they are initialized in order of {@link #getPriority}.*/void init(Container container) throws Exception;/**- * After initialization, services are started in the order they have been added to container.+ * After initialization, services are started in the order they have been added to the container (if container+ * started with explicit list of services) otherwise they are started in order of {@link #getPriority}.*/void start(Container container) throws Exception;/**- * When the container is shutting down, it stops all services in the reverse order they have been added to container.+ * When the container is shutting down, it stops all services in the reverse order they were started.*/void stop(Container container) throws Exception;-}diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex f1410fbfe..3b6f0d619 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -31,6 +31,11 @@ public class MessageBrokerService implements ContainerService {protected ProducerTemplate producerTemplate;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {MessageBrokerSetupService messageBrokerSetupService = container.getService(MessageBrokerSetupService.class);diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.javaindex 8a2384d28..17ba1d24f 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java@@ -43,12 +43,17 @@ import static org.openremote.container.util.MapAccess.getString;public class MessageBrokerSetupService implements ContainerService {public static final String WEBSOCKET_PATH = "/websocket";-public static final String MESSAGE_SESSION_ALLOWED_ORIGIN = "MESSAGE_SESSION_ALLOWED_ORIGIN";public static final String MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT = null;+ public static final int PRIORITY = DEFAULT_PRIORITY - 100;protected MessageBrokerContext context;+ @Override+ public int getPriority() {+ return PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {context = new MessageBrokerContext();diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.javaindex 0a16da7b7..8f57a01b9 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceHealthStatusProvider.java@@ -21,6 +21,7 @@ package org.openremote.container.persistence;import com.zaxxer.hikari.HikariPoolMXBean;import org.openremote.container.Container;+import org.openremote.container.ContainerHealthStatusProvider;import org.openremote.container.ContainerService;import org.openremote.model.system.HealthStatusProvider;import org.openremote.model.value.ObjectValue;@@ -37,13 +38,18 @@ import java.util.logging.Logger;import static org.openremote.container.persistence.Database.PROPERTY_POOL_NAME;-public class PersistenceHealthStatusProvider implements HealthStatusProvider, ContainerService {+public class PersistenceHealthStatusProvider implements ContainerHealthStatusProvider {private 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+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {persistenceService = container.getService(PersistenceService.class);diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex aeb4bae76..5a3d71425 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -75,6 +75,7 @@ public class PersistenceService implements ContainerService {public static final int DATABASE_MAX_POOL_SIZE_DEFAULT = 20;public static final String DATABASE_CONNECTION_TIMEOUT_SECONDS = "DATABASE_CONNECTION_TIMEOUT_SECONDS";public static final int DATABASE_CONNECTION_TIMEOUT_SECONDS_DEFAULT = 5;+ public static final int PRIORITY = 100;protected MessageBrokerService messageBrokerService;protected Database database;@@ -86,6 +87,11 @@ public class PersistenceService implements ContainerService {protected boolean forceClean;protected List<String> defaultSchemaLocations = new ArrayList<>();+ @Override+ public int getPriority() {+ return PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {this.messageBrokerService = container.hasService(MessageBrokerService.class)diff --git a/container/src/main/java/org/openremote/container/security/IdentityService.java b/container/src/main/java/org/openremote/container/security/IdentityService.javaindex 003d03103..62538036b 100644--- a/container/src/main/java/org/openremote/container/security/IdentityService.java+++ b/container/src/main/java/org/openremote/container/security/IdentityService.java@@ -46,6 +46,11 @@ public abstract class IdentityService implements ContainerService {protected UriBuilder externalServerUri;protected IdentityProvider identityProvider;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {boolean identityNetworkSecure = getBoolean(container.getConfig(), IDENTITY_NETWORK_SECURE, IDENTITY_NETWORK_SECURE_DEFAULT);diff --git a/container/src/main/java/org/openremote/container/timer/TimerService.java b/container/src/main/java/org/openremote/container/timer/TimerService.javaindex f4d0b3824..5109866ce 100644--- a/container/src/main/java/org/openremote/container/timer/TimerService.java+++ b/container/src/main/java/org/openremote/container/timer/TimerService.java@@ -86,6 +86,11 @@ public class TimerService implements ContainerService {protected Clock clock;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {this.clock = Clock.valueOf(diff --git a/manager/src/main/java/org/openremote/manager/Main.java b/manager/src/main/java/org/openremote/manager/Main.javaindex 8a8b45a97..8897825bc 100644--- a/manager/src/main/java/org/openremote/manager/Main.java+++ b/manager/src/main/java/org/openremote/manager/Main.java@@ -19,71 +19,11 @@*/package org.openremote.manager;-import org.openremote.agent.protocol.Protocol;import org.openremote.container.Container;-import org.openremote.container.ContainerService;-import org.openremote.container.message.MessageBrokerService;-import org.openremote.container.message.MessageBrokerSetupService;-import org.openremote.container.timer.TimerService;-import org.openremote.manager.agent.AgentService;-import org.openremote.manager.apps.ConsoleAppService;-import org.openremote.manager.asset.AssetAttributeLinkingService;-import org.openremote.manager.asset.AssetProcessingService;-import org.openremote.manager.asset.AssetStorageService;-import org.openremote.manager.concurrent.ManagerExecutorService;-import org.openremote.manager.datapoint.AssetDatapointService;-import org.openremote.manager.event.ClientEventService;-import org.openremote.manager.i18n.I18NService;-import org.openremote.manager.map.MapService;-import org.openremote.manager.notification.NotificationService;-import org.openremote.manager.persistence.ManagerPersistenceService;-import org.openremote.manager.rules.RulesService;-import org.openremote.manager.rules.RulesetStorageService;-import org.openremote.manager.security.ManagerIdentityService;-import org.openremote.manager.setup.SetupService;-import org.openremote.manager.simulator.SimulatorService;-import org.openremote.manager.system.HealthStatusService;-import org.openremote.manager.web.ManagerWebService;--import java.util.ArrayList;-import java.util.Arrays;-import java.util.List;-import java.util.ServiceLoader;public class Main {public static void main(String[] args) throws Exception {- List<ContainerService> services = new ArrayList<ContainerService>() {- {- addAll(Arrays.asList(- new TimerService(),- new ManagerExecutorService(),- new I18NService(),- new ManagerPersistenceService(),- new MessageBrokerSetupService(),- new ManagerIdentityService(),- new SetupService(),- new ClientEventService(),- new RulesetStorageService(),- new RulesService(),- new AssetStorageService(),- new AssetDatapointService(),- new AssetAttributeLinkingService(),- new AssetProcessingService(),- new MessageBrokerService(),- new HealthStatusService()- ));- ServiceLoader.load(Protocol.class).forEach(this::add);- addAll(Arrays.asList(- new AgentService(),- new SimulatorService(),- new MapService(),- new NotificationService(),- new ConsoleAppService(),- new ManagerWebService()- ));- }- };- new Container(services).startBackground();+ new Container().startBackground();}}diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.javaindex 9e9e1b390..fe0785b61 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentHealthStatusProvider.java@@ -21,11 +21,11 @@ package org.openremote.manager.agent;import org.openremote.container.Container;import org.openremote.container.ContainerService;+import org.openremote.container.ContainerHealthStatusProvider;import org.openremote.model.asset.Asset;import org.openremote.model.asset.agent.ConnectionStatus;import org.openremote.model.asset.agent.ProtocolConfiguration;import org.openremote.model.attribute.AttributeRef;-import org.openremote.model.system.HealthStatusProvider;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;@@ -34,12 +34,17 @@ import java.util.List;import java.util.Objects;import java.util.concurrent.atomic.AtomicInteger;-public class AgentHealthStatusProvider implements HealthStatusProvider, ContainerService {+public class AgentHealthStatusProvider implements ContainerHealthStatusProvider {public static final String NAME = "agents";public static final String VERSION = "1.0";protected AgentService agentService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {agentService = container.getService(AgentService.class);diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 355be3888..691f5153e 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -28,7 +28,6 @@ import org.openremote.container.message.MessageBrokerService;import org.openremote.container.message.MessageBrokerSetupService;import org.openremote.container.persistence.PersistenceEvent;import org.openremote.container.timer.TimerService;-import org.openremote.container.web.WebService;import org.openremote.manager.asset.AssetProcessingException;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;@@ -85,7 +84,6 @@ 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());-protected TimerService timerService;protected ManagerIdentityService identityService;protected AssetProcessingService assetProcessingService;@@ -98,6 +96,14 @@ public class AgentService extends RouteBuilder implements ContainerService, Asseprotected LocalAgentConnector localAgentConnector;protected Map<String, Asset> agentMap;+ /**+ * It's important that {@link Protocol}s have a lower priority than this service so they are fully initialized+ * before this service is started.+ */+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.javaindex 712c02efa..8208737f4 100644--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java@@ -36,6 +36,11 @@ public class ConsoleAppService implements ContainerService {protected ManagerWebService managerWebService;protected ManagerIdentityService identityService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetAttributeLinkingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetAttributeLinkingService.javaindex c2150d7fe..28d926085 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetAttributeLinkingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetAttributeLinkingService.java@@ -90,6 +90,11 @@ public class AssetAttributeLinkingService implements ContainerService, AssetUpdaprotected AssetProcessingService assetProcessingService;protected AssetStorageService assetStorageService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {assetProcessingService = container.getService(AssetProcessingService.class);diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex e6d42083f..777c014dc 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -139,6 +139,11 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerfinal protected List<AssetUpdateProcessor> processors = new ArrayList<>();+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {timerService = container.getService(TimerService.class);diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 784671499..83a965360 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -113,6 +113,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicprotected ManagerIdentityService identityService;protected ClientEventService clientEventService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {timerService = container.getService(TimerService.class);diff --git a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.javaindex cd5822c66..da6fbcace 100644--- a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java+++ b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java@@ -21,6 +21,7 @@ package org.openremote.manager.concurrent;import org.openremote.agent.protocol.ProtocolExecutorService;import org.openremote.container.Container;+import org.openremote.container.ContainerService;import org.openremote.container.concurrent.ContainerScheduledExecutor;import java.util.Collection;@@ -41,6 +42,11 @@ public class ManagerExecutorService implements ProtocolExecutorService {protected ScheduledExecutorService scheduledTasksExecutor;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {int scheduledTasksThreadsMax =diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.javaindex ecefc6f5b..3976b1852 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointHealthStatusProvider.java@@ -21,17 +21,22 @@ package org.openremote.manager.datapoint;import org.openremote.container.Container;import org.openremote.container.ContainerService;-import org.openremote.model.system.HealthStatusProvider;+import org.openremote.container.ContainerHealthStatusProvider;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;-public class AssetDatapointHealthStatusProvider implements HealthStatusProvider, ContainerService {+public class AssetDatapointHealthStatusProvider implements ContainerHealthStatusProvider {public static final String NAME = "datapoints";public static final String VERSION = "1.0";protected AssetDatapointService assetDatapointService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {assetDatapointService = container.getService(AssetDatapointService.class);diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.javaindex 523e73182..8dd2a80a7 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java@@ -65,6 +65,11 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProceprotected int maxDatapointAgeDays;protected ScheduledFuture dataPointsPurgeScheduledFuture;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {persistenceService = container.getService(PersistenceService.class);diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.javaindex 2621feac9..fe64741dd 100644--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java@@ -109,9 +109,13 @@ public class ClientEventService implements ContainerService {protected MessageBrokerService messageBrokerService;protected ManagerIdentityService identityService;protected EventSubscriptions eventSubscriptions;-protected boolean stopped;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {timerService = container.getService(TimerService.class);diff --git a/manager/src/main/java/org/openremote/manager/i18n/I18NService.java b/manager/src/main/java/org/openremote/manager/i18n/I18NService.javaindex f36206096..f727b831b 100644--- a/manager/src/main/java/org/openremote/manager/i18n/I18NService.java+++ b/manager/src/main/java/org/openremote/manager/i18n/I18NService.java@@ -10,6 +10,11 @@ public class I18NService implements ContainerService {protected ResourceBundle validationMessages;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {// TODO configurable per user sessiondiff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 9c2fcec40..c818c246e 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -139,6 +139,11 @@ public class MapService implements ContainerService {}}+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.javaindex cbf84a298..e2f4bfb44 100644--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java@@ -20,6 +20,7 @@package org.openremote.manager.notification;import org.openremote.container.Container;+import org.openremote.container.ContainerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.model.AbstractValueHolder;@@ -75,6 +76,11 @@ public class EmailNotificationHandler implements NotificationHandler {}};+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.javaindex aae3d1c82..c3cea06aa 100644--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java@@ -65,24 +65,13 @@ import static org.openremote.model.notification.Notification.Source.*;public class NotificationService extends RouteBuilder implements ContainerService {public static final String NOTIFICATION_QUEUE = "seda://NotificationQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";- protected static final TemporalField WEEK_FIELD_ISO = WeekFields.of(Locale.FRANCE).dayOfWeek(); // Always use ISO for consistencyprivate static final Logger LOG = Logger.getLogger(NotificationService.class.getName());protected TimerService timerService;protected PersistenceService persistenceService;protected AssetStorageService assetStorageService;protected ManagerIdentityService identityService;protected MessageBrokerService messageBrokerService;- protected Map<String, NotificationHandler> notificationHandlerMap;-- public NotificationService() {- // Create notification handlers here to facilitate testing- notificationHandlerMap = new HashMap<>();- NotificationHandler pushHandler = new PushNotificationHandler();- NotificationHandler emailHandler = new EmailNotificationHandler();- notificationHandlerMap.put(pushHandler.getTypeName(), pushHandler);- notificationHandlerMap.put(emailHandler.getTypeName(), emailHandler);-- }+ protected Map<String, NotificationHandler> notificationHandlerMap = new HashMap<>();protected static Processor handleNotificationProcessingException(Logger logger) {return exchange -> {@@ -117,6 +106,11 @@ public class NotificationService extends RouteBuilder implements ContainerServic};}+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {this.timerService = container.getService(TimerService.class);@@ -126,10 +120,8 @@ public class NotificationService extends RouteBuilder implements ContainerServicthis.messageBrokerService = container.getService(MessageBrokerService.class);container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);- // Init notification handlers- for (NotificationHandler handler : notificationHandlerMap.values()) {- handler.init(container);- }+ container.getServices(NotificationHandler.class).forEach(notificationHandler ->+ notificationHandlerMap.put(notificationHandler.getTypeName(), notificationHandler));container.getService(ManagerWebService.class).getApiSingletons().add(new NotificationResourceImpl(this,@@ -141,16 +133,12 @@ public class NotificationService extends RouteBuilder implements ContainerServic@Overridepublic void start(Container container) throws Exception {- for (NotificationHandler handler : notificationHandlerMap.values()) {- handler.start(container);- }+}@Overridepublic void stop(Container container) throws Exception {- for (NotificationHandler handler : notificationHandlerMap.values()) {- handler.stop(container);- }+}@Overridediff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.javaindex af4d0c0d6..48781c4ad 100644--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java@@ -26,6 +26,7 @@ import com.google.firebase.FirebaseOptions;import com.google.firebase.messaging.*;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.Container;+import org.openremote.container.ContainerService;import org.openremote.container.message.MessageBrokerSetupService;import org.openremote.container.persistence.PersistenceEvent;import org.openremote.manager.asset.AssetStorageService;@@ -74,6 +75,11 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatioprotected Map<String, String> consoleFCMTokenMap = new HashMap<>();protected List<String> fcmTokenBlacklist = new ArrayList<>();+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+public void init(Container container) throws Exception {this.assetStorageService = container.getService(AssetStorageService.class);container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.javaindex a7e8ff48e..2fcf62872 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesHealthStatusProvider.java@@ -21,20 +21,25 @@ package org.openremote.manager.rules;import org.openremote.container.Container;import org.openremote.container.ContainerService;+import org.openremote.container.ContainerHealthStatusProvider;import org.openremote.model.rules.AssetRuleset;import org.openremote.model.rules.TenantRuleset;-import org.openremote.model.system.HealthStatusProvider;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;-public class RulesHealthStatusProvider implements HealthStatusProvider, ContainerService {+public class RulesHealthStatusProvider implements ContainerHealthStatusProvider {public static final String NAME = "rules";public static final String VERSION = "1.0";protected RulesService rulesService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {rulesService = container.getService(RulesService.class);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 5bad4d8c4..c552e9283 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -96,17 +96,8 @@ public class RulesService extends RouteBuilder implements ContainerService, Assepublic 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());- protected static List<GeofenceAssetAdapter> geofenceAssetAdapters;-- static {- geofenceAssetAdapters = new ArrayList<>();- ServiceLoader.load(GeofenceAssetAdapter.class).forEach(geofenceAssetAdapter -> {- LOG.fine("Adding GeofenceAssetAdapter: " + geofenceAssetAdapter.getClass().getName());- geofenceAssetAdapters.add(geofenceAssetAdapter);- });- geofenceAssetAdapters.sort(Comparator.comparingInt(GeofenceAssetAdapter::getPriority).reversed());- }+ protected List<GeofenceAssetAdapter> geofenceAssetAdapters = new ArrayList<>();protected final Map<String, RulesEngine<TenantRuleset>> tenantEngines = new HashMap<>();protected final Map<String, RulesEngine<AssetRuleset>> assetEngines = new HashMap<>();protected TimerService timerService;@@ -129,6 +120,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asseprotected Set<AssetState> assetStates = new HashSet<>();protected String configEventExpires;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {timerService = container.getService(TimerService.class);@@ -162,14 +158,13 @@ public class RulesService extends RouteBuilder implements ContainerService, Assereturn false;});- // Init geofence adapters before registering this services camel routes; this allows adapters to know about- // asset persistence changes before the rule engines are updated.- for (GeofenceAssetAdapter geofenceAssetAdapter : geofenceAssetAdapters) {- if (geofenceAssetAdapter instanceof ContainerService) {- ((ContainerService) geofenceAssetAdapter).init(container);- }- }+ ServiceLoader.load(GeofenceAssetAdapter.class).forEach(geofenceAssetAdapter -> {+ LOG.fine("Adding GeofenceAssetAdapter: " + geofenceAssetAdapter.getClass().getName());+ geofenceAssetAdapters.add(geofenceAssetAdapter);+ });+ geofenceAssetAdapters.addAll(container.getServices(GeofenceAssetAdapter.class));+ geofenceAssetAdapters.sort(Comparator.comparingInt(GeofenceAssetAdapter::getPriority));container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);configEventExpires = getString(container.getConfig(), RULE_EVENT_EXPIRES, RULE_EVENT_EXPIRES_DEFAULT);}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex 47730b9e8..f1f64fdbe 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -39,6 +39,11 @@ public class RulesetStorageService implements ContainerService {protected PersistenceService persistenceService;protected ManagerIdentityService identityService;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {persistenceService = container.getService(PersistenceService.class);diff --git a/manager/src/main/java/org/openremote/manager/rules/geofence/GeofenceAssetAdapter.java b/manager/src/main/java/org/openremote/manager/rules/geofence/GeofenceAssetAdapter.javaindex bd2288d26..0d100a647 100644--- a/manager/src/main/java/org/openremote/manager/rules/geofence/GeofenceAssetAdapter.java+++ b/manager/src/main/java/org/openremote/manager/rules/geofence/GeofenceAssetAdapter.java@@ -19,6 +19,7 @@*/package org.openremote.manager.rules.geofence;+import org.openremote.container.ContainerService;import org.openremote.manager.rules.RulesEngine;import org.openremote.model.asset.Asset;import org.openremote.model.query.filter.LocationAttributePredicate;@@ -47,12 +48,7 @@ import java.util.List;* geofence)</li>* </ul>*/-public interface GeofenceAssetAdapter {-- /**- * Adapters with a higher priority are called first- */- int getPriority();+public interface GeofenceAssetAdapter extends ContainerService {/*** Get the name of this adapterdiff --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 35db627bb..634794f8d 100644--- a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java+++ b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java@@ -22,6 +22,7 @@ package org.openremote.manager.rules.geofence;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.Container;import org.openremote.container.ContainerService;+import org.openremote.container.message.MessageBrokerService;import org.openremote.container.message.MessageBrokerSetupService;import org.openremote.container.persistence.PersistenceEvent;import org.openremote.manager.asset.AssetStorageService;@@ -68,7 +69,7 @@ import static org.openremote.model.syslog.SyslogCategory.RULES;* notification is sent to affected consoles/assets. Consoles can also manually request their geofences (e.g. on* startup)*/-public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements GeofenceAssetAdapter, ContainerService {+public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements GeofenceAssetAdapter {private static final Logger LOG = SyslogCategory.getLogger(RULES, ORConsoleGeofenceAssetAdapter.class.getName());public static final String NAME = "ORConsole";@@ -83,6 +84,11 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofeprotected ScheduledFuture notifyAssetsScheduledFuture;protected Set<String> notifyAssets;+ @Override+ public int getPriority() {+ return MessageBrokerSetupService.PRIORITY + 10;+ }+@Overridepublic void init(Container container) throws Exception {this.assetStorageService = container.getService(AssetStorageService.class);@@ -132,11 +138,6 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofe});}- @Override- public int getPriority() {- return 0;- }-@Overridepublic String getName() {return NAME;diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupService.java b/manager/src/main/java/org/openremote/manager/setup/SetupService.javaindex 8a25c5dda..ddd17f750 100644--- a/manager/src/main/java/org/openremote/manager/setup/SetupService.java+++ b/manager/src/main/java/org/openremote/manager/setup/SetupService.java@@ -49,6 +49,11 @@ public class SetupService implements ContainerService {// Make demo/test data accessible from Groovy/Java codepublic SetupTasks setupTasks;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.javaindex e4c4445cc..8366a9528 100644--- a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java+++ b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java@@ -51,6 +51,11 @@ public class SimulatorService extends RouteBuilder implements ContainerService {protected ClientEventService clientEventService;protected SimulatorProtocol simulatorProtocol;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {managerIdentityService = container.getService(ManagerIdentityService.class);diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 7c91303d2..0015712d6 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -58,6 +58,11 @@ public class SyslogService extends Handler implements ContainerService {protected ScheduledFuture flushBatchFuture;protected ScheduledFuture deleteOldFuture;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {executorService = container.getService(ManagerExecutorService.class);diff --git a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.javaindex accc5a34b..33d63c46c 100644--- a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java+++ b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java@@ -37,6 +37,11 @@ public class HealthStatusService implements ContainerService {protected List<HealthStatusProvider> healthStatusProviderList = new ArrayList<>();+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.javaindex 285b2644b..aacca857d 100644--- a/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/JvmHealthStatusProvider.java@@ -19,7 +19,9 @@*/package org.openremote.manager.system;-import org.openremote.model.system.HealthStatusProvider;+import org.openremote.container.Container;+import org.openremote.container.ContainerHealthStatusProvider;+import org.openremote.container.ContainerService;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;@@ -29,11 +31,31 @@ import java.lang.management.MemoryMXBean;import java.lang.management.RuntimeMXBean;import java.lang.management.ThreadMXBean;-public class JvmHealthStatusProvider implements HealthStatusProvider {+public class JvmHealthStatusProvider implements ContainerHealthStatusProvider {public static final String NAME = "jvm";public static final String VERSION = "1.0";+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }++ @Override+ public void init(Container container) throws Exception {++ }++ @Override+ public void start(Container container) throws Exception {++ }++ @Override+ public void stop(Container container) throws Exception {++ }+@Overridepublic String getHealthStatusName() {return NAME;diff --git a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.javaindex ecd0165ae..8ef4aae2f 100644--- a/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SslHealthStatusProvider.java@@ -20,8 +20,8 @@package org.openremote.manager.system;import org.openremote.container.Container;+import org.openremote.container.ContainerHealthStatusProvider;import org.openremote.container.ContainerService;-import org.openremote.model.system.HealthStatusProvider;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;@@ -31,8 +31,6 @@ import java.io.IOException;import java.security.cert.CertificateException;import java.security.cert.X509Certificate;import java.time.Instant;-import java.time.ZoneId;-import java.time.ZonedDateTime;import java.util.Date;import java.util.logging.Level;import java.util.logging.Logger;@@ -42,7 +40,7 @@ import static org.openremote.container.security.IdentityService.*;import static org.openremote.container.util.MapAccess.getBoolean;import static org.openremote.container.util.MapAccess.getInteger;-public class SslHealthStatusProvider implements HealthStatusProvider, ContainerService, X509TrustManager {+public class SslHealthStatusProvider implements ContainerHealthStatusProvider, X509TrustManager {public static final String NAME = "ssl";public static final String VERSION = "1.0";@@ -52,6 +50,11 @@ public class SslHealthStatusProvider implements HealthStatusProvider, ContainerSprotected int port;protected SSLContext sslContext;+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }+@Overridepublic void init(Container container) throws Exception {sslEnabled = getBoolean(container.getConfig(), IDENTITY_NETWORK_SECURE, IDENTITY_NETWORK_SECURE_DEFAULT);diff --git a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.javaindex 2d8df19a7..081e12db4 100644--- a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java@@ -19,7 +19,9 @@*/package org.openremote.manager.system;-import org.openremote.model.system.HealthStatusProvider;+import org.openremote.container.Container;+import org.openremote.container.ContainerHealthStatusProvider;+import org.openremote.container.ContainerService;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Value;import org.openremote.model.value.Values;@@ -27,11 +29,31 @@ import org.openremote.model.value.Values;import java.io.File;import java.lang.management.ManagementFactory;-public class SystemHealthStatusProvider implements HealthStatusProvider {+public class SystemHealthStatusProvider implements ContainerHealthStatusProvider {public static final String NAME = "system";public static final String VERSION = "1.0";+ @Override+ public int getPriority() {+ return ContainerService.DEFAULT_PRIORITY;+ }++ @Override+ public void init(Container container) throws Exception {++ }++ @Override+ public void start(Container container) throws Exception {++ }++ @Override+ public void stop(Container container) throws Exception {++ }+@Overridepublic String getHealthStatusName() {return NAME;diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.javaindex da13cb87f..2dd2fb4c4 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java@@ -30,6 +30,7 @@ import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;import org.jboss.resteasy.spi.ResteasyDeployment;import org.openremote.container.Container;+import org.openremote.container.ContainerService;import org.openremote.container.security.IdentityService;import org.openremote.container.web.WebService;import org.openremote.container.web.jsapi.JSAPIServlet;@@ -82,6 +83,13 @@ public class ManagerWebService extends WebService {protected Collection<Class<?>> apiClasses = new HashSet<>();protected Collection<Object> apiSingletons = new HashSet<>();+ /**+ * Start web service after other services.+ */+ @Override+ public int getPriority() {+ return Integer.MAX_VALUE - 1;+ }@Overridepublic void init(Container container) throws Exception {super.init(container);diff --git a/manager/src/main/resources/META-INF/services/org.openremote.container.ContainerService b/manager/src/main/resources/META-INF/services/org.openremote.container.ContainerServicenew file mode 100644index 000000000..4067ba903--- /dev/null+++ b/manager/src/main/resources/META-INF/services/org.openremote.container.ContainerService@@ -0,0 +1,31 @@+org.openremote.manager.system.JvmHealthStatusProvider+org.openremote.manager.system.SslHealthStatusProvider+org.openremote.manager.system.SystemHealthStatusProvider+org.openremote.manager.rules.RulesHealthStatusProvider+org.openremote.manager.agent.AgentHealthStatusProvider+org.openremote.manager.datapoint.AssetDatapointHealthStatusProvider+org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapter+org.openremote.manager.concurrent.ManagerExecutorService+org.openremote.container.timer.TimerService+org.openremote.manager.i18n.I18NService+org.openremote.manager.persistence.ManagerPersistenceService+org.openremote.manager.security.ManagerIdentityService+org.openremote.manager.setup.SetupService+org.openremote.manager.event.ClientEventService+org.openremote.manager.rules.RulesetStorageService+org.openremote.manager.rules.RulesService+org.openremote.manager.asset.AssetStorageService+org.openremote.manager.datapoint.AssetDatapointService+org.openremote.manager.asset.AssetAttributeLinkingService+org.openremote.manager.asset.AssetProcessingService+org.openremote.container.message.MessageBrokerService+org.openremote.manager.system.HealthStatusService+org.openremote.manager.agent.AgentService+org.openremote.manager.simulator.SimulatorService+org.openremote.manager.map.MapService+org.openremote.manager.notification.NotificationService+org.openremote.manager.apps.ConsoleAppService+org.openremote.manager.web.ManagerWebService+org.openremote.container.message.MessageBrokerSetupService+org.openremote.manager.notification.PushNotificationHandler+org.openremote.manager.notification.EmailNotificationHandler\ No newline at end of filediff --git a/manager/src/main/resources/META-INF/services/org.openremote.manager.rules.geofence.GeofenceAssetAdapter b/manager/src/main/resources/META-INF/services/org.openremote.manager.rules.geofence.GeofenceAssetAdapterdeleted file mode 100644index af4a27928..000000000--- a/manager/src/main/resources/META-INF/services/org.openremote.manager.rules.geofence.GeofenceAssetAdapter+++ /dev/null@@ -1 +0,0 @@-org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapter\ No newline at end of filediff --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.HealthStatusProviderdeleted file mode 100644index 4184de35b..000000000--- a/manager/src/main/resources/META-INF/services/org.openremote.model.system.HealthStatusProvider+++ /dev/null@@ -1,6 +0,0 @@-org.openremote.manager.system.JvmHealthStatusProvider-org.openremote.manager.system.SslHealthStatusProvider-org.openremote.manager.system.SystemHealthStatusProvider-org.openremote.manager.rules.RulesHealthStatusProvider-org.openremote.manager.agent.AgentHealthStatusProvider-org.openremote.manager.datapoint.AssetDatapointHealthStatusProvider\ No newline at end of filediff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovyindex 08307fbb2..de2edcdf5 100644--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy@@ -2,36 +2,18 @@ package org.openremote.testimport com.google.common.collect.Listsimport org.apache.camel.spi.BrowsableEndpoint-import org.openremote.agent.protocol.Protocolimport org.openremote.container.Containerimport org.openremote.container.ContainerService-import org.openremote.container.message.MessageBrokerServiceimport org.openremote.container.message.MessageBrokerSetupServiceimport org.openremote.container.security.keycloak.KeycloakIdentityProviderimport org.openremote.container.timer.TimerService-import org.openremote.manager.agent.AgentService-import org.openremote.manager.apps.ConsoleAppService-import org.openremote.manager.asset.AssetAttributeLinkingServiceimport org.openremote.manager.asset.AssetProcessingService-import org.openremote.manager.asset.AssetStorageService-import org.openremote.manager.concurrent.ManagerExecutorService-import org.openremote.manager.datapoint.AssetDatapointService-import org.openremote.manager.event.ClientEventService-import org.openremote.manager.i18n.I18NService-import org.openremote.manager.map.MapService-import org.openremote.manager.notification.NotificationService-import org.openremote.manager.persistence.ManagerPersistenceService-import org.openremote.manager.rules.RulesService-import org.openremote.manager.rules.RulesetStorageService-import org.openremote.manager.security.ManagerIdentityService-import org.openremote.manager.setup.SetupService-import org.openremote.manager.simulator.SimulatorService-import org.openremote.manager.system.HealthStatusService-import org.openremote.manager.web.ManagerWebServiceimport spock.util.concurrent.PollingConditionsimport java.util.concurrent.TimeUnit+import java.util.stream.Collectors+import static java.util.stream.StreamSupport.streamimport static org.openremote.container.security.IdentityService.IDENTITY_NETWORK_HOSTimport static org.openremote.container.security.IdentityService.IDENTITY_NETWORK_WEBSERVER_PORTimport static org.openremote.container.timer.TimerService.Clock.PSEUDO@@ -53,32 +35,38 @@ trait ManagerContainerTrait extends ContainerTrait {static Iterable<ContainerService> defaultServices(Iterable<ContainerService> additionalServices) {[- new TimerService(),- new ManagerExecutorService(),- new I18NService(),- new ManagerPersistenceService(),- new MessageBrokerSetupService(),- new ManagerIdentityService(),- new SetupService(),- new ClientEventService(),- new RulesetStorageService(),- new RulesService(),- new AssetStorageService(),- new AssetDatapointService(),- new AssetAttributeLinkingService(),- new AssetProcessingService(),- new MessageBrokerService(),- *Lists.newArrayList(ServiceLoader.load(Protocol.class)),- new AgentService(),- new SimulatorService(),- new MapService(),- new NotificationService(),- new ConsoleAppService(),- new ManagerWebService(),- new HealthStatusService(),+ *stream(ServiceLoader.load(ContainerService.class).spliterator(), false)+ .sorted(Comparator.comparingInt({it.getPriority()}))+ .collect(Collectors.toList()),*additionalServices-] as Iterable<ContainerService>+// [+// new TimerService(),+// new ManagerExecutorService(),+// new I18NService(),+// new ManagerPersistenceService(),+// new MessageBrokerSetupService(),+// new ManagerIdentityService(),+// new SetupService(),+// new ClientEventService(),+// new RulesetStorageService(),+// new RulesService(),+// new AssetStorageService(),+// new AssetDatapointService(),+// new AssetAttributeLinkingService(),+// new AssetProcessingService(),+// new MessageBrokerService(),+// *Lists.newArrayList(ServiceLoader.load(Protocol.class)),+// new AgentService(),+// new SimulatorService(),+// new MapService(),+// new NotificationService(),+// new ConsoleAppService(),+// new ManagerWebService(),+// new HealthStatusService(),+// *additionalServices+//+// ] as Iterable<ContainerService>}static Iterable<ContainerService> defaultServices(ContainerService... additionalServices) {diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex 99f878068..69cc3c411 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -1,5 +1,6 @@package org.openremote.test.console+import com.google.common.collect.Listsimport com.google.firebase.messaging.Messageimport org.openremote.container.util.UniqueIdentifierGeneratorimport org.openremote.manager.asset.AssetStorageService@@ -81,10 +82,9 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {def serverPort = findEphemeralPort()ORConsoleGeofenceAssetAdapter.NOTIFY_ASSETS_DEBOUNCE_MILLIS = 100ORConsoleGeofenceAssetAdapter.NOTIFY_ASSETS_BATCH_MILLIS = 200- def services = defaultServices()- ((NotificationService) services.find {- it instanceof NotificationService- }).notificationHandlerMap.put("push", mockPushNotificationHandler)+ def services = Lists.newArrayList(defaultServices())+ services.removeIf {it instanceof PushNotificationHandler}+ services.add(mockPushNotificationHandler)def container = startContainer(defaultConfig(serverPort), services)def assetStorageService = container.getService(AssetStorageService.class)def keycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex 6cb171454..02c3eef16 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -1,5 +1,6 @@package org.openremote.test.notification+import com.google.common.collect.Listsimport com.google.firebase.messaging.Messageimport org.openremote.container.web.WebServiceimport org.openremote.manager.asset.AssetStorageService@@ -67,8 +68,9 @@ class NotificationTest extends Specification implements ManagerContainerTrait {and: "the container environment is started with the mock handler"def serverPort = findEphemeralPort()- def services = defaultServices()- ((NotificationService)services.find {it instanceof NotificationService}).notificationHandlerMap.put(PushNotificationMessage.TYPE, mockPushNotificationHandler)+ def services = Lists.newArrayList(defaultServices())+ services.removeIf {it instanceof PushNotificationHandler}+ services.add(mockPushNotificationHandler)def container = startContainerWithPseudoClock(defaultConfig(serverPort), services)def keycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)def managerDemoSetup = container.getService(SetupService.class).getTaskOfType(ManagerDemoSetup.class)@@ -553,8 +555,9 @@ class NotificationTest extends Specification implements ManagerContainerTrait {and: "the container environment is started with the mock handler"def serverPort = findEphemeralPort()- def services = defaultServices()- ((NotificationService)services.find {it instanceof NotificationService}).notificationHandlerMap.put(EmailNotificationMessage.TYPE, mockEmailNotificationHandler)+ def services = Lists.newArrayList(defaultServices())+ services.removeIf {it instanceof EmailNotificationHandler}+ services.add(mockEmailNotificationHandler)def conditions = new PollingConditions(timeout: 10)def container = startContainer(defaultConfig(serverPort), services)def managerDemoSetup = container.getService(SetupService.class).getTaskOfType(ManagerDemoSetup.class)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex c7af49a8d..c01efb42a 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -1,5 +1,6 @@package org.openremote.test.rules.residence+import com.google.common.collect.Listsimport com.google.firebase.messaging.Messageimport org.openremote.container.timer.TimerServiceimport org.openremote.manager.asset.AssetStorageService@@ -61,8 +62,9 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {and: "the container environment is started with the mock handler"def conditions = new PollingConditions(timeout: 10, delay: 1)def serverPort = findEphemeralPort()- def services = defaultServices()- ((NotificationService)services.find {it instanceof NotificationService}).notificationHandlerMap.put(PushNotificationMessage.TYPE, mockPushNotificationHandler)+ def services = Lists.newArrayList(defaultServices())+ services.removeIf {it instanceof PushNotificationHandler}+ services.add(mockPushNotificationHandler)def container = startContainerWithPseudoClock(defaultConfig(serverPort), services)def managerDemoSetup = container.getService(SetupService.class).getTaskOfType(ManagerDemoSetup.class)def keycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex f1198f09a..8d158e4f0 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -1,5 +1,6 @@package org.openremote.test.rules.residence+import com.google.common.collect.Listsimport com.google.firebase.messaging.Messageimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageService@@ -64,8 +65,9 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoand: "the container environment is started with the mock handler"def conditions = new PollingConditions(timeout: 20, delay: 1)def serverPort = findEphemeralPort()- def services = defaultServices()- ((NotificationService)services.find {it instanceof NotificationService}).notificationHandlerMap.put("push", mockPushNotificationHandler)+ def services = Lists.newArrayList(defaultServices())+ services.removeIf {it instanceof PushNotificationHandler}+ services.add(mockPushNotificationHandler)def container = startContainerWithPseudoClock(defaultConfig(serverPort), services)def managerDemoSetup = container.getService(SetupService.class).getTaskOfType(ManagerDemoSetup.class)def rulesService = container.getService(RulesService.class)