Skip to content

armgit / core

Public Imported from GitHub
0

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

Made changes to MQTT classes for subclass possibilities.

Michael Rademaker80d27d0fb614
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
index 24e8fd025..5dbc1a5ac 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
@@ -60,7 +60,7 @@ public class EventInterceptHandler extends AbstractInterceptHandler {
protected final MessageBrokerService messageBrokerService;
protected final Map<String, MqttConnection> mqttConnectionMap;
- EventInterceptHandler(ManagerKeycloakIdentityProvider managerKeycloakIdentityProvider,
+ public EventInterceptHandler(ManagerKeycloakIdentityProvider managerKeycloakIdentityProvider,
MessageBrokerService messageBrokerService,
Map<String, MqttConnection> mqttConnectionMap) {
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
index 35f3a8614..3a5fbb19d 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
@@ -57,7 +57,7 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {
return verifyRights(topic, username, clientId, ClientRole.READ_ASSETS);
}
- private boolean verifyRights(Topic topic, String username, String clientId, ClientRole... roles) {
+ protected boolean verifyRights(Topic topic, String username, String clientId, ClientRole... roles) {
MqttConnection connection = mqttConnectionMap.get(clientId);
if (connection == null) {
LOG.info("No connection found for clientId: " + clientId);
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttConnection.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttConnection.java
index c48cf9306..f719fc83c 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttConnection.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttConnection.java
@@ -38,4 +38,48 @@ public class MqttConnection {
public int getNextSubscriptionId() {
return ++subscriptionId;
}
+
+
+ public String getRealm() {
+ return this.realm;
+ }
+
+
+ public String getClientId() {
+ return this.clientId;
+ }
+
+
+ public String getUsername() {
+ return this.username;
+ }
+
+
+ public byte[] getPassword() {
+ return this.password;
+ }
+
+
+ public Map<String,String> getAssetSubscriptions() {
+ return this.assetSubscriptions;
+ }
+
+
+ public Map<AttributeRef,String> getAssetAttributeSubscriptions() {
+ return this.assetAttributeSubscriptions;
+ }
+
+
+ public Map<AttributeRef,String> getAssetAttributeValueSubscriptions() {
+ return this.assetAttributeValueSubscriptions;
+ }
+
+
+ public String getAccessToken() {
+ return this.accessToken;
+ }
+
+ public int getSubscriptionId() {
+ return this.subscriptionId;
+ }
}