100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Major: Upgraded to jakarta packages and latest dependencies (#1011)
Rich Turnerd0167dbfcbd8
diff --git a/.ci_cd/deploy.sh b/.ci_cd/deploy.shindex d2612a0c3..146e607da 100644--- a/.ci_cd/deploy.sh+++ b/.ci_cd/deploy.sh@@ -143,7 +143,8 @@ PLATFORM="linux/$PLATFORM"# Verify manager tag and create docker image tarballs as requiredif [ "$MANAGER_TAG" != '#ref' ]; then- docker buildx imagetools inspect --raw openremote/manager:$MANAGER_TAG > /dev/null 2> /dev/null+ echo "Checking existence of manager docker image with tag: $MANAGER_TAG"+ docker buildx imagetools inspect --raw openremote/manager:$MANAGER_TAGif [ $? -ne 0 ]; thenecho "Specified manager tag does not exist in docker hub"revoke_sshdiff --git a/LICENSE.txt b/LICENSE.txtindex eb8653e89..d13ff6eca 100644--- a/LICENSE.txt+++ b/LICENSE.txt@@ -40,9 +40,6 @@ dom4j:dom4j: DOM4J BSD LICENSEio.netty:netty: APACHE LICENSE, VERSION 2.0io.undertow:*: APACHE LICENSE, VERSION 2.0javax.jmdns:jmdns: APACHE LICENSE, VERSION 2.0-javax.validation:validation-api: APACHE LICENSE, VERSION 2.0-javax.activation:activation: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0-javax.mail:mail: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0jdom:jdom: APACHE LICENSE, VERSION 2.0net.jcip:jcip-annotations: Creative Commons Attribution License (http://creativecommons.org/licenses/by/2.5), see http://www.jcip.netorg.apache.camel:*: APACHE LICENSE, VERSION 2.0diff --git a/agent/build.gradle b/agent/build.gradleindex 96f042ae4..3e0a2c78a 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -34,6 +34,8 @@ dependencies {api "com.github.weliem:blessed-bluez:$bluetoothVersion"implementation "dev.failsafe:failsafe:$failsafeVersion"++ implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion"}jar {diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.javaindex 49d046f56..3c26ed1ed 100644--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.DefaultAgentLink;import org.openremote.model.util.ModelIgnore;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@ModelIgnorediff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.javaindex 9feb42438..ea688d5aa 100644--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java@@ -6,8 +6,8 @@ import org.openremote.model.asset.impl.LightAsset;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;-import javax.persistence.Transient;+import jakarta.persistence.Entity;+import jakarta.persistence.Transient;import java.util.Map;import java.util.Optional;diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/ApplicationKey.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/ApplicationKey.javaindex f88dbc5fe..de0df8cfb 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/ApplicationKey.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/ApplicationKey.java@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.bluetooth.mesh;import org.openremote.agent.protocol.bluetooth.mesh.utils.SecureUtils;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;/*** Wrapper class for application keydiff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgent.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgent.javaindex fc8125f68..17cca47eb 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgent.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgentLink.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgentLink.javaindex 63d4987c2..571c78e55 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgentLink.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshAgentLink.java@@ -21,11 +21,11 @@ package org.openremote.agent.protocol.bluetooth.mesh;import org.openremote.model.asset.agent.AgentLink;-import javax.validation.constraints.Max;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.Max;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import java.util.Optional;public class BluetoothMeshAgentLink extends AgentLink<BluetoothMeshAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshKey.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshKey.javaindex c26fc7c21..8aa0aed9f 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshKey.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/MeshKey.java@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.bluetooth.mesh;import org.openremote.model.util.TextUtil;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.Arrays;import java.util.Objects;@@ -189,4 +189,4 @@ abstract class MeshKey implements Cloneable {setKey(key);return true;}-}\ No newline at end of file+}diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/NetworkKey.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/NetworkKey.javaindex ae53de217..f6c3dc6eb 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/NetworkKey.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/NetworkKey.java@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.bluetooth.mesh;import org.openremote.agent.protocol.bluetooth.mesh.utils.SecureUtils;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;/*** Wrapper class for network keydiff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/MeshParserUtils.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/MeshParserUtils.javaindex 773eda990..19db31dfc 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/MeshParserUtils.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/MeshParserUtils.java@@ -19,7 +19,7 @@*/package org.openremote.agent.protocol.bluetooth.mesh.utils;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.nio.ByteBuffer;import java.nio.ByteOrder;import java.text.SimpleDateFormat;@@ -804,4 +804,4 @@ public class MeshParserUtils {return ttl <= 0x7F;}-}\ No newline at end of file+}diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/SecureUtils.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/SecureUtils.javaindex 48d06b130..a77544065 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/SecureUtils.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/utils/SecureUtils.java@@ -31,7 +31,7 @@ import org.bouncycastle.crypto.params.KeyParameter;import org.openremote.agent.protocol.bluetooth.mesh.SecureNetworkBeacon;import org.openremote.model.syslog.SyslogCategory;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.nio.ByteBuffer;import java.nio.ByteOrder;import java.nio.charset.Charset;diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.javaindex ee64cbf20..7cc8a84ff 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/AbstractHTTPServerProtocol.java@@ -26,6 +26,7 @@ import io.undertow.servlet.api.DeploymentInfo;import io.undertow.servlet.api.DeploymentManager;import io.undertow.servlet.api.ServletInfo;import io.undertow.util.HttpString;+import org.jboss.resteasy.core.ResteasyDeploymentImpl;import org.jboss.resteasy.plugins.interceptors.CorsFilter;import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;import org.jboss.resteasy.spi.ResteasyDeployment;@@ -42,8 +43,8 @@ import org.openremote.model.http.HTTPMethod;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;-import javax.servlet.ServletException;-import javax.ws.rs.core.Application;+import jakarta.servlet.ServletException;+import jakarta.ws.rs.core.Application;import java.util.*;import java.util.logging.Level;import java.util.logging.Logger;@@ -150,7 +151,7 @@ public abstract class AbstractHTTPServerProtocol<T extends AbstractHTTPServerPro}protected ResteasyDeployment createDeployment(Application application) {- ResteasyDeployment resteasyDeployment = new ResteasyDeployment();+ ResteasyDeployment resteasyDeployment = new ResteasyDeploymentImpl();resteasyDeployment.setApplication(application);List<String> allowedOrigins;diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPAgent.java b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPAgent.javaindex cc6a4476e..7a921499b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPAgent.java@@ -26,7 +26,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.javaindex 066bf0e3e..9ab815f0f 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java@@ -44,14 +44,14 @@ import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.ValueType;-import javax.ws.rs.HttpMethod;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.HttpMethod;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.Response;import java.lang.annotation.Annotation;import java.lang.reflect.Type;import java.net.URI;diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/PaginationFilter.java b/agent/src/main/java/org/openremote/agent/protocol/http/PaginationFilter.javaindex 4d68fafe0..0b3cd1b28 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/PaginationFilter.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/PaginationFilter.java@@ -19,8 +19,8 @@*/package org.openremote.agent.protocol.http;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;import java.net.URI;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.javaindex 1f29ea5f7..26a2715c5 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@@ -30,7 +30,7 @@ import org.openremote.container.Container;import org.openremote.model.asset.agent.ConnectionStatus;import org.openremote.model.syslog.SyslogCategory;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.net.SocketAddress;import java.time.Duration;import java.util.ArrayList;diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.javaindex f79ed7413..07f615457 100644--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java@@ -25,8 +25,8 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;-import javax.validation.constraints.Pattern;+import jakarta.persistence.Entity;+import jakarta.validation.constraints.Pattern;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgentLink.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgentLink.javaindex 8d236b7dd..b67c8812c 100644--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgentLink.java+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgentLink.java@@ -21,8 +21,8 @@ package org.openremote.agent.protocol.knx;import org.openremote.model.asset.agent.AgentLink;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import java.util.Optional;public class KNXAgentLink extends AgentLink<KNXAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/mail/AbstractMailAgent.java b/agent/src/main/java/org/openremote/agent/protocol/mail/AbstractMailAgent.javaindex 3f0a747ae..a3b35f0e8 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mail/AbstractMailAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mail/AbstractMailAgent.java@@ -25,7 +25,7 @@ import org.openremote.model.auth.UsernamePassword;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.Optional;public abstract class AbstractMailAgent<T extends AbstractMailAgent<T, U, V>, U extends AbstractMailProtocol<T, U, V>, V extends AgentLink<V>> extends Agent<T, U, V> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/mail/MailAgent.java b/agent/src/main/java/org/openremote/agent/protocol/mail/MailAgent.javaindex ab89603e8..34b9bc59a 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mail/MailAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mail/MailAgent.java@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.mail;import org.openremote.model.asset.agent.AgentDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class MailAgent extends AbstractMailAgent<MailAgent, MailProtocol, MailAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/mail/MailClient.java b/agent/src/main/java/org/openremote/agent/protocol/mail/MailClient.javaindex ca523f062..a07277bd8 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mail/MailClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mail/MailClient.java@@ -26,7 +26,7 @@ import org.openremote.model.auth.UsernamePassword;import org.openremote.model.mail.MailMessage;import org.openremote.model.syslog.SyslogCategory;-import javax.mail.*;+import jakarta.mail.*;import java.io.IOException;import java.nio.file.Files;import java.nio.file.Path;diff --git a/agent/src/main/java/org/openremote/agent/protocol/mail/MailClientBuilder.java b/agent/src/main/java/org/openremote/agent/protocol/mail/MailClientBuilder.javaindex abc30351d..c37536a47 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mail/MailClientBuilder.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mail/MailClientBuilder.java@@ -24,7 +24,7 @@ import org.openremote.container.web.WebTargetBuilder;import org.openremote.model.auth.OAuthGrant;import org.openremote.model.auth.UsernamePassword;-import javax.ws.rs.client.Client;+import jakarta.ws.rs.client.Client;import java.net.SocketException;import java.nio.file.Path;import java.util.Date;diff --git a/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java b/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.javaindex d234a19c3..9cb082165 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTAgent.java@@ -25,7 +25,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.javaindex cd63e64fc..0fbe9ac8f 100644--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java@@ -25,7 +25,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.DefaultAgentLink;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class SerialAgent extends IOAgent<SerialAgent, SerialProtocol, DefaultAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.javaindex 3f1c02590..33fd4bfb8 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.simulator;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class SimulatorAgent extends Agent<SimulatorAgent, SimulatorProtocol, SimulatorAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.javaindex 705ea7ab7..64ecc3bbf 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.java@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.simulator.storage;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class StorageSimulatorAgent extends Agent<StorageSimulatorAgent, StorageSimulatorProtocol, StorageSimulatorAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgent.java b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgent.javaindex beb579115..45b905d0d 100644--- a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgent.java@@ -6,7 +6,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgentLink.java b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgentLink.javaindex d55f1ba1a..b8367cfa4 100644--- a/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgentLink.java+++ b/agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPAgentLink.java@@ -21,7 +21,7 @@ package org.openremote.agent.protocol.snmp;import org.openremote.model.asset.agent.AgentLink;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.Optional;public class SNMPAgentLink extends AgentLink<SNMPAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPAgent.javaindex 070265272..bf46675ea 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/TCPAgent.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.DefaultAgentLink;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class TCPAgent extends IOAgent<TCPAgent, TCPProtocol, DefaultAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.javaindex ff42e8c7c..37bcc5480 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java@@ -26,7 +26,7 @@ import org.openremote.model.util.ModelIgnore;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@ModelIgnorediff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.javaindex eaecb99d9..4d01057a9 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java@@ -7,7 +7,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.asset.impl.LightAsset;import org.openremote.model.attribute.AttributeEvent;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.function.Consumer;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.javaindex fc1fd0fe4..98fc52885 100644--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java@@ -8,7 +8,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.asset.impl.PlugAsset;import org.openremote.model.attribute.AttributeEvent;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.function.Consumer;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPAgent.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPAgent.javaindex 0d2016120..1b1aa6510 100644--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UDPAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UDPAgent.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.DefaultAgentLink;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class UDPAgent extends IOAgent<UDPAgent, UDPProtocol, DefaultAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusAgentLink.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusAgentLink.javaindex 31f1f8efb..74811cd71 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusAgentLink.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusAgentLink.java@@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import org.openremote.model.asset.agent.AgentLink;-import javax.validation.constraints.Max;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.Max;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotNull;import java.util.Optional;public class VelbusAgentLink extends AgentLink<VelbusAgentLink> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.javaindex 9e0a6ce57..03fff8ac5 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.velbus;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class VelbusSerialAgent extends VelbusAgent<VelbusSerialAgent, VelbusSerialProtocol> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTCPAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTCPAgent.javaindex aa4ebab7a..2454bc2af 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTCPAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTCPAgent.java@@ -22,7 +22,7 @@ package org.openremote.agent.protocol.velbus;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class VelbusTCPAgent extends VelbusAgent<VelbusTCPAgent, VelbusTCPProtocol> {diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.javaindex bf51f8f9a..4441f5958 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgent.java@@ -25,7 +25,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.javaindex ad462f5c2..3735eeaac 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketAgentProtocol.java@@ -41,10 +41,10 @@ import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.ValueType;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.Invocation;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.Response;import java.net.URI;import java.net.URISyntaxException;import java.util.*;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.javaindex f17e408a5..a383d89aa 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@@ -39,7 +39,7 @@ import org.openremote.model.auth.OAuthGrant;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;-import javax.ws.rs.ProcessingException;+import jakarta.ws.rs.ProcessingException;import java.net.InetSocketAddress;import java.net.SocketException;import java.net.URI;diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.javaindex 5cf713fa9..162e98b78 100644--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveAgent.java@@ -23,7 +23,7 @@ import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class ZWaveAgent extends Agent<ZWaveAgent, ZWaveProtocol, ZWaveAgentLink> {diff --git a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt b/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.ktindex 92cf94fb9..b77c393a4 100644--- a/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt+++ b/console/android/GenericApp/app/src/main/java/io/openremote/app/network/ApiManager.kt@@ -8,7 +8,7 @@ import io.openremote.app.model.ORAppInfoimport io.openremote.app.model.ORConsoleConfigimport java.net.HttpURLConnectionimport java.net.URL-import javax.net.ssl.HttpsURLConnection+import jakarta.net.ssl.HttpsURLConnectionimport kotlin.concurrent.threaddiff --git a/container/build.gradle b/container/build.gradleindex 7f9b2c1bc..f6b87c692 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -19,28 +19,27 @@ dependencies {api "io.undertow:undertow-servlet:$undertowVersion"api "io.undertow:undertow-websockets-jsr:$undertowVersion"-- api "org.jboss.resteasy:resteasy-jaxrs:$resteasyVersion"+ api ("org.jboss.resteasy:resteasy-undertow:$resteasyVersion") {+ exclude group: "io.undertow", module: "undertow-servlet-jakarta"+ }api "org.jboss.resteasy:resteasy-client:$resteasyVersion"api "org.jboss.resteasy:resteasy-jackson2-provider:$resteasyVersion"api "org.jboss.resteasy:resteasy-multipart-provider:$resteasyVersion"- api("org.jboss.resteasy:resteasy-cache-core:$resteasyVersion") {- exclude group: "org.infinispan"- }api "org.jboss.resteasy:resteasy-validator-provider:$resteasyVersion"- api "org.jboss.resteasy:async-http-servlet-3.0:$resteasyVersionAsyncHttpServlet"api "org.keycloak:keycloak-client-registration-api:$keycloakVersion"- api "org.keycloak:keycloak-undertow-adapter:$keycloakVersion"- api "org.keycloak:keycloak-admin-client:$keycloakVersion"+ api "org.keycloak:keycloak-adapter-core:$keycloakVersion"+ api "org.keycloak:keycloak-admin-client-jakarta:$keycloakVersion"api "org.postgresql:postgresql:$postgresJdbcVersion"api "org.flywaydb:flyway-core:$flywaydbVersion"- api "com.zaxxer:HikariCP:$hikaricpVersion"api "org.hibernate:hibernate-core:$hibernateVersion"- api "org.hibernate:hibernate-validator:$hibernateValidatorVersion"+ api "org.hibernate.orm:hibernate-hikaricp:$hibernateVersion"+ api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion"+ api "com.zaxxer:HikariCP:$hikaricpVersion"- api "javax.el:javax.el-api:3.0.0"+ api "jakarta.el:jakarta.el-api:$javaxELAPIVersion"+ api "org.glassfish:jakarta.el:$javaxELVersion"api "org.apache.camel:camel-core:$camelVersion"api "org.apache.camel:camel-jackson:$camelVersion"@@ -48,7 +47,7 @@ dependencies {api "org.apache.camel:camel-health:$camelVersion"api "org.apache.camel:camel-management:$camelVersion"api("com.fasterxml.uuid:java-uuid-generator:$uuidGeneratorVersion")- api "com.vladmihalcea:hibernate-types-52:$hibernateTypesVersion"+ api "com.vladmihalcea:hibernate-types-60:$hibernateTypesVersion"}jar {diff --git a/container/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.java b/container/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.javanew file mode 100644index 000000000..490e90bf0--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.java@@ -0,0 +1,27 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface AdapterSessionStore {+ void saveRequest();+ boolean restoreRequest();+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/AuthChallenge.java b/container/src/main/java/org/keycloak/adapters/spi/AuthChallenge.javanew file mode 100644index 000000000..2920ae681--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/AuthChallenge.java@@ -0,0 +1,38 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface AuthChallenge {+ /**+ *+ * @param exchange+ * @return challenge sent+ */+ boolean challenge(HttpFacade exchange);++ /**+ * Some platforms need the error code that will be sent (i.e. Undertow)+ *+ * @return+ */+ int getResponseCode();+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/AuthOutcome.java b/container/src/main/java/org/keycloak/adapters/spi/AuthOutcome.javanew file mode 100644index 000000000..62d83fceb--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/AuthOutcome.java@@ -0,0 +1,26 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public enum AuthOutcome {+ NOT_ATTEMPTED, FAILED, AUTHENTICATED, NOT_AUTHENTICATED, LOGGED_OUT+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/AuthenticationError.java b/container/src/main/java/org/keycloak/adapters/spi/AuthenticationError.javanew file mode 100644index 000000000..e95ee72ef--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/AuthenticationError.java@@ -0,0 +1,30 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++/**+ * Common marker interface used by keycloak client adapters when there is an error. For servlets, you'll be able+ * to extract this error from the HttpServletRequest.getAttribute(AuthenticationError.class.getName()). Each protocol+ * will have their own subclass of this interface.+ *+ *+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface AuthenticationError {+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/HttpFacade.java b/container/src/main/java/org/keycloak/adapters/spi/HttpFacade.javanew file mode 100644index 000000000..39d5c33ec--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/HttpFacade.java@@ -0,0 +1,131 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++import java.security.cert.X509Certificate;+import java.io.InputStream;+import java.io.OutputStream;+import java.util.List;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface HttpFacade {+ Request getRequest();++ Response getResponse();++ X509Certificate[] getCertificateChain();++ interface Request {++ String getMethod();+ /**+ * Full request URI with query params+ *+ * @return+ */+ String getURI();++ /**+ * Get the request relative path.+ *+ * @return the request relative path+ */+ String getRelativePath();++ /**+ * HTTPS?+ *+ * @return+ */+ boolean isSecure();++ /**+ * Get first query or form param+ *+ * @param param+ * @return+ */+ String getFirstParam(String param);+ String getQueryParamValue(String param);+ Cookie getCookie(String cookieName);+ String getHeader(String name);+ List<String> getHeaders(String name);+ InputStream getInputStream();+ InputStream getInputStream(boolean buffered);++ String getRemoteAddr();+ void setError(AuthenticationError error);+ void setError(LogoutError error);+ }++ interface Response {+ void setStatus(int status);+ void addHeader(String name, String value);+ void setHeader(String name, String value);+ void resetCookie(String name, String path);+ void setCookie(String name, String value, String path, String domain, int maxAge, boolean secure, boolean httpOnly);+ OutputStream getOutputStream();+ void sendError(int code);+ void sendError(int code, String message);++ /**+ * If the response is finished, end it.+ *+ */+ void end();+ }++ public class Cookie {+ protected String name;+ protected String value;+ protected int version;+ protected String domain;+ protected String path;++ public Cookie(String name, String value, int version, String domain, String path) {+ this.name = name;+ this.value = value;+ this.version = version;+ this.domain = domain;+ this.path = path;+ }++ public String getName() {+ return name;+ }++ public String getValue() {+ return value;+ }++ public int getVersion() {+ return version;+ }++ public String getDomain() {+ return domain;+ }++ public String getPath() {+ return path;+ }+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java b/container/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.javanew file mode 100644index 000000000..808d94818--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java@@ -0,0 +1,113 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++import org.jboss.logging.Logger;++import java.util.Collections;+import java.util.HashSet;+import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;++/**+ * Maps external principal and SSO id to internal local http session id+ *+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class InMemorySessionIdMapper implements SessionIdMapper {++ private static final Logger LOG = Logger.getLogger(InMemorySessionIdMapper.class.getName());++ ConcurrentHashMap<String, String> ssoToSession = new ConcurrentHashMap<>();+ ConcurrentHashMap<String, String> sessionToSso = new ConcurrentHashMap<>();+ ConcurrentHashMap<String, Set<String>> principalToSession = new ConcurrentHashMap<>();+ ConcurrentHashMap<String, String> sessionToPrincipal = new ConcurrentHashMap<>();++ @Override+ public boolean hasSession(String id) {+ return sessionToSso.containsKey(id) || sessionToPrincipal.containsKey(id);+ }++ @Override+ public void clear() {+ ssoToSession.clear();+ sessionToSso.clear();+ principalToSession.clear();+ sessionToPrincipal.clear();+ }++ @Override+ public Set<String> getUserSessions(String principal) {+ Set<String> lookup = principalToSession.get(principal);+ if (lookup == null) return null;+ Set<String> copy = new HashSet<>();+ copy.addAll(lookup);+ return copy;+ }++ @Override+ public String getSessionFromSSO(String sso) {+ return ssoToSession.get(sso);+ }++ @Override+ public void map(String sso, String principal, String session) {+ LOG.debugf("Adding mapping (%s, %s, %s)", sso, principal, session);++ if (sso != null) {+ ssoToSession.put(sso, session);+ sessionToSso.put(session, sso);+ }++ if (principal == null) {+ return;+ }++ Set<String> userSessions = principalToSession.get(principal);+ if (userSessions == null) {+ final Set<String> tmp = Collections.synchronizedSet(new HashSet<String>());+ userSessions = principalToSession.putIfAbsent(principal, tmp);+ if (userSessions == null) {+ userSessions = tmp;+ }+ }+ userSessions.add(session);+ sessionToPrincipal.put(session, principal);+ }++ @Override+ public void removeSession(String session) {+ LOG.debugf("Removing session %s", session);++ String sso = sessionToSso.remove(session);+ if (sso != null) {+ ssoToSession.remove(sso);+ }+ String principal = sessionToPrincipal.remove(session);+ if (principal != null) {+ Set<String> sessions = principalToSession.get(principal);+ sessions.remove(session);+ if (sessions.isEmpty()) {+ principalToSession.remove(principal, sessions);+ }+ }+ }+++}diff --git a/container/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.java b/container/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.javanew file mode 100644index 000000000..ce6863ccb--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.java@@ -0,0 +1,31 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++import java.security.Principal;+import java.util.Set;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface KeycloakAccount {+ Principal getPrincipal();++ Set<String> getRoles();+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/LogoutError.java b/container/src/main/java/org/keycloak/adapters/spi/LogoutError.javanew file mode 100644index 000000000..091bf8b31--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/LogoutError.java@@ -0,0 +1,29 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++/**+ * Common marker interface used by keycloak client adapters when there is an error. For servlets, you'll be able+ * to extract this error from the HttpServletRequest.getAttribute(LogoutError.class.getName()). Each protocol+ * will have their own subclass of this interface.+ *+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface LogoutError {+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.java b/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.javanew file mode 100644index 000000000..b50e37b79--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.java@@ -0,0 +1,66 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++import java.util.Set;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface SessionIdMapper {+ /**+ * Returns {@code true} if the mapper contains mapping for the given HTTP session ID.+ * @param id+ * @return+ */+ boolean hasSession(String id);++ /**+ * Clears all mappings from this mapper.+ */+ void clear();++ /**+ * Returns set of HTTP session IDs for the given principal.+ * @param principal Principal+ * @return+ */+ Set<String> getUserSessions(String principal);++ /**+ * Returns HTTP session ID from the given user session ID.+ * @param sso User session ID+ * @return+ */+ String getSessionFromSSO(String sso);++ /**+ * Establishes mapping between user session ID, principal and HTTP session ID.+ * @param sso User session ID+ * @param principal Principal+ * @param session HTTP session ID+ */+ void map(String sso, String principal, String session);++ /**+ * Removes mappings for the given HTTP session ID.+ * @param session HTTP session ID.+ */+ void removeSession(String session);+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapperUpdater.java b/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapperUpdater.javanew file mode 100644index 000000000..f7e6b1e3c--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/SessionIdMapperUpdater.java@@ -0,0 +1,89 @@+/*+ * Copyright 2017 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.spi;++/**+ * Classes implementing this interface represent a mechanism for updating {@link SessionIdMapper} entries.+ * @author hmlnarik+ */+public interface SessionIdMapperUpdater {+ /**+ * {@link SessionIdMapper} entries are updated directly.+ */+ public static final SessionIdMapperUpdater DIRECT = new SessionIdMapperUpdater() {+ @Override public void clear(SessionIdMapper idMapper) {+ idMapper.clear();+ }++ @Override public void map(SessionIdMapper idMapper, String sso, String principal, String httpSessionId) {+ idMapper.map(sso, principal, httpSessionId);+ }++ @Override public void removeSession(SessionIdMapper idMapper, String httpSessionId) {+ idMapper.removeSession(httpSessionId);+ }++ @Override public boolean refreshMapping(SessionIdMapper idMapper, String httpSessionId) {+ return false;+ }+ };++ /**+ * Only HTTP session is manipulated with, {@link SessionIdMapper} entries are not updated by this updater and+ * they have to be updated by some other means, e.g. by some listener of HTTP session changes.+ */+ public static final SessionIdMapperUpdater EXTERNAL = new SessionIdMapperUpdater() {+ @Override public void clear(SessionIdMapper idMapper) { }++ @Override public void map(SessionIdMapper idMapper, String sso, String principal, String httpSessionId) { }++ @Override public void removeSession(SessionIdMapper idMapper, String httpSessionId) { }++ @Override public boolean refreshMapping(SessionIdMapper idMapper, String httpSessionId) { return false; }+ };++ /**+ * Delegates to {@link SessionIdMapper#clear} method..+ */+ void clear(SessionIdMapper idMapper);++ /**+ * Delegates to {@link SessionIdMapper#map} method.+ * @param idMapper Mapper+ * @param sso User session ID+ * @param principal Principal+ * @param session HTTP session ID+ */+ void map(SessionIdMapper idMapper, String sso, String principal, String session);++ /**+ * Delegates to {@link SessionIdMapper#removeSession} method.+ * @param idMapper Mapper+ * @param session HTTP session ID.+ */+ void removeSession(SessionIdMapper idMapper, String session);++ /**+ * Refreshes the mapping in the {@code idMapper} from the internal source of this mapped updater+ * and maps it via {@link SessionIdMapper#map} method.+ * @param idMapper Mapper+ * @param session HTTP session ID.+ * @return {@code true} if the mapping existed in the internal source of this mapped updater+ * and has been refreshed, {@code false} otherwise+ */+ boolean refreshMapping(SessionIdMapper idMapper, String httpSessionId);+}diff --git a/container/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.java b/container/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.javanew file mode 100644index 000000000..5808b0b69--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.java@@ -0,0 +1,31 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.spi;++import java.util.List;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface UserSessionManagement {++ void logoutAll();++ void logoutHttpSessions(List<String> ids);+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java b/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.javanew file mode 100644index 000000000..835d043fb--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java@@ -0,0 +1,130 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.AuthenticationMechanism;+import io.undertow.security.api.NotificationReceiver;+import io.undertow.security.api.SecurityContext;+import io.undertow.security.api.SecurityNotification;+import io.undertow.server.HttpServerExchange;+import io.undertow.util.AttachmentKey;+import io.undertow.util.Headers;+import io.undertow.util.StatusCodes;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.*;+import org.keycloak.adapters.spi.AuthChallenge;+import org.keycloak.adapters.spi.AuthOutcome;+import org.keycloak.adapters.spi.HttpFacade;+import org.keycloak.enums.TokenStore;++/**+ * Abstract base class for a Keycloak-enabled Undertow AuthenticationMechanism.+ *+ * @author Stan Silvert [email protected] (C) 2014 Red Hat Inc.+ */+public abstract class AbstractUndertowKeycloakAuthMech implements AuthenticationMechanism {+ public static final AttachmentKey<AuthChallenge> KEYCLOAK_CHALLENGE_ATTACHMENT_KEY = AttachmentKey.create(AuthChallenge.class);+ protected AdapterDeploymentContext deploymentContext;+ protected UndertowUserSessionManagement sessionManagement;+ protected String errorPage;++ public AbstractUndertowKeycloakAuthMech(AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement sessionManagement, String errorPage) {+ this.deploymentContext = deploymentContext;+ this.sessionManagement = sessionManagement;+ this.errorPage = errorPage;+ }++ @Override+ public ChallengeResult sendChallenge(HttpServerExchange exchange, SecurityContext securityContext) {+ AuthChallenge challenge = exchange.getAttachment(KEYCLOAK_CHALLENGE_ATTACHMENT_KEY);+ if (challenge != null) {+ UndertowHttpFacade facade = createFacade(exchange);+ if (challenge.challenge(facade)) {+ return new ChallengeResult(true, exchange.getStatusCode());+ }+ }+ return new ChallengeResult(false);+ }++ public UndertowHttpFacade createFacade(HttpServerExchange exchange) {+ return new OIDCUndertowHttpFacade(exchange);+ }++ protected Integer servePage(final HttpServerExchange exchange, final String location) {+ sendRedirect(exchange, location);+ return StatusCodes.TEMPORARY_REDIRECT;+ }++ static void sendRedirect(final HttpServerExchange exchange, final String location) {+ // TODO - String concatenation to construct URLS is extremely error prone - switch to a URI which will better handle this.+ String loc = exchange.getRequestScheme() + "://" + exchange.getHostAndPort() + location;+ exchange.getResponseHeaders().put(Headers.LOCATION, loc);+ }++++ protected void registerNotifications(final SecurityContext securityContext) {++ final NotificationReceiver logoutReceiver = new NotificationReceiver() {+ @Override+ public void handleNotification(SecurityNotification notification) {+ if (notification.getEventType() != SecurityNotification.EventType.LOGGED_OUT) return;++ HttpServerExchange exchange = notification.getExchange();+ UndertowHttpFacade facade = createFacade(exchange);+ KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade);+ KeycloakSecurityContext ksc = exchange.getAttachment(OIDCUndertowHttpFacade.KEYCLOAK_SECURITY_CONTEXT_KEY);+ if (!deployment.isBearerOnly() && ksc != null && ksc instanceof RefreshableKeycloakSecurityContext) {+ ((RefreshableKeycloakSecurityContext) ksc).logout(deployment);+ }+ AdapterTokenStore tokenStore = getTokenStore(exchange, facade, deployment, securityContext);+ tokenStore.logout();+ }+ };++ securityContext.registerNotificationReceiver(logoutReceiver);+ }++ /**+ * Call this inside your authenticate method.+ */+ protected AuthenticationMechanismOutcome keycloakAuthenticate(HttpServerExchange exchange, SecurityContext securityContext, RequestAuthenticator authenticator) {+ AuthOutcome outcome = authenticator.authenticate();+ if (outcome == AuthOutcome.AUTHENTICATED) {+ registerNotifications(securityContext);+ return AuthenticationMechanismOutcome.AUTHENTICATED;+ }+ AuthChallenge challenge = authenticator.getChallenge();+ if (challenge != null) {+ exchange.putAttachment(KEYCLOAK_CHALLENGE_ATTACHMENT_KEY, challenge);+ }++ if (outcome == AuthOutcome.FAILED) {+ return AuthenticationMechanismOutcome.NOT_AUTHENTICATED;+ }+ return AuthenticationMechanismOutcome.NOT_ATTEMPTED;+ }++ protected AdapterTokenStore getTokenStore(HttpServerExchange exchange, HttpFacade facade, KeycloakDeployment deployment, SecurityContext securityContext) {+ if (deployment.getTokenStore() == TokenStore.SESSION) {+ return new UndertowSessionTokenStore(exchange, deployment, sessionManagement, securityContext);+ } else {+ return new UndertowCookieTokenStore(facade, deployment, securityContext);+ }+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java b/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.javanew file mode 100644index 000000000..4ddf79070--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java@@ -0,0 +1,86 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.Session;+import io.undertow.util.Sessions;+import org.keycloak.KeycloakPrincipal;+import org.keycloak.adapters.*;+import org.keycloak.adapters.spi.HttpFacade;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @author Stan Silvert [email protected] (C) 2014 Red Hat Inc.+ * @version $Revision: 1 $+ */+public abstract class AbstractUndertowRequestAuthenticator extends RequestAuthenticator {+ protected SecurityContext securityContext;+ protected HttpServerExchange exchange;+++ public AbstractUndertowRequestAuthenticator(HttpFacade facade, KeycloakDeployment deployment, int sslRedirectPort,+ SecurityContext securityContext, HttpServerExchange exchange,+ AdapterTokenStore tokenStore) {+ super(facade, deployment, tokenStore, sslRedirectPort);+ this.securityContext = securityContext;+ this.exchange = exchange;+ }++ protected void propagateKeycloakContext(KeycloakUndertowAccount account) {+ exchange.putAttachment(OIDCUndertowHttpFacade.KEYCLOAK_SECURITY_CONTEXT_KEY, account.getKeycloakSecurityContext());+ }++ @Override+ protected OAuthRequestAuthenticator createOAuthAuthenticator() {+ return new OAuthRequestAuthenticator(this, facade, deployment, sslRedirectPort, tokenStore);+ }++ @Override+ protected void completeOAuthAuthentication(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal) {+ KeycloakUndertowAccount account = createAccount(principal);+ securityContext.authenticationComplete(account, "KEYCLOAK", false);+ propagateKeycloakContext(account);+ tokenStore.saveAccountInfo(account);+ }++ @Override+ protected void completeBearerAuthentication(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal, String method) {+ KeycloakUndertowAccount account = createAccount(principal);+ securityContext.authenticationComplete(account, method, false);+ propagateKeycloakContext(account);+ }++ @Override+ protected String changeHttpSessionId(boolean create) {+ if (create) {+ Session session = Sessions.getOrCreateSession(exchange);+ return session.getId();+ } else {+ Session session = Sessions.getSession(exchange);+ return session != null ? session.getId() : null;+ }+ }++ /**+ * Subclasses need to be able to create their own version of the KeycloakUndertowAccount+ * @return The account+ */+ protected abstract KeycloakUndertowAccount createAccount(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal);++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ChangeSessionId.java b/container/src/main/java/org/keycloak/adapters/undertow/ChangeSessionId.javanew file mode 100644index 000000000..c222d3ccb--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ChangeSessionId.java@@ -0,0 +1,69 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.Session;+import io.undertow.servlet.api.DeploymentInfo;+import io.undertow.servlet.handlers.ServletRequestContext;+import io.undertow.servlet.spec.HttpSessionImpl;+import io.undertow.servlet.spec.ServletContextImpl;++import java.lang.reflect.Method;+import java.security.AccessController;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class ChangeSessionId {+ /**+ * This is a hack to be backward compatible between Undertow 1.3+ and versions lower. In Undertow 1.3, a new+ * switch was added setChangeSessionIdOnLogin, this screws up session management for keycloak as after the session id+ * is uploaded to Keycloak, undertow changes the session id and it can't be invalidated.+ *+ * @param deploymentInfo+ */+ public static void turnOffChangeSessionIdOnLogin(DeploymentInfo deploymentInfo) {+ try {+ Method method = DeploymentInfo.class.getMethod("setChangeSessionIdOnLogin", boolean.class);+ method.invoke(deploymentInfo, false);+ } catch (Exception ignore) {++ }+ }++ @SuppressWarnings("removal")+ public static String changeSessionId(HttpServerExchange exchange, boolean create) {+ final ServletRequestContext sc = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ ServletContextImpl currentServletContext = sc.getCurrentServletContext();+ HttpSessionImpl session = currentServletContext.getSession(exchange, create);+ if (session == null) {+ return null;+ }+ Session underlyingSession;+ if(System.getSecurityManager() == null) {+ underlyingSession = session.getSession();+ } else {+ underlyingSession = AccessController.doPrivileged(new HttpSessionImpl.UnwrapSessionAction(session));+ }+++ return underlyingSession.changeSessionId(exchange, currentServletContext.getSessionConfig());+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/KeycloakChallenge.java b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakChallenge.javanew file mode 100644index 000000000..2a22d49ef--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakChallenge.java@@ -0,0 +1,29 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.AuthenticationMechanism;+import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public interface KeycloakChallenge {+ public AuthenticationMechanism.ChallengeResult sendChallenge(HttpServerExchange httpServerExchange, SecurityContext securityContext);+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.javanew file mode 100644index 000000000..ba36b1a68--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java@@ -0,0 +1,217 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.AuthenticationMechanism;+import io.undertow.security.api.AuthenticationMechanismFactory;+import io.undertow.security.idm.Account;+import io.undertow.security.idm.Credential;+import io.undertow.security.idm.IdentityManager;+import io.undertow.server.handlers.form.FormParserFactory;+import io.undertow.servlet.ServletExtension;+import io.undertow.servlet.api.*;+import io.undertow.servlet.util.ImmediateInstanceHandle;+import org.jboss.logging.Logger;+import org.keycloak.adapters.*;+import org.keycloak.constants.AdapterConstants;++import jakarta.servlet.ServletContext;+import java.io.ByteArrayInputStream;+import java.io.FileInputStream;+import java.io.FileNotFoundException;+import java.io.InputStream;+import java.util.Map;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class KeycloakServletExtension implements ServletExtension {++ protected static Logger log = Logger.getLogger(KeycloakServletExtension.class);+ private final AdapterDeploymentContext deploymentContext;++ public KeycloakServletExtension() {+ this(null);+ }++ public KeycloakServletExtension(AdapterDeploymentContext deploymentContext) {+ this.deploymentContext = deploymentContext;+ }++ // todo when this DeploymentInfo method of the same name is fixed.+ public boolean isAuthenticationMechanismPresent(DeploymentInfo deploymentInfo, final String mechanismName) {+ LoginConfig loginConfig = deploymentInfo.getLoginConfig();+ if (loginConfig != null) {+ for (AuthMethodConfig method : loginConfig.getAuthMethods()) {+ if (method.getName().equalsIgnoreCase(mechanismName)) {+ return true;+ }+ }+ }+ return false;+ }++ private static InputStream getJSONFromServletContext(ServletContext servletContext) {+ String json = servletContext.getInitParameter(AdapterConstants.AUTH_DATA_PARAM_NAME);+ if (json == null) {+ return null;+ }+ return new ByteArrayInputStream(json.getBytes());+ }++ private static InputStream getConfigInputStream(ServletContext context) {+ InputStream is = getJSONFromServletContext(context);+ if (is == null) {+ String path = context.getInitParameter("keycloak.config.file");+ if (path == null) {+ log.debug("using /WEB-INF/keycloak.json");+ is = context.getResourceAsStream("/WEB-INF/keycloak.json");+ } else {+ try {+ is = new FileInputStream(path);+ } catch (FileNotFoundException e) {+ throw new RuntimeException(e);+ }+ }+ }+ return is;+ }+++ @Override+ @SuppressWarnings("UseSpecificCatch")+ public void handleDeployment(DeploymentInfo deploymentInfo, ServletContext servletContext) {+ if (!isAuthenticationMechanismPresent(deploymentInfo, "KEYCLOAK") && deploymentContext == null) {+ log.debug("auth-method is not keycloak!");+ return;+ }+ log.debug("KeycloakServletException initialization");++ // Possible scenarios:+ // 1) The deployment has a keycloak.config.resolver specified and it exists:+ // Outcome: adapter uses the resolver+ // 2) The deployment has a keycloak.config.resolver and isn't valid (doesn't exist, isn't a resolver, ...) :+ // Outcome: adapter is left unconfigured+ // 3) The deployment doesn't have a keycloak.config.resolver , but has a keycloak.json (or equivalent)+ // Outcome: adapter uses it+ // 4) The deployment doesn't have a keycloak.config.resolver nor keycloak.json (or equivalent)+ // Outcome: adapter is left unconfigured+ AdapterDeploymentContext deploymentContext = this.deploymentContext;++ if (deploymentContext == null) {+ KeycloakConfigResolver configResolver;+ String configResolverClass = servletContext.getInitParameter("keycloak.config.resolver");+ if (configResolverClass != null) {+ try {+ configResolver = (KeycloakConfigResolver) deploymentInfo.getClassLoader().loadClass(configResolverClass).getDeclaredConstructors()[0].newInstance();+ deploymentContext = new AdapterDeploymentContext(configResolver);+ log.info("Using " + configResolverClass + " to resolve Keycloak configuration on a per-request basis.");+ } catch (Exception ex) {+ log.warn("The specified resolver " + configResolverClass + " could NOT be loaded. Keycloak is unconfigured and will deny all requests. Reason: " + ex.getMessage());+ deploymentContext = new AdapterDeploymentContext(new KeycloakDeployment());+ }+ } else {+ InputStream is = getConfigInputStream(servletContext);+ final KeycloakDeployment deployment;+ if (is == null) {+ log.warn("No adapter configuration. Keycloak is unconfigured and will deny all requests.");+ deployment = new KeycloakDeployment();+ } else {+ deployment = KeycloakDeploymentBuilder.build(is);+ }+ deploymentContext = new AdapterDeploymentContext(deployment);+ log.debug("Keycloak is using a per-deployment configuration.");+ }+ } else {+ deploymentContext = this.deploymentContext;+ }++ servletContext.setAttribute(AdapterDeploymentContext.class.getName(), deploymentContext);+ UndertowUserSessionManagement userSessionManagement = new UndertowUserSessionManagement();+ final NodesRegistrationManagement nodesRegistrationManagement = new NodesRegistrationManagement();+ final ServletKeycloakAuthMech mech = createAuthenticationMechanism(deploymentInfo, deploymentContext, userSessionManagement, nodesRegistrationManagement);++ UndertowAuthenticatedActionsHandler.Wrapper actions = new UndertowAuthenticatedActionsHandler.Wrapper(deploymentContext);++ // setup handlers++ deploymentInfo.addOuterHandlerChainWrapper(new ServletPreAuthActionsHandler.Wrapper(deploymentContext, userSessionManagement));+ deploymentInfo.addAuthenticationMechanism("KEYCLOAK", new AuthenticationMechanismFactory() {+ @SuppressWarnings("deprecation")+ @Override+ public AuthenticationMechanism create(String s, FormParserFactory formParserFactory, Map<String, String> stringStringMap) {+ return mech;+ }+ }); // authentication+ deploymentInfo.addInnerHandlerChainWrapper(actions); // handles authenticated actions and cors.++ deploymentInfo.setIdentityManager(new IdentityManager() {+ @Override+ public Account verify(Account account) {+ return account;+ }++ @Override+ public Account verify(String id, Credential credential) {+ throw new IllegalStateException("Should never be called in Keycloak flow");+ }++ @Override+ public Account verify(Credential credential) {+ throw new IllegalStateException("Should never be called in Keycloak flow");+ }+ });++ ServletSessionConfig cookieConfig = deploymentInfo.getServletSessionConfig();+ if (cookieConfig == null) {+ cookieConfig = new ServletSessionConfig();+ }+ if (cookieConfig.getPath() == null) {+ log.debug("Setting jsession cookie path to: " + deploymentInfo.getContextPath());+ cookieConfig.setPath(deploymentInfo.getContextPath());+ deploymentInfo.setServletSessionConfig(cookieConfig);+ }+ ChangeSessionId.turnOffChangeSessionIdOnLogin(deploymentInfo);+ deploymentInfo.addListener(new ListenerInfo(UndertowNodesRegistrationManagementWrapper.class, new InstanceFactory<UndertowNodesRegistrationManagementWrapper>() {++ @Override+ public InstanceHandle<UndertowNodesRegistrationManagementWrapper> createInstance() throws InstantiationException {+ UndertowNodesRegistrationManagementWrapper listener = new UndertowNodesRegistrationManagementWrapper(nodesRegistrationManagement);+ return new ImmediateInstanceHandle<UndertowNodesRegistrationManagementWrapper>(listener);+ }++ }));+ }++ protected ServletKeycloakAuthMech createAuthenticationMechanism(DeploymentInfo deploymentInfo, AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement userSessionManagement,+ NodesRegistrationManagement nodesRegistrationManagement) {+ log.debug("creating ServletKeycloakAuthMech");+ String errorPage = getErrorPage(deploymentInfo);+ return new ServletKeycloakAuthMech(deploymentContext, userSessionManagement, nodesRegistrationManagement, deploymentInfo.getConfidentialPortManager(), errorPage);+ }++ protected String getErrorPage(DeploymentInfo deploymentInfo) {+ LoginConfig loginConfig = deploymentInfo.getLoginConfig();+ String errorPage = null;+ if (loginConfig != null) {+ errorPage = loginConfig.getErrorPage();+ }+ return errorPage;+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/KeycloakUndertowAccount.java b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakUndertowAccount.javanew file mode 100644index 000000000..15facef9f--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/KeycloakUndertowAccount.java@@ -0,0 +1,110 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.idm.Account;+import org.jboss.logging.Logger;+import org.keycloak.KeycloakPrincipal;+import org.keycloak.adapters.*;++import java.io.Serializable;+import java.security.Principal;+import java.util.Set;++/**+* @author <a href="mailto:[email protected]">Bill Burke</a>+* @version $Revision: 1 $+*/+public class KeycloakUndertowAccount implements Account, Serializable, OidcKeycloakAccount {+ protected static Logger log = Logger.getLogger(KeycloakUndertowAccount.class);+ protected KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal;+ protected Set<String> accountRoles;++ public KeycloakUndertowAccount(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal) {+ this.principal = principal;+ setRoles(principal.getKeycloakSecurityContext());+ }++ protected void setRoles(RefreshableKeycloakSecurityContext session) {+ Set<String> roles = AdapterUtils.getRolesFromSecurityContext(session);+ this.accountRoles = roles;+ }++ @Override+ public Principal getPrincipal() {+ return principal;+ }++ @Override+ public Set<String> getRoles() {+ return accountRoles;+ }++ @Override+ public RefreshableKeycloakSecurityContext getKeycloakSecurityContext() {+ return principal.getKeycloakSecurityContext();+ }++ public void setCurrentRequestInfo(KeycloakDeployment deployment, AdapterTokenStore tokenStore) {+ principal.getKeycloakSecurityContext().setCurrentRequestInfo(deployment, tokenStore);+ }++ // Check if accessToken is active and try to refresh if it's not+ public boolean checkActive() {+ // this object may have been serialized, so we need to reset realm config/metadata+ RefreshableKeycloakSecurityContext session = getKeycloakSecurityContext();+ if (session.isActive() && !session.getDeployment().isAlwaysRefreshToken()) {+ log.debug("session is active");+ return true;+ }++ log.debug("session is not active or refresh is enforced. Try refresh");+ boolean success = session.refreshExpiredToken(false);+ if (!success || !session.isActive()) {+ log.debug("session is not active return with failure");++ return false;+ }+ log.debug("refresh succeeded");++ setRoles(session);+ return true;+ }++ @Override+ public boolean equals(Object other) {+ if (this == other)+ return true;++ if (!(other instanceof KeycloakUndertowAccount))+ return false;++ KeycloakUndertowAccount otherAccount = (KeycloakUndertowAccount) other;++ return (this.principal != null ? this.principal.equals(otherAccount.principal) : otherAccount.principal == null) &&+ (this.accountRoles != null ? this.accountRoles.equals(otherAccount.accountRoles) : otherAccount.accountRoles == null);+ }++ @Override+ public int hashCode() {+ final int prime = 31;+ int result = 1;+ result = prime * result + (this.principal == null ? 0 : this.principal.hashCode());+ result = prime * result + (this.accountRoles == null ? 0 : this.accountRoles.hashCode());+ return result;+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/OIDCServletUndertowHttpFacade.java b/container/src/main/java/org/keycloak/adapters/undertow/OIDCServletUndertowHttpFacade.javanew file mode 100644index 000000000..295c44dc9--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/OIDCServletUndertowHttpFacade.java@@ -0,0 +1,41 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.OIDCHttpFacade;+import org.keycloak.adapters.undertow.ServletHttpFacade;++import static org.keycloak.adapters.undertow.OIDCUndertowHttpFacade.KEYCLOAK_SECURITY_CONTEXT_KEY;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class OIDCServletUndertowHttpFacade extends ServletHttpFacade implements OIDCHttpFacade {++ public OIDCServletUndertowHttpFacade(HttpServerExchange exchange) {+ super(exchange);+ }++ @Override+ public KeycloakSecurityContext getSecurityContext() {+ return exchange.getAttachment(KEYCLOAK_SECURITY_CONTEXT_KEY);+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/OIDCUndertowHttpFacade.java b/container/src/main/java/org/keycloak/adapters/undertow/OIDCUndertowHttpFacade.javanew file mode 100644index 000000000..9505f4aae--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/OIDCUndertowHttpFacade.java@@ -0,0 +1,41 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.util.AttachmentKey;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.OIDCHttpFacade;+import org.keycloak.adapters.undertow.UndertowHttpFacade;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class OIDCUndertowHttpFacade extends UndertowHttpFacade implements OIDCHttpFacade {+ public static final AttachmentKey<KeycloakSecurityContext> KEYCLOAK_SECURITY_CONTEXT_KEY = AttachmentKey.create(KeycloakSecurityContext.class);++ public OIDCUndertowHttpFacade(HttpServerExchange exchange) {+ super(exchange);+ }++ @Override+ public KeycloakSecurityContext getSecurityContext() {+ return exchange.getAttachment(KEYCLOAK_SECURITY_CONTEXT_KEY);+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java b/container/src/main/java/org/keycloak/adapters/undertow/SavedRequest.javanew file mode 100644index 000000000..a0ce9ece3--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java@@ -0,0 +1,83 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.Session;+import io.undertow.servlet.handlers.ServletRequestContext;+import io.undertow.servlet.spec.HttpSessionImpl;++import jakarta.servlet.http.HttpSession;+import java.io.Serializable;++/**+ * Saved servlet request.+ *+ * Note bill burke: I had to fork this because Undertow was automatically restoring the request before the code could be+ * processed and redirected.+ *+ * CachedAuthenticatedSessionHandler was restoring the request before the authentication manager could read the code from the URI+ * Originally, I copied SavedRequest as is, but there are type mismatches between Undertow 1.1.1 and 1.3.10.+ * So, trySaveRequest calls the same undertow version, removes the saved request, stores it in a different session attribute,+ * then restores the old attribute later+ *+ *+ * @author Stuart Douglas+ */+public class SavedRequest implements Serializable {++ private static final String SESSION_KEY = SavedRequest.class.getName();++ @SuppressWarnings("removal")+ public static void trySaveRequest(final HttpServerExchange exchange) {+ io.undertow.servlet.util.SavedRequest.trySaveRequest(exchange);+ final ServletRequestContext sc = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpSessionImpl session = sc.getCurrentServletContext().getSession(exchange, true);+ Session underlyingSession;+ if(System.getSecurityManager() == null) {+ underlyingSession = session.getSession();+ } else {+ underlyingSession = java.security.AccessController.doPrivileged(new HttpSessionImpl.UnwrapSessionAction(session));+ }+ io.undertow.servlet.util.SavedRequest request = (io.undertow.servlet.util.SavedRequest) underlyingSession.removeAttribute(io.undertow.servlet.util.SavedRequest.class.getName());+ if (request != null) underlyingSession.setAttribute(SESSION_KEY, request);+++ }++ @SuppressWarnings("removal")+ public static void tryRestoreRequest(final HttpServerExchange exchange, HttpSession session) {+ if(session instanceof HttpSessionImpl) {++ Session underlyingSession;+ if(System.getSecurityManager() == null) {+ underlyingSession = ((HttpSessionImpl) session).getSession();+ } else {+ underlyingSession = java.security.AccessController.doPrivileged(new HttpSessionImpl.UnwrapSessionAction(session));+ }+ io.undertow.servlet.util.SavedRequest request = (io.undertow.servlet.util.SavedRequest) underlyingSession.removeAttribute(SESSION_KEY);+ if (request != null) {+ underlyingSession.setAttribute(io.undertow.servlet.util.SavedRequest.class.getName(), request);+ io.undertow.servlet.util.SavedRequest.tryRestoreRequest(exchange, session);++ }++ }+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java b/container/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.javanew file mode 100644index 000000000..c89f7e9e5--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java@@ -0,0 +1,96 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.servlet.handlers.ServletRequestContext;+import org.keycloak.adapters.spi.AuthenticationError;+import org.keycloak.adapters.spi.LogoutError;++import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class ServletHttpFacade extends UndertowHttpFacade {+ protected HttpServletRequest request;+ protected HttpServletResponse response;++ public ServletHttpFacade(HttpServerExchange exchange) {+ super(exchange);+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ request = (HttpServletRequest)servletRequestContext.getServletRequest();+ response = (HttpServletResponse)servletRequestContext.getServletResponse();+ }++ protected class RequestFacade extends UndertowHttpFacade.RequestFacade {+ @Override+ public String getFirstParam(String param) {+ return request.getParameter(param);+ }++ @Override+ public void setError(AuthenticationError error) {+ request.setAttribute(AuthenticationError.class.getName(), error);++ }++ @Override+ public void setError(LogoutError error) {+ request.setAttribute(LogoutError.class.getName(), error);+ }+++ }++ protected class ResponseFacade extends UndertowHttpFacade.ResponseFacade {+ // can't call sendError from a challenge. Undertow ends up calling send error.+ /*+ @Override+ public void sendError(int code) {+ try {+ response.sendError(code);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ public void sendError(int code, String message) {+ try {+ response.sendError(code, message);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ */++ }++ @Override+ public Response getResponse() {+ return new ResponseFacade();+ }++ @Override+ public Request getRequest() {+ return new RequestFacade();+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java b/container/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.javanew file mode 100644index 000000000..6e3d4f30c--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java@@ -0,0 +1,122 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import io.undertow.servlet.api.ConfidentialPortManager;+import io.undertow.servlet.handlers.ServletRequestContext;+import io.undertow.util.Headers;+import org.jboss.logging.Logger;+import org.keycloak.adapters.*;+import org.keycloak.adapters.spi.HttpFacade;+import org.keycloak.enums.TokenStore;++import jakarta.servlet.RequestDispatcher;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import java.io.IOException;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @author Stan Silvert [email protected] (C) 2014 Red Hat Inc.+ * @version $Revision: 1 $+ */+public class ServletKeycloakAuthMech extends AbstractUndertowKeycloakAuthMech {+ private static final Logger log = Logger.getLogger(ServletKeycloakAuthMech.class);++ protected NodesRegistrationManagement nodesRegistrationManagement;+ protected ConfidentialPortManager portManager;++ public ServletKeycloakAuthMech(AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement userSessionManagement,+ NodesRegistrationManagement nodesRegistrationManagement, ConfidentialPortManager portManager,+ String errorPage) {+ super(deploymentContext, userSessionManagement, errorPage);+ this.nodesRegistrationManagement = nodesRegistrationManagement;+ this.portManager = portManager;+ }++ @Override+ protected Integer servePage(HttpServerExchange exchange, String location) {+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ ServletRequest req = servletRequestContext.getServletRequest();+ ServletResponse resp = servletRequestContext.getServletResponse();+ RequestDispatcher disp = req.getRequestDispatcher(location);+ //make sure the login page is never cached+ exchange.getResponseHeaders().add(Headers.CACHE_CONTROL, "no-cache, no-store, must-revalidate");+ exchange.getResponseHeaders().add(Headers.PRAGMA, "no-cache");+ exchange.getResponseHeaders().add(Headers.EXPIRES, "0");+++ try {+ disp.forward(req, resp);+ } catch (ServletException e) {+ throw new RuntimeException(e);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return null;+ }++ @Override+ public AuthenticationMechanismOutcome authenticate(HttpServerExchange exchange, SecurityContext securityContext) {+ UndertowHttpFacade facade = createFacade(exchange);+ KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade);+ if (!deployment.isConfigured()) {+ return AuthenticationMechanismOutcome.NOT_ATTEMPTED;+ }++ nodesRegistrationManagement.tryRegister(deployment);++ RequestAuthenticator authenticator = createRequestAuthenticator(deployment, exchange, securityContext, facade);++ return keycloakAuthenticate(exchange, securityContext, authenticator);+ }++ protected RequestAuthenticator createRequestAuthenticator(KeycloakDeployment deployment, HttpServerExchange exchange, SecurityContext securityContext, UndertowHttpFacade facade) {++ int confidentialPort = getConfidentilPort(exchange);+ AdapterTokenStore tokenStore = getTokenStore(exchange, facade, deployment, securityContext);+ return new ServletRequestAuthenticator(facade, deployment,+ confidentialPort, securityContext, exchange, tokenStore);+ }++ protected int getConfidentilPort(HttpServerExchange exchange) {+ int confidentialPort = 8443;+ if (exchange.getRequestScheme().equalsIgnoreCase("HTTPS")) {+ confidentialPort = exchange.getHostPort();+ } else if (portManager != null) {+ confidentialPort = portManager.getConfidentialPort(exchange);+ }+ return confidentialPort;+ }++ @Override+ protected AdapterTokenStore getTokenStore(HttpServerExchange exchange, HttpFacade facade, KeycloakDeployment deployment, SecurityContext securityContext) {+ if (deployment.getTokenStore() == TokenStore.SESSION) {+ return new ServletSessionTokenStore(exchange, deployment, sessionManagement, securityContext);+ } else {+ return new UndertowCookieTokenStore(facade, deployment, securityContext);+ }+ }++ @Override+ public UndertowHttpFacade createFacade(HttpServerExchange exchange) {+ return new OIDCServletUndertowHttpFacade(exchange);+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ServletPreAuthActionsHandler.java b/container/src/main/java/org/keycloak/adapters/undertow/ServletPreAuthActionsHandler.javanew file mode 100644index 000000000..c9a91a3b3--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ServletPreAuthActionsHandler.java@@ -0,0 +1,76 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HandlerWrapper;+import io.undertow.server.HttpHandler;+import io.undertow.server.HttpServerExchange;+import io.undertow.servlet.handlers.ServletRequestContext;+import org.jboss.logging.Logger;+import org.keycloak.adapters.AdapterDeploymentContext;+import org.keycloak.adapters.PreAuthActionsHandler;+import org.keycloak.adapters.undertow.SessionManagementBridge;+import org.keycloak.adapters.undertow.UndertowHttpFacade;+import org.keycloak.adapters.undertow.UndertowUserSessionManagement;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class ServletPreAuthActionsHandler implements HttpHandler {++ private static final Logger log = Logger.getLogger(ServletPreAuthActionsHandler.class);+ protected HttpHandler next;+ protected UndertowUserSessionManagement userSessionManagement;+ protected AdapterDeploymentContext deploymentContext;++ public static class Wrapper implements HandlerWrapper {+ protected AdapterDeploymentContext deploymentContext;+ protected UndertowUserSessionManagement userSessionManagement;+++ public Wrapper(AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement userSessionManagement) {+ this.deploymentContext = deploymentContext;+ this.userSessionManagement = userSessionManagement;+ }++ @Override+ public HttpHandler wrap(HttpHandler handler) {+ return new ServletPreAuthActionsHandler(deploymentContext, userSessionManagement, handler);+ }+ }++ protected ServletPreAuthActionsHandler(AdapterDeploymentContext deploymentContext,+ UndertowUserSessionManagement userSessionManagement,+ HttpHandler next) {+ this.next = next;+ this.deploymentContext = deploymentContext;+ this.userSessionManagement = userSessionManagement;+ }++ @Override+ public void handleRequest(HttpServerExchange exchange) throws Exception {+ UndertowHttpFacade facade = new OIDCServletUndertowHttpFacade(exchange);+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ SessionManagementBridge bridge = new SessionManagementBridge(userSessionManagement, servletRequestContext.getDeployment().getSessionManager());+ PreAuthActionsHandler handler = new PreAuthActionsHandler(bridge, deploymentContext, facade);+ if (handler.handleRequest()) return;+ next.handleRequest(exchange);+ }+++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java b/container/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.javanew file mode 100644index 000000000..6380c995e--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java@@ -0,0 +1,82 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import io.undertow.servlet.handlers.ServletRequestContext;+import org.keycloak.KeycloakPrincipal;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.AdapterTokenStore;+import org.keycloak.adapters.KeycloakDeployment;+import org.keycloak.adapters.OAuthRequestAuthenticator;+import org.keycloak.adapters.RefreshableKeycloakSecurityContext;+import org.keycloak.adapters.spi.HttpFacade;+import org.keycloak.adapters.undertow.ChangeSessionId;++import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpSession;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @author Stan Silvert [email protected] (C) 2014 Red Hat Inc.+ * @version $Revision: 1 $+ */+public class ServletRequestAuthenticator extends AbstractUndertowRequestAuthenticator {+++ public ServletRequestAuthenticator(HttpFacade facade, KeycloakDeployment deployment, int sslRedirectPort,+ SecurityContext securityContext, HttpServerExchange exchange,+ AdapterTokenStore tokenStore) {+ super(facade, deployment, sslRedirectPort, securityContext, exchange, tokenStore);+ }++ @Override+ protected OAuthRequestAuthenticator createOAuthAuthenticator() {+ return new OAuthRequestAuthenticator(this, facade, deployment, sslRedirectPort, tokenStore);+ }++ @Override+ protected void propagateKeycloakContext(KeycloakUndertowAccount account) {+ super.propagateKeycloakContext(account);+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpServletRequest req = (HttpServletRequest) servletRequestContext.getServletRequest();+ req.setAttribute(KeycloakSecurityContext.class.getName(), account.getKeycloakSecurityContext());+ }++ @Override+ protected KeycloakUndertowAccount createAccount(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal) {+ return new KeycloakUndertowAccount(principal);+ }++ @Override+ protected String changeHttpSessionId(boolean create) {+ if (!deployment.isTurnOffChangeSessionIdOnLogin()) return ChangeSessionId.changeSessionId(exchange, create);+ else return getHttpSessionId(create);+ }++ protected String getHttpSessionId(boolean create) {+ HttpSession session = getSession(create);+ return session != null ? session.getId() : null;+ }++ protected HttpSession getSession(boolean create) {+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpServletRequest req = (HttpServletRequest) servletRequestContext.getServletRequest();+ return req.getSession(create);+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java b/container/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.javanew file mode 100644index 000000000..5b49b7fff--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java@@ -0,0 +1,156 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import io.undertow.servlet.handlers.ServletRequestContext;+import org.jboss.logging.Logger;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.*;+import org.keycloak.adapters.undertow.SavedRequest;+import org.keycloak.adapters.undertow.UndertowUserSessionManagement;++import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpSession;++/**+ * Per-request object. Storage of tokens in servlet HTTP session.+ *+ * @author <a href="mailto:[email protected]">Marek Posolda</a>+ */+public class ServletSessionTokenStore implements AdapterTokenStore {++ protected static Logger log = Logger.getLogger(ServletSessionTokenStore.class);++ private final HttpServerExchange exchange;+ private final KeycloakDeployment deployment;+ private final UndertowUserSessionManagement sessionManagement;+ private final SecurityContext securityContext;++ public ServletSessionTokenStore(HttpServerExchange exchange, KeycloakDeployment deployment, UndertowUserSessionManagement sessionManagement,+ SecurityContext securityContext) {+ this.exchange = exchange;+ this.deployment = deployment;+ this.sessionManagement = sessionManagement;+ this.securityContext = securityContext;+ }++ @Override+ public void checkCurrentToken() {+ // no-op on undertow+ }++ @Override+ public boolean isCached(RequestAuthenticator authenticator) {+ HttpSession session = getSession(false);+ if (session == null) {+ log.debug("session was null, returning null");+ return false;+ }+ KeycloakUndertowAccount account = null;+ try {+ account = (KeycloakUndertowAccount)session.getAttribute(KeycloakUndertowAccount.class.getName());+ } catch (IllegalStateException e) {+ log.debug("session was invalidated. Return false.");+ return false;+ }+ if (account == null) {+ log.debug("Account was not in session, returning null");+ return false;+ }++ if (!deployment.getRealm().equals(account.getKeycloakSecurityContext().getRealm())) {+ log.debug("Account in session belongs to a different realm than for this request.");+ return false;+ }++ account.setCurrentRequestInfo(deployment, this);+ if (account.checkActive()) {+ log.debug("Cached account found");+ securityContext.authenticationComplete(account, "KEYCLOAK", false);+ ((AbstractUndertowRequestAuthenticator)authenticator).propagateKeycloakContext(account);+ restoreRequest();+ return true;+ } else {+ log.debug("Refresh failed. Account was not active. Returning null and invalidating Http session");+ try {+ session.removeAttribute(KeycloakUndertowAccount.class.getName());+ session.removeAttribute(KeycloakSecurityContext.class.getName());+ session.invalidate();+ } catch (Exception e) {+ log.debug("Failed to invalidate session, might already be invalidated");+ }+ return false;+ }+ }++ @Override+ public void saveAccountInfo(OidcKeycloakAccount account) {+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpSession session = getSession(true);+ session.setAttribute(KeycloakUndertowAccount.class.getName(), account);+ session.setAttribute(KeycloakSecurityContext.class.getName(), account.getKeycloakSecurityContext());+ sessionManagement.login(servletRequestContext.getDeployment().getSessionManager());+ }++ @Override+ public void logout() {+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpServletRequest req = (HttpServletRequest) servletRequestContext.getServletRequest();+ req.removeAttribute(KeycloakUndertowAccount.class.getName());+ req.removeAttribute(KeycloakSecurityContext.class.getName());+ HttpSession session = req.getSession(false);+ if (session == null) return;+ try {+ KeycloakUndertowAccount account = (KeycloakUndertowAccount) session.getAttribute(KeycloakUndertowAccount.class.getName());+ if (account == null) return;+ session.removeAttribute(KeycloakSecurityContext.class.getName());+ session.removeAttribute(KeycloakUndertowAccount.class.getName());+ } catch (IllegalStateException ise) {+ // Session may be already logged-out in case that app has adminUrl+ log.debugf("Session %s logged-out already", session.getId());+ }+ }++ @Override+ public void refreshCallback(RefreshableKeycloakSecurityContext securityContext) {+ // no-op+ }++ @Override+ public void saveRequest() {+ SavedRequest.trySaveRequest(exchange);++ }++ @Override+ public boolean restoreRequest() {+ HttpSession session = getSession(false);+ if (session == null) return false;+ SavedRequest.tryRestoreRequest(exchange, session);+ return false;+ }++ protected HttpSession getSession(boolean create) {+ final ServletRequestContext servletRequestContext = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ HttpServletRequest req = (HttpServletRequest) servletRequestContext.getServletRequest();+ return req.getSession(create);+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java b/container/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.javanew file mode 100644index 000000000..fcde53737--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java@@ -0,0 +1,48 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.session.SessionManager;+import org.keycloak.adapters.spi.UserSessionManagement;++import java.util.List;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class SessionManagementBridge implements UserSessionManagement {++ protected UndertowUserSessionManagement userSessionManagement;+ protected SessionManager sessionManager;++ public SessionManagementBridge(UndertowUserSessionManagement userSessionManagement, SessionManager sessionManager) {+ this.userSessionManagement = userSessionManagement;+ this.sessionManager = sessionManager;+ }++ @Override+ public void logoutAll() {+ userSessionManagement.logoutAll(sessionManager);+ }++ @Override+ public void logoutHttpSessions(List<String> ids) {+ userSessionManagement.logoutHttpSessions(sessionManager, ids);+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticatedActionsHandler.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticatedActionsHandler.javanew file mode 100644index 000000000..b7ed15400--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticatedActionsHandler.java@@ -0,0 +1,68 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HandlerWrapper;+import io.undertow.server.HttpHandler;+import io.undertow.server.HttpServerExchange;+import org.jboss.logging.Logger;+import org.keycloak.adapters.AdapterDeploymentContext;+import org.keycloak.adapters.AuthenticatedActionsHandler;+import org.keycloak.adapters.KeycloakDeployment;++/**+ * Bridge for authenticated Keycloak adapter actions+ *+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @author Stan Silvert [email protected] (C) 2014 Red Hat Inc.+ * @version $Revision: 1 $+ */+public class UndertowAuthenticatedActionsHandler implements HttpHandler {+ private static final Logger log = Logger.getLogger(UndertowAuthenticatedActionsHandler.class);+ protected AdapterDeploymentContext deploymentContext;+ protected HttpHandler next;++ public static class Wrapper implements HandlerWrapper {+ protected AdapterDeploymentContext deploymentContext;++ public Wrapper(AdapterDeploymentContext deploymentContext) {+ this.deploymentContext = deploymentContext;+ }++ @Override+ public HttpHandler wrap(HttpHandler handler) {+ return new UndertowAuthenticatedActionsHandler(deploymentContext, handler);+ }+ }+++ public UndertowAuthenticatedActionsHandler(AdapterDeploymentContext deploymentContext, HttpHandler next) {+ this.deploymentContext = deploymentContext;+ this.next = next;+ }++ @Override+ public void handleRequest(HttpServerExchange exchange) throws Exception {+ OIDCUndertowHttpFacade facade = new OIDCUndertowHttpFacade(exchange);+ KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade);+ if (deployment != null && deployment.isConfigured()) {+ AuthenticatedActionsHandler handler = new AuthenticatedActionsHandler(deployment, facade);+ if (handler.handledRequest()) return;+ }+ next.handleRequest(exchange);+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticationMechanism.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticationMechanism.javanew file mode 100644index 000000000..27aa3be29--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowAuthenticationMechanism.java@@ -0,0 +1,57 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import org.keycloak.adapters.*;+import org.keycloak.adapters.undertow.UndertowHttpFacade;+import org.keycloak.adapters.undertow.UndertowUserSessionManagement;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class UndertowAuthenticationMechanism extends AbstractUndertowKeycloakAuthMech {+ protected NodesRegistrationManagement nodesRegistrationManagement;+ protected int confidentialPort;++ public UndertowAuthenticationMechanism(AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement sessionManagement,+ NodesRegistrationManagement nodesRegistrationManagement, int confidentialPort, String errorPage) {+ super(deploymentContext, sessionManagement, errorPage);+ this.nodesRegistrationManagement = nodesRegistrationManagement;+ this.confidentialPort = confidentialPort;+ }++ @Override+ public AuthenticationMechanismOutcome authenticate(HttpServerExchange exchange, SecurityContext securityContext) {+ UndertowHttpFacade facade = createFacade(exchange);+ KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade);+ if (!deployment.isConfigured()) {+ return AuthenticationMechanismOutcome.NOT_ATTEMPTED;+ }++ nodesRegistrationManagement.tryRegister(deployment);++ AdapterTokenStore tokenStore = getTokenStore(exchange, facade, deployment, securityContext);+ RequestAuthenticator authenticator = new UndertowRequestAuthenticator(facade, deployment, confidentialPort, securityContext, exchange, tokenStore);++ return keycloakAuthenticate(exchange, securityContext, authenticator);+ }++}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.javanew file mode 100644index 000000000..270454777--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java@@ -0,0 +1,105 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import org.jboss.logging.Logger;+import org.keycloak.KeycloakPrincipal;+import org.keycloak.adapters.*;+import org.keycloak.adapters.spi.HttpFacade;++/**+ * Per-request object. Storage of tokens in cookie+ *+ * @author <a href="mailto:[email protected]">Marek Posolda</a>+ */+public class UndertowCookieTokenStore implements AdapterTokenStore {++ protected static Logger log = Logger.getLogger(UndertowCookieTokenStore.class);++ private final HttpFacade facade;+ private final KeycloakDeployment deployment;+ private final SecurityContext securityContext;++ public UndertowCookieTokenStore(HttpFacade facade, KeycloakDeployment deployment,+ SecurityContext securityContext) {+ this.facade = facade;+ this.deployment = deployment;+ this.securityContext = securityContext;+ }++ @Override+ public void checkCurrentToken() {+ // no-op on undertow+ }++ @Override+ public boolean isCached(RequestAuthenticator authenticator) {+ KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal = CookieTokenStore.getPrincipalFromCookie(deployment, facade, this);+ if (principal == null) {+ log.debug("Account was not in cookie or was invalid, returning null");+ return false;+ }+ KeycloakUndertowAccount account = new KeycloakUndertowAccount(principal);++ if (!deployment.getRealm().equals(account.getKeycloakSecurityContext().getRealm())) {+ log.debug("Account in session belongs to a different realm than for this request.");+ return false;+ }++ if (account.checkActive()) {+ log.debug("Cached account found");+ securityContext.authenticationComplete(account, "KEYCLOAK", false);+ ((AbstractUndertowRequestAuthenticator)authenticator).propagateKeycloakContext(account);+ return true;+ } else {+ log.debug("Account was not active, removing cookie and returning false");+ CookieTokenStore.removeCookie(deployment, facade);+ return false;+ }+ }++ @Override+ public void saveAccountInfo(OidcKeycloakAccount account) {+ RefreshableKeycloakSecurityContext secContext = (RefreshableKeycloakSecurityContext)account.getKeycloakSecurityContext();+ CookieTokenStore.setTokenCookie(deployment, facade, secContext);+ }++ @Override+ public void logout() {+ KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal = CookieTokenStore.getPrincipalFromCookie(deployment, facade, this);+ if (principal == null) return;++ CookieTokenStore.removeCookie(deployment, facade);+ }++ @Override+ public void refreshCallback(RefreshableKeycloakSecurityContext securityContext) {+ CookieTokenStore.setTokenCookie(deployment, facade, securityContext);+ }++ @Override+ public void saveRequest() {++ }++ @Override+ public boolean restoreRequest() {+ return false;+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.javanew file mode 100644index 000000000..fa18e8b96--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java@@ -0,0 +1,333 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.server.handlers.CookieImpl;+import io.undertow.server.handlers.form.FormData;+import io.undertow.server.handlers.form.FormData.FormValue;+import io.undertow.server.handlers.form.FormDataParser;+import io.undertow.server.handlers.form.FormParserFactory;+import io.undertow.servlet.handlers.ServletRequestContext;+import io.undertow.util.AttachmentKey;+import io.undertow.util.Headers;+import io.undertow.util.HttpString;+import jakarta.servlet.ReadListener;+import org.keycloak.adapters.spi.AuthenticationError;+import org.keycloak.adapters.spi.HttpFacade;+import org.keycloak.adapters.spi.LogoutError;+import org.keycloak.common.util.KeycloakUriBuilder;++import java.security.cert.X509Certificate;+import jakarta.servlet.ServletInputStream;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletRequestWrapper;+import java.io.BufferedInputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.OutputStream;+import java.net.InetAddress;+import java.net.InetSocketAddress;+import java.util.Deque;+import java.util.List;+import java.util.Map;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class UndertowHttpFacade implements HttpFacade {+ public static final AttachmentKey<AuthenticationError> AUTH_ERROR_ATTACHMENT_KEY = AttachmentKey.create(AuthenticationError.class);+ public static final AttachmentKey<LogoutError> LOGOUT_ERROR_ATTACHMENT_KEY = AttachmentKey.create(LogoutError.class);++ protected HttpServerExchange exchange;+ protected RequestFacade requestFacade = new RequestFacade();+ protected ResponseFacade responseFacade = new ResponseFacade();++ public UndertowHttpFacade(HttpServerExchange exchange) {+ this.exchange = exchange;+ }++ @Override+ public Request getRequest() {+ return requestFacade;+ }++ @Override+ public Response getResponse() {+ return responseFacade;+ }++ @Override+ public X509Certificate[] getCertificateChain() {+ X509Certificate[] chain = new X509Certificate[0];+ try {+ chain = (X509Certificate[]) exchange.getConnection().getSslSessionInfo().getPeerCertificates();+ } catch (Exception ignore) {++ }+ return chain;+ }++ protected class RequestFacade implements Request {++ private InputStream inputStream;+ private final FormParserFactory formParserFactory = FormParserFactory.builder().build();+ private FormData formData;++ @Override+ public String getURI() {+ KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(exchange.getRequestURI())+ .replaceQuery(exchange.getQueryString());+ if (!exchange.isHostIncludedInRequestURI()) uriBuilder.scheme(exchange.getRequestScheme()).host(exchange.getHostAndPort());+ return uriBuilder.buildAsString();+ }++ @Override+ public String getRelativePath() {+ return exchange.getRelativePath();+ }++ @Override+ public boolean isSecure() {+ String protocol = exchange.getRequestScheme();+ return protocol.equalsIgnoreCase("https");+ }++ @Override+ public String getFirstParam(String param) {+ Deque<String> values = exchange.getQueryParameters().get(param);++ if (values != null && !values.isEmpty()) {+ return values.getFirst();+ }++ if (formData == null && "post".equalsIgnoreCase(getMethod())) {+ FormDataParser parser = formParserFactory.createParser(exchange);+ try {+ formData = parser.parseBlocking();+ } catch (IOException cause) {+ throw new RuntimeException("Failed to parse form parameters", cause);+ }+ }++ if (formData != null) {+ Deque<FormValue> formValues = formData.get(param);++ if (formValues != null && !formValues.isEmpty()) {+ FormValue firstValue = formValues.getFirst();++ if (!firstValue.isFileItem()) {+ return firstValue.getValue();+ }+ }+ }++ return null;+ }++ @Override+ public String getQueryParamValue(String param) {+ Map<String,Deque<String>> queryParameters = exchange.getQueryParameters();+ if (queryParameters == null) return null;+ Deque<String> strings = queryParameters.get(param);+ if (strings == null) return null;+ return strings.getFirst();+ }++ @SuppressWarnings("removal")+ @Override+ public Cookie getCookie(String cookieName) {+ Map<String, io.undertow.server.handlers.Cookie> requestCookies = exchange.getRequestCookies();+ if (requestCookies == null) return null;+ io.undertow.server.handlers.Cookie cookie = requestCookies.get(cookieName);+ if (cookie == null) return null;+ return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath());+ }++ @Override+ public List<String> getHeaders(String name) {+ return exchange.getRequestHeaders().get(name);+ }++ @Override+ public String getMethod() {+ return exchange.getRequestMethod().toString();+ }++++ @Override+ public String getHeader(String name) {+ return exchange.getRequestHeaders().getFirst(name);+ }++ @Override+ public InputStream getInputStream() {+ return getInputStream(false);+ }++ @Override+ public InputStream getInputStream(boolean buffered) {+ if (!exchange.isBlocking()) exchange.startBlocking();++ if (inputStream != null) {+ return inputStream;+ }++ if (buffered) {+ ServletRequestContext context = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY);+ ServletRequest servletRequest = context.getServletRequest();++ inputStream = new BufferedInputStream(exchange.getInputStream());++ context.setServletRequest(new HttpServletRequestWrapper((HttpServletRequest) servletRequest) {+ @Override+ public ServletInputStream getInputStream() {+ inputStream.mark(0);+ return new ServletInputStream() {+ @Override+ public boolean isFinished() {+ try {+ return inputStream.available() == 0;+ } catch (IOException ignored) {+ }+ return true;+ }++ @Override+ public boolean isReady() {+ try {+ return inputStream.available() > 0;+ } catch (IOException ignored) {+ }+ return false;+ }++ @Override+ public void setReadListener(ReadListener readListener) {++ }++ @Override+ public int read() throws IOException {+ return inputStream.read();+ }+ };+ }+ });+ return inputStream;+ }++ return exchange.getInputStream();+ }++ @Override+ public String getRemoteAddr() {+ InetSocketAddress sourceAddress = exchange.getSourceAddress();+ if (sourceAddress == null) {+ return "";+ }+ InetAddress address = sourceAddress.getAddress();+ if (address == null) {+ // this is unresolved, so we just return the host name not exactly spec, but if the name should be+ // resolved then a PeerNameResolvingHandler should be used and this is probably better than just+ // returning null+ return sourceAddress.getHostString();+ }+ return address.getHostAddress();+ }++ @Override+ public void setError(AuthenticationError error) {+ exchange.putAttachment(AUTH_ERROR_ATTACHMENT_KEY, error);+ }++ @Override+ public void setError(LogoutError error) {+ exchange.putAttachment(LOGOUT_ERROR_ATTACHMENT_KEY, error);++ }+ }++ protected class ResponseFacade implements Response {+ @Override+ public void setStatus(int status) {+ exchange.setStatusCode(status);+ }++ @Override+ public void addHeader(String name, String value) {+ exchange.getResponseHeaders().add(new HttpString(name), value);+ }++ @Override+ public void setHeader(String name, String value) {+ exchange.getResponseHeaders().put(new HttpString(name), value);+ }++ @Override+ public void resetCookie(String name, String path) {+ CookieImpl cookie = new CookieImpl(name, "");+ cookie.setMaxAge(0);+ cookie.setPath(path);+ exchange.setResponseCookie(cookie);+ }++ @Override+ public void setCookie(String name, String value, String path, String domain, int maxAge, boolean secure, boolean httpOnly) {+ CookieImpl cookie = new CookieImpl(name, value);+ cookie.setPath(path);+ cookie.setDomain(domain);+ cookie.setMaxAge(maxAge);+ cookie.setSecure(secure);+ cookie.setHttpOnly(httpOnly);+ exchange.setResponseCookie(cookie);+ }++ @Override+ public OutputStream getOutputStream() {+ if (!exchange.isBlocking()) exchange.startBlocking();+ return exchange.getOutputStream();+ }++ @Override+ public void sendError(int code) {+ exchange.setStatusCode(code);+ }++ @Override+ public void sendError(int code, String message) {+ exchange.setStatusCode(code);+ exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "text/html");+ try {+ exchange.getOutputStream().write(message.getBytes());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ exchange.endExchange();+ }+++ @Override+ public void end() {+ exchange.endExchange();+ }+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.javanew file mode 100644index 000000000..f25726123--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java@@ -0,0 +1,44 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import org.keycloak.adapters.NodesRegistrationManagement;++import jakarta.servlet.ServletContextEvent;+import jakarta.servlet.ServletContextListener;++/**+ * @author <a href="mailto:[email protected]">Marek Posolda</a>+ */+public class UndertowNodesRegistrationManagementWrapper implements ServletContextListener {++ private final NodesRegistrationManagement delegate;++ public UndertowNodesRegistrationManagementWrapper(NodesRegistrationManagement delegate) {+ this.delegate = delegate;+ }++ @Override+ public void contextInitialized(ServletContextEvent sce) {+ }++ @Override+ public void contextDestroyed(ServletContextEvent sce) {+ delegate.stop();+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowPreAuthActionsHandler.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowPreAuthActionsHandler.javanew file mode 100644index 000000000..be234587c--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowPreAuthActionsHandler.java@@ -0,0 +1,63 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HttpHandler;+import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.SessionManager;+import org.jboss.logging.Logger;+import org.keycloak.adapters.AdapterDeploymentContext;+import org.keycloak.adapters.PreAuthActionsHandler;+import org.keycloak.adapters.undertow.SessionManagementBridge;+import org.keycloak.adapters.undertow.UndertowHttpFacade;+import org.keycloak.adapters.undertow.UndertowUserSessionManagement;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class UndertowPreAuthActionsHandler implements HttpHandler {++ private static final Logger log = Logger.getLogger(UndertowPreAuthActionsHandler.class);+ protected HttpHandler next;+ protected SessionManager sessionManager;+ protected UndertowUserSessionManagement userSessionManagement;+ protected AdapterDeploymentContext deploymentContext;++ public UndertowPreAuthActionsHandler(AdapterDeploymentContext deploymentContext,+ UndertowUserSessionManagement userSessionManagement,+ SessionManager sessionManager,+ HttpHandler next) {+ this.next = next;+ this.deploymentContext = deploymentContext;+ this.sessionManager = sessionManager;+ this.userSessionManagement = userSessionManagement;+ }++ @Override+ public void handleRequest(HttpServerExchange exchange) throws Exception {+ UndertowHttpFacade facade = createFacade(exchange);+ SessionManagementBridge bridge = new SessionManagementBridge(userSessionManagement, sessionManager);+ PreAuthActionsHandler handler = new PreAuthActionsHandler(bridge, deploymentContext, facade);+ if (handler.handleRequest()) return;+ next.handleRequest(exchange);+ }++ public UndertowHttpFacade createFacade(HttpServerExchange exchange) {+ return new OIDCUndertowHttpFacade(exchange);+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.javanew file mode 100644index 000000000..26f358378--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java@@ -0,0 +1,42 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import org.keycloak.KeycloakPrincipal;+import org.keycloak.adapters.AdapterTokenStore;+import org.keycloak.adapters.KeycloakDeployment;+import org.keycloak.adapters.RefreshableKeycloakSecurityContext;+import org.keycloak.adapters.spi.HttpFacade;++/**+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class UndertowRequestAuthenticator extends AbstractUndertowRequestAuthenticator {+ public UndertowRequestAuthenticator(HttpFacade facade, KeycloakDeployment deployment, int sslRedirectPort,+ SecurityContext securityContext, HttpServerExchange exchange, AdapterTokenStore tokenStore) {+ super(facade, deployment, sslRedirectPort, securityContext, exchange, tokenStore);+ }++ @Override+ protected KeycloakUndertowAccount createAccount(KeycloakPrincipal<RefreshableKeycloakSecurityContext> principal) {+ return new KeycloakUndertowAccount(principal);+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowSessionTokenStore.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowSessionTokenStore.javanew file mode 100644index 000000000..f290c002b--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowSessionTokenStore.java@@ -0,0 +1,121 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.keycloak.adapters.undertow;++import io.undertow.security.api.SecurityContext;+import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.Session;+import io.undertow.util.Sessions;+import org.jboss.logging.Logger;+import org.keycloak.KeycloakSecurityContext;+import org.keycloak.adapters.*;+import org.keycloak.adapters.undertow.UndertowUserSessionManagement;++/**+ * Per-request object. Storage of tokens in undertow session.+ *+ * @author <a href="mailto:[email protected]">Marek Posolda</a>+ */+public class UndertowSessionTokenStore implements AdapterTokenStore {++ protected static Logger log = Logger.getLogger(UndertowSessionTokenStore.class);++ private final HttpServerExchange exchange;+ private final KeycloakDeployment deployment;+ private final UndertowUserSessionManagement sessionManagement;+ private final SecurityContext securityContext;++ public UndertowSessionTokenStore(HttpServerExchange exchange, KeycloakDeployment deployment, UndertowUserSessionManagement sessionManagement,+ SecurityContext securityContext) {+ this.exchange = exchange;+ this.deployment = deployment;+ this.sessionManagement = sessionManagement;+ this.securityContext = securityContext;+ }++ @Override+ public void checkCurrentToken() {+ // no-op on undertow+ }++ @Override+ public boolean isCached(RequestAuthenticator authenticator) {+ Session session = Sessions.getSession(exchange);+ if (session == null) {+ log.debug("session was null, returning null");+ return false;+ }+ KeycloakUndertowAccount account = (KeycloakUndertowAccount)session.getAttribute(KeycloakUndertowAccount.class.getName());+ if (account == null) {+ log.debug("Account was not in session, returning null");+ return false;+ }++ if (!deployment.getRealm().equals(account.getKeycloakSecurityContext().getRealm())) {+ log.debug("Account in session belongs to a different realm than for this request.");+ return false;+ }++ account.setCurrentRequestInfo(deployment, this);+ if (account.checkActive()) {+ log.debug("Cached account found");+ securityContext.authenticationComplete(account, "KEYCLOAK", false);+ ((AbstractUndertowRequestAuthenticator)authenticator).propagateKeycloakContext(account);+ return true;+ } else {+ log.debug("Account was not active, returning false");+ session.removeAttribute(KeycloakUndertowAccount.class.getName());+ session.removeAttribute(KeycloakSecurityContext.class.getName());+ session.invalidate(exchange);+ return false;+ }+ }++ @Override+ public void saveRequest() {++ }++ @Override+ public boolean restoreRequest() {+ return false;+ }++ @Override+ public void saveAccountInfo(OidcKeycloakAccount account) {+ Session session = Sessions.getOrCreateSession(exchange);+ session.setAttribute(KeycloakUndertowAccount.class.getName(), account);+ session.setAttribute(KeycloakSecurityContext.class.getName(), account.getKeycloakSecurityContext());+ sessionManagement.login(session.getSessionManager());+ }++ @Override+ public void logout() {+ Session session = Sessions.getSession(exchange);+ if (session == null) return;+ KeycloakUndertowAccount account = (KeycloakUndertowAccount)session.getAttribute(KeycloakUndertowAccount.class.getName());+ if (account == null) return;+ session.removeAttribute(KeycloakUndertowAccount.class.getName());+ session.removeAttribute(KeycloakSecurityContext.class.getName());+ }++ @Override+ public void refreshCallback(RefreshableKeycloakSecurityContext securityContext) {+ // no-op+ }+}diff --git a/container/src/main/java/org/keycloak/adapters/undertow/UndertowUserSessionManagement.java b/container/src/main/java/org/keycloak/adapters/undertow/UndertowUserSessionManagement.javanew file mode 100644index 000000000..953080c21--- /dev/null+++ b/container/src/main/java/org/keycloak/adapters/undertow/UndertowUserSessionManagement.java@@ -0,0 +1,160 @@+/*+ * Copyright 2016 Red Hat, Inc. and/or its affiliates+ * and other contributors as indicated by the @author tags.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.keycloak.adapters.undertow;++import io.undertow.server.HttpServerExchange;+import io.undertow.server.session.Session;+import io.undertow.server.session.SessionConfig;+import io.undertow.server.session.SessionListener;+import io.undertow.server.session.SessionManager;+import org.jboss.logging.Logger;++import java.util.List;+import java.util.Set;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.Executors;++/**+ * Manages relationship to users and sessions so that forced admin logout can be implemented+ *+ * @author <a href="mailto:[email protected]">Bill Burke</a>+ * @version $Revision: 1 $+ */+public class UndertowUserSessionManagement implements SessionListener {+ private static final Logger log = Logger.getLogger(UndertowUserSessionManagement.class);+ protected volatile boolean registered;+ private final ExecutorService executor = Executors.newSingleThreadExecutor();++ public void login(SessionManager manager) {+ if (!registered) {+ manager.registerSessionListener(this);+ registered = true;+ }+ }++ /**+ * This method runs the given runnable in the current thread if the session manager does not use distributed sessions,+ * or in a separate thread if it does. This is to work around:+ * <pre>+ * org.infinispan.util.concurrent.TimeoutException: ISPN000299: Unable to acquire lock after 15 seconds for key SessionCreationMetaDataKey+ * </pre>+ * See https://issues.jboss.org/browse/KEYCLOAK-9822+ * @param r+ */+ private void workaroundIspnDeadlock(final SessionManager manager, Runnable r) {+ if (manager.getClass().getName().equals("org.wildfly.clustering.web.undertow.session.DistributableSessionManager")) {+ executor.submit(r);+ } else {+ r.run();+ }+ }++ public void logoutAll(final SessionManager manager) {+ final Set<String> allSessions = manager.getAllSessions();+ workaroundIspnDeadlock(manager, new Runnable() {+ @Override+ public void run() {+ for (String sessionId : allSessions) logoutSession(manager, sessionId);+ }+ });+ }++ public void logoutHttpSessions(final SessionManager manager, final List<String> sessionIds) {+ log.debugf("logoutHttpSessions: %s", sessionIds);++ workaroundIspnDeadlock(manager, new Runnable() {+ @Override+ public void run() {+ for (String sessionId : sessionIds) {+ logoutSession(manager, sessionId);+ }+ }+ });+ }++ protected void logoutSession(SessionManager manager, String httpSessionId) {+ log.debugf("logoutHttpSession: %s", httpSessionId);+ Session session = getSessionById(manager, httpSessionId);+ try {+ if (session != null) session.invalidate(null);+ } catch (Exception e) {+ log.warnf("Session %s not present or already invalidated.", httpSessionId);+ }+ }++ protected Session getSessionById(SessionManager manager, final String sessionId) {+ // TODO: Workaround for WFLY-3345. Remove this once we move to wildfly 8.2+ if (manager.getClass().getName().equals("org.wildfly.clustering.web.undertow.session.DistributableSessionManager")) {+ return manager.getSession(null, new SessionConfig() {++ @Override+ public void setSessionId(HttpServerExchange exchange, String sessionId) {+ }++ @Override+ public void clearSession(HttpServerExchange exchange, String sessionId) {+ }++ @Override+ public String findSessionId(HttpServerExchange exchange) {+ return sessionId;+ }++ @Override+ public SessionCookieSource sessionCookieSource(HttpServerExchange exchange) {+ return null;+ }++ @Override+ public String rewriteUrl(String originalUrl, String sessionId) {+ return null;+ }++ });++ } else {+ return manager.getSession(sessionId);+ }+ }+++ @Override+ public void sessionCreated(Session session, HttpServerExchange exchange) {+ }++ @Override+ public void sessionDestroyed(Session session, HttpServerExchange exchange, SessionDestroyedReason reason) {+ }+++ @Override+ public void sessionIdChanged(Session session, String oldSessionId) {+ }++ @Override+ public void attributeAdded(Session session, String name, Object value) {+ }++ @Override+ public void attributeUpdated(Session session, String name, Object newValue, Object oldValue) {+ }++ @Override+ public void attributeRemoved(Session session, String name, Object oldValue) {+ }++}diff --git a/container/src/main/java/org/openremote/container/json/JacksonConfig.java b/container/src/main/java/org/openremote/container/json/JacksonConfig.javaindex ed6662be3..1abb5fa5a 100644--- a/container/src/main/java/org/openremote/container/json/JacksonConfig.java+++ b/container/src/main/java/org/openremote/container/json/JacksonConfig.java@@ -22,10 +22,10 @@ package org.openremote.container.json;import com.fasterxml.jackson.databind.ObjectMapper;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.ext.ContextResolver;-import javax.ws.rs.ext.Provider;+import jakarta.ws.rs.Produces;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.ext.ContextResolver;+import jakarta.ws.rs.ext.Provider;@Provider@Produces(MediaType.APPLICATION_JSON)diff --git a/container/src/main/java/org/openremote/container/persistence/Database.java b/container/src/main/java/org/openremote/container/persistence/Database.javaindex d81971fe4..5d57bdb59 100644--- a/container/src/main/java/org/openremote/container/persistence/Database.java+++ b/container/src/main/java/org/openremote/container/persistence/Database.java@@ -22,8 +22,6 @@ package org.openremote.container.persistence;import com.zaxxer.hikari.HikariConfig;import com.zaxxer.hikari.HikariDataSource;import org.hibernate.cfg.AvailableSettings;-import org.hibernate.dialect.PostgreSQL10Dialect;-import org.openremote.container.PostgreSQL10LTreeDialect;import org.openremote.container.concurrent.ContainerThreadFactory;import java.util.Properties;@@ -55,7 +53,6 @@ public interface Database {@Overridepublic Properties createProperties() {Properties properties = new Properties();- properties.put(AvailableSettings.DIALECT, PostgreSQL10LTreeDialect.class.getName());return properties;}diff --git a/container/src/main/java/org/openremote/container/persistence/EnhancedImportSqlCommandExtractor.java b/container/src/main/java/org/openremote/container/persistence/EnhancedImportSqlCommandExtractor.javaindex 1e62cbaaa..c92cb343b 100644--- a/container/src/main/java/org/openremote/container/persistence/EnhancedImportSqlCommandExtractor.java+++ b/container/src/main/java/org/openremote/container/persistence/EnhancedImportSqlCommandExtractor.java@@ -20,31 +20,33 @@package org.openremote.container.persistence;import org.apache.commons.io.IOUtils;-import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractor;-import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;-import org.hibernate.tool.hbm2ddl.SingleLineSqlCommandExtractor;+import org.hibernate.dialect.Dialect;+import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor;+import org.hibernate.tool.schema.internal.script.SingleLineSqlScriptExtractor;+import org.hibernate.tool.schema.spi.SqlScriptCommandExtractor;+import org.hibernate.tool.schema.spi.SqlScriptException;import java.io.IOException;import java.io.Reader;+import java.util.List;/*** Load and parse import SQL files, either the whole file as a single statement if its first line* is <code>-- importOneStatementOnly</code>, or as a semicolon-separated list of statements.*/-@SuppressWarnings("deprecation")-public class EnhancedImportSqlCommandExtractor implements ImportSqlCommandExtractor {+public class EnhancedImportSqlCommandExtractor implements SqlScriptCommandExtractor {@Override- public String[] extractCommands(Reader reader) {+ public List<String> extractCommands(Reader reader, Dialect dialect) {try {String sql = IOUtils.toString(reader);if (sql.startsWith("-- importOneStatementOnly")) {- return new SingleLineSqlCommandExtractor().extractCommands(reader);+ return new SingleLineSqlScriptExtractor().extractCommands(reader, dialect);} else {- return new MultipleLinesSqlCommandExtractor().extractCommands(reader);+ return new MultiLineSqlScriptExtractor().extractCommands(reader, dialect);}} catch (IOException e) {- throw new org.hibernate.tool.hbm2ddl.ImportScriptException("Error during import script parsing.", e);+ throw new SqlScriptException("Error during import script parsing.", e);}}}diff --git a/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java b/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.javaindex a0b76e95e..ff4882f70 100644--- a/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java+++ b/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java@@ -29,6 +29,7 @@ import org.hibernate.service.spi.SessionFactoryServiceRegistry;import java.util.Collections;import java.util.List;+@SuppressWarnings("deprecation")public class IntegratorProvider implements org.hibernate.jpa.boot.spi.IntegratorProvider, Integrator {@Override@@ -37,7 +38,7 @@ public class IntegratorProvider implements org.hibernate.jpa.boot.spi.Integrator}@Override- public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {+ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {final EventListenerRegistry eventListenerRegistry = serviceRegistry.getService(EventListenerRegistry.class);// Replace the flush entity listeners which removes the standard DefaultFlushEntityEventListenerdiff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.javaindex bd428f5c5..565e462f2 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceEventInterceptor.java@@ -19,17 +19,15 @@*/package org.openremote.container.persistence;+import jakarta.transaction.Status;+import jakarta.transaction.Synchronization;import org.apache.camel.CamelExecutionException;-import org.apache.camel.ExchangePattern;import org.hibernate.CallbackException;import org.hibernate.EmptyInterceptor;import org.hibernate.Transaction;import org.hibernate.type.Type;-import org.openremote.container.message.MessageBrokerService;import org.openremote.model.PersistenceEvent;-import javax.transaction.Status;-import javax.transaction.Synchronization;import java.io.Serializable;import java.util.HashSet;import java.util.Set;diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex 2c2bb22b9..0b53791fd 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -19,6 +19,10 @@*/package org.openremote.container.persistence;+import jakarta.persistence.*;+import jakarta.persistence.spi.ClassTransformer;+import jakarta.persistence.spi.PersistenceUnitTransactionType;+import jakarta.ws.rs.core.UriBuilder;import org.apache.camel.FluentProducerTemplate;import org.apache.camel.Predicate;import org.flywaydb.core.Flyway;@@ -58,11 +62,7 @@ import org.openremote.model.security.UserAttribute;import org.openremote.model.syslog.SyslogEvent;import org.openremote.model.util.ValueUtil;-import javax.persistence.*;-import javax.persistence.spi.ClassTransformer;-import javax.persistence.spi.PersistenceUnitTransactionType;import javax.sql.DataSource;-import javax.ws.rs.core.UriBuilder;import java.io.File;import java.lang.reflect.Field;import java.net.URL;@@ -84,7 +84,7 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc/*** Programmatic definition of OpenRemotePU for hibernate*/- public static class PersistenceUnitInfo implements javax.persistence.spi.PersistenceUnitInfo {+ public static class PersistenceUnitInfo implements jakarta.persistence.spi.PersistenceUnitInfo {List<String> managedClassNames;Properties properties;@@ -98,7 +98,7 @@ public class PersistenceService implements ContainerService, Consumer<Persistencprops.put(AvailableSettings.SCANNER_DISCOVERY, "none");//props.put(AvailableSettings.SHOW_SQL, "true");props.put(AvailableSettings.CURRENT_SESSION_CONTEXT_CLASS, "thread");- props.put(AvailableSettings.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR, "org.openremote.container.persistence.EnhancedImportSqlCommandExtractor");+ props.put(AvailableSettings.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR, "org.openremote.container.persistence.EnhancedSqlScriptExtractor");// Add custom propertiesprops.putAll(properties);@@ -304,11 +304,19 @@ public class PersistenceService implements ContainerService, Consumer<PersistencstorageDir = Paths.get(getString(container.getConfig(), OR_STORAGE_DIR, OR_STORAGE_DIR_DEFAULT));LOG.log(Level.INFO, "Setting storage directory to '" + storageDir.toAbsolutePath() + "'");- if (!Files.exists(storageDir) || !Files.isDirectory(storageDir)) {- String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' doesn't exist or is not a folder";- LOG.log(Level.SEVERE, msg);- throw new FileSystemNotFoundException(msg);+ if (!Files.exists(storageDir)) {+ Files.createDirectories(storageDir);+ if (!storageDir.toFile().setWritable(true, false)) {+ String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' doesn't exist and cannot be created";+ LOG.log(Level.SEVERE, msg);+ throw new FileSystemNotFoundException(msg);+ }} else {+ if (!Files.isDirectory(storageDir)) {+ String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not a folder";+ LOG.log(Level.SEVERE, msg);+ throw new FileSystemNotFoundException(msg);+ }File testFile = storageDir.toFile();if (!testFile.canRead() || !testFile.canWrite()) {String msg = "Specified OR_STORAGE_DIR '" + storageDir.toAbsolutePath() + "' is not writable";@@ -342,7 +350,6 @@ public class PersistenceService implements ContainerService, Consumer<PersistencentityClasses.add(X509ProvisioningConfig.class.getName());// Add packages with package-info (don't think this is JPA spec but hibernate specific)- entityClasses.add("org.openremote.container.persistence");entityClasses.add("org.openremote.container.util");// Get asset sub type entities from asset modeldiff --git a/container/src/main/java/org/openremote/container/persistence/package-info.java b/container/src/main/java/org/openremote/container/persistence/package-info.javadeleted file mode 100644index 405a026e5..000000000--- a/container/src/main/java/org/openremote/container/persistence/package-info.java+++ /dev/null@@ -1,27 +0,0 @@-@TypeDefs({- @TypeDef(- name = Constants.PERSISTENCE_JSON_VALUE_TYPE,- typeClass = JsonBinaryType.class- ),- @TypeDef(- name = Constants.PERSISTENCE_STRING_ARRAY_TYPE,- typeClass = StringArrayType.class- ),- @TypeDef(- name = EpochMillisInstantType.TYPE_NAME,- typeClass = EpochMillisInstantType.class- ),- @TypeDef(- name = LTreeType.TYPE,- typeClass = LTreeType.class- )-})--package org.openremote.container.persistence;--import com.vladmihalcea.hibernate.type.array.StringArrayType;-import com.vladmihalcea.hibernate.type.json.JsonBinaryType;-import org.hibernate.annotations.TypeDef;-import org.hibernate.annotations.TypeDefs;-import org.openremote.model.Constants;-import org.openremote.model.persistence.EpochMillisInstantType;diff --git a/container/src/main/java/org/openremote/container/security/AuthForm.java b/container/src/main/java/org/openremote/container/security/AuthForm.javaindex ba6500a4e..6b83abf65 100644--- a/container/src/main/java/org/openremote/container/security/AuthForm.java+++ b/container/src/main/java/org/openremote/container/security/AuthForm.java@@ -19,7 +19,7 @@*/package org.openremote.container.security;-import javax.ws.rs.FormParam;+import jakarta.ws.rs.FormParam;public abstract class AuthForm {diff --git a/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java b/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.javaindex 81f84e1cc..d2a673679 100644--- a/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java+++ b/container/src/main/java/org/openremote/container/security/AuthOverloadHandler.java@@ -25,7 +25,7 @@ import io.undertow.util.HttpString;import java.util.Deque;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import static org.openremote.model.Constants.REALM_PARAM_NAME;/**diff --git a/container/src/main/java/org/openremote/container/security/BearerAuthClientRequestFilter.java b/container/src/main/java/org/openremote/container/security/BearerAuthClientRequestFilter.javaindex eb94da288..2e04c0220 100644--- a/container/src/main/java/org/openremote/container/security/BearerAuthClientRequestFilter.java+++ b/container/src/main/java/org/openremote/container/security/BearerAuthClientRequestFilter.java@@ -19,11 +19,11 @@*/package org.openremote.container.security;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import static org.openremote.container.web.WebClient.REQUEST_PROPERTY_ACCESS_TOKEN;/**diff --git a/container/src/main/java/org/openremote/container/security/CORSFilter.java b/container/src/main/java/org/openremote/container/security/CORSFilter.javaindex 247e3654d..d4b4559b5 100644--- a/container/src/main/java/org/openremote/container/security/CORSFilter.java+++ b/container/src/main/java/org/openremote/container/security/CORSFilter.java@@ -5,13 +5,13 @@ import org.jboss.resteasy.spi.CorsHeaders;import org.openremote.container.web.file.HttpFilter;import org.openremote.model.util.TextUtil;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpSession;-import javax.ws.rs.HttpMethod;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpSession;+import jakarta.ws.rs.HttpMethod;import java.io.IOException;import java.util.HashSet;import java.util.Set;diff --git a/container/src/main/java/org/openremote/container/security/ClientCredentialsAuthForm.java b/container/src/main/java/org/openremote/container/security/ClientCredentialsAuthForm.javaindex bab112509..3c7cf4595 100644--- a/container/src/main/java/org/openremote/container/security/ClientCredentialsAuthForm.java+++ b/container/src/main/java/org/openremote/container/security/ClientCredentialsAuthForm.java@@ -19,7 +19,7 @@*/package org.openremote.container.security;-import javax.ws.rs.FormParam;+import jakarta.ws.rs.FormParam;public class ClientCredentialsAuthForm extends AuthForm {diff --git a/container/src/main/java/org/openremote/container/security/ClientSecretRequestFilter.java b/container/src/main/java/org/openremote/container/security/ClientSecretRequestFilter.javaindex 740da26c2..db2daacb2 100644--- a/container/src/main/java/org/openremote/container/security/ClientSecretRequestFilter.java+++ b/container/src/main/java/org/openremote/container/security/ClientSecretRequestFilter.java@@ -19,13 +19,13 @@*/package org.openremote.container.security;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;import java.io.UnsupportedEncodingException;import java.util.Base64;-import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;+import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION;import static org.openremote.container.web.WebClient.REQUEST_PROPERTY_CLIENT_ID;import static org.openremote.container.web.WebClient.REQUEST_PROPERTY_CLIENT_SECRET;diff --git a/container/src/main/java/org/openremote/container/security/PasswordAuthForm.java b/container/src/main/java/org/openremote/container/security/PasswordAuthForm.javaindex 4a9b213c5..95571cfa1 100644--- a/container/src/main/java/org/openremote/container/security/PasswordAuthForm.java+++ b/container/src/main/java/org/openremote/container/security/PasswordAuthForm.java@@ -19,7 +19,7 @@*/package org.openremote.container.security;-import javax.ws.rs.FormParam;+import jakarta.ws.rs.FormParam;public class PasswordAuthForm extends AuthForm {diff --git a/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java b/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.javaindex 35f642fd7..07bc1063d 100644--- a/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/basic/BasicIdentityProvider.java@@ -38,8 +38,8 @@ import org.openremote.container.persistence.PersistenceService;import org.openremote.container.security.IdentityProvider;import org.openremote.model.Constants;-import javax.persistence.NoResultException;-import javax.persistence.NonUniqueResultException;+import jakarta.persistence.NoResultException;+import jakarta.persistence.NonUniqueResultException;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.security.Principal;diff --git a/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java b/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.javaindex 9a3a943a1..89ba790f7 100644--- a/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java+++ b/container/src/main/java/org/openremote/container/security/basic/PasswordStorage.java@@ -222,4 +222,4 @@ public class PasswordStorage {return Base64.getEncoder().encodeToString(array);}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex bd157ec05..c75f909cd 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -28,9 +28,12 @@ import io.undertow.server.handlers.proxy.LoadBalancingProxyClient;import io.undertow.server.handlers.proxy.ProxyHandler;import io.undertow.servlet.api.DeploymentInfo;import io.undertow.servlet.api.LoginConfig;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.UriBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.keycloak.KeycloakPrincipal;import org.keycloak.KeycloakSecurityContext;import org.keycloak.adapters.KeycloakConfigResolver;@@ -50,9 +53,6 @@ import org.openremote.model.auth.OAuthGrant;import org.openremote.model.auth.OAuthPasswordGrant;import javax.security.auth.Subject;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriBuilder;import java.net.URI;import java.security.Principal;import java.util.Arrays;@@ -66,9 +66,9 @@ import java.util.function.Supplier;import java.util.logging.Level;import java.util.logging.Logger;+import static jakarta.ws.rs.core.Response.Status.Family.REDIRECTION;+import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL;import static java.util.concurrent.TimeUnit.MINUTES;-import static javax.ws.rs.core.Response.Status.Family.REDIRECTION;-import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL;import static org.openremote.container.util.MapAccess.getInteger;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.container.web.WebClient.getTarget;@@ -172,8 +172,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {LOG.info("Keycloak service URL: " + keycloakServiceUri.build());- ResteasyClientBuilder clientBuilder =- new ResteasyClientBuilder()+ ResteasyClientBuilderImpl clientBuilder = new ResteasyClientBuilderImpl().connectTimeout(getInteger(container.getConfig(), KEYCLOAK_CONNECT_TIMEOUT, KEYCLOAK_CONNECT_TIMEOUT_DEFAULT),TimeUnit.MILLISECONDSdiff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakResource.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakResource.javaindex 5d6cd535e..96d415d1b 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakResource.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakResource.java@@ -25,10 +25,10 @@ import org.keycloak.representations.idm.PublishedRealmRepresentation;import org.openremote.container.security.PasswordAuthForm;import org.openremote.container.security.ClientCredentialsAuthForm;-import javax.ws.rs.*;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.Response;-import static javax.ws.rs.core.MediaType.*;+import static jakarta.ws.rs.core.MediaType.*;public interface KeycloakResource {diff --git a/container/src/main/java/org/openremote/container/security/keycloak/SimpleKeycloakServletExtension.java b/container/src/main/java/org/openremote/container/security/keycloak/SimpleKeycloakServletExtension.javaindex a9684dfff..f0adc3462 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/SimpleKeycloakServletExtension.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/SimpleKeycloakServletExtension.java@@ -31,7 +31,7 @@ import org.keycloak.adapters.KeycloakConfigResolver;import org.keycloak.adapters.NodesRegistrationManagement;import org.keycloak.adapters.undertow.*;-import javax.servlet.ServletContext;+import jakarta.servlet.ServletContext;import java.util.Map;/**@@ -44,7 +44,7 @@ public class SimpleKeycloakServletExtension implements ServletExtension {public static final String AUTH_MECHANISM = "SIMPLE_KEYCLOAK";- protected static Logger log = Logger.getLogger(KeycloakServletExtension.class);+ protected static Logger log = Logger.getLogger(SimpleKeycloakServletExtension.class);final protected KeycloakConfigResolver configResolver;final protected AdapterDeploymentContext deploymentContext;diff --git a/container/src/main/java/org/openremote/container/PostgreSQL10LTreeDialect.java b/container/src/main/java/org/openremote/container/security/keycloak/UndertowNodesRegistrationManagementWrapper.javasimilarity index 50%rename from container/src/main/java/org/openremote/container/PostgreSQL10LTreeDialect.javarename to container/src/main/java/org/openremote/container/security/keycloak/UndertowNodesRegistrationManagementWrapper.javaindex 58cfeb478..e75af31be 100644--- a/container/src/main/java/org/openremote/container/PostgreSQL10LTreeDialect.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/UndertowNodesRegistrationManagementWrapper.java@@ -1,5 +1,5 @@/*- * Copyright 2022, OpenRemote Inc.+ * Copyright 2023, OpenRemote Inc.** See the CONTRIBUTORS.txt file in the distribution for a* full listing of individual contributors.@@ -17,16 +17,27 @@* 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;+package org.openremote.container.security.keycloak;-import org.hibernate.dialect.PostgreSQL10Dialect;-import org.openremote.container.persistence.LTreeType;+import jakarta.servlet.ServletContextEvent;+import jakarta.servlet.ServletContextListener;+import org.keycloak.adapters.NodesRegistrationManagement;-import java.sql.Types;+/**+ * This is a copy of the same class from the now obsolete keycloak-undertow-adapter but for jakarta EE.+ *+ */+// TODO: Move to a standard OIDC adapter+public class UndertowNodesRegistrationManagementWrapper implements ServletContextListener {++ private final NodesRegistrationManagement delegate;++ public UndertowNodesRegistrationManagementWrapper(NodesRegistrationManagement delegate) {+ this.delegate = delegate;+ }-public class PostgreSQL10LTreeDialect extends PostgreSQL10Dialect {- public PostgreSQL10LTreeDialect() {- super();- registerHibernateType(Types.OTHER, LTreeType.class.getName());+ @Override+ public void contextDestroyed(ServletContextEvent sce) {+ delegate.stop();}}diff --git a/container/src/main/java/org/openremote/container/util/MailUtil.java b/container/src/main/java/org/openremote/container/util/MailUtil.javaindex 2dd16d91d..f83e86741 100644--- a/container/src/main/java/org/openremote/container/util/MailUtil.java+++ b/container/src/main/java/org/openremote/container/util/MailUtil.java@@ -19,19 +19,17 @@*/package org.openremote.container.util;+import jakarta.mail.*;+import jakarta.mail.internet.InternetAddress;import org.openremote.model.mail.MailMessage;-import javax.mail.*;-import javax.mail.internet.InternetAddress;-import java.io.IOException;import java.util.*;import java.util.stream.Collectors;-import java.util.stream.StreamSupport;public class MailUtil {- protected static class MessageContent {+ public static class MessageContent {protected List<Header> headers;protected String mimeType;diff --git a/container/src/main/java/org/openremote/container/util/package-info.java b/container/src/main/java/org/openremote/container/util/package-info.javaindex ed22d2e4b..c3e7ce5f6 100644--- a/container/src/main/java/org/openremote/container/util/package-info.java+++ b/container/src/main/java/org/openremote/container/util/package-info.java@@ -1,17 +1,4 @@@org.hibernate.annotations.GenericGenerators({- @org.hibernate.annotations.GenericGenerator(- name = Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR,- strategy = "enhanced-sequence",- parameters = {- @org.hibernate.annotations.Parameter(- name = "sequence_name",- value = "OPENREMOTE_SEQUENCE"- ),- @org.hibernate.annotations.Parameter(- name = "initial_value",- value = "1000"- )- }),@org.hibernate.annotations.GenericGenerator(name = Constants.PERSISTENCE_UNIQUE_ID_GENERATOR,strategy = "org.openremote.container.util.UniqueIdentifierGenerator"@@ -20,4 +7,4 @@package org.openremote.container.util;-import org.openremote.model.Constants;\ No newline at end of file+import org.openremote.model.Constants;diff --git a/container/src/main/java/org/openremote/container/web/AlreadyGzippedWriterInterceptor.java b/container/src/main/java/org/openremote/container/web/AlreadyGzippedWriterInterceptor.javaindex a9f3926b2..b7517e1dc 100644--- a/container/src/main/java/org/openremote/container/web/AlreadyGzippedWriterInterceptor.java+++ b/container/src/main/java/org/openremote/container/web/AlreadyGzippedWriterInterceptor.java@@ -19,12 +19,12 @@*/package org.openremote.container.web;-import javax.annotation.Priority;-import javax.ws.rs.Priorities;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.ext.Provider;-import javax.ws.rs.ext.WriterInterceptor;-import javax.ws.rs.ext.WriterInterceptorContext;+import jakarta.annotation.Priority;+import jakarta.ws.rs.Priorities;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.ext.Provider;+import jakarta.ws.rs.ext.WriterInterceptor;+import jakarta.ws.rs.ext.WriterInterceptorContext;import java.io.IOException;import java.util.Arrays;@@ -45,4 +45,4 @@ public class AlreadyGzippedWriterInterceptor implements WriterInterceptor {}context.proceed();}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/ClientErrorExceptionHandler.java b/container/src/main/java/org/openremote/container/web/ClientErrorExceptionHandler.javaindex 143f4226c..65fb2951a 100644--- a/container/src/main/java/org/openremote/container/web/ClientErrorExceptionHandler.java+++ b/container/src/main/java/org/openremote/container/web/ClientErrorExceptionHandler.java@@ -19,10 +19,10 @@*/package org.openremote.container.web;-import javax.ws.rs.ClientErrorException;-import javax.ws.rs.core.Response;-import javax.ws.rs.ext.ExceptionMapper;-import javax.ws.rs.ext.Provider;+import jakarta.ws.rs.ClientErrorException;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.ext.ExceptionMapper;+import jakarta.ws.rs.ext.Provider;import java.util.logging.Logger;@Providerdiff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.javaindex c43f78626..277d4b699 100644--- a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java+++ b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java@@ -40,9 +40,9 @@ import org.xnio.OptionMap;import org.xnio.Options;import org.xnio.Xnio;-import javax.websocket.HandshakeResponse;-import javax.websocket.server.HandshakeRequest;-import javax.websocket.server.ServerEndpointConfig;+import jakarta.websocket.HandshakeResponse;+import jakarta.websocket.server.HandshakeRequest;+import jakarta.websocket.server.ServerEndpointConfig;import java.security.Principal;import java.util.Optional;import java.util.logging.Logger;diff --git a/container/src/main/java/org/openremote/container/web/FollowRedirectFilter.java b/container/src/main/java/org/openremote/container/web/FollowRedirectFilter.javaindex 6ac0d8c08..03f3d3dc3 100644--- a/container/src/main/java/org/openremote/container/web/FollowRedirectFilter.java+++ b/container/src/main/java/org/openremote/container/web/FollowRedirectFilter.java@@ -19,10 +19,10 @@*/package org.openremote.container.web;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientResponseContext;-import javax.ws.rs.client.ClientResponseFilter;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientResponseContext;+import jakarta.ws.rs.client.ClientResponseFilter;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.io.InputStream;diff --git a/container/src/main/java/org/openremote/container/web/HeaderInjectorFilter.java b/container/src/main/java/org/openremote/container/web/HeaderInjectorFilter.javaindex ecd66f3e4..9ca9ccd7f 100644--- a/container/src/main/java/org/openremote/container/web/HeaderInjectorFilter.java+++ b/container/src/main/java/org/openremote/container/web/HeaderInjectorFilter.java@@ -19,8 +19,8 @@*/package org.openremote.container.web;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;import java.util.List;import java.util.Map;diff --git a/container/src/main/java/org/openremote/container/web/OAuthFilter.java b/container/src/main/java/org/openremote/container/web/OAuthFilter.javaindex 153736fc7..cc9edfe8d 100644--- a/container/src/main/java/org/openremote/container/web/OAuthFilter.java+++ b/container/src/main/java/org/openremote/container/web/OAuthFilter.java@@ -25,11 +25,11 @@ import org.openremote.model.auth.OAuthRefreshTokenGrant;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;-import javax.ws.rs.client.*;-import javax.ws.rs.core.Form;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.*;+import jakarta.ws.rs.core.Form;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.net.SocketException;import java.time.LocalDateTime;diff --git a/container/src/main/java/org/openremote/container/web/PermanentFailureFilter.java b/container/src/main/java/org/openremote/container/web/PermanentFailureFilter.javaindex ba59991b7..f4730b0cc 100644--- a/container/src/main/java/org/openremote/container/web/PermanentFailureFilter.java+++ b/container/src/main/java/org/openremote/container/web/PermanentFailureFilter.java@@ -21,11 +21,11 @@ package org.openremote.container.web;import org.openremote.model.syslog.SyslogCategory;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;-import javax.ws.rs.client.ClientResponseContext;-import javax.ws.rs.client.ClientResponseFilter;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientResponseContext;+import jakarta.ws.rs.client.ClientResponseFilter;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.util.List;import java.util.logging.Logger;diff --git a/container/src/main/java/org/openremote/container/web/ProxyClientRequestFilter.java b/container/src/main/java/org/openremote/container/web/ProxyClientRequestFilter.javaindex a8af373ea..84c997ee3 100644--- a/container/src/main/java/org/openremote/container/web/ProxyClientRequestFilter.java+++ b/container/src/main/java/org/openremote/container/web/ProxyClientRequestFilter.java@@ -19,8 +19,8 @@*/package org.openremote.container.web;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;import java.io.IOException;import static org.openremote.container.web.WebClient.*;diff --git a/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java b/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.javaindex 140f97d99..fda37b6a2 100644--- a/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java+++ b/container/src/main/java/org/openremote/container/web/QueryParameterInjectorFilter.java@@ -21,11 +21,11 @@ package org.openremote.container.web;import org.openremote.model.asset.agent.Protocol;-import javax.ws.rs.client.ClientRequestContext;-import javax.ws.rs.client.ClientRequestFilter;-import javax.ws.rs.core.MultivaluedMap;-import javax.ws.rs.core.UriBuilder;-import javax.ws.rs.ext.Provider;+import jakarta.ws.rs.client.ClientRequestContext;+import jakarta.ws.rs.client.ClientRequestFilter;+import jakarta.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.UriBuilder;+import jakarta.ws.rs.ext.Provider;import java.io.IOException;import java.time.Instant;import java.time.ZoneId;diff --git a/container/src/main/java/org/openremote/container/web/RequestLogger.java b/container/src/main/java/org/openremote/container/web/RequestLogger.javaindex 09fd17324..dd522c00f 100644--- a/container/src/main/java/org/openremote/container/web/RequestLogger.java+++ b/container/src/main/java/org/openremote/container/web/RequestLogger.java@@ -22,13 +22,13 @@ package org.openremote.container.web;import org.openremote.container.security.keycloak.KeycloakIdentityProvider;import org.openremote.model.syslog.SyslogCategory;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.container.ContainerRequestContext;-import javax.ws.rs.container.ContainerRequestFilter;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.SecurityContext;-import javax.ws.rs.ext.Provider;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.ws.rs.container.ContainerRequestContext;+import jakarta.ws.rs.container.ContainerRequestFilter;+import jakarta.ws.rs.core.Context;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.SecurityContext;+import jakarta.ws.rs.ext.Provider;import java.io.IOException;@Providerdiff --git a/container/src/main/java/org/openremote/container/web/WebApplication.java b/container/src/main/java/org/openremote/container/web/WebApplication.javaindex 709f22f9b..cd9d06e4d 100644--- a/container/src/main/java/org/openremote/container/web/WebApplication.java+++ b/container/src/main/java/org/openremote/container/web/WebApplication.java@@ -21,7 +21,7 @@ package org.openremote.container.web;import org.openremote.model.Container;-import javax.ws.rs.core.Application;+import jakarta.ws.rs.core.Application;import java.util.Collection;import java.util.HashSet;import java.util.Set;@@ -46,6 +46,7 @@ public class WebApplication extends Application {return classes;}+ @SuppressWarnings("deprecation")@Overridepublic Set<Object> getSingletons() {return singletons;diff --git a/container/src/main/java/org/openremote/container/web/WebClient.java b/container/src/main/java/org/openremote/container/web/WebClient.javaindex 6e8100164..32e0f1847 100644--- a/container/src/main/java/org/openremote/container/web/WebClient.java+++ b/container/src/main/java/org/openremote/container/web/WebClient.java@@ -21,11 +21,12 @@ package org.openremote.container.web;import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.json.JacksonConfig;import org.openremote.container.security.BearerAuthClientRequestFilter;import org.openremote.container.security.ClientSecretRequestFilter;-import javax.ws.rs.client.Client;+import jakarta.ws.rs.client.Client;import java.net.URI;public interface WebClient {@@ -38,7 +39,7 @@ public interface WebClient {String REQUEST_PROPERTY_X_FORWARDED_PROTO = WebClient.class.getName() + ".xForwardedProto";String REQUEST_PROPERTY_X_FORWARDED_PORT = WebClient.class.getName() + ".xForwardedPort";- static ResteasyClientBuilder registerDefaults(ResteasyClientBuilder builder) {+ static ResteasyClientBuilderImpl registerDefaults(ResteasyClientBuilderImpl builder) {return builder.register(new JacksonConfig()).register(new ProxyClientRequestFilter())diff --git a/container/src/main/java/org/openremote/container/web/WebResource.java b/container/src/main/java/org/openremote/container/web/WebResource.javaindex f0a0955f5..b25459db7 100644--- a/container/src/main/java/org/openremote/container/web/WebResource.java+++ b/container/src/main/java/org/openremote/container/web/WebResource.java@@ -25,13 +25,13 @@ import org.openremote.container.security.AuthContext;import org.openremote.container.security.basic.BasicAuthContext;import org.openremote.container.security.keycloak.AccessTokenAuthContext;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.*;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.*;import java.security.Principal;-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;import static org.openremote.model.Constants.REALM_PARAM_NAME;public class WebResource implements AuthContext {diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.javaindex e54e25ad2..f8ee3dcf9 100644--- a/container/src/main/java/org/openremote/container/web/WebService.java+++ b/container/src/main/java/org/openremote/container/web/WebService.java@@ -31,7 +31,8 @@ import io.undertow.servlet.api.DeploymentManager;import io.undertow.servlet.api.FilterInfo;import io.undertow.servlet.util.ImmediateInstanceHandle;import io.undertow.util.HeaderMap;-import org.jboss.resteasy.plugins.interceptors.encoding.GZIPEncodingInterceptor;+import org.jboss.resteasy.core.ResteasyDeploymentImpl;+import org.jboss.resteasy.plugins.interceptors.GZIPEncodingInterceptor;import org.jboss.resteasy.spi.ResteasyDeployment;import org.openremote.container.json.JacksonConfig;import org.openremote.container.security.CORSFilter;@@ -42,9 +43,9 @@ import org.openremote.model.ContainerService;import org.openremote.model.util.TextUtil;import org.xnio.Options;-import javax.servlet.DispatcherType;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.UriBuilder;+import jakarta.servlet.DispatcherType;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.UriBuilder;import java.net.Inet4Address;import java.net.URI;import java.util.*;@@ -280,7 +281,7 @@ public abstract class WebService implements ContainerService {if (apiClasses == null && apiSingletons == null)return null;WebApplication webApplication = new WebApplication(container, apiClasses, apiSingletons);- ResteasyDeployment resteasyDeployment = new ResteasyDeployment();+ ResteasyDeployment resteasyDeployment = new ResteasyDeploymentImpl();resteasyDeployment.setApplication(webApplication);// Custom providers (these only apply to server applications, not client calls)diff --git a/container/src/main/java/org/openremote/container/web/WebServiceExceptions.java b/container/src/main/java/org/openremote/container/web/WebServiceExceptions.javaindex 8f8eee1a4..60671d658 100644--- a/container/src/main/java/org/openremote/container/web/WebServiceExceptions.java+++ b/container/src/main/java/org/openremote/container/web/WebServiceExceptions.java@@ -24,19 +24,19 @@ import io.undertow.server.HttpServerExchange;import io.undertow.servlet.api.ExceptionHandler;import io.undertow.util.HttpString;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.ws.rs.ForbiddenException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.*;-import javax.ws.rs.ext.ExceptionMapper;-import javax.ws.rs.ext.Provider;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.ws.rs.ForbiddenException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.*;+import jakarta.ws.rs.ext.ExceptionMapper;+import jakarta.ws.rs.ext.Provider;import java.io.PrintWriter;import java.io.StringWriter;import java.util.logging.Level;import java.util.logging.Logger;-import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;/*** Unified exception handling for all web services (Resteasy, Undertow, Servlets, WebSockets).diff --git a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.javaindex 62398739e..0c9c55f3d 100644--- a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java+++ b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java@@ -23,19 +23,20 @@ import org.apache.http.client.HttpClient;import org.apache.http.client.config.CookieSpecs;import org.apache.http.client.config.RequestConfig;import org.apache.http.impl.client.HttpClientBuilder;-import org.jboss.resteasy.client.jaxrs.BasicAuthentication;+import org.jboss.resteasy.client.jaxrs.internal.BasicAuthentication;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.json.JacksonConfig;import org.openremote.model.auth.OAuthGrant;-import javax.ws.rs.Priorities;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.Priorities;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.Response;import java.net.URI;import java.util.*;import java.util.concurrent.ExecutorService;@@ -44,9 +45,9 @@ import java.util.function.UnaryOperator;import java.util.stream.Collectors;/**- * This is a factory for creating JAX-RS {@link javax.ws.rs.client.WebTarget} instances. The instances share a common- * {@link javax.ws.rs.client.Client} that uses a connection pool and has the following- * {@link javax.ws.rs.ext.ContextResolver}s registered (additional filters etc. should be registered on the+ * This is a factory for creating JAX-RS {@link WebTarget} instances. The instances share a common+ * {@link jakarta.ws.rs.client.Client} that uses a connection pool and has the following+ * {@link jakarta.ws.rs.ext.ContextResolver}s registered (additional filters etc. should be registered on the* {@link WebTargetBuilder} instances):* <ul>* <li>{@link org.openremote.container.json.JacksonConfig}.</li>@@ -193,7 +194,7 @@ public class WebTargetBuilder {.build();ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(apacheClient);- ResteasyClientBuilder clientBuilder = new ResteasyClientBuilder()+ ResteasyClientBuilder clientBuilder = new ResteasyClientBuilderImpl().httpEngine(engine).connectionPoolSize(connectionPoolSize).connectionCheckoutTimeout(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS)diff --git a/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java b/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.javaindex 7eb8ee47c..d857df007 100644--- a/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java+++ b/container/src/main/java/org/openremote/container/web/file/AbstractFileServlet.java@@ -34,12 +34,12 @@ import java.util.concurrent.TimeUnit;import java.util.logging.Logger;import java.util.regex.Pattern;-import javax.servlet.ServletContext;-import javax.servlet.ServletException;-import javax.servlet.ServletOutputStream;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.ServletContext;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletOutputStream;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;/*** <p>diff --git a/container/src/main/java/org/openremote/container/web/file/DefaultServletOutputStream.java b/container/src/main/java/org/openremote/container/web/file/DefaultServletOutputStream.javaindex 454e1bd4d..8fe34a5dc 100644--- a/container/src/main/java/org/openremote/container/web/file/DefaultServletOutputStream.java+++ b/container/src/main/java/org/openremote/container/web/file/DefaultServletOutputStream.java@@ -15,8 +15,8 @@ package org.openremote.container.web.file;import java.io.IOException;import java.io.OutputStream;-import javax.servlet.ServletOutputStream;-import javax.servlet.WriteListener;+import jakarta.servlet.ServletOutputStream;+import jakarta.servlet.WriteListener;/*** <p>@@ -71,4 +71,4 @@ public class DefaultServletOutputStream extends ServletOutputStream {public void setWriteListener(WriteListener writeListener) {throw new UnsupportedOperationException("Not supported");}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/file/FileServlet.java b/container/src/main/java/org/openremote/container/web/file/FileServlet.javaindex a12f4d1a6..b3eeb3784 100644--- a/container/src/main/java/org/openremote/container/web/file/FileServlet.java+++ b/container/src/main/java/org/openremote/container/web/file/FileServlet.java@@ -19,9 +19,9 @@*/package org.openremote.container.web.file;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import java.io.File;import java.io.IOException;import java.util.Arrays;diff --git a/container/src/main/java/org/openremote/container/web/file/GzipHttpServletResponse.java b/container/src/main/java/org/openremote/container/web/file/GzipHttpServletResponse.javaindex fc124ec43..b4f1beb39 100644--- a/container/src/main/java/org/openremote/container/web/file/GzipHttpServletResponse.java+++ b/container/src/main/java/org/openremote/container/web/file/GzipHttpServletResponse.java@@ -20,7 +20,7 @@ import java.util.Set;import java.util.regex.Pattern;import java.util.zip.GZIPOutputStream;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponse;/*** This HTTP servlet response wrapper will GZIP the response when the given threshold has exceeded and the response@@ -230,4 +230,4 @@ public class GzipHttpServletResponse extends HttpServletResponseOutputWrapper {return false;}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java b/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.javaindex 517fcf6fd..dfd491e33 100644--- a/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java+++ b/container/src/main/java/org/openremote/container/web/file/GzipResponseFilter.java@@ -12,11 +12,11 @@*/package org.openremote.container.web.file;-import javax.servlet.FilterChain;-import javax.servlet.ServletException;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpSession;+import jakarta.servlet.FilterChain;+import jakarta.servlet.ServletException;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpSession;import java.io.IOException;import java.util.Arrays;import java.util.Enumeration;diff --git a/container/src/main/java/org/openremote/container/web/file/HttpFilter.java b/container/src/main/java/org/openremote/container/web/file/HttpFilter.javaindex b822e9eb7..596cc87cf 100644--- a/container/src/main/java/org/openremote/container/web/file/HttpFilter.java+++ b/container/src/main/java/org/openremote/container/web/file/HttpFilter.java@@ -14,18 +14,18 @@ package org.openremote.container.web.file;import java.io.IOException;-import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.Servlet;-import javax.servlet.ServletContext;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;-import javax.servlet.http.HttpServlet;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpSession;+import jakarta.servlet.Filter;+import jakarta.servlet.FilterChain;+import jakarta.servlet.FilterConfig;+import jakarta.servlet.Servlet;+import jakarta.servlet.ServletContext;+import jakarta.servlet.ServletException;+import jakarta.servlet.ServletRequest;+import jakarta.servlet.ServletResponse;+import jakarta.servlet.http.HttpServlet;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpSession;/*** <p>@@ -170,4 +170,4 @@ public abstract class HttpFilter implements Filter {}}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/file/HttpServletResponseOutputWrapper.java b/container/src/main/java/org/openremote/container/web/file/HttpServletResponseOutputWrapper.javaindex 0c1bc216e..3571d8323 100644--- a/container/src/main/java/org/openremote/container/web/file/HttpServletResponseOutputWrapper.java+++ b/container/src/main/java/org/openremote/container/web/file/HttpServletResponseOutputWrapper.java@@ -18,9 +18,9 @@ import java.io.OutputStreamWriter;import java.io.PrintWriter;import java.io.Writer;-import javax.servlet.ServletOutputStream;-import javax.servlet.http.HttpServletResponse;-import javax.servlet.http.HttpServletResponseWrapper;+import jakarta.servlet.ServletOutputStream;+import jakarta.servlet.http.HttpServletResponse;+import jakarta.servlet.http.HttpServletResponseWrapper;/*** Convenience class for extending {@link HttpServletResponseWrapper} wherein the servlet response {@link OutputStream}@@ -175,4 +175,4 @@ public abstract class HttpServletResponseOutputWrapper extends HttpServletResponthis.passThrough = passThrough;}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java b/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.javaindex f9cb48573..4f10b9c5d 100644--- a/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java+++ b/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java@@ -19,7 +19,7 @@*/package org.openremote.container.web.socket;-import javax.websocket.Session;+import jakarta.websocket.Session;import java.util.Collection;import java.util.concurrent.ConcurrentHashMap;diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.javaindex 1b6458048..13937a56b 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketAdapter.java@@ -26,10 +26,10 @@ import org.openremote.container.security.keycloak.KeycloakIdentityProvider;import org.openremote.container.web.ConnectionConstants;import org.openremote.model.Constants;-import javax.websocket.CloseReason;-import javax.websocket.Endpoint;-import javax.websocket.EndpointConfig;-import javax.websocket.Session;+import jakarta.websocket.CloseReason;+import jakarta.websocket.Endpoint;+import jakarta.websocket.EndpointConfig;+import jakarta.websocket.Session;import java.io.IOException;import java.util.concurrent.RejectedExecutionException;import java.util.logging.Level;diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketCORSFilter.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketCORSFilter.javaindex a1bccb45c..7021d12f5 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketCORSFilter.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketCORSFilter.java@@ -19,9 +19,9 @@*/package org.openremote.container.web.socket;-import javax.servlet.*;-import javax.servlet.http.HttpServletRequest;-import javax.servlet.http.HttpServletResponse;+import jakarta.servlet.*;+import jakarta.servlet.http.HttpServletRequest;+import jakarta.servlet.http.HttpServletResponse;import java.io.IOException;import java.util.logging.Level;import java.util.logging.Logger;@@ -70,4 +70,4 @@ public class WebsocketCORSFilter implements Filter {public void destroy() {}-}\ No newline at end of file+}diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.javaindex 29a6881e1..e1e3942d9 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketProducer.java@@ -25,7 +25,7 @@ import org.apache.camel.Message;import org.apache.camel.support.DefaultProducer;import org.openremote.container.web.ConnectionConstants;-import javax.websocket.Session;+import jakarta.websocket.Session;import java.io.IOException;import java.util.Collection;import java.util.logging.Level;diff --git a/container/src/main/java/org/openremote/container/web/socket/WebsocketSessions.java b/container/src/main/java/org/openremote/container/web/socket/WebsocketSessions.javaindex 471842abe..47bb1ac15 100644--- a/container/src/main/java/org/openremote/container/web/socket/WebsocketSessions.java+++ b/container/src/main/java/org/openremote/container/web/socket/WebsocketSessions.java@@ -21,7 +21,7 @@ package org.openremote.container.web.socket;import org.apache.camel.Service;-import javax.websocket.Session;+import jakarta.websocket.Session;import java.util.Collection;public interface WebsocketSessions extends Service {diff --git a/container/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension b/container/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtensionnew file mode 100644index 000000000..88f1892fa--- /dev/null+++ b/container/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension@@ -0,0 +1,18 @@+#+# Copyright 2016 Red Hat, Inc. and/or its affiliates+# and other contributors as indicated by the @author tags.+#+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+#++org.keycloak.adapters.undertow.KeycloakServletExtensiondiff --git a/deployment/manager/consoleappconfig/smartcity.json b/deployment/manager/consoleappconfig/smartcity.jsondeleted file mode 100644index 41b45fa31..000000000--- a/deployment/manager/consoleappconfig/smartcity.json+++ /dev/null@@ -1,16 +0,0 @@-{- "realm": "smartcity",- "initialUrl": "https://demo.openremote.io/console_loader/?realm=smartcity&consoleProviders=geofence push storage",- "url": "https://demo.openremote.io/manager/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences",- "menuEnabled": false,- "menuPosition": "BOTTOM_RIGHT",- "menuImage": null,- "primaryColor": "#4D9D2A",- "secondaryColor": "#CFCFCF",- "links": [- {- "displayText": "Map",- "pageLink": "https://demo.openremote.io/console_loader/?realm=smartcity&consoleProviders=geofence push storage&consoleAutoEnable=true#!geofences"- }- ]-}diff --git a/gradle.properties b/gradle.propertiesindex 0d511e8e1..43fa4f3ee 100644--- a/gradle.properties+++ b/gradle.properties@@ -1,25 +1,25 @@org.gradle.jvmargs=-Xms256m -Xmx1024m-jaxrsSpecVersion = 2.0.1.Final-javaxAnnotationsVersion = 2.0.1.Final+jaxrsSpecVersion = 3.1.0+javaxAnnotationsVersion = 2.1.1javaxPersistenceVersion = 1.0.2.Final-javaxELVersion = 2.2.6+javaxELAPIVersion = 5.0.1+javaxELVersion = 4.0.2slf4jVersion = 2.0.6guavaVersion = 31.1-jre-undertowVersion = 2.2.18.Final-resteasyVersion = 3.14.0.Final-resteasyVersionAsyncHttpServlet = 3.0.19.Final+undertowVersion = 2.3.4.Final+resteasyVersion = 6.2.2.FinaljbossLoggingAnnotationsVersion = 2.0.2.FinalkeycloakVersion = 18.0.2classgraphVersion=4.8.149-jacksonVersion = 2.13.3+jacksonVersion = 2.13.4groovyVersion = 3.0.10groovySandboxVersion = 4.0.0sqliteVersion = 3.34.0-hibernateVersion = 5.6.10.Final-hibernateValidatorVersion = 6.2.3.Final-postgresJdbcVersion = 42.4.0+hibernateVersion = 6.1.7.Final+hibernateValidatorVersion = 8.0.0.FinalhikaricpVersion = 5.0.1+postgresJdbcVersion = 42.6.0junitVersion = 4.13.2spockVersion = 2.0-groovy-3.0byteBuddyVersion = 1.11.0@@ -39,12 +39,13 @@ ical4jVersion = 3.2.6friendlyIdVersion = 1.0.1geotoolsVersion = 19.1firebaseAdminVersion = 9.1.1+jakartaMailVersion = 2.0.1jaywayJsonPathVersion = 2.7.0typescriptGeneratorVersion = 2.28.785californiumCoreVersion = 2.1.0californiumScandiumVersion = 3.5.0zwaveVersion = 3.4.0-SNAPSHOT-hibernateTypesVersion = 2.14.0+hibernateTypesVersion = 2.21.1reflectionsVersion=0.9.12swaggerVersion=2.1.9jsonSchemaVersion=4.18.0@@ -57,4 +58,4 @@ snapshotsRepoUrl=https://s01.oss.sonatype.org/content/repositories/snapshots/releasesRepoUrl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/activeMQVersion = 2.26.0jbossLoggingManagerVersion=2.1.19.Final-greenmailVersion=1.6.7+greenmailVersion=2.0.0diff --git a/manager/build.gradle b/manager/build.gradleindex 5a23b4ff3..689a2a5b2 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -20,6 +20,7 @@ dependencies {implementation "org.geotools:gt-main:$geotoolsVersion"implementation "com.google.firebase:firebase-admin:$firebaseAdminVersion"+ implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion"implementation "io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion"implementation "org.openjdk.nashorn:nashorn-core:$nashornVersion"diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.javaindex adf7422f7..791229ff2 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java@@ -34,7 +34,7 @@ import org.openremote.model.http.RequestParams;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.*;+import jakarta.ws.rs.*;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Arrays;diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 691806ce3..b78419243 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -53,7 +53,7 @@ import org.openremote.model.query.filter.StringPredicate;import org.openremote.model.util.Pair;import org.openremote.model.util.TextUtil;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.util.*;import java.util.concurrent.ConcurrentMap;import java.util.concurrent.Future;diff --git a/manager/src/main/java/org/openremote/manager/apps/AppResourceImpl.java b/manager/src/main/java/org/openremote/manager/apps/AppResourceImpl.javaindex 099fea773..ce2499879 100644--- a/manager/src/main/java/org/openremote/manager/apps/AppResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/apps/AppResourceImpl.java@@ -25,10 +25,10 @@ import org.openremote.model.apps.ConsoleAppConfig;import org.openremote.model.http.RequestParams;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.NotFoundException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.NotFoundException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import java.io.File;import java.io.IOException;import java.nio.file.Files;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex a89ee40d8..2419e72d1 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -46,7 +46,7 @@ import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.util.*;import java.util.function.Supplier;import java.util.logging.Level;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex d6856773d..f308fc658 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -37,21 +37,21 @@ import org.openremote.model.security.ClientRole;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.persistence.OptimisticLockException;-import javax.validation.ConstraintViolationException;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.ForbiddenException;-import javax.ws.rs.NotAuthorizedException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.persistence.OptimisticLockException;+import jakarta.validation.ConstraintViolationException;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.ForbiddenException;+import jakarta.ws.rs.NotAuthorizedException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import java.util.*;import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.IntStream;-import static javax.ws.rs.core.Response.Status.*;+import static jakarta.ws.rs.core.Response.Status.*;import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;import static org.openremote.model.query.AssetQuery.Access;import static org.openremote.model.value.MetaItemType.*;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 2d1a98288..b060e2b87 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -57,12 +57,12 @@ import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemType;import org.postgresql.util.PGobject;-import javax.persistence.EntityManager;-import javax.persistence.NoResultException;-import javax.persistence.Query;-import javax.persistence.TypedQuery;-import javax.validation.ConstraintViolation;-import javax.validation.ConstraintViolationException;+import jakarta.persistence.EntityManager;+import jakarta.persistence.NoResultException;+import jakarta.persistence.Query;+import jakarta.persistence.TypedQuery;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.ConstraintViolationException;import java.sql.*;import java.util.*;import java.util.concurrent.atomic.AtomicInteger;@@ -1117,11 +1117,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicStringBuilder sb = new StringBuilder("DELETE FROM user_asset_link WHERE (1=0");IntStream.range(0, userAssetLinks.size()).forEach(i -> sb.append(" OR (asset_id=?")- .append(3*i)- .append(" AND user_id=?").append((3*i)+1)- .append(" AND realm=?")+ .append(" AND user_id=?").append((3*i)+2)+ .append(" AND realm=?")+ .append((3*i)+3).append(")"));sb.append(")");@@ -1129,9 +1129,9 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicIntStream.range(0, userAssetLinks.size()).forEach(i -> {UserAssetLink userAssetLink = userAssetLinks.get(i);- query.setParameter((3*i), userAssetLink.getId().getAssetId());- query.setParameter((3*i)+1, userAssetLink.getId().getUserId());- query.setParameter((3*i)+2, userAssetLink.getId().getRealm());+ query.setParameter((3*i)+1, userAssetLink.getId().getAssetId());+ query.setParameter((3*i)+2, userAssetLink.getId().getUserId());+ query.setParameter((3*i)+3, userAssetLink.getId().getRealm());});int deleteCount = query.executeUpdate();@@ -1160,8 +1160,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic*/public void deleteUserAssetLinks(String userId) {persistenceService.doTransaction(entityManager -> {- Query query = entityManager.createQuery("DELETE FROM UserAssetLink ual WHERE ual.id.userId = ?0");- query.setParameter(0, userId);+ Query query = entityManager.createQuery("DELETE FROM UserAssetLink ual WHERE ual.id.userId = ?1");+ query.setParameter(1, userId);int deleteCount = query.executeUpdate();LOG.fine("Deleted all user asset links for user: user ID=" + userId + ", count=" + deleteCount);});diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetUpdateProcessor.java b/manager/src/main/java/org/openremote/manager/asset/AssetUpdateProcessor.javaindex 02d9e5c54..3c6b8b882 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetUpdateProcessor.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetUpdateProcessor.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.Asset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeEvent.Source;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;/*** Process update of an asset attribute (value), from a {@link Source}.diff --git a/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java b/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.javaindex 98385dfc3..c02151db4 100644--- a/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AttributeLinkingService.java@@ -34,7 +34,7 @@ import org.openremote.model.util.Pair;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemType;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.util.Arrays;import java.util.NoSuchElementException;import java.util.Optional;diff --git a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.javaindex cf8f06a67..1fb312a44 100644--- a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java@@ -43,7 +43,7 @@ import org.openremote.model.security.Realm;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.BadRequestException;+import jakarta.ws.rs.BadRequestException;import java.util.Collections;import java.util.HashMap;import java.util.Map;diff --git a/manager/src/main/java/org/openremote/manager/dashboard/DashboardResourceImpl.java b/manager/src/main/java/org/openremote/manager/dashboard/DashboardResourceImpl.javaindex 36149e4b5..08eff7b0b 100644--- a/manager/src/main/java/org/openremote/manager/dashboard/DashboardResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/dashboard/DashboardResourceImpl.java@@ -10,11 +10,11 @@ import org.openremote.model.dashboard.DashboardAccess;import org.openremote.model.http.RequestParams;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.WebApplicationException;import java.util.List;-import static javax.ws.rs.core.Response.Status.*;+import static jakarta.ws.rs.core.Response.Status.*;public class DashboardResourceImpl extends ManagerWebResource implements DashboardResource {diff --git a/manager/src/main/java/org/openremote/manager/dashboard/DashboardStorageService.java b/manager/src/main/java/org/openremote/manager/dashboard/DashboardStorageService.javaindex 7521e83ce..f50452134 100644--- a/manager/src/main/java/org/openremote/manager/dashboard/DashboardStorageService.java+++ b/manager/src/main/java/org/openremote/manager/dashboard/DashboardStorageService.java@@ -11,19 +11,19 @@ import org.openremote.model.ContainerService;import org.openremote.model.dashboard.Dashboard;import org.openremote.model.dashboard.DashboardAccess;-import javax.persistence.Query;-import javax.persistence.TypedQuery;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.ws.rs.WebApplicationException;+import jakarta.persistence.Query;+import jakarta.persistence.TypedQuery;+import jakarta.persistence.criteria.CriteriaBuilder;+import jakarta.persistence.criteria.CriteriaQuery;+import jakarta.persistence.criteria.Predicate;+import jakarta.persistence.criteria.Root;+import jakarta.ws.rs.WebApplicationException;import java.util.ArrayList;import java.util.Collection;import java.util.List;-import static javax.ws.rs.core.Response.Status.FORBIDDEN;-import static javax.ws.rs.core.Response.Status.NOT_FOUND;+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;public class DashboardStorageService extends RouteBuilder implements ContainerService {diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.javaindex c01216249..cb8e7d759 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java@@ -38,7 +38,7 @@ import org.openremote.model.util.Pair;import org.openremote.model.util.ValueUtil;import org.postgresql.util.PGobject;-import javax.persistence.TypedQuery;+import jakarta.persistence.TypedQuery;import java.sql.Connection;import java.sql.PreparedStatement;import java.sql.ResultSet;diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.javaindex 48227184d..31e98cf5b 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java@@ -35,14 +35,14 @@ import org.openremote.model.datapoint.ValueDatapoint;import org.openremote.model.http.RequestParams;import org.openremote.model.syslog.SyslogCategory;-import javax.ws.rs.BadRequestException;-import javax.ws.rs.BeanParam;-import javax.ws.rs.NotSupportedException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.container.AsyncResponse;-import javax.ws.rs.container.ConnectionCallback;-import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.BadRequestException;+import jakarta.ws.rs.BeanParam;+import jakarta.ws.rs.NotSupportedException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.container.AsyncResponse;+import jakarta.ws.rs.container.ConnectionCallback;+import jakarta.ws.rs.core.HttpHeaders;+import jakarta.ws.rs.core.Response;import java.io.*;import java.util.concurrent.ScheduledFuture;import java.util.logging.Level;diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.javaindex 2fc5e1974..8a73e7102 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java@@ -21,7 +21,7 @@ import org.openremote.model.query.filter.NameValuePredicate;import org.openremote.model.util.Pair;import org.openremote.model.value.MetaItemType;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.io.File;import java.nio.file.Files;import java.nio.file.Path;diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.javaindex 546fa5cb9..862f57c3d 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetPredictedDatapointResourceImpl.java@@ -30,9 +30,12 @@ import org.openremote.model.datapoint.AssetPredictedDatapointResource;import org.openremote.model.datapoint.ValueDatapoint;import org.openremote.model.http.RequestParams;-import javax.ws.rs.BeanParam;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.BeanParam;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.Response;+import java.time.Instant;+import java.time.LocalDateTime;+import java.time.ZoneId;import java.util.logging.Logger;public class AssetPredictedDatapointResourceImpl extends ManagerWebResource implements AssetPredictedDatapointResource {diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javaindex 3f144f9e6..e2641d054 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java@@ -23,7 +23,7 @@ import org.openremote.model.query.AssetQuery;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.time.Instant;import java.time.LocalDateTime;diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.javaindex 877910ff0..054419e04 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java@@ -20,7 +20,7 @@ import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.query.AssetQuery;import org.openremote.model.syslog.SyslogCategory;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.time.Instant;import java.time.LocalDateTime;diff --git a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.javaindex 09e6a5cc1..e638720fb 100644--- a/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java+++ b/manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java@@ -19,6 +19,7 @@*/package org.openremote.manager.event;+import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;import org.apache.camel.Exchange;import org.apache.camel.Message;import org.apache.camel.support.DefaultMessage;@@ -45,7 +46,7 @@ public class EventSubscriptions {final protected TimerService timerService;final protected ConcurrentMap<String, SessionSubscriptions> sessionSubscriptionIdMap = new ConcurrentHashMap<>();- class SessionSubscriptions extends HashSet<SessionSubscription<?>> {+ class SessionSubscriptions extends ConcurrentHashSet<SessionSubscription<?>> {protected void createOrUpdate(EventSubscription<?> eventSubscription) {if (TextUtil.isNullOrEmpty(eventSubscription.getSubscriptionId())) {diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.javaindex cf0d04314..cb9f4e10d 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientResourceImpl.java@@ -27,12 +27,12 @@ import org.openremote.model.gateway.GatewayClientResource;import org.openremote.model.gateway.GatewayConnection;import org.openremote.model.http.RequestParams;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.WebApplicationException;import java.util.Collections;import java.util.List;-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;-import static javax.ws.rs.core.Response.Status.FORBIDDEN;+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;+import static jakarta.ws.rs.core.Response.Status.FORBIDDEN;public class GatewayClientResourceImpl extends ManagerWebResource implements GatewayClientResource {diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.javaindex 5362c6ae4..eb5773ba3 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java@@ -186,7 +186,6 @@ public class GatewayConnector {this.gatewayMessageConsumer = null;}- LOG.fine("Gateway connector disconnected: Gateway ID=" + gatewayId);Runnable disconnectRunnable = this.disconnectRunnable;this.disconnectRunnable = null;initialSyncInProgress = false;@@ -197,7 +196,9 @@ public class GatewayConnector {syncProcessorFuture.cancel(true);}- disconnectRunnable.run();+ // Wait a short while to disconnect to allow disconnect message to be delivered+ LOG.fine("Gateway connector disconnected: Gateway ID=" + gatewayId);+ executorService.schedule(disconnectRunnable, 1, TimeUnit.SECONDS);assetProcessingService.sendAttributeEvent(new AttributeEvent(gatewayId, GatewayAsset.STATUS, ConnectionStatus.DISCONNECTED), AttributeEvent.Source.GATEWAY);}diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 021ac689f..3c5462712 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -53,7 +53,7 @@ import org.openremote.model.security.User;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.util.*;import java.util.concurrent.ScheduledExecutorService;import java.util.concurrent.atomic.AtomicBoolean;diff --git a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.javaindex 0edc40702..784f3a0f6 100644--- a/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/map/MapResourceImpl.java@@ -26,8 +26,8 @@ import org.openremote.model.http.RequestParams;import org.openremote.model.manager.MapRealmConfig;import org.openremote.model.map.MapResource;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.Response;import java.io.IOException;import java.util.Map;diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 70f267614..984b795f6 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -39,7 +39,7 @@ import org.openremote.model.manager.MapRealmConfig;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.core.UriBuilder;+import jakarta.ws.rs.core.UriBuilder;import java.io.*;import java.nio.file.Files;import java.nio.file.Path;diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.javaindex 42b7210d1..12e10fe1a 100644--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java@@ -19,6 +19,9 @@*/package org.openremote.manager.notification;+import jakarta.mail.*;+import jakarta.mail.internet.InternetAddress;+import jakarta.mail.internet.MimeMessage;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.model.Container;@@ -33,9 +36,6 @@ import org.openremote.model.query.filter.RealmPredicate;import org.openremote.model.query.filter.UserAssetPredicate;import org.openremote.model.util.TextUtil;-import javax.mail.*;-import javax.mail.internet.InternetAddress;-import javax.mail.internet.MimeMessage;import java.io.UnsupportedEncodingException;import java.util.*;import java.util.logging.Level;diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.javaindex f23225789..0cef95ca6 100644--- a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java@@ -33,13 +33,13 @@ import org.openremote.model.notification.SentNotification;import org.openremote.model.query.AssetQuery;import org.openremote.model.util.ValueUtil;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.WebApplicationException;import java.util.Collections;import java.util.HashMap;import java.util.Map;import java.util.logging.Logger;-import static javax.ws.rs.core.Response.Status.*;+import static jakarta.ws.rs.core.Response.Status.*;import static org.openremote.model.notification.Notification.Source.CLIENT;public class NotificationResourceImpl extends WebResource implements NotificationResource {diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.javaindex 82accaed9..2a2286c72 100644--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java@@ -42,8 +42,8 @@ import org.openremote.model.query.UserQuery;import org.openremote.model.util.TextUtil;import org.openremote.model.util.TimeUtil;-import javax.persistence.Query;-import javax.persistence.TypedQuery;+import jakarta.persistence.Query;+import jakarta.persistence.TypedQuery;import java.time.Instant;import java.time.temporal.ChronoUnit;import java.util.*;@@ -349,8 +349,8 @@ public class NotificationService extends RouteBuilder implements ContainerServicbuilder.append(" order by n.sentOn asc");return persistenceService.doReturningTransaction(entityManager -> {TypedQuery<SentNotification> query = entityManager.createQuery(builder.toString(), SentNotification.class);- IntStream.range(0, parameters.size())- .forEach(i -> query.setParameter(i + 1, parameters.get(i)));+ IntStream.rangeClosed(1, parameters.size())+ .forEach(i -> query.setParameter(i, parameters.get(i-1)));return query.getResultList();});}@@ -372,8 +372,8 @@ public class NotificationService extends RouteBuilder implements ContainerServicpersistenceService.doTransaction(entityManager -> {Query query = entityManager.createQuery(builder.toString());- IntStream.range(0, parameters.size())- .forEach(i -> query.setParameter(i + 1, parameters.get(i)));+ IntStream.rangeClosed(1, parameters.size())+ .forEach(i -> query.setParameter(i, parameters.get(i-1)));query.executeUpdate();});}diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.javaindex 14c970902..ef86e65c9 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java@@ -26,7 +26,7 @@ import org.openremote.model.http.RequestParams;import org.openremote.model.provisioning.ProvisioningConfig;import org.openremote.model.provisioning.ProvisioningResource;-import javax.ws.rs.ForbiddenException;+import jakarta.ws.rs.ForbiddenException;public class ProvisioningResourceImpl extends ManagerWebResource implements ProvisioningResource {diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.javaindex a10b88ad9..13cff102a 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java@@ -28,8 +28,8 @@ import org.openremote.model.ContainerService;import org.openremote.model.provisioning.ProvisioningConfig;import org.openremote.model.util.ValueUtil;-import javax.validation.ConstraintViolation;-import javax.validation.ConstraintViolationException;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.ConstraintViolationException;import java.util.List;import java.util.Set;import java.util.logging.Level;diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.javaindex 1a11e15ee..32748a0aa 100644--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java@@ -47,7 +47,7 @@ import org.openremote.model.webhook.Webhook;import org.quartz.CronExpression;import org.shredzone.commons.suncalc.SunTimes;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.core.MediaType;import java.time.ZonedDateTime;import java.util.*;import java.util.concurrent.ScheduledExecutorService;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.javaindex 74ab700d3..627f6cae7 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java@@ -34,15 +34,15 @@ import org.openremote.model.rules.geofence.GeofenceDefinition;import org.openremote.model.security.ClientRole;import org.openremote.model.security.Realm;-import javax.ws.rs.BeanParam;-import javax.ws.rs.ForbiddenException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.BeanParam;+import jakarta.ws.rs.ForbiddenException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.Response;import java.util.List;import java.util.logging.Logger;-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;-import static javax.ws.rs.core.Response.Status.NOT_FOUND;+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;public class RulesResourceImpl extends ManagerWebResource implements RulesResource {diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex c55c5b0a2..a183cd5bc 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -58,7 +58,7 @@ import org.openremote.model.util.TimeUtil;import org.openremote.model.value.MetaHolder;import org.openremote.model.value.MetaItemType;-import javax.persistence.EntityManager;+import jakarta.persistence.EntityManager;import java.util.*;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ConcurrentMap;diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.javaindex b3b7015c9..8a8869257 100644--- a/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java+++ b/manager/src/main/java/org/openremote/manager/rules/facade/WebhooksFacade.java@@ -25,8 +25,8 @@ import org.openremote.model.rules.Ruleset;import org.openremote.model.rules.Webhooks;import org.openremote.model.webhook.Webhook;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;public class WebhooksFacade<T extends Ruleset> extends Webhooks {diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex 0be6de180..4abd66ca9 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -28,8 +28,8 @@ import org.openremote.model.query.filter.StringPredicate;import org.openremote.model.security.*;import org.openremote.model.util.TextUtil;-import javax.persistence.Tuple;-import javax.persistence.TypedQuery;+import jakarta.persistence.Tuple;+import jakarta.persistence.TypedQuery;import java.util.*;import java.util.stream.Collectors;import java.util.stream.IntStream;@@ -211,7 +211,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {List<User> users = persistenceService.doReturningTransaction(entityManager -> {TypedQuery<User> sqlQuery = entityManager.createQuery(sb.toString(), User.class);- IntStream.range(0, parameters.size()).forEach(i -> sqlQuery.setParameter(i + 1, parameters.get(i)));+ IntStream.rangeClosed(1, parameters.size()).forEach(i -> sqlQuery.setParameter(i, parameters.get(i-1)));if (userQuery.limit != null && userQuery.limit > 0) {sqlQuery.setMaxResults(userQuery.limit);@@ -283,10 +283,11 @@ public interface ManagerIdentityProvider extends IdentityProvider {});}+ @SuppressWarnings("unchecked")static Realm[] getRealmsFromDb(PersistenceService persistenceService) {return persistenceService.doReturningTransaction(entityManager -> {- List<Realm> realms = entityManager.createQuery(- "select r from Realm r where r.notBefore is null or r.notBefore = 0 or to_timestamp(r.notBefore) <= now()"+ List<Realm> realms = (List<Realm>)entityManager.createNativeQuery(+ "select *, (select ra.VALUE from PUBLIC.REALM_ATTRIBUTE ra where ra.REALM_ID = r.ID and ra.name = 'displayName') as displayName from public.realm r where r.not_before is null or r.not_before = 0 or r.not_before <= extract('epoch' from now())", Realm.class).getResultList();// Make sure the master realm is always on top@@ -314,8 +315,8 @@ public interface ManagerIdentityProvider extends IdentityProvider {static boolean realmExistsFromDb(PersistenceService persistenceService, String realm) {return persistenceService.doReturningTransaction(em -> {- long count = em.createQuery(- "select count(r) from Realm r where r.name = :realm and r.enabled = true and (r.notBefore is null or r.notBefore = 0 or to_timestamp(r.notBefore) <= now())",+ long count = (long)em.createNativeQuery(+ "select count(*) from public.realm r where r.name = :realm and r.enabled = true and (r.not_before is null or r.not_before = 0 or r.not_before <= extract('epoch' from now()))",Long.class).setParameter("realm", realm).getSingleResult();return count > 0;diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 13e3359d1..57fca365f 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -56,11 +56,11 @@ import org.openremote.model.security.*;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.persistence.Query;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriBuilder;+import jakarta.persistence.Query;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.UriBuilder;import java.io.InputStream;import java.net.URISyntaxException;import java.nio.charset.StandardCharsets;@@ -983,22 +983,22 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im// Delete gateway connectionsQuery query = entityManager.createQuery("delete from " + GatewayConnection.class.getSimpleName() + " gc " +- "where gc.localRealm = ?0");+ "where gc.localRealm = ?1");- query.setParameter(0, realmName);+ query.setParameter(1, realmName);query.executeUpdate();// Delete provisioning configsquery = entityManager.createQuery("delete from " + ProvisioningConfig.class.getSimpleName() + " pc " +- "where pc.realm = ?0");+ "where pc.realm = ?1");- query.setParameter(0, realmName);+ query.setParameter(1, realmName);query.executeUpdate();// Delete Rulesquery = entityManager.createQuery("delete from " + RealmRuleset.class.getSimpleName() + " rs " +- "where rs.realm = ?0");- query.setParameter(0, realmName);+ "where rs.realm = ?1");+ query.setParameter(1, realmName);query.executeUpdate();// Delete Assetsdiff --git a/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.javaindex 6f83be2ee..2e4d10d19 100644--- a/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/RealmResourceImpl.java@@ -28,14 +28,14 @@ import org.openremote.model.provisioning.ProvisioningConfig;import org.openremote.model.security.Realm;import org.openremote.model.security.RealmResource;-import javax.ws.rs.ClientErrorException;-import javax.ws.rs.NotAllowedException;-import javax.ws.rs.WebApplicationException;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.ClientErrorException;+import jakarta.ws.rs.NotAllowedException;+import jakarta.ws.rs.WebApplicationException;+import jakarta.ws.rs.core.Response;import java.util.Arrays;import java.util.logging.Logger;-import static javax.ws.rs.core.Response.Status.NOT_FOUND;+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;import static org.openremote.model.Constants.MASTER_REALM;public class RealmResourceImpl extends ManagerWebResource implements RealmResource {diff --git a/manager/src/main/java/org/openremote/manager/security/RealmView.java b/manager/src/main/java/org/openremote/manager/security/RealmView.javaindex cba725923..02bf9c8ca 100644--- a/manager/src/main/java/org/openremote/manager/security/RealmView.java+++ b/manager/src/main/java/org/openremote/manager/security/RealmView.java@@ -22,9 +22,9 @@ package org.openremote.manager.security;import org.hibernate.annotations.Formula;import org.hibernate.annotations.Subselect;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Id;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Id;/*** Use this to query the Keycloak REALM table in JPA queries.diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.javaindex 90f9db732..6bf595d7c 100644--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java@@ -30,7 +30,7 @@ import org.openremote.model.query.UserQuery;import org.openremote.model.query.filter.RealmPredicate;import org.openremote.model.security.*;-import javax.ws.rs.*;+import jakarta.ws.rs.*;import java.util.Arrays;import java.util.Objects;diff --git a/manager/src/main/java/org/openremote/manager/setup/SchemaExporter.java b/manager/src/main/java/org/openremote/manager/setup/SchemaExporter.javaindex 6fc457683..bc7a337ad 100644--- a/manager/src/main/java/org/openremote/manager/setup/SchemaExporter.java+++ b/manager/src/main/java/org/openremote/manager/setup/SchemaExporter.java@@ -24,7 +24,7 @@ import org.openremote.container.persistence.Database;import org.openremote.container.persistence.PersistenceService;import org.openremote.manager.persistence.ManagerPersistenceService;-import javax.persistence.Persistence;+import jakarta.persistence.Persistence;import java.io.File;import java.util.Properties;import java.util.logging.Logger;diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.javaindex 1a8dcac52..bc5c6a7e4 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogResourceImpl.java@@ -24,9 +24,9 @@ import org.openremote.model.http.RequestParams;import org.openremote.model.syslog.*;import org.openremote.model.util.Pair;-import javax.ws.rs.BeanParam;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriBuilder;+import jakarta.ws.rs.BeanParam;+import jakarta.ws.rs.core.Response;+import jakarta.ws.rs.core.UriBuilder;import java.net.URI;import java.time.Instant;import java.util.Collections;diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 2adeb6ae7..1842295ea 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -33,7 +33,7 @@ import org.openremote.model.syslog.SyslogEvent;import org.openremote.model.syslog.SyslogLevel;import org.openremote.model.util.Pair;-import javax.persistence.TypedQuery;+import jakarta.persistence.TypedQuery;import java.time.Duration;import java.time.Instant;import java.time.temporal.ChronoUnit;diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerFileServlet.java b/manager/src/main/java/org/openremote/manager/web/ManagerFileServlet.javaindex b11f4e3ce..d1018385f 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerFileServlet.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerFileServlet.java@@ -29,8 +29,8 @@ import org.openremote.model.Container;import org.openremote.container.web.file.FileServlet;import org.openremote.container.web.file.GzipResponseFilter;-import javax.servlet.DispatcherType;-import javax.servlet.Filter;+import jakarta.servlet.DispatcherType;+import jakarta.servlet.Filter;import java.io.File;import java.nio.file.Files;import java.nio.file.Path;diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.javaindex 6a1b4cfb2..811e55d15 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java@@ -45,7 +45,7 @@ import org.openremote.container.security.IdentityService;import org.openremote.container.web.WebService;import org.openremote.model.Container;-import javax.ws.rs.WebApplicationException;+import jakarta.ws.rs.WebApplicationException;import java.net.URI;import java.nio.file.Files;import java.nio.file.Path;@@ -60,8 +60,8 @@ import java.util.stream.Collectors;import java.util.stream.Stream;import static io.undertow.util.RedirectBuilder.redirect;-import static javax.ws.rs.core.Response.Status.NOT_FOUND;-import static javax.ws.rs.core.UriBuilder.fromUri;+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;+import static jakarta.ws.rs.core.UriBuilder.fromUri;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.model.Constants.REALM_PARAM_NAME;import static org.openremote.model.util.ValueUtil.configureObjectMapper;diff --git a/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java b/manager/src/main/java/org/openremote/manager/webhook/WebhookService.javaindex 1bbf0166f..03bca2878 100644--- a/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java+++ b/manager/src/main/java/org/openremote/manager/webhook/WebhookService.java@@ -22,6 +22,7 @@ package org.openremote.manager.webhook;import org.apache.camel.builder.RouteBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;import org.openremote.container.web.WebTargetBuilder;import org.openremote.manager.rules.RulesEngine;import org.openremote.model.Container;@@ -29,11 +30,11 @@ import org.openremote.model.ContainerService;import org.openremote.model.http.HTTPMethod;import org.openremote.model.webhook.Webhook;-import javax.ws.rs.ProcessingException;-import javax.ws.rs.client.Entity;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.ProcessingException;+import jakarta.ws.rs.client.Entity;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;+import jakarta.ws.rs.core.Response;import java.net.URI;import java.util.concurrent.TimeUnit;import java.util.logging.Logger;@@ -52,7 +53,7 @@ public class WebhookService extends RouteBuilder implements ContainerService {@Overridepublic void init(Container container) throws Exception {- this.clientBuilder = new ResteasyClientBuilder()+ this.clientBuilder = new ResteasyClientBuilderImpl().connectTimeout(getInteger(container.getConfig(), WEBHOOK_CONNECT_TIMEOUT, WEBHOOK_CONNECT_TIMEOUT_DEFAULT),TimeUnit.MILLISECONDSdiff --git a/model/build.gradle b/model/build.gradleindex 88da3dcb6..427c07a93 100644--- a/model/build.gradle+++ b/model/build.gradle@@ -8,15 +8,14 @@ dependencies {api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"api "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"- api "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$javaxPersistenceVersion"- api "org.hibernate:hibernate-core:$hibernateVersion"- api "org.hibernate:hibernate-validator:$hibernateValidatorVersion"- api "com.vladmihalcea:hibernate-types-52:$hibernateTypesVersion"- api "org.glassfish.web:javax.el:$javaxELVersion"+ api "org.hibernate.orm:hibernate-core:$hibernateVersion"+ api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion"+ api "com.vladmihalcea:hibernate-types-60:$hibernateTypesVersion"+ api "jakarta.el:jakarta.el-api:$javaxELAPIVersion"api "org.jboss.logging:jboss-logging-annotations:$jbossLoggingAnnotationsVersion"- api "org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:$javaxAnnotationsVersion"- api "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:$jaxrsSpecVersion"+ api "jakarta.annotation:jakarta.annotation-api:$javaxAnnotationsVersion"+ api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxrsSpecVersion"api "org.keycloak:keycloak-core:$keycloakVersion"@@ -30,7 +29,7 @@ dependencies {api "io.swagger.core.v3:swagger-annotations:$swaggerVersion"// Custom build until PR is merged from https://github.com/richturner/mbknor-jackson-jsonSchema- api "com.github.richturner:mbknor-jackson-jsonschema:1.0.40-SNAPSHOT"+ api "com.github.richturner:mbknor-jackson-jsonschema:1.0.40-JAKARTA"//api "com.kjetland:mbknor-jackson-jsonschema_2.12:1.0.39"api "org.scala-lang:scala-library:2.12.10"api "io.github.classgraph:classgraph:$classgraphVersion"diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 89a660e11..983d61c38 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -46,11 +46,10 @@ public interface Constants {String RESTRICTED_USER_REALM_ROLE = "restricted_user";String AUTH_CONTEXT = "AUTH_CONTEXT";int ACCESS_TOKEN_LIFESPAN_SECONDS = 60; // 1 minute- String PERSISTENCE_SEQUENCE_ID_GENERATOR = "SEQUENCE_ID_GENERATOR";+ String PERSISTENCE_SEQUENCE_ID_GENERATOR = "OPENREMOTE_SEQUENCE";String PERSISTENCE_UNIQUE_ID_GENERATOR = "UNIQUE_ID_GENERATOR";String PERSISTENCE_JSON_VALUE_TYPE = "jsonb";String PERSISTENCE_STRING_ARRAY_TYPE = "string-array";- String PERSISTENCE_LTREE_TYPE = "ltree";String OR_HOSTNAME = "OR_HOSTNAME";String OR_ADDITIONAL_HOSTNAMES = "OR_ADDITIONAL_HOSTNAMES";diff --git a/model/src/main/java/org/openremote/model/apps/AppResource.java b/model/src/main/java/org/openremote/model/apps/AppResource.javaindex d834120fd..8f2fe7a6c 100644--- a/model/src/main/java/org/openremote/model/apps/AppResource.java+++ b/model/src/main/java/org/openremote/model/apps/AppResource.java@@ -22,10 +22,10 @@ package org.openremote.model.apps;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.http.RequestParams;-import javax.ws.rs.*;-import javax.ws.rs.core.Response;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.Response;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "UI Apps")@Path("apps")diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 5e1da532c..23979d6fc 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -21,6 +21,8 @@ package org.openremote.model.asset;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;+import jakarta.persistence.Table;import org.hibernate.annotations.*;import org.openremote.model.Constants;import org.openremote.model.IdentifiableEntity;@@ -30,6 +32,7 @@ import org.openremote.model.attribute.AttributeMap;import org.openremote.model.attribute.MetaMap;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.jackson.AssetTypeIdResolver;+import org.openremote.model.persistence.LTreeType;import org.openremote.model.util.TsIgnore;import org.openremote.model.util.ValueUtil;import org.openremote.model.validation.AssetValid;@@ -37,15 +40,13 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import javax.persistence.*;-import javax.persistence.Entity;-import javax.persistence.Table;-import javax.validation.Valid;-import javax.validation.constraints.*;+import jakarta.persistence.*;+import jakarta.validation.Valid;+import jakarta.validation.constraints.*;import java.util.*;import java.util.stream.Collectors;-import static javax.persistence.DiscriminatorType.STRING;+import static jakarta.persistence.DiscriminatorType.STRING;import static org.openremote.model.Constants.*;// @formatter:off@@ -268,13 +269,13 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>@Column(name = "TYPE", nullable = false, updatable = false, insertable = false)protected String type = getClass().getSimpleName();- @Column(name = "PATH", updatable = false, insertable = false, columnDefinition = PERSISTENCE_LTREE_TYPE)- @Type(type = PERSISTENCE_LTREE_TYPE)+ @Column(name = "PATH", updatable = false, insertable = false, columnDefinition = LTreeType.TYPE)+ @Type(LTreeType.class)@Generated(GenerationTime.ALWAYS)protected String[] path;@Column(name = "ATTRIBUTES", columnDefinition = PERSISTENCE_JSON_VALUE_TYPE)- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)@Validprotected AttributeMap attributes;diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java b/model/src/main/java/org/openremote/model/asset/AssetModelResource.javaindex c6ce89479..dbee6b5cb 100644--- a/model/src/main/java/org/openremote/model/asset/AssetModelResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetModelResource.java@@ -24,9 +24,9 @@ import org.openremote.model.http.RequestParams;import org.openremote.model.value.MetaItemDescriptor;import org.openremote.model.value.ValueDescriptor;-import javax.ws.rs.*;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** Resource for handling model requests and also providing server side validation of {@link Asset}sdiff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.javaindex ab077aa29..02de91151 100644--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java@@ -33,15 +33,15 @@ import org.openremote.model.query.AssetQuery;import org.openremote.model.util.TsIgnore;import org.openremote.model.value.MetaItemType;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;-import javax.ws.rs.*;-import javax.ws.rs.core.Response;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.Response;import java.util.List;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** Asset<?> access rules:diff --git a/model/src/main/java/org/openremote/model/asset/UserAssetLink.java b/model/src/main/java/org/openremote/model/asset/UserAssetLink.javaindex f51133652..42ac7c054 100644--- a/model/src/main/java/org/openremote/model/asset/UserAssetLink.java+++ b/model/src/main/java/org/openremote/model/asset/UserAssetLink.java@@ -22,7 +22,7 @@ package org.openremote.model.asset;import org.hibernate.annotations.Formula;import org.openremote.model.value.MetaItemType;-import javax.persistence.*;+import jakarta.persistence.*;import java.io.Serializable;import java.util.Date;import java.util.List;diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java b/model/src/main/java/org/openremote/model/asset/agent/AgentResource.javaindex 49ba8f5a5..a34d962a4 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentResource.java@@ -28,10 +28,10 @@ import org.openremote.model.file.FileInfo;import org.openremote.model.http.RequestParams;import org.openremote.model.protocol.ProtocolInstanceDiscovery;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** This resource is for Agent specific tasks like import and discovery; normal asset/attribute CRUD operations shoulddiff --git a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.javaindex 5839bc39d..be75d2a0d 100644--- a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Date;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.javaindex 4c692b26a..c68cbdf7c 100644--- a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.javaindex 79de4a276..b58faf5b0 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.util.TextUtil;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.javaindex e706ab001..b7ffae2b2 100644--- a/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/DoorAsset.java@@ -28,7 +28,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.javaindex d29aeac6d..919f141f9 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java@@ -30,7 +30,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.javaindex 89f21a4a0..e01b9e091 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.javaindex b3c5c7095..dd02ef449 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java@@ -25,7 +25,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.javaindex 9b7850e46..c131190a4 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.javaindex 57e4e3b8a..b6c013ed1 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java@@ -22,7 +22,7 @@ package org.openremote.model.asset.impl;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import static org.openremote.model.Constants.UNITS_KILO;import static org.openremote.model.Constants.UNITS_WATT;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.javaindex e838bf063..759c5187b 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java@@ -23,7 +23,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_KILO;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.javaindex f3d7d0f6b..52f61ece1 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java@@ -29,7 +29,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.javaindex 2f078440b..8d6d32aaa 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java@@ -28,7 +28,7 @@ import org.openremote.model.value.AbstractNameValueHolder;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.javaindex 0c4482847..2163664d4 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.*;diff --git a/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.java b/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.javaindex 21b8bb235..ec9bf3fbd 100644--- a/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;import org.openremote.model.value.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.javaindex c684e393e..c36b285ca 100644--- a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.*;diff --git a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.javaindex 67f065dd4..9c660abda 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.javaindex f9446d3f4..50f329a11 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_CELSIUS;diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.javaindex 7a8cb588a..13ad23b26 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.attribute.MetaItem;import org.openremote.model.attribute.MetaMap;import org.openremote.model.value.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Collection;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.javaindex b3052ca94..7087dcac2 100644--- a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;import org.openremote.model.value.impl.ColourRGB;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_KELVIN;diff --git a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.javaindex b6f27770e..79119887b 100644--- a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_DECIBEL;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.javaindex fa4eaf02f..5284d92c7 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.javaindex 1149a0d14..29c28a59e 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.javaindex baa34c272..682bac82c 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java@@ -25,7 +25,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.javaindex 240aac414..ddf6364cb 100644--- a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.javaindex 24b84fb26..407bd8451 100644--- a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.*;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.javaindex 2ca45562f..d564b9fc6 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;import org.openremote.model.value.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_KNOT;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.javaindex 54d9cfc91..f3234c934 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.UNITS_CELSIUS;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.javaindex 99d73e7b4..71152c5c6 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java@@ -22,8 +22,8 @@ package org.openremote.model.asset.impl;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;-import javax.persistence.DiscriminatorValue;-import javax.persistence.Entity;+import jakarta.persistence.DiscriminatorValue;+import jakarta.persistence.Entity;/*** Generic asset i.e. "Thing"diff --git a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.javaindex a44899eb6..dd432fa7c 100644--- a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java@@ -21,8 +21,8 @@ package org.openremote.model.asset.impl;import org.openremote.model.asset.Asset;-import javax.persistence.DiscriminatorValue;-import javax.persistence.Entity;+import jakarta.persistence.DiscriminatorValue;+import jakarta.persistence.Entity;/*** This is only needed so JPA can deserialise an Asset whose type doesn't match an entity otherwise it is un-useddiff --git a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.javaindex 52b5b2891..509797d4f 100644--- a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;import org.openremote.model.value.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.*;diff --git a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.javaindex b21584461..688d7884a 100644--- a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueConstraint;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;import static org.openremote.model.Constants.*;diff --git a/model/src/main/java/org/openremote/model/attribute/Attribute.java b/model/src/main/java/org/openremote/model/attribute/Attribute.javaindex 3d57cf7c1..b9ae434e2 100644--- a/model/src/main/java/org/openremote/model/attribute/Attribute.java+++ b/model/src/main/java/org/openremote/model/attribute/Attribute.java@@ -34,8 +34,8 @@ import org.openremote.model.asset.Asset;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.*;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;import java.io.IOException;import java.util.*;import java.util.function.Predicate;diff --git a/model/src/main/java/org/openremote/model/attribute/NamedMap.java b/model/src/main/java/org/openremote/model/attribute/NamedMap.javaindex 069df3b7c..b06ba2fc3 100644--- a/model/src/main/java/org/openremote/model/attribute/NamedMap.java+++ b/model/src/main/java/org/openremote/model/attribute/NamedMap.java@@ -25,7 +25,7 @@ import org.openremote.model.value.AbstractNameValueHolder;import org.openremote.model.value.NameHolder;import org.openremote.model.value.ValueHolder;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.util.*;import java.util.function.Consumer;diff --git a/model/src/main/java/org/openremote/model/auth/OAuthGrant.java b/model/src/main/java/org/openremote/model/auth/OAuthGrant.javaindex bf5765689..ef3b9df5c 100644--- a/model/src/main/java/org/openremote/model/auth/OAuthGrant.java+++ b/model/src/main/java/org/openremote/model/auth/OAuthGrant.java@@ -19,14 +19,13 @@*/package org.openremote.model.auth;-import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import org.openremote.model.util.TextUtil;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;import java.io.Serializable;import java.util.*;diff --git a/model/src/main/java/org/openremote/model/auth/OAuthPasswordGrant.java b/model/src/main/java/org/openremote/model/auth/OAuthPasswordGrant.javaindex 3f266946c..9a9c6ad37 100644--- a/model/src/main/java/org/openremote/model/auth/OAuthPasswordGrant.java+++ b/model/src/main/java/org/openremote/model/auth/OAuthPasswordGrant.java@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonTypeName;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.MultivaluedMap;import java.util.Collections;import java.util.Objects;diff --git a/model/src/main/java/org/openremote/model/auth/OAuthRefreshTokenGrant.java b/model/src/main/java/org/openremote/model/auth/OAuthRefreshTokenGrant.javaindex d2a59e8d7..33935a8b2 100644--- a/model/src/main/java/org/openremote/model/auth/OAuthRefreshTokenGrant.java+++ b/model/src/main/java/org/openremote/model/auth/OAuthRefreshTokenGrant.java@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonTypeName;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.MultivaluedMap;import java.util.Collections;@JsonTypeName(OAuthRefreshTokenGrant.REFRESH_TOKEN_GRANT_TYPE)diff --git a/model/src/main/java/org/openremote/model/console/ConsoleRegistration.java b/model/src/main/java/org/openremote/model/console/ConsoleRegistration.javaindex 4bd889767..e223edd6b 100644--- a/model/src/main/java/org/openremote/model/console/ConsoleRegistration.java+++ b/model/src/main/java/org/openremote/model/console/ConsoleRegistration.java@@ -22,8 +22,8 @@ package org.openremote.model.console;import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotNull;import java.util.Map;/**diff --git a/model/src/main/java/org/openremote/model/console/ConsoleResource.java b/model/src/main/java/org/openremote/model/console/ConsoleResource.javaindex dfbab04ff..b4768376b 100644--- a/model/src/main/java/org/openremote/model/console/ConsoleResource.java+++ b/model/src/main/java/org/openremote/model/console/ConsoleResource.java@@ -24,11 +24,11 @@ import org.openremote.model.asset.impl.ConsoleAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.http.RequestParams;-import javax.validation.Valid;-import javax.validation.constraints.NotNull;-import javax.ws.rs.*;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Console")@Path("console")diff --git a/model/src/main/java/org/openremote/model/dashboard/Dashboard.java b/model/src/main/java/org/openremote/model/dashboard/Dashboard.javaindex 81e64c803..3dce1ec69 100644--- a/model/src/main/java/org/openremote/model/dashboard/Dashboard.java+++ b/model/src/main/java/org/openremote/model/dashboard/Dashboard.java@@ -1,10 +1,11 @@package org.openremote.model.dashboard;-import javax.persistence.*;-import javax.validation.Valid;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;+import jakarta.persistence.*;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import java.util.Date;import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;@@ -48,7 +49,7 @@ public class Dashboard {@NotNull(message = "{Dashboard.template.NotNull}")@Column(name = "TEMPLATE", columnDefinition = PERSISTENCE_JSON_VALUE_TYPE, nullable = false)- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)@Validprotected DashboardTemplate template;diff --git a/model/src/main/java/org/openremote/model/dashboard/DashboardGridItem.java b/model/src/main/java/org/openremote/model/dashboard/DashboardGridItem.javaindex 7572dfbcd..34ad56b1c 100644--- a/model/src/main/java/org/openremote/model/dashboard/DashboardGridItem.java+++ b/model/src/main/java/org/openremote/model/dashboard/DashboardGridItem.java@@ -1,6 +1,6 @@package org.openremote.model.dashboard;-import javax.validation.constraints.Min;+import jakarta.validation.constraints.Min;public class DashboardGridItem {diff --git a/model/src/main/java/org/openremote/model/dashboard/DashboardResource.java b/model/src/main/java/org/openremote/model/dashboard/DashboardResource.javaindex 558d5395b..839837b37 100644--- a/model/src/main/java/org/openremote/model/dashboard/DashboardResource.java+++ b/model/src/main/java/org/openremote/model/dashboard/DashboardResource.java@@ -4,13 +4,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;import java.util.List;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Dashboard")@Path("dashboard")diff --git a/model/src/main/java/org/openremote/model/dashboard/DashboardScreenPreset.java b/model/src/main/java/org/openremote/model/dashboard/DashboardScreenPreset.javaindex af656e706..198f5dc13 100644--- a/model/src/main/java/org/openremote/model/dashboard/DashboardScreenPreset.java+++ b/model/src/main/java/org/openremote/model/dashboard/DashboardScreenPreset.java@@ -1,12 +1,12 @@package org.openremote.model.dashboard;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;-import javax.ws.rs.WebApplicationException;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;+import jakarta.ws.rs.WebApplicationException;-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;public class DashboardScreenPreset {diff --git a/model/src/main/java/org/openremote/model/dashboard/DashboardTemplate.java b/model/src/main/java/org/openremote/model/dashboard/DashboardTemplate.javaindex 6e7eed58d..e65adaca4 100644--- a/model/src/main/java/org/openremote/model/dashboard/DashboardTemplate.java+++ b/model/src/main/java/org/openremote/model/dashboard/DashboardTemplate.java@@ -1,8 +1,8 @@package org.openremote.model.dashboard;-import javax.validation.Valid;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotNull;public class DashboardTemplate {diff --git a/model/src/main/java/org/openremote/model/dashboard/DashboardWidget.java b/model/src/main/java/org/openremote/model/dashboard/DashboardWidget.javaindex e472de129..c5b3fb961 100644--- a/model/src/main/java/org/openremote/model/dashboard/DashboardWidget.java+++ b/model/src/main/java/org/openremote/model/dashboard/DashboardWidget.java@@ -1,9 +1,9 @@package org.openremote.model.dashboard;-import javax.validation.Valid;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotEmpty;+import jakarta.validation.constraints.NotNull;public class DashboardWidget {diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapoint.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapoint.javaindex 3cc7d7a63..0853f8a72 100644--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapoint.java+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapoint.java@@ -23,8 +23,8 @@ import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.attribute.AttributeState;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;@Entity@Table(name = "ASSET_DATAPOINT")diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.javaindex d84db0717..74a22a97f 100644--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java@@ -23,12 +23,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.datapoint.query.AssetDatapointQuery;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;-import javax.ws.rs.container.AsyncResponse;-import javax.ws.rs.container.Suspended;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;+import jakarta.ws.rs.container.AsyncResponse;+import jakarta.ws.rs.container.Suspended;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Asset Datapoint")@Path("asset/datapoint")diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapoint.java b/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapoint.javaindex 6f905292b..00da2cf41 100644--- a/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapoint.java+++ b/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapoint.java@@ -24,8 +24,8 @@ import org.openremote.model.attribute.AttributeRef;import org.openremote.model.attribute.AttributeState;import org.openremote.model.datapoint.Datapoint;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;@Entity@Table(name = AssetPredictedDatapoint.TABLE_NAME)diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapointResource.javaindex 55acf2fdc..84266cec0 100644--- a/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapointResource.java+++ b/model/src/main/java/org/openremote/model/datapoint/AssetPredictedDatapointResource.java@@ -23,10 +23,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.datapoint.query.AssetDatapointQuery;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Asset Predicted Datapoint")@Path("asset/predicted")diff --git a/model/src/main/java/org/openremote/model/datapoint/Datapoint.java b/model/src/main/java/org/openremote/model/datapoint/Datapoint.javaindex 30da476e2..6ff6164e7 100644--- a/model/src/main/java/org/openremote/model/datapoint/Datapoint.java+++ b/model/src/main/java/org/openremote/model/datapoint/Datapoint.java@@ -19,24 +19,23 @@*/package org.openremote.model.datapoint;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.attribute.AttributeState;-import javax.persistence.*;+import jakarta.persistence.*;import java.io.Serializable;import java.util.Date;import java.util.Objects;-import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;-/*** <p>* A datapoint is used to hold time series data of an entity attribute.* <p>*/@MappedSuperclass-@IdClass(Datapoint.class)+@IdClass(DatapointID.class)public abstract class Datapoint implements Serializable {@Id@@ -52,7 +51,7 @@ public abstract class Datapoint implements Serializable {protected Date timestamp;@Column(name = "VALUE", columnDefinition = "jsonb", nullable = false)- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)protected Object value;public Datapoint() {diff --git a/model/src/main/java/org/openremote/model/datapoint/DatapointID.java b/model/src/main/java/org/openremote/model/datapoint/DatapointID.javanew file mode 100644index 000000000..0ec1ecf45--- /dev/null+++ b/model/src/main/java/org/openremote/model/datapoint/DatapointID.java@@ -0,0 +1,53 @@+/*+ * Copyright 2023, 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.model.datapoint;++import java.io.Serializable;+import java.util.Date;+import java.util.Objects;++public class DatapointID implements Serializable {++ protected String assetId;+ protected String attributeName;+ protected Date timestamp;++ public DatapointID() {+ }++ public DatapointID(String assetId, String attributeName, Date timestamp) {+ this.assetId = assetId;+ this.attributeName = attributeName;+ this.timestamp = timestamp;+ }++ @Override+ public boolean equals(Object o) {+ if (this == o) return true;+ if (o == null || getClass() != o.getClass()) return false;+ DatapointID that = (DatapointID) o;+ return assetId.equals(that.assetId) && attributeName.equals(that.attributeName) && timestamp.equals(that.timestamp);+ }++ @Override+ public int hashCode() {+ return Objects.hash(assetId, attributeName, timestamp);+ }+}diff --git a/model/src/main/java/org/openremote/model/event/Event.java b/model/src/main/java/org/openremote/model/event/Event.javaindex dd4a446b2..37ca58b2e 100644--- a/model/src/main/java/org/openremote/model/event/Event.java+++ b/model/src/main/java/org/openremote/model/event/Event.java@@ -21,10 +21,10 @@ package org.openremote.model.event;import org.openremote.model.util.TextUtil;-import javax.persistence.Column;-import javax.persistence.MappedSuperclass;-import javax.persistence.Temporal;-import javax.persistence.TemporalType;+import jakarta.persistence.Column;+import jakarta.persistence.MappedSuperclass;+import jakarta.persistence.Temporal;+import jakarta.persistence.TemporalType;import java.util.Date;/**diff --git a/model/src/main/java/org/openremote/model/event/bus/EventRegistration.java b/model/src/main/java/org/openremote/model/event/bus/EventRegistration.javaindex be19f76ba..30ac4e28d 100644--- a/model/src/main/java/org/openremote/model/event/bus/EventRegistration.java+++ b/model/src/main/java/org/openremote/model/event/bus/EventRegistration.java@@ -21,7 +21,7 @@ package org.openremote.model.event.bus;import org.openremote.model.event.Event;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;/*** Handle for receiving events from {@link EventBus}.diff --git a/model/src/main/java/org/openremote/model/flow/EditorSettings.java b/model/src/main/java/org/openremote/model/flow/EditorSettings.javaindex 0d018117a..edcf97b7e 100644--- a/model/src/main/java/org/openremote/model/flow/EditorSettings.java+++ b/model/src/main/java/org/openremote/model/flow/EditorSettings.java@@ -20,10 +20,11 @@package org.openremote.model.flow;-import javax.persistence.Column;-import javax.persistence.EnumType;-import javax.persistence.Enumerated;-import javax.validation.constraints.NotNull;+import com.vladmihalcea.hibernate.type.array.StringArrayType;+import jakarta.persistence.Column;+import jakarta.persistence.EnumType;+import jakarta.persistence.Enumerated;+import jakarta.validation.constraints.NotNull;import static org.openremote.model.Constants.PERSISTENCE_STRING_ARRAY_TYPE;@@ -48,7 +49,7 @@ public class EditorSettings {public double positionY;@Column(name = "EDITOR_COMPONENTS", columnDefinition = "text[]")- @org.hibernate.annotations.Type(type = PERSISTENCE_STRING_ARRAY_TYPE)+ @org.hibernate.annotations.Type(StringArrayType.class)public String[] components;diff --git a/model/src/main/java/org/openremote/model/flow/Flow.java b/model/src/main/java/org/openremote/model/flow/Flow.javaindex 2fbbfb53d..adac486e3 100644--- a/model/src/main/java/org/openremote/model/flow/Flow.java+++ b/model/src/main/java/org/openremote/model/flow/Flow.java@@ -20,7 +20,7 @@package org.openremote.model.flow;-import javax.persistence.*;+import jakarta.persistence.*;import java.util.*;diff --git a/model/src/main/java/org/openremote/model/flow/FlowObject.java b/model/src/main/java/org/openremote/model/flow/FlowObject.javaindex 85ce73812..ede2dafaf 100644--- a/model/src/main/java/org/openremote/model/flow/FlowObject.java+++ b/model/src/main/java/org/openremote/model/flow/FlowObject.java@@ -5,14 +5,11 @@package org.openremote.model.flow;+import jakarta.persistence.*;import org.openremote.model.IdentifiableEntity;-import javax.persistence.Column;-import javax.persistence.GeneratedValue;-import javax.persistence.Id;-import javax.persistence.MappedSuperclass;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;@@ -21,7 +18,7 @@ import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;public class FlowObject implements IdentifiableEntity<FlowObject> {@Id- @Column(name = "ID", length = 43) // TODO Is this ideal long-term for reads when keys must be distributed on cluster?+ @Column(name = "ID")@GeneratedValue(generator = PERSISTENCE_UNIQUE_ID_GENERATOR)public String id;diff --git a/model/src/main/java/org/openremote/model/flow/Node.java b/model/src/main/java/org/openremote/model/flow/Node.javaindex 8049a4793..eaf99dcf8 100644--- a/model/src/main/java/org/openremote/model/flow/Node.java+++ b/model/src/main/java/org/openremote/model/flow/Node.java@@ -22,7 +22,9 @@ package org.openremote.model.flow;import com.fasterxml.jackson.annotation.JsonIgnore;-import javax.persistence.*;+import com.vladmihalcea.hibernate.type.array.StringArrayType;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;+import jakarta.persistence.*;import java.util.ArrayList;import java.util.Arrays;import java.util.List;@@ -78,7 +80,7 @@ public class Node extends FlowObject {public String properties;@Column(name = "PERSISTENT_PROPERTY_PATHS", nullable = true, columnDefinition = "text[]")- @org.hibernate.annotations.Type(type = PERSISTENCE_STRING_ARRAY_TYPE)+ @org.hibernate.annotations.Type(StringArrayType.class)public String[] persistentPropertyPaths;diff --git a/model/src/main/java/org/openremote/model/flow/Slot.java b/model/src/main/java/org/openremote/model/flow/Slot.javaindex ef1b0a296..3ad25bed4 100644--- a/model/src/main/java/org/openremote/model/flow/Slot.java+++ b/model/src/main/java/org/openremote/model/flow/Slot.java@@ -22,7 +22,7 @@ package org.openremote.model.flow;import com.fasterxml.jackson.annotation.JsonIgnore;-import javax.persistence.*;+import jakarta.persistence.*;@Entity@Table(name = "SLOT")diff --git a/model/src/main/java/org/openremote/model/flow/Wire.java b/model/src/main/java/org/openremote/model/flow/Wire.javaindex 67dec3477..f3df5cfc7 100644--- a/model/src/main/java/org/openremote/model/flow/Wire.java+++ b/model/src/main/java/org/openremote/model/flow/Wire.java@@ -22,11 +22,11 @@ package org.openremote.model.flow;import com.fasterxml.jackson.annotation.JsonIgnore;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.IdClass;-import javax.persistence.Table;-import javax.validation.constraints.NotNull;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.IdClass;+import jakarta.persistence.Table;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;@IdClass(Wire.Id.class)@@ -70,17 +70,17 @@ public class Wire {}}- @javax.persistence.Id+ @jakarta.persistence.Id@NotNull@Column(name = "SOURCE_NODE_ID")public String sourceId;- @javax.persistence.Id+ @jakarta.persistence.Id@NotNull@Column(name = "SINK_NODE_ID")public String sinkId;- @javax.persistence.Id+ @jakarta.persistence.Id@NotNull@Column(name = "FLOW_ID")@@ -144,4 +144,4 @@ public class Wire {", sinkId='" + sinkId + '\'' +'}';}-}\ No newline at end of file+}diff --git a/model/src/main/java/org/openremote/model/gateway/GatewayClientResource.java b/model/src/main/java/org/openremote/model/gateway/GatewayClientResource.javaindex d6296204a..83e9d35ed 100644--- a/model/src/main/java/org/openremote/model/gateway/GatewayClientResource.java+++ b/model/src/main/java/org/openremote/model/gateway/GatewayClientResource.java@@ -23,13 +23,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.asset.agent.ConnectionStatus;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;import java.util.List;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** Resource for managing the connection to a central managerdiff --git a/model/src/main/java/org/openremote/model/gateway/GatewayConnection.java b/model/src/main/java/org/openremote/model/gateway/GatewayConnection.javaindex 7de7c97d8..a594d5bbe 100644--- a/model/src/main/java/org/openremote/model/gateway/GatewayConnection.java+++ b/model/src/main/java/org/openremote/model/gateway/GatewayConnection.java@@ -22,14 +22,14 @@ package org.openremote.model.gateway;import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Id;-import javax.persistence.Table;-import javax.validation.constraints.Max;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Id;+import jakarta.persistence.Table;+import jakarta.validation.constraints.Max;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;@Entity@Table(name = "GATEWAY_CONNECTION")diff --git a/model/src/main/java/org/openremote/model/http/RequestParams.java b/model/src/main/java/org/openremote/model/http/RequestParams.javaindex f72a20b7e..6b69e04e4 100644--- a/model/src/main/java/org/openremote/model/http/RequestParams.java+++ b/model/src/main/java/org/openremote/model/http/RequestParams.java@@ -21,8 +21,8 @@ package org.openremote.model.http;import org.openremote.model.util.TextUtil;-import javax.ws.rs.HeaderParam;-import javax.ws.rs.core.*;+import jakarta.ws.rs.HeaderParam;+import jakarta.ws.rs.core.*;import java.net.URI;public class RequestParams {diff --git a/model/src/main/java/org/openremote/model/manager/ConfigurationResource.java b/model/src/main/java/org/openremote/model/manager/ConfigurationResource.javaindex d3d570fa4..98e4c9b01 100644--- a/model/src/main/java/org/openremote/model/manager/ConfigurationResource.java+++ b/model/src/main/java/org/openremote/model/manager/ConfigurationResource.java@@ -24,11 +24,11 @@ import org.openremote.model.Constants;import org.openremote.model.file.FileInfo;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;import java.io.IOException;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Configuration")@Path("configuration")diff --git a/model/src/main/java/org/openremote/model/map/MapResource.java b/model/src/main/java/org/openremote/model/map/MapResource.javaindex eca221b13..6554b99d9 100644--- a/model/src/main/java/org/openremote/model/map/MapResource.java+++ b/model/src/main/java/org/openremote/model/map/MapResource.java@@ -24,8 +24,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.http.RequestParams;import org.openremote.model.manager.MapRealmConfig;-import javax.ws.rs.*;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.MediaType;import java.io.IOException;import java.util.Map;diff --git a/model/src/main/java/org/openremote/model/notification/NotificationResource.java b/model/src/main/java/org/openremote/model/notification/NotificationResource.javaindex 507959462..b88fa2e5b 100644--- a/model/src/main/java/org/openremote/model/notification/NotificationResource.java+++ b/model/src/main/java/org/openremote/model/notification/NotificationResource.java@@ -23,10 +23,10 @@ import com.fasterxml.jackson.databind.JsonNode;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Notification")@Path("notification")diff --git a/model/src/main/java/org/openremote/model/notification/SentNotification.java b/model/src/main/java/org/openremote/model/notification/SentNotification.javaindex fdd624ad5..869a7de85 100644--- a/model/src/main/java/org/openremote/model/notification/SentNotification.java+++ b/model/src/main/java/org/openremote/model/notification/SentNotification.java@@ -19,8 +19,9 @@*/package org.openremote.model.notification;-import javax.persistence.*;-import javax.validation.constraints.NotNull;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;+import jakarta.persistence.*;+import jakarta.validation.constraints.NotNull;import java.util.Date;import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;@@ -32,7 +33,8 @@ public class SentNotification {@Id@Column(name = "ID")- @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @SequenceGenerator(name = PERSISTENCE_SEQUENCE_ID_GENERATOR, initialValue = 1000, allocationSize = 1)protected Long id;@Column(name = "NAME")@@ -60,7 +62,7 @@ public class SentNotification {protected String sourceId;@Column(name = "MESSAGE", columnDefinition = "jsonb")- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)protected AbstractNotificationMessage message;@Column(name = "ERROR", length = 4096)diff --git a/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java b/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.javaindex 9b017304d..d02ea7510 100644--- a/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java+++ b/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java@@ -19,49 +19,38 @@*/package org.openremote.model.persistence;-import org.hibernate.dialect.Dialect;-import org.hibernate.engine.spi.SharedSessionContractImplementor;-import org.hibernate.internal.util.compare.ComparableComparator;-import org.hibernate.type.AbstractSingleColumnStandardBasicType;-import org.hibernate.type.LiteralType;-import org.hibernate.type.VersionType;-import org.hibernate.type.descriptor.java.InstantJavaDescriptor;-import org.hibernate.type.descriptor.sql.BigIntTypeDescriptor;+import com.vladmihalcea.hibernate.type.MutableType;+import com.vladmihalcea.hibernate.type.util.Configuration;+import org.hibernate.type.descriptor.java.InstantJavaType;+import org.hibernate.type.descriptor.jdbc.BigIntJdbcType;import java.time.Instant;-import java.util.Comparator;-public class EpochMillisInstantType extends AbstractSingleColumnStandardBasicType<Instant>- implements VersionType<Instant>, LiteralType<Instant> {+public class EpochMillisInstantType extends MutableType<Instant, BigIntJdbcType, InstantJavaType> {public static final String TYPE_NAME = "epoch-millis-instant";public EpochMillisInstantType() {- super( BigIntTypeDescriptor.INSTANCE, InstantJavaDescriptor.INSTANCE );+ super(+ Instant.class,+ BigIntJdbcType.INSTANCE,+ InstantJavaType.INSTANCE+ );}- @Override- public String objectToSQLString(Instant value, Dialect dialect) throws Exception {- return Long.toString(value.toEpochMilli());+ public EpochMillisInstantType(Configuration configuration) {+ super(+ Instant.class,+ BigIntJdbcType.INSTANCE,+ InstantJavaType.INSTANCE,+ configuration+ );}- @Override- public Instant seed(SharedSessionContractImplementor session) {- return Instant.now();+ public EpochMillisInstantType(org.hibernate.type.spi.TypeBootstrapContext typeBootstrapContext) {+ this(new Configuration(typeBootstrapContext.getConfigurationSettings()));}- @Override- public Instant next(Instant current, SharedSessionContractImplementor session) {- return Instant.now();- }-- @SuppressWarnings("unchecked")- @Override- public Comparator<Instant> getComparator() {- return ComparableComparator.INSTANCE;- }-- @Overridepublic String getName() {return TYPE_NAME;}diff --git a/container/src/main/java/org/openremote/container/persistence/LTreeType.java b/model/src/main/java/org/openremote/model/persistence/LTreeType.javasimilarity index 55%rename from container/src/main/java/org/openremote/container/persistence/LTreeType.javarename to model/src/main/java/org/openremote/model/persistence/LTreeType.javaindex 6e7df4fff..117ba7e63 100644--- a/container/src/main/java/org/openremote/container/persistence/LTreeType.java+++ b/model/src/main/java/org/openremote/model/persistence/LTreeType.java@@ -17,12 +17,11 @@* 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.persistence;+package org.openremote.model.persistence;import org.hibernate.HibernateException;import org.hibernate.engine.spi.SharedSessionContractImplementor;import org.hibernate.usertype.UserType;-import org.openremote.model.Constants;import java.io.Serializable;import java.sql.PreparedStatement;@@ -31,45 +30,43 @@ import java.sql.SQLException;import java.sql.Types;import java.util.Arrays;-public class LTreeType implements UserType {+public class LTreeType implements UserType<String[]> {- public static final String TYPE = Constants.PERSISTENCE_LTREE_TYPE;+ public static final String TYPE = "ltree";@Override- public int[] sqlTypes() {- return new int[] {Types.OTHER};+ public int getSqlType() {+ return Types.OTHER;}- @SuppressWarnings("rawtypes")@Override- public Class returnedClass() {+ public Class<String[]> returnedClass() {return String[].class;}@Override- public boolean equals(Object x, Object y) throws HibernateException {- return x.equals(y);+ public boolean equals(String[] x, String[] y) throws HibernateException {+ return Arrays.equals(x, y);}@Override- public int hashCode(Object x) throws HibernateException {- return x.hashCode();+ public int hashCode(String[] x) throws HibernateException {+ return Arrays.hashCode(x);}@Override- public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {- String ltreeStr = rs.getString(names[0]);+ public String[] nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {+ String ltreeStr = rs.getString(position);return ltreeStr != null ? ltreeStr.split("\\.") : null;}@Override- public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {- st.setObject(index, value != null ? String.join(".", (String[])value) : null, Types.OTHER);+ public void nullSafeSet(PreparedStatement st, String[] value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {+ st.setObject(index, value != null ? String.join(".", value) : null, Types.OTHER);}@Override- public Object deepCopy(Object value) throws HibernateException {- String[] v = (String[])value;+ public String[] deepCopy(String[] v) throws HibernateException {return v == null ? null : Arrays.copyOf(v, v.length);}@@ -79,17 +76,17 @@ public class LTreeType implements UserType {}@Override- public Serializable disassemble(Object value) throws HibernateException {- return (String[])value;+ public Serializable disassemble(String[] value) throws HibernateException {+ return value;}@Override- public Object assemble(Serializable cached, Object owner) throws HibernateException {- return cached;+ public String[] assemble(Serializable cached, Object owner) throws HibernateException {+ return deepCopy((String[])cached);}@Override- public Object replace(Object original, Object target, Object owner)+ public String[] replace(String[] original, String[] target, Object owner)throws HibernateException {// TODO Auto-generated method stubreturn deepCopy(original);diff --git a/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java b/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.javaindex 7b111e143..d712ff43a 100644--- a/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java+++ b/model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java@@ -183,7 +183,8 @@ public final class ProtocolUtil {if (valRef.get() == null) {Protocol.LOG.warning("Failed to convert value: " + fromType + " -> " + toType);- Protocol.LOG.warning("Cannot send linked attribute update");+ Protocol.LOG.warning("Cannot send linked attribute update: assetId=" + assetId + ", attribute=" + attribute.getName());+ return new Pair<>(true, null);}}diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.javaindex d6ee40e23..60acfe1c2 100644--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java@@ -23,17 +23,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;+import com.vladmihalcea.hibernate.type.array.StringArrayType;import org.openremote.model.Constants;import org.openremote.model.security.ClientRole;-import javax.persistence.*;-import javax.validation.constraints.Min;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.persistence.*;+import jakarta.validation.constraints.Min;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import java.util.Arrays;import java.util.Date;-import static javax.persistence.DiscriminatorType.STRING;+import static jakarta.persistence.DiscriminatorType.STRING;import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;@SuppressWarnings("unchecked")@@ -53,7 +54,8 @@ public abstract class ProvisioningConfig<T, U extends ProvisioningConfig<T, U>>@Id@Column(name = "ID")@Min(1)- @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @SequenceGenerator(name = PERSISTENCE_SEQUENCE_ID_GENERATOR, initialValue = 1000, allocationSize = 1)protected Long id;@Temporal(TemporalType.TIMESTAMP)@@ -85,7 +87,7 @@ public abstract class ProvisioningConfig<T, U extends ProvisioningConfig<T, U>>protected boolean restrictedUser;@Column(name = "ROLES", columnDefinition = "client_role[]")- @org.hibernate.annotations.Type(type = Constants.PERSISTENCE_STRING_ARRAY_TYPE)+ @org.hibernate.annotations.Type(StringArrayType.class)@Enumerated(EnumType.STRING)protected ClientRole[] userRoles;diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.javaindex 7e914387d..48c7c4c15 100644--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java@@ -22,10 +22,10 @@ package org.openremote.model.provisioning;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.http.RequestParams;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Provisioning")@Path("provisioning")diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.javaindex f33279cbf..9e733c368 100644--- a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java@@ -20,12 +20,13 @@package org.openremote.model.provisioning;import com.fasterxml.jackson.annotation.JsonIgnore;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;import org.openremote.model.util.TextUtil;-import javax.persistence.Column;-import javax.persistence.DiscriminatorValue;-import javax.persistence.Entity;-import javax.persistence.Transient;+import jakarta.persistence.Column;+import jakarta.persistence.DiscriminatorValue;+import jakarta.persistence.Entity;+import jakarta.persistence.Transient;import java.security.cert.CertificateException;import java.security.cert.X509Certificate;@@ -44,7 +45,7 @@ public class X509ProvisioningConfig extends ProvisioningConfig<X509ProvisioningDboolean valid = true;@Column(name = DATA_PROPERTY_NAME, columnDefinition = "jsonb")- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)protected X509ProvisioningData data;protected X509ProvisioningConfig() {}diff --git a/model/src/main/java/org/openremote/model/query/filter/NameValuePredicate.java b/model/src/main/java/org/openremote/model/query/filter/NameValuePredicate.javaindex 2a90d0028..b91286c10 100644--- a/model/src/main/java/org/openremote/model/query/filter/NameValuePredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/NameValuePredicate.java@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonValue;import org.openremote.model.value.AbstractNameValueHolder;import org.openremote.model.value.NameHolder;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.Arrays;/**diff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.javaindex 819eba088..fed4ae759 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -24,9 +24,9 @@ import org.hibernate.annotations.Formula;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;import java.util.Date;/**diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.javaindex 911f68435..a883bf44a 100644--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java@@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;import java.util.Date;/**diff --git a/model/src/main/java/org/openremote/model/rules/RealmRuleset.java b/model/src/main/java/org/openremote/model/rules/RealmRuleset.javaindex 922dad1b2..bab9e2b2f 100644--- a/model/src/main/java/org/openremote/model/rules/RealmRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/RealmRuleset.java@@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Table;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Table;import java.util.Date;/**diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.javaindex a51d55089..7dbc7dc31 100644--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java@@ -24,13 +24,13 @@ import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.rules.geofence.GeofenceDefinition;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;import java.util.List;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Rule")@Path("rules")diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.javaindex 56f7c50fa..e496a272b 100644--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java@@ -24,12 +24,13 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.databind.node.BooleanNode;import com.fasterxml.jackson.databind.node.ObjectNode;+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;import org.openremote.model.calendar.CalendarEvent;import org.openremote.model.util.ValueUtil;-import javax.persistence.*;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Size;+import jakarta.persistence.*;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Size;import java.util.Date;import java.util.Optional;@@ -65,7 +66,8 @@ public abstract class Ruleset {@Id@Column(name = "ID")- @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @SequenceGenerator(name = PERSISTENCE_SEQUENCE_ID_GENERATOR, initialValue = 1000, allocationSize = 1)protected Long id;@Version@@ -98,7 +100,7 @@ public abstract class Ruleset {protected Lang lang = Lang.GROOVY;@Column(name = "META", columnDefinition = "jsonb")- @org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)+ @org.hibernate.annotations.Type(JsonBinaryType.class)protected ObjectNode meta;@Transientdiff --git a/model/src/main/java/org/openremote/model/rules/Webhooks.java b/model/src/main/java/org/openremote/model/rules/Webhooks.javaindex c48248a52..fc543228f 100644--- a/model/src/main/java/org/openremote/model/rules/Webhooks.java+++ b/model/src/main/java/org/openremote/model/rules/Webhooks.java@@ -22,8 +22,8 @@ package org.openremote.model.rules;import org.openremote.model.util.TsIgnore;import org.openremote.model.webhook.Webhook;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;@TsIgnorepublic abstract class Webhooks {diff --git a/model/src/main/java/org/openremote/model/rules/flow/FlowResource.java b/model/src/main/java/org/openremote/model/rules/flow/FlowResource.javaindex 507a058f9..12deabeea 100644--- a/model/src/main/java/org/openremote/model/rules/flow/FlowResource.java+++ b/model/src/main/java/org/openremote/model/rules/flow/FlowResource.java@@ -2,9 +2,9 @@ package org.openremote.model.rules.flow;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.http.RequestParams;-import javax.ws.rs.*;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Flow")@Path("flow")diff --git a/model/src/main/java/org/openremote/model/rules/json/RuleActionWebhook.java b/model/src/main/java/org/openremote/model/rules/json/RuleActionWebhook.javaindex 85d187f85..ccb5d0770 100644--- a/model/src/main/java/org/openremote/model/rules/json/RuleActionWebhook.java+++ b/model/src/main/java/org/openremote/model/rules/json/RuleActionWebhook.java@@ -21,8 +21,8 @@ package org.openremote.model.rules.json;import org.openremote.model.webhook.Webhook;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.MediaType;+import jakarta.ws.rs.client.WebTarget;+import jakarta.ws.rs.core.MediaType;public class RuleActionWebhook extends RuleAction {public Webhook webhook;diff --git a/model/src/main/java/org/openremote/model/security/Realm.java b/model/src/main/java/org/openremote/model/security/Realm.javaindex c79ec5150..421160ea0 100644--- a/model/src/main/java/org/openremote/model/security/Realm.java+++ b/model/src/main/java/org/openremote/model/security/Realm.java@@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import org.hibernate.annotations.Formula;import org.hibernate.annotations.Subselect;-import javax.persistence.*;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;-import javax.validation.constraints.Size;+import jakarta.persistence.*;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;+import jakarta.validation.constraints.Size;import java.lang.reflect.Field;import java.util.*;diff --git a/model/src/main/java/org/openremote/model/security/RealmResource.java b/model/src/main/java/org/openremote/model/security/RealmResource.javaindex 5317a39a7..b0e4f1bb4 100644--- a/model/src/main/java/org/openremote/model/security/RealmResource.java+++ b/model/src/main/java/org/openremote/model/security/RealmResource.java@@ -23,11 +23,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** Manage realms.diff --git a/model/src/main/java/org/openremote/model/security/RealmRole.java b/model/src/main/java/org/openremote/model/security/RealmRole.javaindex 6e074a8ef..1b7db01f0 100644--- a/model/src/main/java/org/openremote/model/security/RealmRole.java+++ b/model/src/main/java/org/openremote/model/security/RealmRole.java@@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonValue;import org.hibernate.annotations.Subselect;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Id;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Id;import java.util.Objects;@Entitydiff --git a/model/src/main/java/org/openremote/model/security/User.java b/model/src/main/java/org/openremote/model/security/User.javaindex 30563125b..b3797eaf1 100644--- a/model/src/main/java/org/openremote/model/security/User.java+++ b/model/src/main/java/org/openremote/model/security/User.java@@ -26,13 +26,13 @@ import org.hibernate.annotations.Formula;import org.hibernate.annotations.Subselect;import org.openremote.model.persistence.EpochMillisInstantType;-import javax.persistence.*;-import javax.validation.constraints.Email;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;-import javax.validation.constraints.Size;-import javax.ws.rs.core.MultivaluedHashMap;-import javax.ws.rs.core.MultivaluedMap;+import jakarta.persistence.*;+import jakarta.validation.constraints.Email;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;+import jakarta.validation.constraints.Size;+import jakarta.ws.rs.core.MultivaluedHashMap;+import jakarta.ws.rs.core.MultivaluedMap;import java.lang.reflect.Field;import java.time.Instant;import java.util.ArrayList;@@ -77,7 +77,7 @@ public class User {protected Boolean enabled;@Column(name = "CREATED_TIMESTAMP")- @org.hibernate.annotations.Type(type = EpochMillisInstantType.TYPE_NAME)+ @org.hibernate.annotations.Type(EpochMillisInstantType.class)protected Instant createdOn;@Formula("(SELECT C.SECRET FROM PUBLIC.CLIENT C WHERE C.ID = SERVICE_ACCOUNT_CLIENT_LINK)")diff --git a/model/src/main/java/org/openremote/model/security/UserAttribute.java b/model/src/main/java/org/openremote/model/security/UserAttribute.javaindex cff51c1ea..d9baadf7c 100644--- a/model/src/main/java/org/openremote/model/security/UserAttribute.java+++ b/model/src/main/java/org/openremote/model/security/UserAttribute.java@@ -22,9 +22,9 @@ package org.openremote.model.security;import com.fasterxml.jackson.annotation.JsonCreator;import org.hibernate.annotations.Subselect;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Id;+import jakarta.persistence.Column;+import jakarta.persistence.Entity;+import jakarta.persistence.Id;@Entity@Subselect("select * from PUBLIC.USER_ATTRIBUTE") // Map this immutable to an SQL view, don't use/create tablediff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.javaindex 0a0398e27..b1c3ca00e 100644--- a/model/src/main/java/org/openremote/model/security/UserResource.java+++ b/model/src/main/java/org/openremote/model/security/UserResource.java@@ -24,11 +24,11 @@ import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;import org.openremote.model.query.UserQuery;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;/*** Manage users in realms and get info of current user.diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java b/model/src/main/java/org/openremote/model/syslog/SyslogConfig.javaindex ac6a89e14..294d72cce 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogConfig.java@@ -21,7 +21,7 @@ package org.openremote.model.syslog;import org.hibernate.validator.constraints.Range;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.util.Arrays;public class SyslogConfig {diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.javaindex 8d737b72a..2297c58e6 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java@@ -19,11 +19,12 @@*/package org.openremote.model.syslog;+import org.openremote.model.Constants;import org.openremote.model.event.shared.EventFilter;import org.openremote.model.event.shared.SharedEvent;-import javax.persistence.*;-import javax.validation.constraints.NotNull;+import jakarta.persistence.*;+import jakarta.validation.constraints.NotNull;import java.util.*;import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;@@ -86,7 +87,8 @@ public class SyslogEvent extends SharedEvent {@Id@Column(name = "ID")- @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)+ @SequenceGenerator(name = PERSISTENCE_SEQUENCE_ID_GENERATOR, initialValue = 1000, allocationSize = 1)protected Long id;@NotNulldiff --git a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java b/model/src/main/java/org/openremote/model/syslog/SyslogResource.javaindex 52cbe82b6..49683861f 100644--- a/model/src/main/java/org/openremote/model/syslog/SyslogResource.java+++ b/model/src/main/java/org/openremote/model/syslog/SyslogResource.java@@ -22,13 +22,13 @@ package org.openremote.model.syslog;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;import org.openremote.model.http.RequestParams;-import javax.annotation.security.RolesAllowed;-import javax.validation.Valid;-import javax.ws.rs.*;-import javax.ws.rs.core.Response;+import jakarta.annotation.security.RolesAllowed;+import jakarta.validation.Valid;+import jakarta.ws.rs.*;+import jakarta.ws.rs.core.Response;import java.util.List;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Syslog")@Path("syslog")diff --git a/model/src/main/java/org/openremote/model/system/StatusResource.java b/model/src/main/java/org/openremote/model/system/StatusResource.javaindex 1cb8c2193..45f8a1e9a 100644--- a/model/src/main/java/org/openremote/model/system/StatusResource.java+++ b/model/src/main/java/org/openremote/model/system/StatusResource.java@@ -23,12 +23,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import io.swagger.v3.oas.annotations.tags.Tag;import org.openremote.model.Constants;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.Produces;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Tag(name = "Status")@Path("")diff --git a/model/src/main/java/org/openremote/model/util/ValueUtil.java b/model/src/main/java/org/openremote/model/util/ValueUtil.javaindex 7e5b7e78c..3912d426e 100644--- a/model/src/main/java/org/openremote/model/util/ValueUtil.java+++ b/model/src/main/java/org/openremote/model/util/ValueUtil.java@@ -50,11 +50,11 @@ import org.reflections.scanners.SubTypesScanner;import org.reflections.util.ClasspathHelper;import org.reflections.util.ConfigurationBuilder;-import javax.persistence.Entity;-import javax.validation.ConstraintViolation;-import javax.validation.Validation;-import javax.validation.Validator;-import javax.validation.constraints.NotNull;+import jakarta.persistence.Entity;+import jakarta.validation.ConstraintViolation;+import jakarta.validation.Validation;+import jakarta.validation.Validator;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.lang.reflect.*;import java.math.BigDecimal;diff --git a/model/src/main/java/org/openremote/model/validation/AssetValid.java b/model/src/main/java/org/openremote/model/validation/AssetValid.javaindex 290974f4f..6f7c4befa 100644--- a/model/src/main/java/org/openremote/model/validation/AssetValid.java+++ b/model/src/main/java/org/openremote/model/validation/AssetValid.java@@ -26,10 +26,10 @@ import org.openremote.model.util.TsIgnore;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.AttributeDescriptor;-import javax.validation.Constraint;-import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;-import javax.validation.Payload;+import jakarta.validation.Constraint;+import jakarta.validation.ConstraintValidator;+import jakarta.validation.ConstraintValidatorContext;+import jakarta.validation.Payload;import java.lang.annotation.Documented;import java.lang.annotation.Repeatable;import java.lang.annotation.Retention;diff --git a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.javaindex 657d6b211..942a1d7c1 100644--- a/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java+++ b/model/src/main/java/org/openremote/model/value/AbstractNameValueHolder.java@@ -28,10 +28,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.validation.Valid;-import javax.validation.constraints.NotBlank;-import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotBlank;+import jakarta.validation.constraints.NotNull;+import jakarta.validation.constraints.Pattern;import java.io.Serializable;import java.util.Objects;import java.util.Optional;diff --git a/model/src/main/java/org/openremote/model/value/JsonPathFilter.java b/model/src/main/java/org/openremote/model/value/JsonPathFilter.javaindex 2e08e1aed..9ed6a2d38 100644--- a/model/src/main/java/org/openremote/model/value/JsonPathFilter.java+++ b/model/src/main/java/org/openremote/model/value/JsonPathFilter.java@@ -33,7 +33,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;/*** This filter works on any type of data; when applying the filter the data should be converted to JSON representationdiff --git a/model/src/main/java/org/openremote/model/value/MetaItemType.java b/model/src/main/java/org/openremote/model/value/MetaItemType.javaindex e6ee1c7d1..08180c07e 100644--- a/model/src/main/java/org/openremote/model/value/MetaItemType.java+++ b/model/src/main/java/org/openremote/model/value/MetaItemType.java@@ -27,7 +27,7 @@ import org.openremote.model.attribute.AttributeLink;import org.openremote.model.rules.AssetState;import org.openremote.model.util.TsIgnore;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.Pattern;import java.util.Date;@TsIgnorediff --git a/model/src/main/java/org/openremote/model/value/NameHolder.java b/model/src/main/java/org/openremote/model/value/NameHolder.javaindex 00455fc28..1b570b686 100644--- a/model/src/main/java/org/openremote/model/value/NameHolder.java+++ b/model/src/main/java/org/openremote/model/value/NameHolder.java@@ -21,7 +21,7 @@ package org.openremote.model.value;import com.fasterxml.jackson.annotation.JsonProperty;-import javax.validation.constraints.Pattern;+import jakarta.validation.constraints.Pattern;/*** Identifies an item that holds a named property, the name should be very simple, as we use them in SQL pathdiff --git a/model/src/main/java/org/openremote/model/value/impl/PeriodAndDuration.java b/model/src/main/java/org/openremote/model/value/impl/PeriodAndDuration.javaindex a7ee32cae..a56e89984 100644--- a/model/src/main/java/org/openremote/model/value/impl/PeriodAndDuration.java+++ b/model/src/main/java/org/openremote/model/value/impl/PeriodAndDuration.java@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import net.fortuna.ical4j.model.Dur;import org.openremote.model.util.TextUtil;-import javax.validation.constraints.NotNull;+import jakarta.validation.constraints.NotNull;import java.io.Serializable;import java.time.Duration;import java.time.Period;diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.javaindex 83debdee3..d82f45df2 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java+++ b/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java@@ -27,7 +27,7 @@ import org.openremote.model.value.ValueType;import static org.openremote.model.Constants.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class HarvestRobotAsset extends Asset<HarvestRobotAsset> {diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.javaindex ce3526a6f..5f6874b69 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java+++ b/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java@@ -26,7 +26,7 @@ import org.openremote.model.value.ValueType;import static org.openremote.model.Constants.*;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class IrrigationAsset extends Asset<IrrigationAsset> {diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.javaindex 9990907b2..4e7c80ba8 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java+++ b/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java@@ -25,7 +25,7 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueConstraint;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import static org.openremote.model.Constants.*;diff --git a/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.javaindex 2a7072db1..33fca9333 100644--- a/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/MockAgent.java@@ -24,7 +24,7 @@ import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;-import javax.persistence.Entity;+import jakarta.persistence.Entity;import java.util.Optional;@Entitydiff --git a/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.javaindex c0d382a4e..59d2db07b 100644--- a/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/HTTPServerTestAgent.java@@ -23,7 +23,7 @@ import org.openremote.agent.protocol.http.AbstractHTTPServerAgent;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.DefaultAgentLink;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class HTTPServerTestAgent extends AbstractHTTPServerAgent<HTTPServerTestAgent, TestHTTPServerProtocol, DefaultAgentLink> {diff --git a/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.javaindex 6c8a01731..f135b94b1 100644--- a/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/http/TestResource.java@@ -22,10 +22,10 @@ package org.openremote.setup.integration.protocol.http;import org.openremote.model.Constants;import org.openremote.model.asset.Asset;-import javax.annotation.security.RolesAllowed;-import javax.ws.rs.*;+import jakarta.annotation.security.RolesAllowed;+import jakarta.ws.rs.*;-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;@Path("resource1")public interface TestResource {diff --git a/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.java b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.javaindex ab70c7785..92a7e1a09 100644--- a/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.java+++ b/setup/src/integration/java/org/openremote/setup/integration/protocol/velbus/MockVelbusAgent.java@@ -23,7 +23,7 @@ import org.openremote.agent.protocol.velbus.VelbusAgent;import org.openremote.agent.protocol.velbus.VelbusAgentLink;import org.openremote.model.asset.agent.AgentDescriptor;-import javax.persistence.Entity;+import jakarta.persistence.Entity;@Entitypublic class MockVelbusAgent extends VelbusAgent<MockVelbusAgent, MockVelbusProtocol> {diff --git a/test/build.gradle b/test/build.gradleindex ad859d39b..137d356ea 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -121,6 +121,7 @@ publishing {}repositories {+ mavenCentral()maven {if (!version.endsWith('-LOCAL')) {credentials {diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovyindex 71bf3f5f9..218f9bdb6 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetIntegrityTest.groovy@@ -13,7 +13,7 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.WebApplicationException+import jakarta.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex d1f7d8a27..26aa4cb42 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -15,8 +15,8 @@ import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.ForbiddenException-import javax.ws.rs.WebApplicationException+import jakarta.ws.rs.ForbiddenException+import jakarta.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovyindex 8d9420190..c70f63bc6 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetProcessingTest.groovy@@ -18,7 +18,7 @@ import org.openremote.setup.integration.protocol.MockProtocolimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.persistence.EntityManager+import jakarta.persistence.EntityManagerimport static org.openremote.model.value.ValueType.*import static org.openremote.model.value.MetaItemType.*diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovyindex 9b7647d5e..893b5a765 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy@@ -12,7 +12,7 @@ import org.openremote.model.asset.UserAssetLinkimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specification-import javax.ws.rs.WebApplicationException+import jakarta.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex a8a789ea1..0d73c6197 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -36,7 +36,7 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.WebApplicationException+import jakarta.ws.rs.WebApplicationExceptionimport java.util.concurrent.TimeUnitimport java.util.stream.IntStreamdiff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovyindex 6f678772e..725a46536 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy@@ -18,10 +18,10 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.MediaType-import javax.ws.rs.core.Response+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.MediaType+import jakarta.ws.rs.core.Responseimport java.time.LocalDateTimeimport java.time.temporal.ChronoUnitdiff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovyindex 73d6c6a9e..87b91b165 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy@@ -19,10 +19,10 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.MediaType-import javax.ws.rs.core.Response+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.MediaType+import jakarta.ws.rs.core.Responseimport java.time.LocalDateTimeimport java.time.ZoneOffsetimport java.time.temporal.ChronoUnitdiff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovyindex 5cd627d62..7807caee4 100644--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy@@ -2,6 +2,9 @@ package org.openremote.test.notificationimport com.fasterxml.jackson.databind.node.ObjectNodeimport com.fasterxml.jackson.databind.node.TextNode+import jakarta.mail.Message+import jakarta.mail.internet.InternetAddress+import jakarta.ws.rs.WebApplicationExceptionimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.asset.console.ConsoleResourceImpl@@ -26,9 +29,6 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.mail.Message-import javax.mail.internet.InternetAddress-import javax.ws.rs.WebApplicationExceptionimport java.time.Instantimport java.time.temporal.ChronoUnitimport java.util.concurrent.TimeUnitdiff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovyindex a978bc63e..53911a8dc 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy@@ -20,12 +20,11 @@package org.openremote.test.protocol.httpimport com.fasterxml.jackson.databind.node.ObjectNode-import org.jboss.resteasy.spi.ResteasyUriInfo+import org.jboss.resteasy.specimpl.ResteasyUriInfoimport org.jboss.resteasy.util.BasicAuthHelperimport org.openremote.agent.protocol.http.HTTPAgentimport org.openremote.agent.protocol.http.HTTPAgentLinkimport org.openremote.agent.protocol.http.HTTPProtocol-import org.openremote.agent.protocol.websocket.WebsocketAgentProtocolimport org.openremote.container.web.OAuthServerResponseimport org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingService@@ -49,10 +48,10 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.HttpMethod-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.*+import jakarta.ws.rs.HttpMethod+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.*import java.util.regex.Patternimport static org.openremote.model.value.MetaItemType.AGENT_LINKdiff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovyindex a7b11f709..a7a48c965 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy@@ -22,7 +22,7 @@ package org.openremote.test.protocol.httpimport com.fasterxml.jackson.databind.node.ObjectNodeimport io.undertow.servlet.Servletsimport io.undertow.servlet.api.DeploymentManager-import org.jboss.resteasy.spi.ResteasyUriInfo+import org.jboss.resteasy.specimpl.ResteasyUriInfoimport org.jboss.resteasy.util.BasicAuthHelperimport org.openremote.agent.protocol.http.AbstractHTTPServerProtocolimport org.openremote.container.util.UniqueIdentifierGenerator@@ -46,11 +46,11 @@ import org.openremote.setup.integration.protocol.http.HTTPServerTestAgentimport org.openremote.setup.integration.protocol.http.TestHTTPServerProtocolimport org.openremote.setup.integration.protocol.http.TestResource-import javax.ws.rs.ForbiddenException-import javax.ws.rs.HttpMethod-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.*+import jakarta.ws.rs.ForbiddenException+import jakarta.ws.rs.HttpMethod+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.*import static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovyindex 082a53a58..66e477638 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy@@ -21,7 +21,7 @@ package org.openremote.test.protocol.httpimport org.apache.http.client.utils.URIBuilderimport org.jboss.resteasy.client.jaxrs.ResteasyClient-import org.jboss.resteasy.spi.ResteasyUriInfo+import org.jboss.resteasy.specimpl.ResteasyUriInfoimport org.jboss.resteasy.util.BasicAuthHelperimport org.openremote.model.auth.OAuthClientCredentialsGrantimport org.openremote.model.auth.OAuthGrant@@ -34,9 +34,9 @@ import org.openremote.model.util.ValueUtilimport spock.lang.Sharedimport spock.lang.Specification-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.*+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.*class WebTargetTest extends Specification {diff --git a/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientProtocolTest.groovyindex ac71066bc..8938ef4fe 100644--- a/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientProtocolTest.groovy@@ -23,11 +23,8 @@ import com.icegreen.greenmail.user.GreenMailUserimport com.icegreen.greenmail.util.GreenMailimport com.icegreen.greenmail.util.GreenMailUtilimport com.icegreen.greenmail.util.ServerSetupTest-import org.openremote.agent.protocol.mail.AbstractMailProtocol-import org.openremote.agent.protocol.mail.MailAgent-import org.openremote.agent.protocol.mail.MailAgentLink-import org.openremote.agent.protocol.mail.MailClientBuilder-import org.openremote.agent.protocol.mail.MailProtocol+import jakarta.mail.internet.MimeMessage+import org.openremote.agent.protocol.mail.*import org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageService@@ -46,8 +43,6 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.mail.internet.MimeMessage-import static org.openremote.model.value.MetaItemType.AGENT_LINKimport static org.openremote.model.value.ValueType.TEXTdiff --git a/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientTest.groovyindex 35cfc7bf8..9fbd19741 100644--- a/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/mail/MailClientTest.groovy@@ -13,12 +13,12 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.mail.Message-import javax.mail.Multipart-import javax.mail.internet.InternetAddress-import javax.mail.internet.MimeBodyPart-import javax.mail.internet.MimeMessage-import javax.mail.internet.MimeMultipart+import jakarta.mail.Message+import jakarta.mail.Multipart+import jakarta.mail.internet.InternetAddress+import jakarta.mail.internet.MimeBodyPart+import jakarta.mail.internet.MimeMessage+import jakarta.mail.internet.MimeMultipartimport java.nio.file.Pathsimport java.util.concurrent.CopyOnWriteArrayListdiff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovyindex c6a7f68e5..f2edc7311 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy@@ -50,12 +50,12 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.HttpMethod-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.HttpHeaders-import javax.ws.rs.core.MediaType-import javax.ws.rs.core.Response+import jakarta.ws.rs.HttpMethod+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.HttpHeaders+import jakarta.ws.rs.core.MediaType+import jakarta.ws.rs.core.Responseimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex e7fd8d198..2e66cb488 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -9,7 +9,7 @@ import org.openremote.model.rules.*import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.ws.rs.WebApplicationException+import jakarta.ws.rs.WebApplicationExceptionimport static org.openremote.container.util.MapAccess.getStringimport static org.openremote.manager.security.ManagerIdentityProvider.OR_ADMIN_PASSWORDdiff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex 84179a35f..45f71d921 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -3,6 +3,11 @@ package org.openremote.test.rules.residenceimport com.fasterxml.jackson.databind.JsonNodeimport com.fasterxml.jackson.databind.node.ObjectNodeimport com.google.firebase.messaging.Message+import jakarta.mail.internet.InternetAddress+import jakarta.ws.rs.client.ClientRequestContext+import jakarta.ws.rs.client.ClientRequestFilter+import jakarta.ws.rs.core.MediaType+import jakarta.ws.rs.core.Responseimport net.fortuna.ical4j.model.Recurimport org.openremote.container.timer.TimerServiceimport org.openremote.container.util.MailUtil@@ -44,11 +49,6 @@ import spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import javax.mail.internet.InternetAddress-import javax.ws.rs.client.ClientRequestContext-import javax.ws.rs.client.ClientRequestFilter-import javax.ws.rs.core.MediaType-import javax.ws.rs.core.Responseimport java.time.Durationimport java.time.Instantimport java.time.temporal.ChronoUnit@@ -107,7 +107,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {def "Turn all lights off when console exits the residence geofence"() {List<PushNotificationMessage> pushMessages = []- List<javax.mail.Message> emailMessages = []+ List<jakarta.mail.Message> emailMessages = []List<Notification.Target> pushTargets = []List<Notification.Target> emailTargets = []@@ -155,7 +155,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {}// Assume sent to FCM- mockEmailNotificationHandler.sendMessage(_ as javax.mail.Message) >> {+ mockEmailNotificationHandler.sendMessage(_ as jakarta.mail.Message) >> {email ->emailMessages << email.get(0)return NotificationSendResult.success()@@ -297,15 +297,15 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {and: "an email notification should have been sent to [email protected] with the triggered asset in the body"conditions.eventually {- assert emailMessages.any {it.getRecipients(javax.mail.Message.RecipientType.TO).length == 1- && (it.getRecipients(javax.mail.Message.RecipientType.TO)[0] as InternetAddress).address == "[email protected]"- && MailUtil.toMailMessage(it, true).content == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + ValueUtil.asJSON(outsideLocation).orElse("") + "</td></tr></table>"}+ assert emailMessages.any {it.getRecipients(jakarta.mail.Message.RecipientType.TO).length == 1+ && (it.getRecipients(jakarta.mail.Message.RecipientType.TO)[0] as InternetAddress).address == "[email protected]"+ && MailUtil.toMailMessage(it, true).content == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + ValueUtil.asJSON(outsideLocation).orElse("") + "</td></tr></table>"}}and : "an email notification should have been sent to the asset's linked user(s) (only testuser2 has email notifications enabled)"conditions.eventually {- assert emailMessages.any {it.getRecipients(javax.mail.Message.RecipientType.TO).length == 1- && (it.getRecipients(javax.mail.Message.RecipientType.TO)[0] as InternetAddress).address == "[email protected]"+ assert emailMessages.any {it.getRecipients(jakarta.mail.Message.RecipientType.TO).length == 1+ && (it.getRecipients(jakarta.mail.Message.RecipientType.TO)[0] as InternetAddress).address == "[email protected]"&& MailUtil.toMailMessage(it, true).content == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + ValueUtil.asJSON(outsideLocation).orElse("") + "</td></tr></table>"}}diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex c356e2774..da8a6c8a5 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -39,7 +39,11 @@ import spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport java.time.Instant+import java.time.LocalDateTime+import java.time.ZoneIdimport java.time.ZoneOffset+import java.time.ZonedDateTime+import java.time.temporal.ChronoFieldimport java.time.temporal.ChronoUnitimport java.util.concurrent.TimeUnit@@ -51,6 +55,17 @@ import static org.openremote.model.util.ValueUtil.parseclass ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerContainerTrait {+ def getOccurrenceFromTo(long baseTime, int occurrence) {+ def tomorrowMidnight = LocalDateTime.ofInstant(Instant.ofEpochMilli(baseTime).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS), ZoneId.systemDefault())+ def from = LocalDateTime.of(tomorrowMidnight.get(ChronoField.YEAR), tomorrowMidnight.get(ChronoField.MONTH_OF_YEAR), tomorrowMidnight.get(ChronoField.DAY_OF_MONTH), 6, 0, 0)+ from = from.plus(occurrence, ChronoUnit.WEEKS)+ def to = from.plus(2, ChronoUnit.HOURS)+ return [+ from.atZone(ZoneId.systemDefault()).toDate(),+ to.atZone(ZoneId.systemDefault()).toDate()+ ]+ }+def "Trigger notification when presence is detected and alarm enabled"() {def notificationIds = []@@ -245,11 +260,10 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCowhen: "a validity period is added to the ruleset that enables the ruleset for the next day of the week repeating for 2 weeks"stopPseudoClock()- def tomorrowMidnight = Instant.ofEpochMilli(getClockTimeOf(container)).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS)- def from = tomorrowMidnight.plus(6, ChronoUnit.HOURS)- def to = tomorrowMidnight.plus(8, ChronoUnit.HOURS)+ def baseTime = getClockTimeOf(container)+ def fromTo = getOccurrenceFromTo(baseTime, 0)def recur = new Recur(Recur.WEEKLY, 2)- def validity = new CalendarEvent(from.atZone(ZoneOffset.UTC).toDate(), to.atZone(ZoneOffset.UTC).toDate(), recur)+ def validity = new CalendarEvent(fromTo[0], fromTo[1], recur)ruleset.setValidity(validity)rulesetStorageService.merge(ruleset)ruleset = rulesetStorageService.find(AssetRuleset.class, ruleset.id)@@ -257,11 +271,9 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCothen: "the ruleset should have saved successfully and the validity should also have been stored"assert ruleset != nullassert ruleset.getValidity() != null- assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).key == from.toEpochMilli()- assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).value == to.toEpochMilli()+ assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).key == fromTo[0].getTime()+ assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).value == fromTo[1].getTime()assert ruleset.getValidity().getRecurrence() != null- def recurrenceList = ruleset.getValidity().getRecurrence().getDates(new net.fortuna.ical4j.model.Date(getClockTimeOf(container)), new net.fortuna.ical4j.model.Period(new net.fortuna.ical4j.model.DateTime(new Date(getClockTimeOf(container))), new net.fortuna.ical4j.model.DateTime(tomorrowMidnight.plus(30, ChronoUnit.DAYS).toDate())), Value.DATE)- assert recurrenceList.size() == 2and: "the ruleset state should be deployed and paused"RulesetDeployment rulesetDeployment@@ -276,11 +288,11 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert apartment1Engine.pauseTimers.size() == 0assert apartment1Engine.unpauseTimers.size() == 1// Assert scheduled future delay is correct- assert from.toEpochMilli() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000+ assert fromTo[0].getTime() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000}when: "time advances to within the first valid time period"- advancePseudoClock((from.toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ advancePseudoClock(fromTo[0].getTime()-getClockTimeOf(container)+10000, TimeUnit.MILLISECONDS, container)apartment1Engine.unPauseRuleset(rulesetDeployment)then: "the ruleset status should be un-paused"@@ -291,11 +303,10 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoand: "the next pause of the ruleset should be scheduled"assert apartment1Engine.pauseTimers.size() == 1assert apartment1Engine.unpauseTimers.size() == 0- // Assert scheduled future delay is correct- assert to.toEpochMilli() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000+ assert fromTo[1].getTime() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000when: "time advances past the first expiry the ruleset is paused again"- advancePseudoClock((to.toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ advancePseudoClock((fromTo[1].getTime()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)apartment1Engine.pauseRuleset(rulesetDeployment)then: "the ruleset status should be paused"@@ -303,14 +314,16 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert rulesetDeployment.status == RulesetStatus.PAUSED}- and: "the next unpause of the ruleset should be scheduled"+ when: "the next occurrence is calculated"+ fromTo = getOccurrenceFromTo(baseTime, 1)++ then: "the next unpause of the ruleset should be scheduled"assert apartment1Engine.pauseTimers.size() == 0assert apartment1Engine.unpauseTimers.size() == 1- // Assert scheduled future delay is correct- assert from.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000+ assert fromTo[0].getTime() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000when: "time advances to within the next valid time period"- advancePseudoClock((from.plus(7, ChronoUnit.DAYS).plus(61, ChronoUnit.MINUTES).toEpochMilli() - getClockTimeOf(container)), TimeUnit.MILLISECONDS, container)+ advancePseudoClock(fromTo[0].getTime() - getClockTimeOf(container) + (61*60000), TimeUnit.MILLISECONDS, container)apartment1Engine.unPauseRuleset(rulesetDeployment)then: "the ruleset status should be un-paused"@@ -322,10 +335,10 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert apartment1Engine.pauseTimers.size() == 1assert apartment1Engine.unpauseTimers.size() == 0// Assert scheduled future delay is correct- assert to.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000+ assert fromTo[1].getTime() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000when: "time advances past the second expiry the ruleset is paused again"- advancePseudoClock((to.plus(7, ChronoUnit.DAYS).plus(61, ChronoUnit.MINUTES).toEpochMilli()-getClockTimeOf(container)), TimeUnit.MILLISECONDS, container)+ advancePseudoClock(fromTo[1].getTime() - getClockTimeOf(container) + (45*60000), TimeUnit.MILLISECONDS, container)apartment1Engine.pauseRuleset(rulesetDeployment)then: "the ruleset status should be expired"diff --git a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovyindex 316686bb1..293c26b8c 100644--- a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy@@ -32,7 +32,7 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specification-import javax.ws.rs.ForbiddenException+import jakarta.ws.rs.ForbiddenExceptionimport static org.openremote.container.security.IdentityProvider.OR_ADMIN_PASSWORDimport static org.openremote.container.security.IdentityProvider.OR_ADMIN_PASSWORD_DEFAULTdiff --git a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovyindex a286a82b5..cc6d592c4 100644--- a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy@@ -24,6 +24,7 @@ import org.apache.camel.builder.RouteBuilderimport org.jboss.resteasy.client.jaxrs.ResteasyClientimport org.jboss.resteasy.client.jaxrs.ResteasyClientBuilderimport org.jboss.resteasy.client.jaxrs.ResteasyWebTarget+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImplimport org.keycloak.representations.AccessTokenResponseimport org.openremote.container.Containerimport org.openremote.container.message.MessageBrokerService@@ -60,12 +61,12 @@ import org.openremote.model.security.Userimport org.slf4j.Loggerimport org.slf4j.LoggerFactory-import javax.persistence.TypedQuery-import javax.websocket.ClientEndpointConfig-import javax.websocket.Endpoint-import javax.websocket.Session-import javax.websocket.WebSocketContainer-import javax.ws.rs.core.UriBuilder+import jakarta.persistence.TypedQuery+import jakarta.websocket.ClientEndpointConfig+import jakarta.websocket.Endpoint+import jakarta.websocket.Session+import jakarta.websocket.WebSocketContainer+import jakarta.ws.rs.core.UriBuilderimport java.util.concurrent.TimeUnitimport java.util.logging.Handlerimport java.util.stream.Collectors@@ -460,9 +461,9 @@ trait ContainerTrait {ResteasyClientBuilder createClient() {ResteasyClientBuilder clientBuilder =- new ResteasyClientBuilder()- .establishConnectionTimeout(2, SECONDS)- .socketTimeout(15, SECONDS)+ new ResteasyClientBuilderImpl()+ .connectTimeout(2, SECONDS)+ .readTimeout(15, SECONDS).connectionPoolSize(10)return WebClient.registerDefaults(clientBuilder)}diff --git a/ui/app/manager/info.json b/ui/app/manager/info.jsondeleted file mode 100644index 292d994ae..000000000--- a/ui/app/manager/info.json+++ /dev/null@@ -1,6 +0,0 @@-{- "consoleAppIncompatible": false,- "realms": ["master", "smartcity"],- "providers": ["geofence", "push", "storage"],- "description": "The default app of OpenRemote"-}