Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added default implementation of getPriority to ContainerService

Rich Turner0b7a2f94806e
diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
index a21c37b64..cf5461ec9 100644
--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
@@ -104,11 +104,6 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
protected final Map<String, OptimisationInstance> assetOptimisationInstanceMap = new HashMap<>();
protected List<String> forceChargeAssetIds = new ArrayList<>();
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
@Override
public void init(Container container) throws Exception {
timerService = container.getService(TimerService.class);
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
index 6289a540b..28ee66be3 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -79,11 +79,6 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
protected final Map<String, GatewayConnection> connectionRealmMap = new HashMap<>();
protected final Map<String, WebsocketIOClient<String>> clientRealmMap = new HashMap<>();
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
@Override
public void init(Container container) throws Exception {
executorService = container.getExecutorService();
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
index 65a637cff..92f45caef 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
@@ -32,12 +32,14 @@ import java.util.logging.Logger;
import static org.openremote.model.syslog.SyslogCategory.API;
/**
- * This {@link MQTTHandler} is responsible for provisioning service users and assets
+ * This {@link MQTTHandler} is responsible for provisioning service users and assets and authenticating the client
+ * against the configured {@link org.openremote.model.provisioning.ProvisioningConfig}s.
*/
public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
- private static final Logger LOG = SyslogCategory.getLogger(API, UserAssetProvisioningMQTTHandler.class);
+ protected static final Logger LOG = SyslogCategory.getLogger(API, UserAssetProvisioningMQTTHandler.class);
public static final String TOP_LEVEL_TOPIC = "provisioning";
+ protected ProvisioningService provisioningService;
@Override
public boolean topicMatches(Topic topic) {
diff --git a/model/src/main/java/org/openremote/model/ContainerService.java b/model/src/main/java/org/openremote/model/ContainerService.java
index dfe998d96..293d3c8e6 100644
--- a/model/src/main/java/org/openremote/model/ContainerService.java
+++ b/model/src/main/java/org/openremote/model/ContainerService.java
@@ -51,7 +51,9 @@ public interface ContainerService {
* 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();
+ default int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
/**
* All services are initialized in the order they have been added to the container (if container started with