Skip to content

armgit / core

Public Imported from GitHub
0

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

Merged MessageBrokerSetupService and MessageBrokerService and cleaned up AbstractNettyIoClient connection logic (now uses Retry class and simplified ConnectionStatus values)

Rich Turner629d29719550
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
index 43a96131e..097cb418f 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
@@ -26,7 +26,6 @@ import org.openremote.container.ContainerService;
import org.openremote.container.concurrent.GlobalLock;
import org.openremote.container.message.MessageBrokerContext;
import org.openremote.container.message.MessageBrokerService;
-import org.openremote.container.message.MessageBrokerSetupService;
import org.openremote.container.timer.TimerService;
import org.openremote.model.ValidationFailure;
import org.openremote.model.ValueHolder;
@@ -109,7 +108,7 @@ public abstract class AbstractProtocol implements Protocol {
}
private static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, AbstractProtocol.class);
- public static final int PRIORITY = ContainerService.DEFAULT_PRIORITY - 100;
+ public static final int PRIORITY = MessageBrokerService.PRIORITY + 10;
protected final Map<AttributeRef, AssetAttribute> linkedAttributes = new HashMap<>();
protected final Set<AttributeRef> dynamicAttributes = new HashSet<>();
protected final Map<AttributeRef, LinkedProtocolInfo> linkedProtocolConfigurations = new HashMap<>();
@@ -132,13 +131,7 @@ public abstract class AbstractProtocol implements Protocol {
executorService = container.getService(ProtocolExecutorService.class);
assetService = container.getService(ProtocolAssetService.class);
predictedAssetService = container.getService(ProtocolPredictedAssetService.class);
- }
-
- @Override
- final public void start(Container container) throws Exception {
- LOG.fine("Starting protocol: " + getProtocolName());
- this.messageBrokerContext = container.getService(MessageBrokerSetupService.class).getContext();
- this.producerTemplate = container.getService(MessageBrokerService.class).getProducerTemplate();
+ messageBrokerContext = container.getService(MessageBrokerService.class).getContext();
withLock(getProtocolName() + "::start", () -> {
try {
@@ -164,6 +157,12 @@ public abstract class AbstractProtocol implements Protocol {
});
}
+ @Override
+ final public void start(Container container) throws Exception {
+ LOG.fine("Starting protocol: " + getProtocolName());
+ this.producerTemplate = container.getService(MessageBrokerService.class).getProducerTemplate();
+ }
+
@Override
final public void stop(Container container) {
withLock(getProtocolName() + "::stop", () -> {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
index f6218a761..e000d3603 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java
@@ -378,11 +378,15 @@ public class ControllerProtocol extends AbstractProtocol {
try {
response = checkRequest.invoke(null);
+ responseConsumer.accept(response);
} catch (ProcessingException e) {
LOG.log(Level.SEVERE, "### Initial status for " + attributeRef.getAttributeName() + " [" + deviceName + "," + sensorName + "] doesn't succeed", e);
+ } finally {
+ if (response != null) {
+ response.close();
+ }
}
- responseConsumer.accept(response);
});
}
@@ -658,11 +662,14 @@ public class ControllerProtocol extends AbstractProtocol {
try {
response = checkRequest.invoke(null);
+ responseConsumer.accept(response);
} catch (ProcessingException e) {
LOG.log(Level.SEVERE, "### Check for " + this.controllersMap.get(protocolRef).getControllerConfigName() + " doesn't succeed", e);
+ } finally {
+ if (response != null) {
+ response.close();
+ }
}
-
- responseConsumer.accept(response);
});
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/OAuthFilter.java b/agent/src/main/java/org/openremote/agent/protocol/http/OAuthFilter.java
index a7d0cd75d..2dac87444 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/OAuthFilter.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/OAuthFilter.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.IOException;
+import java.net.SocketException;
import java.time.LocalDateTime;
import java.util.Objects;
import java.util.logging.Logger;
@@ -53,7 +54,7 @@ public class OAuthFilter implements ClientRequestFilter {
this.oAuthGrant = oAuthGrant;
}
- public String getAuthHeader() {
+ public String getAuthHeader() throws SocketException {
String accessToken = getAccessToken();
if (!TextUtil.isNullOrEmpty(accessToken)) {
@@ -63,7 +64,7 @@ public class OAuthFilter implements ClientRequestFilter {
return null;
}
- public synchronized String getAccessToken() {
+ public synchronized String getAccessToken() throws SocketException {
LocalDateTime expiryDateTime = authServerResponse == null ? null : authServerResponse.getExpiryDateTime();
boolean updateRequired = expiryDateTime == null || expiryDateTime.minusSeconds(10).isBefore(LocalDateTime.now());
@@ -74,37 +75,44 @@ public class OAuthFilter implements ClientRequestFilter {
return authServerResponse != null ? authServerResponse.accessToken : null;
}
- protected synchronized void updateToken() {
+ protected synchronized void updateToken() throws SocketException {
LOG.fine("Updating OAuth token");
- Response response;
-
- if (authServerResponse != null && authServerResponse.refreshToken != null) {
- // Do a refresh
- LOG.fine("Using Refresh grant");
- response = requestTokenUsingRefresh();
- if (response.getStatus() == 403) {
- // Maybe the refresh token is not valid so do full auth
- LOG.info("OAuth token refresh failed, trying a full authentication");
- authServerResponse = null;
- updateToken();
- return;
+ Response response = null;
+
+ try {
+ if (authServerResponse != null && authServerResponse.refreshToken != null) {
+ // Do a refresh
+ LOG.fine("Using Refresh grant");
+ response = requestTokenUsingRefresh();
+ if (response.getStatus() == 403) {
+ // Maybe the refresh token is not valid so do full auth
+ LOG.info("OAuth token refresh failed, trying a full authentication");
+ authServerResponse = null;
+ updateToken();
+ return;
+ }
+ } else {
+ // Do full auth
+ LOG.fine("Doing full authentication");
+ response = requestToken();
}
- } else {
- // Do full auth
- LOG.fine("Doing full authentication");
- response = requestToken();
- }
- if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
- authServerResponse = null;
- LOG.warning("OAuth server response error: " + response.getStatus());
- } else {
- authServerResponse = response.readEntity(OAuthServerResponse.class);
- LOG.finest("OAuth server successfully returned an access token");
+ if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
+ authServerResponse = null;
+ LOG.warning("OAuth server response error: " + response.getStatus());
+ throw new RuntimeException("OAuth server response error: " + response.getStatus());
+ } else {
+ authServerResponse = response.readEntity(OAuthServerResponse.class);
+ LOG.finest("OAuth server successfully returned an access token");
+ }
+ } finally {
+ if (response != null) {
+ response.close();
+ }
}
}
- protected Response requestTokenUsingRefresh() {
+ protected Response requestTokenUsingRefresh() throws SocketException {
OAuthRefreshTokenGrant refreshGrant = new OAuthRefreshTokenGrant(
oAuthGrant.getTokenEndpointUri(),
oAuthGrant.getClientId(),
@@ -118,7 +126,7 @@ public class OAuthFilter implements ClientRequestFilter {
.post(Entity.entity(new Form(refreshGrant.valueMap), MediaType.APPLICATION_FORM_URLENCODED_TYPE));
}
- protected Response requestToken() {
+ protected Response requestToken() throws SocketException {
Invocation.Builder builder = authTarget
.request(MediaType.APPLICATION_JSON_TYPE);
diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
index 4ab23e72d..626cea858 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
@@ -23,6 +23,7 @@ import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.*;
import org.openremote.agent.protocol.ProtocolExecutorService;
+import org.openremote.container.util.Util;
import org.openremote.model.asset.agent.ConnectionStatus;
import org.openremote.model.syslog.SyslogCategory;
@@ -31,7 +32,7 @@ import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.*;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -154,9 +155,9 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
}
private static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, AbstractNettyIoClient.class);
- protected final static int INITIAL_RECONNECT_DELAY_MILLIS = 1000;
- protected final static int MAX_RECONNECT_DELAY_MILLIS = 60000;
- protected final static int RECONNECT_BACKOFF_MULTIPLIER = 2;
+ protected final static long RECONNECT_DELAY_INITIAL_MILLIS = 1000L;
+ protected final static long RECONNECT_DELAY_MAX_MILLIS = 5*60000L;
+ protected final static long RECONNECT_DELAY_JITTER_MILLIS = 10000L;
protected final List<Consumer<T>> messageConsumers = new ArrayList<>();
protected final List<Consumer<ConnectionStatus>> connectionStatusConsumers = new ArrayList<>();
protected ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED;
@@ -165,8 +166,7 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
protected Bootstrap bootstrap;
protected EventLoopGroup workerGroup;
protected ProtocolExecutorService executorService;
- protected ScheduledFuture reconnectTask;
- protected int reconnectDelayMilliseconds = INITIAL_RECONNECT_DELAY_MILLIS;
+ protected Util.Retry connectRetry;
protected boolean permanentError;
protected Supplier<ChannelHandler[]> encoderDecoderProvider;
@@ -197,7 +197,7 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
return;
}
- if (connectionStatus == ConnectionStatus.CONNECTED || connectionStatus == ConnectionStatus.CONNECTING) {
+ if (connectionStatus != ConnectionStatus.DISCONNECTED) {
LOG.finest("Must be disconnected before calling connect: " + getClientUri());
return;
}
@@ -206,6 +206,38 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
onConnectionStatusChanged(ConnectionStatus.CONNECTING);
}
+ scheduleDoConnect();
+ }
+
+ protected void scheduleDoConnect() {
+ connectRetry = new Util.Retry("Connect to '" + getClientUri() + "'", executorService, () -> {
+ boolean success = false;
+ try {
+ success = doConnect().get();
+ if (success) {
+ onConnectionStatusChanged(ConnectionStatus.CONNECTED);
+ } else {
+ // Cleanup resources ready for next connection attempt
+ doDisconnect();
+ }
+ } catch (Exception e) {
+ LOG.log(Level.INFO, "An exception was thrown during connection attempt", e);
+ }
+ return success;
+ })
+ .setSuccessCallback(() -> this.connectRetry = null)
+ .setLogger(LOG)
+ .setInitialDelay(RECONNECT_DELAY_INITIAL_MILLIS)
+ .setMaxDelay(RECONNECT_DELAY_MAX_MILLIS)
+ .setJitterMargin(RECONNECT_DELAY_JITTER_MILLIS);
+
+ connectRetry.run();
+ }
+
+ protected Future<Boolean> doConnect() {
+
+ LOG.info("Establishing connection: " + getClientUri());
+
if (workerGroup == null) {
// TODO: In Netty 5 you can pass in an executor service; can only pass in thread factory for now
workerGroup = getWorkerGroup();
@@ -216,7 +248,7 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
configureChannel();
bootstrap.group(workerGroup);
- bootstrap.handler(new ChannelInitializer() {
+ bootstrap.handler(new ChannelInitializer<Channel>() {
@Override
public void initChannel(Channel channel) {
AbstractNettyIoClient.this.initChannel(channel);
@@ -226,6 +258,7 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
// Start and store the channel
channelFuture = startChannel();
channel = channelFuture.channel();
+ CompletableFuture<Boolean> connectedFuture = new CompletableFuture<>();
// Add channel callback - this gets called when the channel connects or when channel encounters an error
channelFuture.addListener(new ChannelFutureListener() {
@@ -234,49 +267,55 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
synchronized (AbstractNettyIoClient.this) {
channelFuture.removeListener(this);
- if (connectionStatus == ConnectionStatus.DISCONNECTING) {
+ if (connectionStatus != ConnectionStatus.CONNECTING) {
return;
}
if (future.isSuccess()) {
- LOG.log(Level.INFO, "Connection initialising: " + getClientUri());
- reconnectTask = null;
- reconnectDelayMilliseconds = INITIAL_RECONNECT_DELAY_MILLIS;
+ LOG.log(Level.INFO, "Connected: " + getClientUri());
} else if (future.cause() != null) {
LOG.log(Level.WARNING, "Connection error: " + getClientUri(), future.cause());
- // Failed to connect so schedule reconnection attempt
- scheduleReconnect();
}
+ connectedFuture.complete(future.isSuccess());
}
}
});
// Add closed callback
channel.closeFuture().addListener(future -> {
- if (connectionStatus != ConnectionStatus.DISCONNECTING && connectionStatus != ConnectionStatus.DISCONNECTED) {
- LOG.info("Connection closed: " + getClientUri());
- scheduleReconnect();
+ if (connectionStatus == ConnectionStatus.CONNECTED) {
+ LOG.info("Connection closed un-expectedly: " + getClientUri());
+ onConnectionStatusChanged(ConnectionStatus.CONNECTING);
+ doDisconnect();
+ scheduleDoConnect();
}
});
+
+ return connectedFuture;
}
@Override
public void disconnect() {
synchronized (this) {
- if (connectionStatus == ConnectionStatus.ERROR || connectionStatus == ConnectionStatus.DISCONNECTING || connectionStatus == ConnectionStatus.DISCONNECTED) {
- LOG.finest("Already disconnecting or disconnected: " + getClientUri());
+ if (connectionStatus == ConnectionStatus.DISCONNECTED) {
+ LOG.finest("Already disconnected: " + getClientUri());
return;
}
LOG.finest("Disconnecting IO client: " + getClientUri());
- onConnectionStatusChanged(permanentError ? ConnectionStatus.ERROR : ConnectionStatus.DISCONNECTING);
+ onConnectionStatusChanged(ConnectionStatus.DISCONNECTED);
}
- try {
- if (reconnectTask != null) {
- reconnectTask.cancel(false);
- }
+ if (connectRetry != null) {
+ connectRetry.cancel(true);
+ connectRetry = null;
+ }
+ doDisconnect();
+ }
+
+ protected void doDisconnect() {
+ try {
if (channelFuture != null) {
channelFuture.cancel(true);
channelFuture = null;
@@ -288,20 +327,17 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
channel.close();
channel = null;
}
-
} finally {
if (workerGroup != null) {
workerGroup.shutdownGracefully();
workerGroup = null;
}
- onConnectionStatusChanged(ConnectionStatus.DISCONNECTED);
}
}
@Override
public void sendMessage(T message) {
if (connectionStatus != ConnectionStatus.CONNECTED) {
- LOG.warning("Cannot send message: Status = " + connectionStatus + ": " + getClientUri());
return;
}
@@ -369,30 +405,31 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
* Inserts the decoders and encoders into the channel pipeline
*/
protected void initChannel(Channel channel) {
- channel.pipeline().addLast(new ChannelInboundHandlerAdapter() {
- @Override
- public void channelActive(ChannelHandlerContext ctx) throws Exception {
- synchronized (AbstractNettyIoClient.this) {
- LOG.fine("Connected: " + getClientUri());
- onConnectionStatusChanged(ConnectionStatus.CONNECTED);
- }
- super.channelActive(ctx);
- }
-
- @Override
- public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- synchronized (AbstractNettyIoClient.this) {
- if (connectionStatus != ConnectionStatus.DISCONNECTING) {
- // This is a connection failure so ignore as reconnect logic will handle it
- return;
- }
-
- LOG.fine("Disconnected: " + getClientUri());
- onConnectionStatusChanged(ConnectionStatus.DISCONNECTED);
- }
- super.channelInactive(ctx);
- }
- });
+ // Below is un-necessary as channel listener handles this
+// channel.pipeline().addLast(new ChannelInboundHandlerAdapter() {
+// @Override
+// public void channelActive(ChannelHandlerContext ctx) throws Exception {
+// synchronized (AbstractNettyIoClient.this) {
+// LOG.fine("Connected: " + getClientUri());
+// onConnectionStatusChanged(ConnectionStatus.CONNECTED);
+// }
+// super.channelActive(ctx);
+// }
+//
+// @Override
+// public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+// synchronized (AbstractNettyIoClient.this) {
+// if (connectionStatus != ConnectionStatus.DISCONNECTING) {
+// // This is a connection failure so ignore as reconnect logic will handle it
+// return;
+// }
+//
+// LOG.fine("Disconnected: " + getClientUri());
+// onConnectionStatusChanged(ConnectionStatus.DISCONNECTED);
+// }
+// super.channelInactive(ctx);
+// }
+// });
addEncodersDecoders(channel);
}
@@ -444,34 +481,6 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
}));
}
- protected void scheduleReconnect() {
- synchronized (this) {
- if (connectionStatus == ConnectionStatus.WAITING) {
- return;
- }
-
- onConnectionStatusChanged(ConnectionStatus.WAITING);
- }
-
- if (reconnectDelayMilliseconds < MAX_RECONNECT_DELAY_MILLIS) {
- reconnectDelayMilliseconds *= RECONNECT_BACKOFF_MULTIPLIER;
- reconnectDelayMilliseconds = Math.min(MAX_RECONNECT_DELAY_MILLIS, reconnectDelayMilliseconds);
- }
-
- LOG.finest("Scheduling reconnection in '" + reconnectDelayMilliseconds + "' milliseconds: " + getClientUri());
-
- reconnectTask = executorService.schedule(() -> {
- synchronized (this) {
- reconnectTask = null;
-
- // Attempt to reconnect if not disconnecting
- if (connectionStatus != ConnectionStatus.DISCONNECTING && connectionStatus != ConnectionStatus.DISCONNECTED) {
- connect();
- }
- }
- }, reconnectDelayMilliseconds);
- }
-
protected void setPermanentError(String message) {
synchronized (this) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpIoClient.java
index fb3335ed3..4b028c7df 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpIoClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpIoClient.java
@@ -117,9 +117,4 @@ public class UdpIoClient<T> extends AbstractNettyIoClient<T, InetSocketAddress>
super.configureChannel();
//bootstrap.option(ChannelOption.SO_BROADCAST, true);
}
-
- @Override
- protected synchronized void scheduleReconnect() {
- // No connection to reconnect
- }
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java
index b88652f7c..1b4d342e3 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java
@@ -364,10 +364,10 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien
invocation = target.request().build(httpSubscription.method.toString(), Entity.entity(httpSubscription.body, httpSubscription.contentType));
}
Response response = invocation.invoke();
+ response.close();
if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
LOG.warning("WebsocketHttpSubscription returned an un-successful response code: " + response.getStatus());
}
- response.close();
} else {
websocketClient.sendMessage(subscription.body);
}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIoClient.java
index dc79f7b34..f46f2a668 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIoClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketIoClient.java
@@ -31,7 +31,6 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.util.CharsetUtil;
-import io.netty.util.ReferenceCountUtil;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.openremote.agent.protocol.ProtocolExecutorService;
import org.openremote.agent.protocol.http.OAuthFilter;
@@ -41,11 +40,15 @@ import org.openremote.model.asset.agent.ConnectionStatus;
import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
+import javax.ws.rs.ProcessingException;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MultivaluedMap;
import java.net.InetSocketAddress;
+import java.net.SocketException;
import java.net.URI;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -72,22 +75,18 @@ public class WebsocketIoClient<T> extends AbstractNettyIoClient<T, InetSocketAdd
this.handshaker = handshaker;
}
- public ChannelFuture handshakeFuture() {
- return handshakeFuture;
- }
-
@Override
public void handlerAdded(ChannelHandlerContext ctx) {
handshakeFuture = ctx.newPromise();
}
@Override
- public void channelActive(ChannelHandlerContext ctx) throws Exception {
+ public void channelActive(ChannelHandlerContext ctx) {
handshaker.handshake(ctx.channel());
}
@Override
- public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
+ public void channelRead0(ChannelHandlerContext ctx, Object msg) {
Channel ch = ctx.channel();
if (!handshaker.isHandshakeComplete()) {
@@ -252,7 +251,7 @@ public class WebsocketIoClient<T> extends AbstractNettyIoClient<T, InetSocketAdd
channel.pipeline().addLast(new MessageToMessageEncoder<ByteBuf>() {
@Override
- protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) throws Exception {
+ protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List<Object> out) {
out.add(new TextWebSocketFrame(msg));
}
});
@@ -262,19 +261,14 @@ public class WebsocketIoClient<T> extends AbstractNettyIoClient<T, InetSocketAdd
// Put string encoder first (encoders are called in reverse to decoders)
channel.pipeline().addLast(new MessageToMessageEncoder<String>() {
@Override
- protected void encode(ChannelHandlerContext ctx, String msg, List<Object> out) throws Exception {
+ protected void encode(ChannelHandlerContext ctx, String msg, List<Object> out) {
out.add(new TextWebSocketFrame(msg));
}
});
}
@Override
- public synchronized void connect() {
-
- if (permanentError) {
- LOG.fine("Unable to connect as permanent error has been set");
- return;
- }
+ protected Future<Boolean> doConnect() {
if (oAuthGrant != null) {
LOG.fine("Retrieving OAuth access token: " + getClientUri());
@@ -286,14 +280,16 @@ public class WebsocketIoClient<T> extends AbstractNettyIoClient<T, InetSocketAdd
OAuthFilter oAuthFilter = new OAuthFilter(authTarget, oAuthGrant);
authHeaderValue = oAuthFilter.getAuthHeader();
if (TextUtil.isNullOrEmpty(authHeaderValue)) {
- throw new Exception("Returned access token is null");
+ throw new RuntimeException("Returned access token is null");
}
LOG.fine("Retrieved access token via OAuth: " + getClientUri());
+ } catch (SocketException | ProcessingException e) {
+ LOG.log(Level.SEVERE, "Failed to retrieve OAuth access token for '" + getClientUri() + "': Connection error");
+ return CompletableFuture.completedFuture(false);
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Failed to retrieve OAuth access token: " + getClientUri(), e);
- setPermanentError(e.getMessage());
- return;
+ LOG.log(Level.SEVERE, "Failed to retrieve OAuth access token: " + getClientUri());
+ return CompletableFuture.completedFuture(false);
} finally {
if (client != null) {
client.close();
@@ -301,6 +297,6 @@ public class WebsocketIoClient<T> extends AbstractNettyIoClient<T, InetSocketAdd
}
}
- super.connect();
+ return super.doConnect();
}
}
diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
index 3b6f0d619..ba9bad6f4 100644
--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
@@ -19,39 +19,143 @@
*/
package org.openremote.container.message;
+import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.impl.DefaultStreamCachingStrategy;
+import org.apache.camel.spi.*;
+import org.apache.camel.util.StringHelper;
+import org.apache.camel.util.concurrent.CamelThreadFactory;
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.security.IdentityService;
+import org.openremote.container.web.DefaultWebsocketComponent;
+import org.openremote.container.web.WebService;
+import org.openremote.container.web.socket.WebsocketComponent;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
import java.util.logging.Logger;
+import static org.openremote.container.util.MapAccess.getString;
+
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;
protected ProducerTemplate producerTemplate;
+ protected MessageBrokerContext context;
@Override
public int getPriority() {
- return ContainerService.DEFAULT_PRIORITY;
+ return PRIORITY;
}
@Override
public void init(Container container) throws Exception {
- MessageBrokerSetupService messageBrokerSetupService = container.getService(MessageBrokerSetupService.class);
- producerTemplate = messageBrokerSetupService.getContext().createProducerTemplate();
+
+ context = new MessageBrokerContext();
+
+ final ExecutorServiceManager executorServiceManager = context.getExecutorServiceManager();
+ executorServiceManager.setThreadNamePattern("#counter# #name#");
+ executorServiceManager.setThreadPoolFactory(new ThreadPoolFactory() {
+ @Override
+ public ExecutorService newCachedThreadPool(ThreadFactory threadFactory) {
+ // This is an unlimited pool used probably only be multicast aggregation
+ return new ContainerExecutor(getExecutorName("MessagingPool", threadFactory), 1, Integer.MAX_VALUE, 10, -1);
+ }
+
+ @Override
+ public ExecutorService newThreadPool(ThreadPoolProfile profile, ThreadFactory threadFactory) {
+ // This pool is used by SEDA consumers, so the endpoint parameters define the pool and queue sizes
+ return new ContainerExecutor(
+ getExecutorName("Messaging", threadFactory),
+ profile.getPoolSize(),
+ profile.getMaxPoolSize(),
+ profile.getKeepAliveTime(),
+ profile.getMaxQueueSize()
+ );
+ }
+
+ @Override
+ public ScheduledExecutorService newScheduledThreadPool(ThreadPoolProfile profile, ThreadFactory threadFactory) {
+ return new ContainerScheduledExecutor(
+ getExecutorName("MessagingTasks", threadFactory),
+ profile.getPoolSize()
+ );
+ }
+
+ protected String getExecutorName(String name, ThreadFactory threadFactory) {
+ if (threadFactory instanceof CamelThreadFactory) {
+ CamelThreadFactory factory = (CamelThreadFactory) threadFactory;
+ String camelName = factory.getName();
+ camelName = camelName.contains("://") ? StringHelper.after(camelName, "://") : camelName;
+ camelName = camelName.contains("?") ? StringHelper.before(camelName, "?") : camelName;
+ name = name + "-" + camelName;
+ }
+ return name;
+ }
+ });
+
+ // TODO make configurable in environment
+ context.disableJMX();
+
+ // TODO might need this for errorhandler?
+ context.setAllowUseOriginalMessage(false);
+
+ // Don't use JMS, we do our own correlation
+ context.setUseBreadcrumb(false);
+
+ // Force a quick shutdown of routes with in-flight exchanges
+ context.getShutdownStrategy().setTimeout(1);
+ context.getShutdownStrategy().setSuppressLoggingOnTimeout(true);
+
+ context.setStreamCaching(true);
+ StreamCachingStrategy streamCachingStrategy = new DefaultStreamCachingStrategy();
+ streamCachingStrategy.setSpoolThreshold(524288); // Half megabyte
+ context.setStreamCachingStrategy(streamCachingStrategy);
+
+ context.setErrorHandlerBuilder(new org.apache.camel.builder.LoggingErrorHandlerBuilder() {
+ @Override
+ public Processor createErrorHandler(RouteContext routeContext, Processor processor) {
+ // TODO: Custom error handler?
+ return super.createErrorHandler(routeContext, processor);
+ }
+ });
+
+ context.getRegistry().put(Container.class.getName(), container);
+
+ String allowedOrigin = getString(container.getConfig(), MESSAGE_SESSION_ALLOWED_ORIGIN, MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT);
+ WebsocketComponent websocketComponent = new DefaultWebsocketComponent(
+ container.getService(IdentityService.class),
+ container.getService(WebService.class),
+ allowedOrigin
+ );
+
+ context.addComponent(WebsocketComponent.NAME, websocketComponent);
}
@Override
public void start(Container container) throws Exception {
- MessageBrokerSetupService messageBrokerSetupService = container.getService(MessageBrokerSetupService.class);
-
+ producerTemplate = context.createProducerTemplate();
LOG.info("Starting Camel message broker");
- messageBrokerSetupService.getContext().start();
+ context.start();
}
@Override
public void stop(Container container) throws Exception {
+ if (context != null) {
+ context.stop();
+ }
+ }
+
+ public MessageBrokerContext getContext() {
+ return context;
}
public ProducerTemplate getProducerTemplate() {
diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java
deleted file mode 100644
index 17ba1d24f..000000000
--- a/container/src/main/java/org/openremote/container/message/MessageBrokerSetupService.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2016, OpenRemote Inc.
- *
- * See the CONTRIBUTORS.txt file in the distribution for a
- * full listing of individual contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.openremote.container.message;
-
-import org.apache.camel.Processor;
-import org.apache.camel.impl.DefaultStreamCachingStrategy;
-import org.apache.camel.spi.*;
-import org.apache.camel.util.StringHelper;
-import org.apache.camel.util.concurrent.CamelThreadFactory;
-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.security.IdentityService;
-import org.openremote.container.web.DefaultWebsocketComponent;
-import org.openremote.container.web.WebService;
-import org.openremote.container.web.socket.WebsocketComponent;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-
-import static org.openremote.container.util.MapAccess.getString;
-
-@SuppressWarnings("deprecation")
-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;
- }
-
- @Override
- public void init(Container container) throws Exception {
- context = new MessageBrokerContext();
-
- final ExecutorServiceManager executorServiceManager = context.getExecutorServiceManager();
- executorServiceManager.setThreadNamePattern("#counter# #name#");
- executorServiceManager.setThreadPoolFactory(new ThreadPoolFactory() {
- @Override
- public ExecutorService newCachedThreadPool(ThreadFactory threadFactory) {
- // This is an unlimited pool used probably only be multicast aggregation
- return new ContainerExecutor(getExecutorName("MessagingPool", threadFactory), 1, Integer.MAX_VALUE, 10, -1);
- }
-
- @Override
- public ExecutorService newThreadPool(ThreadPoolProfile profile, ThreadFactory threadFactory) {
- // This pool is used by SEDA consumers, so the endpoint parameters define the pool and queue sizes
- return new ContainerExecutor(
- getExecutorName("Messaging", threadFactory),
- profile.getPoolSize(),
- profile.getMaxPoolSize(),
- profile.getKeepAliveTime(),
- profile.getMaxQueueSize()
- );
- }
-
- @Override
- public ScheduledExecutorService newScheduledThreadPool(ThreadPoolProfile profile, ThreadFactory threadFactory) {
- return new ContainerScheduledExecutor(
- getExecutorName("MessagingTasks", threadFactory),
- profile.getPoolSize()
- );
- }
-
- protected String getExecutorName(String name, ThreadFactory threadFactory) {
- if (threadFactory instanceof CamelThreadFactory) {
- CamelThreadFactory factory = (CamelThreadFactory) threadFactory;
- String camelName = factory.getName();
- camelName = camelName.contains("://") ? StringHelper.after(camelName, "://") : camelName;
- camelName = camelName.contains("?") ? StringHelper.before(camelName, "?") : camelName;
- name = name + "-" + camelName;
- }
- return name;
- }
- });
-
- // TODO make configurable in environment
- context.disableJMX();
-
- // TODO might need this for errorhandler?
- context.setAllowUseOriginalMessage(false);
-
- // Don't use JMS, we do our own correlation
- context.setUseBreadcrumb(false);
-
- // Force a quick shutdown of routes with in-flight exchanges
- context.getShutdownStrategy().setTimeout(1);
- context.getShutdownStrategy().setSuppressLoggingOnTimeout(true);
-
- context.setStreamCaching(true);
- StreamCachingStrategy streamCachingStrategy = new DefaultStreamCachingStrategy();
- streamCachingStrategy.setSpoolThreshold(524288); // Half megabyte
- context.setStreamCachingStrategy(streamCachingStrategy);
-
- context.setErrorHandlerBuilder(new org.apache.camel.builder.LoggingErrorHandlerBuilder() {
- @Override
- public Processor createErrorHandler(RouteContext routeContext, Processor processor) {
- // TODO: Custom error handler?
- return super.createErrorHandler(routeContext, processor);
- }
- });
-
- context.getRegistry().put(Container.class.getName(), container);
-
- String allowedOrigin = getString(container.getConfig(), MESSAGE_SESSION_ALLOWED_ORIGIN, MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT);
- WebsocketComponent websocketComponent = new DefaultWebsocketComponent(
- container.getService(IdentityService.class),
- container.getService(WebService.class),
- allowedOrigin
- );
-
- context.addComponent(WebsocketComponent.NAME, websocketComponent);
- }
-
- @Override
- public void start(Container container) throws Exception {
- // We need more control over startup here: The Websocket Camel component adds request
- // mappings to the WebService when Camel is started. This must happen before the WebService
- // is initialized but after WebSocket routes are started.
- //
- // The init order is:
- //
- // 1. MessageBrokerSetupService#init() - creates Camel context
- // 2. WhatEverService#init() - adds Camel routes such as Websocket routes
- // 3. MessageBrokerService#init() - starts Camel context which initializes WebSocket component
- // 4. WebService#init() - configures HTTP routing paths, giving Camel routes a chance to add routes before
- }
-
- @Override
- public void stop(Container container) throws Exception {
- if (context != null) {
- context.stop();
- }
- }
-
- public MessageBrokerContext getContext() {
- return context;
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "{" +
- '}';
- }
-}
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java
index 9e7da161a..2095ea1ed 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java
@@ -106,6 +106,11 @@ public class PersistenceEventInterceptor extends EmptyInterceptor {
if (status != Status.STATUS_COMMITTED)
return;
+ if (messageBrokerService.getProducerTemplate() == null) {
+ // Message broker not started yet
+ return;
+ }
+
for (PersistenceEvent persistenceEvent : persistenceEvents) {
try {
messageBrokerService.getProducerTemplate().sendBodyAndHeader(
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 9dfe3d22c..067f07267 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -75,7 +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;
+ public static final int PRIORITY = Integer.MIN_VALUE + 10;
protected MessageBrokerService messageBrokerService;
protected Database database;
diff --git a/container/src/main/java/org/openremote/container/security/IdentityService.java b/container/src/main/java/org/openremote/container/security/IdentityService.java
index 2df9c0dc7..50693e0ff 100644
--- a/container/src/main/java/org/openremote/container/security/IdentityService.java
+++ b/container/src/main/java/org/openremote/container/security/IdentityService.java
@@ -22,6 +22,7 @@ package org.openremote.container.security;
import io.undertow.servlet.api.DeploymentInfo;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
+import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.keycloak.KeycloakIdentityProvider;
import javax.ws.rs.core.UriBuilder;
@@ -31,6 +32,7 @@ import static org.openremote.container.util.MapAccess.*;
public abstract class IdentityService implements ContainerService {
+ public static final int PRIORITY = PersistenceService.PRIORITY + 10; // Run after persistence setup
private static final Logger LOG = Logger.getLogger(IdentityService.class.getName());
public static final String IDENTITY_NETWORK_SECURE = "IDENTITY_NETWORK_SECURE";
@@ -48,7 +50,7 @@ public abstract class IdentityService implements ContainerService {
@Override
public int getPriority() {
- return ContainerService.DEFAULT_PRIORITY - 20;
+ return PRIORITY;
}
@Override
diff --git a/container/src/main/java/org/openremote/container/util/Util.java b/container/src/main/java/org/openremote/container/util/Util.java
index b7147519e..94435628a 100644
--- a/container/src/main/java/org/openremote/container/util/Util.java
+++ b/container/src/main/java/org/openremote/container/util/Util.java
@@ -11,14 +11,150 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-/**
- * TODO Old functions for old rules, can be deleted?
- */
public class Util {
+ public static class Retry {
+
+ protected String name;
+ protected ScheduledExecutorService executorService;
+ protected TimeUnit timeUnit = TimeUnit.MILLISECONDS;
+ protected Logger logger;
+ protected long initialDelay;
+ protected long maxDelay = 5*60000L;
+ protected long backoffMultiplier = 2L;
+ protected long jitterMargin = 10000L;
+ protected int maxRetries = Integer.MAX_VALUE;
+ protected boolean running;
+ protected int retries;
+ Supplier<Boolean> task;
+ Future<?> future;
+ Runnable successCallback;
+ Runnable failureCallback;
+
+ public Retry(String name, ScheduledExecutorService executorService, Supplier<Boolean> task) {
+ this.name = name;
+ this.executorService = executorService;
+ this.task = task;
+ }
+
+ public Retry setTimeUnit(TimeUnit timeUnit) {
+ this.timeUnit = timeUnit;
+ return this;
+ }
+
+ public Retry setLogger(Logger logger) {
+ this.logger = logger;
+ return this;
+ }
+
+ public Retry setInitialDelay(long initialDelay) {
+ this.initialDelay = initialDelay;
+ return this;
+ }
+
+ public Retry setMaxDelay(long maxDelay) {
+ this.maxDelay = maxDelay;
+ return this;
+ }
+
+ public Retry setBackoffMultiplier(long backoffMultiplier) {
+ this.backoffMultiplier = backoffMultiplier;
+ return this;
+ }
+
+ public Retry setJitterMargin(long jitterMargin) {
+ this.jitterMargin = jitterMargin;
+ return this;
+ }
+
+ public Retry setMaxRetries(int maxRetries) {
+ this.maxRetries = maxRetries;
+ return this;
+ }
+
+ public Retry setSuccessCallback(Runnable successCallback) {
+ this.successCallback = successCallback;
+ return this;
+ }
+
+ public Retry setFailureCallback(Runnable failureCallback) {
+ this.failureCallback = failureCallback;
+ return this;
+ }
+
+ public synchronized void run() {
+ if (running) {
+ throw new IllegalStateException(name + ": already running");
+ }
+
+ retries = 1;
+ running = true;
+
+ if (initialDelay > 0) {
+ future = executorService.schedule(this::doAttempt, initialDelay, timeUnit);
+ } else {
+ future = executorService.submit(this::doAttempt);
+ }
+ }
+
+ public synchronized void cancel(boolean mayInterrupt) {
+ if (!running) {
+ return;
+ }
+
+ future.cancel(mayInterrupt);
+ }
+
+ protected void doAttempt() {
+ boolean success = false;
+ boolean retry = retries < maxRetries;
+
+ try {
+ log(Level.INFO, name + ": running, attempt=" + retries, null);
+ success = task.get();
+ } catch (Exception e) {
+ log(Level.INFO, name + ": threw an exception", e);
+ }
+
+ if (success) {
+ if (successCallback != null) {
+ successCallback.run();
+ }
+ return;
+ }
+
+ if (!retry) {
+ if (failureCallback != null) {
+ failureCallback.run();
+ }
+ return;
+ }
+
+ long adjustedMax = Math.max(maxDelay - jitterMargin, jitterMargin);
+ long delay = Math.min(initialDelay * (long)Math.pow(2, retries), adjustedMax);
+ delay += Math.random()*jitterMargin;
+ retries++;
+
+ log(Level.INFO, name + ": scheduling retry in " + delay + " " + timeUnit.name(), null);
+ future = executorService.schedule(this::doAttempt, delay, timeUnit);
+ }
+
+ protected void log(Level level, String log, Throwable e) {
+ if (logger != null) {
+ logger.log(level, log, e);
+ }
+ }
+ }
+
/**
* Convert a JSON serialisable object to an {@link ObjectValue}
*/
diff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
index a6dfc28f9..e5174f27a 100644
--- a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
+++ b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
@@ -29,7 +29,6 @@ import io.undertow.websockets.jsr.DefaultContainerConfigurator;
import io.undertow.websockets.jsr.UndertowContainerProvider;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.keycloak.KeycloakPrincipal;
-import org.openremote.container.message.MessageBrokerSetupService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.IdentityService;
import org.openremote.container.security.basic.BasicAuthContext;
@@ -54,6 +53,7 @@ import static org.openremote.container.web.WebService.pathStartsWithHandler;
public class DefaultWebsocketComponent extends WebsocketComponent {
+ public static final String WEBSOCKET_PATH = "/websocket";
private static final Logger LOG = Logger.getLogger(DefaultWebsocketComponent.class.getName());
static {
@@ -78,7 +78,7 @@ public class DefaultWebsocketComponent extends WebsocketComponent {
WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
getConsumers().entrySet().forEach(consumerEntry -> {
- String endpointPath = MessageBrokerSetupService.WEBSOCKET_PATH + "/" + consumerEntry.getKey();
+ String endpointPath = WEBSOCKET_PATH + "/" + consumerEntry.getKey();
LOG.info("Deploying websocket endpoint: " + endpointPath);
webSocketDeploymentInfo.addEndpoint(
ServerEndpointConfig.Builder.create(WebsocketAdapter.class, endpointPath)
@@ -141,7 +141,7 @@ public class DefaultWebsocketComponent extends WebsocketComponent {
String deploymentName = "WebSocket Deployment";
deploymentInfo = new DeploymentInfo()
.setDeploymentName(deploymentName)
- .setContextPath(MessageBrokerSetupService.WEBSOCKET_PATH)
+ .setContextPath(WEBSOCKET_PATH)
.addServletContextAttribute(WebSocketDeploymentInfo.ATTRIBUTE_NAME, webSocketDeploymentInfo)
.setClassLoader(WebsocketComponent.class.getClassLoader());
@@ -154,7 +154,7 @@ public class DefaultWebsocketComponent extends WebsocketComponent {
deploymentInfo.addSecurityConstraints(constraint);
HttpHandler handler = webService.addServletDeployment(identityService, deploymentInfo, true);
- websocketHttpHandler = pathStartsWithHandler(deploymentName, MessageBrokerSetupService.WEBSOCKET_PATH, handler);
+ websocketHttpHandler = pathStartsWithHandler(deploymentName, WEBSOCKET_PATH, handler);
// Give web socket handler higher priority than any other handlers already added
webService.getRequestHandlers().add(0, websocketHttpHandler);
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
index cd471720c..e40d0ac5a 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java
@@ -43,6 +43,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import java.util.*;
import java.util.function.Function;
+import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -66,7 +67,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
return withAgentConnector(agentId, agentConnector -> {
LOG.finer("Asking connector '" + agentConnector.value.getClass().getSimpleName() + "' for protocol configurations");
return agentConnector.value.getProtocolDescriptors(agentConnector.key);
- });
+ }, () -> new ProtocolDescriptor[0]);
}
@Override
@@ -88,7 +89,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
List<AgentStatusEvent> result = withAgentConnector(agentId, agentConnector -> {
LOG.finer("Asking connector '" + agentConnector.value.getClass().getSimpleName() + "' for connection status");
return agentConnector.value.getConnectionStatus(agentConnector.key);
- });
+ }, Collections::emptyList);
// Compress response (the request attribute enables the interceptor)
request.setAttribute(HttpHeaders.CONTENT_ENCODING, "gzip");
@@ -123,7 +124,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
@Override
public AttributeValidationResult validateProtocolConfiguration(RequestParams requestParams, String agentId, AssetAttribute protocolConfiguration) {
- return withAgentConnector(agentId, agentConnector -> agentConnector.value.validateProtocolConfiguration(protocolConfiguration));
+ return withAgentConnector(agentId, agentConnector -> agentConnector.value.validateProtocolConfiguration(protocolConfiguration), () -> null);
}
@Override
@@ -144,7 +145,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
"Asking connector '" + agentConnector.value.getClass().getSimpleName()
+ "' to do linked attribute discovery for protocol configuration: " + protocolConfigRef);
return agentConnector.value.getDiscoveredLinkedAttributes(protocolConfigRef);
- }
+ }, () -> new AssetTreeNode[0]
);
persistAssets(assets, parentAsset, realm);
@@ -173,14 +174,14 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
+ "' to do linked attribute discovery using uploaded file for protocol configuration: " + protocolConfigRef
);
return agentConnector.value.getDiscoveredLinkedAttributes(protocolConfigRef, fileInfo);
- }
+ }, () -> new AssetTreeNode[0]
);
persistAssets(assets, parentAsset, realm);
return assets;
}
- protected <T> T withAgentConnector(String agentId, Function<Pair<Asset, AgentConnector>, T> function) {
+ protected <T> T withAgentConnector(String agentId, Function<Pair<Asset, AgentConnector>, T> function, Supplier<T> failureFunction) {
return Optional.ofNullable(agentService.getAgents().get(agentId))
.filter(asset -> asset.getWellKnownType() == AssetType.AGENT)
.map(agent -> new Pair<>(agent, agentService.getAgentConnector(agent).orElseThrow(() -> {
@@ -188,10 +189,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResour
return new IllegalStateException("Agent connector not found or returned invalid response");
})))
.map(function)
- .orElseThrow(() -> {
- LOG.warning("Failed to find agent with ID: " + agentId);
- return new IllegalArgumentException("Agent not found");
- });
+ .orElseGet(failureFunction);
}
// TODO: Allow user to select which assets/attributes are actually added to the DB
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index 79c6ebc57..dc922e7ae 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -31,7 +31,6 @@ import org.openremote.agent.protocol.ProtocolAssetService;
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.container.timer.TimerService;
import org.openremote.manager.asset.AssetProcessingException;
@@ -158,7 +157,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
@Override
public void start(Container container) throws Exception {
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
// Load all protocol instances and fail hard and fast when a duplicate is found
Collection<Protocol> discoveredProtocols = container.getServices(Protocol.class);
@@ -541,7 +540,19 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
protected String getAgentAncestorId(Asset asset) {
if (asset.getPath() == null) {
// Fully load
- asset = assetStorageService.find(asset.getId());
+ Asset fullyLoaded = assetStorageService.find(asset.getId());
+ if (fullyLoaded != null) {
+ asset = fullyLoaded;
+ } else if (!TextUtil.isNullOrEmpty(asset.getParentId())) {
+ fullyLoaded = assetStorageService.find(asset.getParentId());
+ List<String> path = new ArrayList<>(Arrays.asList(fullyLoaded.getPath()));
+ path.add(0, asset.getId());
+ asset.setPath(path.toArray(new String[0]));
+ }
+ }
+
+ if (asset.getPath() == null) {
+ return null;
}
return Arrays.stream(asset.getPath())
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index ae3b093ae..646355bfe 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -26,7 +26,6 @@ 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.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.timer.TimerService;
@@ -219,7 +218,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
processors.add(assetDatapointService);
processors.add(assetAttributeLinkingService);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 76bf36a55..8ea418c81 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -25,7 +25,6 @@ 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.message.MessageBrokerSetupService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
@@ -251,7 +250,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
this)
);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
index 1497b580b..e0377d062 100644
--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
@@ -24,7 +24,6 @@ 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.security.AuthContext;
import org.openremote.container.timer.TimerService;
import org.openremote.container.web.socket.WebsocketConstants;
@@ -127,13 +126,13 @@ public class ClientEventService implements ContainerService {
container.getService(ManagerExecutorService.class)
);
- MessageBrokerSetupService messageBrokerSetupService = container.getService(MessageBrokerSetupService.class);
- messageBrokerSetupService.getContext().getTypeConverterRegistry().addTypeConverters(
+ MessageBrokerService messageBrokerService = container.getService(MessageBrokerService.class);
+ messageBrokerService.getContext().getTypeConverterRegistry().addTypeConverters(
new EventTypeConverters()
);
// TODO: Remove prefix and just use event type then use a subscription wrapper to pass subscription ID around
- messageBrokerSetupService.getContext().addRoutes(new RouteBuilder() {
+ messageBrokerService.getContext().addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
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 9df52afd8..29891319f 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java
@@ -27,7 +27,7 @@ import org.openremote.agent.protocol.io.AbstractNettyIoClient;
import org.openremote.agent.protocol.websocket.WebsocketIoClient;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
-import org.openremote.container.message.MessageBrokerSetupService;
+import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.timer.TimerService;
@@ -91,7 +91,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
new GatewayClientResourceImpl(timerService, identityService, this)
);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
}
@Override
@@ -331,7 +331,7 @@ public class GatewayClientService extends RouteBuilder implements ContainerServi
return new ArrayList<>(connectionRealmMap.values());
}
- protected void setConnection(GatewayConnection connection) {
+ public void setConnection(GatewayConnection connection) {
LOG.info("Updating/creating gateway connection: " + connection);
persistenceService.doTransaction(em -> em.merge(connection));
}
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
index f953cb6c2..06847e3d7 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
@@ -24,7 +24,7 @@ import org.keycloak.admin.client.resource.ClientsResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
-import org.openremote.container.message.MessageBrokerSetupService;
+import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.container.web.ClientRequestInfo;
import org.openremote.container.web.socket.WebsocketConstants;
@@ -36,6 +36,7 @@ import org.openremote.manager.concurrent.ManagerExecutorService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
+import org.openremote.model.ValueHolder;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.asset.AssetType;
@@ -53,6 +54,7 @@ import javax.ws.rs.core.Response;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -107,7 +109,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
} else {
active = true;
identityProvider = (ManagerKeycloakIdentityProvider) identityService.getIdentityProvider();
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
}
}
@@ -125,6 +127,14 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
gateways.forEach(gateway -> {
+ // Check if client has been created
+ boolean hasClientId = gateway.getAttribute("clientId").map(a -> a.getValueAsString().isPresent()).orElse(false);
+ boolean hasClientSecret = gateway.getAttribute("clientSecret").map(a -> a.getValueAsString().isPresent()).orElse(false);
+
+ if (!hasClientId || !hasClientSecret) {
+ createGatewayClient(gateway);
+ }
+
// Create connector
GatewayConnector connector = new GatewayConnector(assetStorageService, assetProcessingService, executorService, gateway);
gatewayConnectorMap.put(gateway.getId(), connector);
@@ -473,7 +483,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
protected void createGatewayClient(Asset gateway) {
String id = UUID.randomUUID().toString();
- String secret = UUID.randomUUID().toString();
+ String secret = gateway.getAttribute("clientSecret").flatMap(ValueHolder::getValueAsString).map(UUID::fromString).orElseGet(UUID::randomUUID).toString();
String clientId = GATEWAY_CLIENT_ID_PREFIX + gateway.getId();
ClientRepresentation clientRepresentation = new ClientRepresentation();
clientRepresentation.setId(id);
@@ -489,7 +499,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
ClientsResource clientsResource = identityProvider.getRealms(getClientRequestInfo()).realm(gateway.getRealm()).clients();
Response response = clientsResource.create(clientRepresentation);
-
+ response.close();
if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {
LOG.warning("Failed to create Keycloak client for gateway '" + gateway.getId() + "' Response=" + response.getStatus());
} else {
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
index 03cf46697..c4af7e407 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
@@ -26,7 +26,6 @@ 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.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.timer.TimerService;
@@ -115,7 +114,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
this.assetStorageService = container.getService(AssetStorageService.class);
this.identityService = container.getService(ManagerIdentityService.class);
this.messageBrokerService = container.getService(MessageBrokerService.class);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
container.getServices(NotificationHandler.class).forEach(notificationHandler ->
notificationHandlerMap.put(notificationHandler.getTypeName(), notificationHandler));
diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
index b58770815..e2e351d04 100644
--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
@@ -27,7 +27,7 @@ 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.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.model.asset.Asset;
@@ -78,7 +78,7 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
public void init(Container container) throws Exception {
this.assetStorageService = container.getService(AssetStorageService.class);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
String firebaseConfigFilePath = container.getConfig().get(FIREBASE_CONFIG_FILE);
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index 8a67de1d1..171f11305 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -22,7 +22,7 @@ package org.openremote.manager.rules;
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.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.timer.TimerService;
@@ -172,7 +172,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
geofenceAssetAdapters.addAll(container.getServices(GeofenceAssetAdapter.class));
geofenceAssetAdapters.sort(Comparator.comparingInt(GeofenceAssetAdapter::getPriority));
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
configEventExpires = getString(container.getConfig(), RULE_EVENT_EXPIRES, RULE_EVENT_EXPIRES_DEFAULT);
container.getService(ManagerWebService.class).getApiSingletons().add(
diff --git a/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java b/manager/src/main/java/org/openremote/manager/rules/geofence/ORConsoleGeofenceAssetAdapter.java
index 0815678e5..0e76bf6f3 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
@@ -21,7 +21,7 @@ package org.openremote.manager.rules.geofence;
import org.apache.camel.builder.RouteBuilder;
import org.openremote.container.Container;
-import org.openremote.container.message.MessageBrokerSetupService;
+import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.concurrent.ManagerExecutorService;
@@ -83,7 +83,7 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofe
@Override
public int getPriority() {
- return MessageBrokerSetupService.PRIORITY + 10;
+ return MessageBrokerService.PRIORITY + 10;
}
@Override
@@ -92,7 +92,7 @@ public class ORConsoleGeofenceAssetAdapter extends RouteBuilder implements Geofe
this.notificationService = container.getService(NotificationService.class);
this.identityService = container.getService(ManagerIdentityService.class);
this.executorService = container.getService(ManagerExecutorService.class);
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 557bf27c5..8127a3021 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -231,6 +231,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
.entity(response.getEntity())
.build()
);
+ } else {
+ response.close();
}
}
@@ -244,6 +246,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
.entity(response.getEntity())
.build()
);
+ } else {
+ response.close();
}
}
@@ -572,13 +576,15 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
// Fire persistence event although we don't use database for Tenant CUD but call Keycloak API
PersistenceEvent persistenceEvent = new PersistenceEvent<>(cause, tenant, new String[0], null);
- messageBrokerService.getProducerTemplate().sendBodyAndHeader(
- PersistenceEvent.PERSISTENCE_TOPIC,
- ExchangePattern.InOnly,
- persistenceEvent,
- PersistenceEvent.HEADER_ENTITY_TYPE,
- persistenceEvent.getEntity().getClass()
- );
+ if (messageBrokerService.getProducerTemplate() != null) {
+ messageBrokerService.getProducerTemplate().sendBodyAndHeader(
+ PersistenceEvent.PERSISTENCE_TOPIC,
+ ExchangePattern.InOnly,
+ persistenceEvent,
+ PersistenceEvent.HEADER_ENTITY_TYPE,
+ persistenceEvent.getEntity().getClass()
+ );
+ }
clientEventService.publishEvent(
new AssetTreeModifiedEvent(timerService.getCurrentTimeMillis(), tenant.getRealm(), null)
@@ -597,6 +603,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
.build()
);
} else {
+ response.close();
+
componentRepresentation = realmResource.components()
.query(componentRepresentation.getParentId(),
componentRepresentation.getProviderType(),
@@ -609,6 +617,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
.entity(response.getEntity())
.build()
);
+ } else {
+ response.close();
}
}
return componentRepresentation.getId();
@@ -626,6 +636,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
.build()
);
} else {
+ response.close();
+
componentRepresentation = realmResource.components()
.query(componentRepresentation.getParentId(),
componentRepresentation.getProviderType(),
diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupService.java b/manager/src/main/java/org/openremote/manager/setup/SetupService.java
index aaaca07ea..e5b153b8d 100644
--- a/manager/src/main/java/org/openremote/manager/setup/SetupService.java
+++ b/manager/src/main/java/org/openremote/manager/setup/SetupService.java
@@ -21,8 +21,11 @@ package org.openremote.manager.setup;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
+import org.openremote.container.message.MessageBrokerService;
+import org.openremote.container.security.IdentityService;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.setup.builtin.BuiltinSetupTasks;
+import sun.plugin2.message.Message;
import java.util.ArrayList;
import java.util.List;
@@ -53,7 +56,7 @@ public class SetupService implements ContainerService {
@Override
public int getPriority() {
- return AGENT_SERVICE_PRIORITY - 1; // Start before agent service to ensure agents etc. are available
+ return IdentityService.PRIORITY + 10; // Start just after identity service so we know what tasks to run
}
@Override
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakCleanSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakCleanSetup.java
index 8fdbeeda4..43118c02e 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakCleanSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakCleanSetup.java
@@ -24,6 +24,7 @@ import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.openremote.container.Container;
+import org.openremote.manager.gateway.GatewayService;
import org.openremote.manager.setup.AbstractKeycloakSetup;
import java.util.List;
@@ -53,9 +54,9 @@ public class KeycloakCleanSetup extends AbstractKeycloakSetup {
}
}
- // Find out if there is a client already present for this application, if so, delete it
+ // Find out if there is a client already present for this application, if so, delete it as well as any gateway clients
masterClientsResource.findAll().stream()
- .filter(clientRepresentation -> clientRepresentation.getClientId().equals(KEYCLOAK_CLIENT_ID))
+ .filter(clientRepresentation -> clientRepresentation.getClientId().equals(KEYCLOAK_CLIENT_ID) || clientRepresentation.getClientId().startsWith(GatewayService.GATEWAY_CLIENT_ID_PREFIX))
.map(ClientRepresentation::getId)
.forEach(clientObjectId -> {
LOG.info("Deleting client: " + clientObjectId);
diff --git a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
index 8366a9528..e746b28d6 100644
--- a/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
+++ b/manager/src/main/java/org/openremote/manager/simulator/SimulatorService.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.openremote.agent.protocol.simulator.SimulatorProtocol;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
-import org.openremote.container.message.MessageBrokerSetupService;
+import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.security.AuthContext;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.event.ClientEventService;
@@ -76,7 +76,7 @@ public class SimulatorService extends RouteBuilder implements ContainerService {
return false;
});
- container.getService(MessageBrokerSetupService.class).getContext().addRoutes(this);
+ container.getService(MessageBrokerService.class).getContext().addRoutes(this);
// When a protocol instance has its values updated through linked attribute writes, publish a snapshot to all sessions
simulatorProtocol.setValuesChangedHandler(
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.ContainerService
index c97d1d549..f02801120 100644
--- a/manager/src/main/resources/META-INF/services/org.openremote.container.ContainerService
+++ b/manager/src/main/resources/META-INF/services/org.openremote.container.ContainerService
@@ -21,7 +21,6 @@ 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
org.openremote.manager.predicted.AssetPredictedDatapointService
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
index 2a11b6054..c805f1f22 100644
--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
@@ -29,10 +29,10 @@ import org.keycloak.representations.AccessTokenResponse
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.security.AuthForm
import org.openremote.container.security.IdentityService
import org.openremote.container.security.keycloak.KeycloakIdentityProvider
+import org.openremote.container.web.DefaultWebsocketComponent
import org.openremote.container.web.WebClient
import org.openremote.manager.web.ManagerWebService
import org.openremote.model.Constants
@@ -130,7 +130,7 @@ trait ContainerTrait {
static getWebsocketServerUrl(UriBuilder uriBuilder, String endpointPath, String realm, String accessToken) {
uriBuilder.clone()
.scheme("ws")
- .replacePath(MessageBrokerSetupService.WEBSOCKET_PATH)
+ .replacePath(DefaultWebsocketComponent.WEBSOCKET_PATH)
.path(endpointPath)
.queryParam(Constants.REQUEST_HEADER_REALM, realm)
.queryParam("Authorization", "Bearer " + accessToken)
diff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
index df23a27b9..39d73aef7 100644
--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy
@@ -3,7 +3,7 @@ package org.openremote.test
import org.apache.camel.spi.BrowsableEndpoint
import org.openremote.container.Container
import org.openremote.container.ContainerService
-import org.openremote.container.message.MessageBrokerSetupService
+import org.openremote.container.message.MessageBrokerService
import org.openremote.container.timer.TimerService
import org.openremote.manager.asset.AssetProcessingService
import spock.util.concurrent.PollingConditions
@@ -115,7 +115,7 @@ trait ManagerContainerTrait extends ContainerTrait {
static void noPendingExchangesOnMessageEndpoint(Container container, String... endpointName) {
for (String name : endpointName) {
- def endpoint = container.getService(MessageBrokerSetupService.class).context.getEndpoint(name)
+ def endpoint = container.getService(MessageBrokerService.class).getContext().getEndpoint(name)
if (!endpoint) {
throw new IllegalArgumentException("Messaging endpoint not found: " + name)
}
diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
index ab8542f67..ec7cb3d61 100644
--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy
@@ -2,7 +2,6 @@ package org.openremote.test.gateway
import com.google.common.collect.Lists
import io.netty.channel.ChannelHandler
-import org.apache.camel.builder.AdviceWithRouteBuilder
import org.apache.http.client.utils.URIBuilder
import org.openremote.agent.protocol.http.HttpClientProtocol
import org.openremote.agent.protocol.http.OAuthClientCredentialsGrant
@@ -10,13 +9,11 @@ import org.openremote.agent.protocol.io.AbstractNettyIoClient
import org.openremote.agent.protocol.simulator.SimulatorProtocol
import org.openremote.agent.protocol.websocket.WebsocketIoClient
import org.openremote.container.Container
-import org.openremote.container.message.MessageBrokerSetupService
import org.openremote.container.util.UniqueIdentifierGenerator
import org.openremote.container.web.ClientRequestInfo
import org.openremote.manager.asset.AssetProcessingService
import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.concurrent.ManagerExecutorService
-import org.openremote.manager.event.ClientEventService
import org.openremote.manager.gateway.GatewayClientService
import org.openremote.manager.gateway.GatewayConnector
import org.openremote.manager.gateway.GatewayService
@@ -24,7 +21,6 @@ import org.openremote.manager.security.ManagerIdentityService
import org.openremote.manager.security.ManagerKeycloakIdentityProvider
import org.openremote.manager.setup.SetupService
import org.openremote.manager.setup.builtin.ManagerDemoSetup
-import org.openremote.model.Constants
import org.openremote.model.asset.*
import org.openremote.model.asset.agent.ConnectionStatus
import org.openremote.model.attribute.*
@@ -544,7 +540,12 @@ class GatewayTest extends Specification implements ManagerContainerTrait {
conditions.eventually {
assert gatewayService.gatewayConnectorMap.get(gateway.getId()).disabled
assert !gatewayService.gatewayConnectorMap.get(gateway.getId()).connected
- assert gatewayClient.connectionStatus == ConnectionStatus.WAITING
+ assert gatewayClient.connectionStatus == ConnectionStatus.CONNECTING
+ }
+
+ and: "the central manager should have sent a disconnect event to the client"
+ conditions.eventually {
+ assert clientReceivedMessages.last().contains("gateway-disconnect")
}
gatewayClient.disconnect()
diff --git a/test/src/test/groovy/org/openremote/test/protocol/TcpClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/TcpClientTest.groovy
index 5f661f599..f6ff3c213 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/TcpClientTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/TcpClientTest.groovy
@@ -148,10 +148,10 @@ class TcpClientTest extends Specification implements ManagerContainerTrait {
when: "we lose connection to the server"
echoServer.stop()
- then: "the client status should change to WAITING"
+ then: "the client status should change to CONNECTING"
conditions.eventually {
- assert client.connectionStatus == ConnectionStatus.WAITING
- assert connectionStatus == ConnectionStatus.WAITING
+ assert client.connectionStatus == ConnectionStatus.CONNECTING
+ assert connectionStatus == ConnectionStatus.CONNECTING
}
when: "the connection to the server is restored"