Skip to content

armgit / core

Public Imported from GitHub
0

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

Minor updates for testing robustness

Rich Turner5579889a809b
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 2e21783af..49e8d9164 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
@@ -307,7 +307,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien
);
}
- protected void doSubscription(WebsocketIoClient websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription subscription) {
+ protected void doSubscription(WebsocketIoClient<String> websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription subscription) {
if (subscription instanceof WebsocketHttpSubscription) {
WebsocketHttpSubscription httpSubscription = (WebsocketHttpSubscription)subscription;
diff --git a/model/src/main/java/org/openremote/model/rules/TemporaryFact.java b/model/src/main/java/org/openremote/model/rules/TemporaryFact.java
index 8d00a665d..dbf417b59 100644
--- a/model/src/main/java/org/openremote/model/rules/TemporaryFact.java
+++ b/model/src/main/java/org/openremote/model/rules/TemporaryFact.java
@@ -41,7 +41,7 @@ public class TemporaryFact<T> extends Event {
* be designed with this margin in mind.
*/
// TODO This is not true, need to add GlobalLockTimeout
- public static final int GUARANTEED_MIN_EXPIRATION_MILLIS = 3000;
+ public static int GUARANTEED_MIN_EXPIRATION_MILLIS = 3000;
final protected long expirationMilliseconds;
final protected T fact;
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
index e3aac0a04..2a11b6054 100644
--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
@@ -63,7 +63,7 @@ trait ContainerTrait {
ResteasyClientBuilder clientBuilder =
new ResteasyClientBuilder()
.establishConnectionTimeout(2, SECONDS)
- .socketTimeout(10, SECONDS)
+ .socketTimeout(15, SECONDS)
.connectionPoolSize(10)
return WebClient.registerDefaults(clientBuilder)
}