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
Migrate OpenRemote to Java 21 LTS (#1526)
Panos Kalogeropoulos143a830dca25
diff --git a/.ci_cd/aws/provision_account.sh b/.ci_cd/aws/provision_account.shindex a7d8519e2..0742325c2 100644--- a/.ci_cd/aws/provision_account.sh+++ b/.ci_cd/aws/provision_account.sh@@ -296,12 +296,12 @@ STACK_ID=$(aws cloudformation create-stack --capabilities CAPABILITY_NAMED_IAM -# Wait for cloud formation stack status to be CREATE_*echo "Waiting for stack to be created"-STATUS=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --query "Stacks[?StackId=='$STACK_ID'].StackStatus" --output text $ACCOUNT_PROFILE 2>/dev/null)+STATUS=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --query "Stacks[0].StackStatus" --output text $ACCOUNT_PROFILE 2>/dev/null)while [[ "$STATUS" == 'CREATE_IN_PROGRESS' ]]; doecho "Stack creation is still in progress .. Sleeping 30 seconds"sleep 30- STATUS=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --query "Stacks[?StackId=='$STACK_ID'].StackStatus" --output text $ACCOUNT_PROFILE 2>/dev/null)+ STATUS=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --query "Stacks[0].StackStatus" --output text $ACCOUNT_PROFILE 2>/dev/null)doneif [ "$STATUS" != 'CREATE_COMPLETE' ] && [ "$STATUS" != 'UPDATE_COMPLETE' ]; thendiff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.ymlindex 769289aaf..d69602acf 100644--- a/.github/workflows/ci_cd.yml+++ b/.github/workflows/ci_cd.yml@@ -602,13 +602,13 @@ jobs:version: latestinstall: true- - name: Set up JDK 17 and gradle cache+ - name: Set up JDK 21 and gradle cacheid: javaif: ${{ steps.install-command.outputs.value != '' || steps.test-backend-command.outputs.value != '' }}uses: actions/setup-java@v4with:distribution: 'temurin'- java-version: '17'+ java-version: '21'cache: 'gradle'- name: Get yarn cache directory pathdiff --git a/agent/build.gradle b/agent/build.gradleindex 2bb887aa1..acef7f598 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -31,7 +31,9 @@ dependencies {api "com.hivemq:hivemq-mqtt-client:$hiveMQClientVersion"- api "com.github.weliem:blessed-bluez:$bluetoothVersion"+ api("com.github.weliem:blessed-bluez:$bluetoothVersion") {+ exclude group: "com.github.weliem.blessed-bluez", module: "blessed-test"+ }implementation "dev.failsafe:failsafe:$failsafeVersion"diff --git a/agent/src/main/java/org/openremote/agent/protocol/mqtt/AbstractMQTT_IOClient.java b/agent/src/main/java/org/openremote/agent/protocol/mqtt/AbstractMQTT_IOClient.javaindex a4a47a4fd..02a500b81 100644--- a/agent/src/main/java/org/openremote/agent/protocol/mqtt/AbstractMQTT_IOClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/mqtt/AbstractMQTT_IOClient.java@@ -76,6 +76,7 @@ public abstract class AbstractMQTT_IOClient<S> implements IOClient<MQTTMessage<Sprotected boolean disconnected = true; // Need to use this flag to cancel client reconnect taskprotected final AtomicBoolean connected = new AtomicBoolean(false); // Used for subscriptionsprotected Consumer<String> topicSubscribeFailureConsumer;+ protected ConnectionStatus currentStatus;protected AbstractMQTT_IOClient(String host, int port, boolean secure, boolean cleanSession, UsernamePassword usernamePassword, URI websocketURI, MQTTLastWill lastWill, KeyManagerFactory keyManagerFactory, TrustManagerFactory trustManagerFactory) {this(UniqueIdentifierGenerator.generateId(), host, port, secure, cleanSession, usernamePassword, websocketURI, lastWill, keyManagerFactory, trustManagerFactory);@@ -404,6 +405,10 @@ public abstract class AbstractMQTT_IOClient<S> implements IOClient<MQTTMessage<S*/protected void onConnectionStatusChanged(ConnectionStatus statusOverride) {ConnectionStatus status = statusOverride != null ? statusOverride : getConnectionStatus();+ if (currentStatus == status) {+ return;+ }+ currentStatus = status;LOG.info("Client '" + getClientUri() + "' connection status changed: " + status);connectionStatusConsumers.forEach(diff --git a/balena/manager.Dockerfile b/balena/manager.Dockerfileindex cdc49bdbb..3b4742b75 100644--- a/balena/manager.Dockerfile+++ b/balena/manager.Dockerfile@@ -1,4 +1,4 @@-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadadARG GIT_COMMIT=unknowndiff --git a/container/build.gradle b/container/build.gradleindex ba04a6f79..26f58baa5 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -7,18 +7,16 @@ dependencies {api project(":model")- api "org.codehaus.groovy:groovy-all:$groovyVersion"+ api "org.apache.groovy:groovy-all:$groovyVersion"api "org.craftercms:groovy-sandbox:$groovySandboxVersion"// SLF4J JUL providerapi "org.slf4j:slf4j-jdk14:$slf4jVersion"- // Log4J redirect to SLF4J- api "org.slf4j:log4j-over-slf4j:$slf4jVersion"- api "io.undertow:undertow-servlet:$undertowVersion"+ api "io.undertow:undertow-core:$undertowVersion"api "io.undertow:undertow-websockets-jsr:$undertowVersion"api ("org.jboss.resteasy:resteasy-undertow:$resteasyVersion") {- exclude group: "io.undertow", module: "undertow-servlet-jakarta"+ exclude group: "jakarta.servlet", module: "undertow-servlet-jakarta"}api "org.jboss.resteasy:resteasy-client:$resteasyVersion"api "org.jboss.resteasy:resteasy-jackson2-provider:$resteasyVersion"@@ -26,6 +24,8 @@ dependencies {api "org.jboss.resteasy:resteasy-validator-provider:$resteasyVersion"api "org.keycloak:keycloak-client-registration-api:$keycloakVersion"+ // This is the generic keycloak adapter that isn't kept up to date - deprecated possibly?+ // They now only develop keycloak-jboss-adapter-core which is wildfly specific and would need some work to integrateapi "org.keycloak:keycloak-adapter-core:$keycloakVersion"api "org.keycloak:keycloak-policy-enforcer:$keycloakVersion"api "org.keycloak:keycloak-admin-client:$keycloakVersion"diff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.javaindex 769d81976..44ca1c3db 100644--- a/container/src/main/java/org/openremote/container/Container.java+++ b/container/src/main/java/org/openremote/container/Container.java@@ -24,11 +24,10 @@ import io.micrometer.core.instrument.Clock;import io.micrometer.core.instrument.MeterRegistry;import io.micrometer.core.instrument.Metrics;import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;-import io.micrometer.prometheus.PrometheusConfig;-import io.prometheus.client.CollectorRegistry;+import io.micrometer.prometheusmetrics.PrometheusConfig;+import io.prometheus.metrics.model.registry.PrometheusRegistry;import org.openremote.container.concurrent.ContainerScheduledExecutor;import org.openremote.container.concurrent.ContainerThreadFactory;-import org.openremote.container.util.LogUtil;import org.openremote.model.ContainerService;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;@@ -79,10 +78,6 @@ public class Container implements org.openremote.model.Container {protected Thread waitingThread;protected final Map<Class<? extends ContainerService>, ContainerService> services = new LinkedHashMap<>();- static {- LogUtil.initialiseJUL();- }-/*** Discover {@link ContainerService}s using {@link ServiceLoader}; services are then ordered by* {@link ContainerService#getPriority}.@@ -115,7 +110,7 @@ public class Container implements org.openremote.model.Container {if (metricsEnabled) {// TODO: Add a meter registry provider SPI to make this pluggable- meterRegistry = new io.micrometer.prometheus.PrometheusMeterRegistry(PrometheusConfig.DEFAULT, io.prometheus.client.CollectorRegistry.defaultRegistry, Clock.SYSTEM);+ meterRegistry = new io.micrometer.prometheusmetrics.PrometheusMeterRegistry(PrometheusConfig.DEFAULT, PrometheusRegistry.defaultRegistry, Clock.SYSTEM);}int scheduledExecutorThreads = getInteger(@@ -214,7 +209,7 @@ public class Container implements org.openremote.model.Container {}Metrics.globalRegistry.remove(meterRegistry);- CollectorRegistry.defaultRegistry.clear();+ PrometheusRegistry.defaultRegistry.clear();meterRegistry = null;waitingThread.interrupt();waitingThread = null;diff --git a/container/src/main/java/org/openremote/container/util/LogUtil.java b/container/src/main/java/org/openremote/container/util/LogUtil.javaindex 82d48a342..d3954241c 100644--- a/container/src/main/java/org/openremote/container/util/LogUtil.java+++ b/container/src/main/java/org/openremote/container/util/LogUtil.java@@ -20,8 +20,6 @@package org.openremote.container.util;import org.openremote.model.util.TextUtil;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import java.io.IOException;import java.io.InputStream;@@ -46,18 +44,18 @@ import static org.openremote.model.Container.OR_DEV_MODE;*/public class LogUtil {- protected static final Logger LOG = LoggerFactory.getLogger(LogUtil.class);+ protected static final System.Logger LOG = System.getLogger(LogUtil.class.getName());public static final String OR_LOGGING_CONFIG_FILE = "OR_LOGGING_CONFIG_FILE";public static void initialiseJUL() throws ExceptionInInitializerError {// Don't do anything if standard JUL system properties setif (!TextUtil.isNullOrEmpty(System.getProperty("java.util.logging.config.class"))) {- LOG.info("Using specified java.util.logging.config.class system property: " + System.getProperty("java.util.logging.config.class"));+ LOG.log(System.Logger.Level.INFO,"Using specified java.util.logging.config.class system property: " + System.getProperty("java.util.logging.config.class"));return;}if (!TextUtil.isNullOrEmpty(System.getProperty("java.util.logging.config.file"))) {- LOG.info("Using specified java.util.logging.config.file system property: " + System.getProperty("java.util.logging.config.file"));+ LOG.log(System.Logger.Level.INFO,"Using specified java.util.logging.config.file system property: " + System.getProperty("java.util.logging.config.file"));return;}@@ -79,14 +77,14 @@ public class LogUtil {InputStream configFile = getFileInputStream(System.getenv(OR_LOGGING_CONFIG_FILE));if (configFile != null) {- LOG.info("Using logging configuration: " + System.getenv(OR_LOGGING_CONFIG_FILE));+ LOG.log(System.Logger.Level.INFO, "Using logging configuration: " + System.getenv(OR_LOGGING_CONFIG_FILE));return configFile;}// Look for the file on the classpathconfigFile = Thread.currentThread().getContextClassLoader().getResourceAsStream(System.getenv(OR_LOGGING_CONFIG_FILE));if (configFile != null) {- LOG.info("Using logging configuration from classpath: " + System.getenv(OR_LOGGING_CONFIG_FILE));+ LOG.log(System.Logger.Level.INFO,"Using logging configuration from classpath: " + System.getenv(OR_LOGGING_CONFIG_FILE));return configFile;}}@@ -98,7 +96,7 @@ public class LogUtil {InputStream configFile = org.openremote.model.Container.class.getClassLoader().getResourceAsStream(loggingFile);if (configFile != null) {- LOG.info("Using built in logging configuration from classpath: " + loggingFile);+ LOG.log(System.Logger.Level.INFO,"Using built in logging configuration from classpath: " + loggingFile);return configFile;}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.javadeleted file mode 100644index 1d799822b..000000000--- a/container/src/main/java/org/openremote/container/util/package-info.java+++ /dev/null@@ -1,10 +0,0 @@- @org.hibernate.annotations.GenericGenerator(- name = Constants.PERSISTENCE_UNIQUE_ID_GENERATOR,- type = org.openremote.container.util.HibernateUniqueIdentifierGenerator.class- )-})--package org.openremote.container.util;--import org.openremote.model.Constants;diff --git a/gradle.properties b/gradle.propertiesindex 42da54dc5..8ba4026ba 100644--- a/gradle.properties+++ b/gradle.properties@@ -1,4 +1,4 @@-org.gradle.jvmargs=-Xms256m -Xmx1024m+org.gradle.jvmargs=-Xmx3gorg.gradle.parallel=true# Set the socket timeout to 5 minutes (good for proxies)@@ -9,65 +9,59 @@ systemProp.org.gradle.internal.repository.max.retries=10systemProp.org.gradle.internal.repository.initial.backoff=500jaxrsSpecVersion = 3.1.0-javaxAnnotationsVersion = 2.1.1-javaxPersistenceVersion = 1.0.2.Final-javaxELAPIVersion = 5.0.1+javaxAnnotationsVersion = 3.0.0+javaxELAPIVersion = 6.0.1javaxELVersion = 4.0.2slf4jVersion = 2.0.6-guavaVersion = 33.3.1-jre+guavaVersion = 33.4.0-jreundertowVersion = 2.3.18.Final-resteasyVersion = 6.2.7.Final-jbossLoggingAnnotationsVersion = 2.0.2.Final-keycloakVersion = 23.0.6+resteasyVersion = 6.2.11.Final+keycloakVersion = 25.0.3classgraphVersion=4.8.179jacksonVersion = 2.18.2-groovyVersion = 3.0.10-groovySandboxVersion = 4.0.0-sqliteVersion = 3.47.1.0-hibernateVersion = 6.3.1.Final-hibernateValidatorVersion = 8.0.0.Final-hikaricpVersion = 5.0.1-postgresJdbcVersion = 42.7.2-junitVersion = 4.13.2-spockVersion = 2.0-groovy-3.0-byteBuddyVersion = 1.11.0-objenesisVersion = 3.2-camelVersion = 4.0.4-sunriseSunsetCalculatorVersion = 1.2+groovyVersion = 4.0.24+groovySandboxVersion = 4.2.2+sqliteVersion = 3.48.0.0+hibernateVersion = 6.5.3.Final+hibernateValidatorVersion = 8.0.2.Final+hikaricpVersion = 6.2.1+postgresJdbcVersion = 42.7.5+spockVersion = 2.4-M5-groovy-4.0+byteBuddyVersion = 1.16.1+objenesisVersion = 3.4+camelVersion = 4.9.0easyRulesVersion = 4.1.0-quartzVersion= 2.3.2-calimeroVersion = 2.4-uuidGeneratorVersion = 4.0.1-jSerialCommVersion = 2.7.0-saxonHEVersion = 11.3-jmxtermVersion = 1.0.0-nettyVersion = 4.1.115.Final-flywaydbVersion = 10.8.1-ical4jVersion = 3.2.6+quartzVersion= 2.5.0+calimeroVersion = 2.6-rc1+uuidGeneratorVersion = 5.1.0+jSerialCommVersion = 2.11.0+saxonHEVersion = 12.5+nettyVersion = 4.1.117.Final+flywaydbVersion = 11.2.0+ical4jVersion = 4.1.0friendlyIdVersion = 1.0.1-geotoolsVersion = 19.1-firebaseAdminVersion = 9.2.0-jakartaMailVersion = 2.0.1+geotoolsVersion = 22.2+firebaseAdminVersion = 9.4.3+jakartaMailVersion = 2.0.3jaywayJsonPathVersion = 2.9.0typescriptGeneratorVersion = 3.2.1263-californiumCoreVersion = 2.1.0-californiumScandiumVersion = 3.5.0+californiumCoreVersion = 3.13.0+californiumScandiumVersion = 3.13.0zwaveVersion = 3.4.0reflectionsVersion=0.9.12-swaggerVersion=2.2.26-swaggeruiVersion = 5.17.14-jsonSchemaVersion=4.18.0-hiveMQClientVersion=1.3.3-bluetoothVersion = 0.39-nashornVersion=15.3+swaggerVersion=2.2.28+swaggeruiVersion = 5.18.2+hiveMQClientVersion=1.3.4+bluetoothVersion = 0.62+nashornVersion=15.6failsafeVersion=3.3.2suncalcVersion=3.11snapshotsRepoUrl=https://s01.oss.sonatype.org/content/repositories/snapshots/releasesRepoUrl=https://s01.oss.sonatype.org/service/local/-activeMQVersion = 2.38.0+activeMQVersion = 2.39.0jbossLoggingManagerVersion=2.1.19.Final-greenmailVersion=2.0.0+greenmailVersion=2.1.2prometheusVersion=0.16.0-micrometerVersion=1.11.0+micrometerVersion=1.14.3jdomVersion = 2.0.6.1-jSchVersion = 0.2.21+jSchVersion = 0.2.23diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jarindex 7454180f2..7f93135c4 100644Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex db9a6b825..e2847c820 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,5 +1,7 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip+networkTimeout=10000+validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex c53aefaa5..0adc8e1a5 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@#!/bin/sh#-# Copyright � 2015-2021 the original authors.+# Copyright © 2015-2021 the original authors.## Licensed under the Apache License, Version 2.0 (the "License");# you may not use this file except in compliance with the License.@@ -32,10 +32,10 @@# Busybox and similar reduced shells will NOT work, because this script# requires all of these POSIX shell features:# * functions;-# * expansions �$var�, �${var}�, �${var:-default}�, �${var+SET}�,-# �${var#prefix}�, �${var%suffix}�, and �$( cmd )�;-# * compound commands having a testable exit status, especially �case�;-# * various built-in commands including �command�, �set�, and �ulimit�.+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;+# * compound commands having a testable exit status, especially «case»;+# * various built-in commands including «command», «set», and «ulimit».## Important for patching:#@@ -55,7 +55,7 @@# Darwin, MinGW, and NonStop.## (3) This script is generated from the Groovy template-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt# within the Gradle project.## You can find Gradle at https://github.com/gradle/gradle/.@@ -80,13 +80,11 @@ doesacdone-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit--APP_NAME="Gradle"+# This is normally unused+# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}--# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit# Use the maximum available, or set MAX_FD != -1 to use that value.MAX_FD=maximum@@ -133,22 +131,29 @@ location of your Java installation."fielseJAVACMD=java- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.+ if ! command -v java >/dev/null 2>&1+ then+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.Please set the JAVA_HOME variable in your environment to match thelocation of your Java installation."+ fifi# Increase the maximum file descriptors if we can.if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; thencase $MAX_FD in #(max*)+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.+ # shellcheck disable=SC3045MAX_FD=$( ulimit -H -n ) ||warn "Could not query maximum file descriptor limit"esaccase $MAX_FD in #('' | soft) :;; #(*)+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.+ # shellcheck disable=SC3045ulimit -n "$MAX_FD" ||warn "Could not set maximum file descriptor limit to $MAX_FD"esac@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; thendonefi++# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'+# Collect all arguments for the java command;# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of# shell script including quotes and variable substitutions, so put them in@@ -205,6 +214,12 @@ set -- \org.gradle.wrapper.GradleWrapperMain \"$@"+# Stop when "xargs" is not available.+if ! command -v xargs >/dev/null 2>&1+then+ die "xargs is not available"+fi+# Use "xargs" to parse quoted args.## With -n1 it outputs one arg per line, with the quotes and backslashes removed.diff --git a/gradlew.bat b/gradlew.batindex 107acd32c..93e3f59f1 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -14,7 +14,7 @@@rem limitations under the License.@rem-@if "%DEBUG%" == "" @echo off+@if "%DEBUG%"=="" @echo off@rem ##########################################################################@rem@rem Gradle startup script for Windows@@ -25,7 +25,8 @@if "%OS%"=="Windows_NT" setlocalset DIRNAME=%~dp0-if "%DIRNAME%" == "" set DIRNAME=.+if "%DIRNAME%"=="" set DIRNAME=.+@rem This is normally unusedset APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHomeset JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1-if "%ERRORLEVEL%" == "0" goto execute+if %ERRORLEVEL% equ 0 goto executeecho.echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar:end@rem End local scope for the variables with windows NT shell-if "%ERRORLEVEL%"=="0" goto mainEnd+if %ERRORLEVEL% equ 0 goto mainEnd:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead ofrem the _cmd.exe /c_ return code!-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1-exit /b 1+set EXIT_CODE=%ERRORLEVEL%+if %EXIT_CODE% equ 0 set EXIT_CODE=1+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%+exit /b %EXIT_CODE%:mainEndif "%OS%"=="Windows_NT" endlocaldiff --git a/manager/Dockerfile b/manager/Dockerfileindex cfbdf4eaa..69a66d03a 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -1,4 +1,4 @@-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadadARG GIT_COMMIT=unknowndiff --git a/manager/build.gradle b/manager/build.gradleindex bcc441b2f..807058c9e 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -27,13 +27,7 @@ dependencies {implementation "org.openjdk.nashorn:nashorn-core:$nashornVersion"implementation "org.apache.camel:camel-undertow:$camelVersion"- implementation ("io.netty:netty-codec-http") {- version {- strictly "$nettyVersion"- }- }-- // Exposed via MQTT API+ // Indirect dep from org.apache.activemq:artemis-mqtt-protocolapi ("io.netty:netty-codec-mqtt") {version {strictly "$nettyVersion"@@ -57,7 +51,6 @@ dependencies {}implementation "org.shredzone.commons:commons-suncalc:$suncalcVersion"- implementation "org.slf4j:slf4j-api:$slf4jVersion"implementation "io.prometheus:simpleclient_httpserver:$prometheusVersion"implementation "com.github.mwiede:jsch:$jSchVersion"diff --git a/manager/src/main/java/org/openremote/manager/Main.java b/manager/src/main/java/org/openremote/manager/Main.javaindex 359bf9913..8914f1f89 100644--- a/manager/src/main/java/org/openremote/manager/Main.java+++ b/manager/src/main/java/org/openremote/manager/Main.java@@ -20,9 +20,14 @@package org.openremote.manager;import org.openremote.container.Container;+import org.openremote.container.util.LogUtil;public class Main {+ static {+ LogUtil.initialiseJUL();+ }+public static void main(String[] args) throws Exception {Container container = new Container();diff --git a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.javaindex 71baf7410..751c70dc4 100644--- a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java@@ -39,8 +39,6 @@ import org.openremote.model.setup.Setup;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.ValueFormat;import org.openremote.model.value.ValueType;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import java.io.IOException;import java.nio.file.Files;@@ -58,7 +56,7 @@ public class ManagerSetup implements Setup {public static final String OR_PROVISIONING_DOCROOT = "OR_PROVISIONING_DOCROOT";public static final String OR_PROVISIONING_DOCROOT_DEFAULT = "deployment/manager/provisioning";- protected static final Logger LOG = LoggerFactory.getLogger(ManagerSetup.class);+ protected static final System.Logger LOG = System.getLogger(ManagerSetup.class.getName());protected Path provisionDocRoot;final protected TimerService timerService;@@ -460,17 +458,16 @@ public class ManagerSetup implements Setup {return;}- LOG.info("Provisioning assets");+ LOG.log(System.Logger.Level.INFO, "Provisioning assets");Files.list(Paths.get(provisionDocRoot.toString(), "assets")).sorted().forEach(file -> {try {Asset<?> asset = ValueUtil.JSON.readValue(file.toFile(), Asset.class);asset = assetStorageService.merge(asset);-- LOG.info("Asset merged: " + asset.toString());+ LOG.log(System.Logger.Level.INFO, "Asset merged: " + asset);} catch (IOException e) {- LOG.warn("Processing of file " + file.getFileName() + " went wrong", e);+ LOG.log(System.Logger.Level.INFO, "Processing of file " + file.getFileName() + " went wrong", e);}});diff --git a/model/build.gradle b/model/build.gradleindex 9e308e5ad..881a4f4b4 100644--- a/model/build.gradle+++ b/model/build.gradle@@ -11,7 +11,6 @@ dependencies {api "org.hibernate.orm:hibernate-core:$hibernateVersion"api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion"api "jakarta.el:jakarta.el-api:$javaxELAPIVersion"- api "org.jboss.logging:jboss-logging-annotations:$jbossLoggingAnnotationsVersion"api "jakarta.annotation:jakarta.annotation-api:$javaxAnnotationsVersion"api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxrsSpecVersion"diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex fcc9ccee3..224ee4f03 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -52,7 +52,6 @@ public interface Constants {String SESSION_CLOSE_ERROR = "connection.sessionCloseError";int ACCESS_TOKEN_LIFESPAN_SECONDS = 60; // 1 minuteString PERSISTENCE_SEQUENCE_ID_GENERATOR = "OPENREMOTE_SEQUENCE";- String PERSISTENCE_UNIQUE_ID_GENERATOR = "UNIQUE_ID_GENERATOR";String OR_HOSTNAME = "OR_HOSTNAME";String OR_ADDITIONAL_HOSTNAMES = "OR_ADDITIONAL_HOSTNAMES";diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex dd497aa7e..5b8e1eda8 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -47,6 +47,7 @@ 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.HibernateUniqueIdentifierType;import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import org.openremote.model.validation.AssetValid;@@ -59,7 +60,6 @@ import java.util.*;import java.util.stream.Collectors;import static jakarta.persistence.DiscriminatorType.STRING;-import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;// @formatter:off@@ -277,10 +277,9 @@ public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T>public static final AttributeDescriptor<String> MANUFACTURER = new AttributeDescriptor<>("manufacturer", ValueType.TEXT).withOptional(true);public static final AttributeDescriptor<String> MODEL = new AttributeDescriptor<>("model", ValueType.TEXT).withOptional(true);- @Id+ @Id @HibernateUniqueIdentifierType@Column(name = "ID", length = 22, columnDefinition = "char(22)")@Pattern(regexp = Constants.ASSET_ID_REGEXP, message = "{Asset.id.Pattern}")- @GeneratedValue(generator = PERSISTENCE_UNIQUE_ID_GENERATOR)protected String id;@Versiondiff --git a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.javaindex 300271945..549c2c1c4 100644--- a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java+++ b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java@@ -23,14 +23,17 @@ import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.annotation.JsonSerialize;import com.fasterxml.jackson.databind.util.StdConverter;-import net.fortuna.ical4j.model.DateList;import net.fortuna.ical4j.model.Recur;import org.openremote.model.asset.Asset;import org.openremote.model.util.Pair;import java.io.Serializable;+import java.time.Instant;+import java.time.LocalDateTime;+import java.time.ZoneOffset;import java.time.temporal.ChronoUnit;import java.util.Date;+import java.util.List;/*** Represents an event that occurs at a point in time with a {@link #start}, {#link #end} and optional@@ -75,28 +78,27 @@ import java.util.Date;}* }</pre></blockquote>*/-// TODO: Update to ical4j 4 once released with DST bug fix https://github.com/ical4j/ical4j/issues/117public class CalendarEvent implements Serializable {protected Date start;protected Date end;@JsonSerialize(converter = RecurStringConverter.class)- protected Recur recurrence;+ protected Recur<LocalDateTime> recurrence;- public static class RecurStringConverter extends StdConverter<Recur, String> {+ public static class RecurStringConverter extends StdConverter<Recur<?>, String> {@Override- public String convert(Recur value) {+ public String convert(Recur<?> value) {return value.toString();}}@JsonCreatorpublic CalendarEvent(@JsonProperty("start") Date start, @JsonProperty("end") Date end, @JsonProperty("recurrence") String recurrence) {- Recur recur = null;+ Recur<LocalDateTime> recur = null;try {- recur = new Recur(recurrence);- } catch (Exception e) {}+ recur = new Recur<>(recurrence);+ } catch (Exception ignored) {}this.start = start;this.end = end;@@ -104,10 +106,10 @@ public class CalendarEvent implements Serializable {}public CalendarEvent(Date start, Date end) {- this(start, end, (Recur)null);+ this(start, end, (Recur<LocalDateTime>)null);}- public CalendarEvent(Date start, Date end, Recur recurrence) {+ public CalendarEvent(Date start, Date end, Recur<LocalDateTime> recurrence) {this.start = start;this.end = end;this.recurrence = recurrence;@@ -121,7 +123,7 @@ public class CalendarEvent implements Serializable {return end;}- public Recur getRecurrence() {+ public Recur<LocalDateTime> getRecurrence() {return recurrence;}@@ -135,7 +137,7 @@ public class CalendarEvent implements Serializable {return new Pair<>(getStart().getTime(), getEnd().getTime());}- Recur recurrence = getRecurrence();+ Recur<LocalDateTime> recurrence = getRecurrence();if (recurrence == null) {if (getEnd().before(when)) {@@ -144,22 +146,28 @@ public class CalendarEvent implements Serializable {return new Pair<>(getStart().getTime(), getEnd().getTime());}- long whenMillis = when.toInstant().minus(getEnd().getTime() - getStart().getTime(), ChronoUnit.MILLIS).toEpochMilli();- DateList matches = recurrence.getDates(new net.fortuna.ical4j.model.DateTime(getStart()), new net.fortuna.ical4j.model.DateTime(whenMillis), new net.fortuna.ical4j.model.DateTime(Long.MAX_VALUE), net.fortuna.ical4j.model.parameter.Value.DATE_TIME, 2);+ Instant whenMillis = when.toInstant().minus(getEnd().getTime() - getStart().getTime(), ChronoUnit.MILLIS);+ List<LocalDateTime> matches = recurrence.getDates(+ LocalDateTime.ofInstant(getStart().toInstant(), ZoneOffset.UTC),+ LocalDateTime.ofInstant(whenMillis, ZoneOffset.UTC),+ LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.MAX_VALUE), ZoneOffset.UTC),+ 2);++ List<Instant> instants = matches.stream().map(d -> d.toInstant(ZoneOffset.UTC)).toList();if (matches.isEmpty()) {return null;}- long endTime = matches.get(0).getTime() + (getEnd().getTime()- getStart().getTime());+ long endTime = instants.get(0).toEpochMilli() + (getEnd().getTime()- getStart().getTime());if (endTime <= when.getTime()) {- if (matches.size() == 2) {- return new Pair<>(matches.get(1).getTime(), matches.get(1).getTime() + (getEnd().getTime()- getStart().getTime()));+ if (instants.size() == 2) {+ return new Pair<>(instants.get(1).toEpochMilli(), instants.get(1).toEpochMilli() + (getEnd().getTime()- getStart().getTime()));}return null;}- return new Pair<>(matches.get(0).getTime(), endTime);+ return new Pair<>(instants.get(0).toEpochMilli(), endTime);}}diff --git a/model/src/main/java/org/openremote/model/dashboard/Dashboard.java b/model/src/main/java/org/openremote/model/dashboard/Dashboard.javaindex f2be0074a..5fbeca238 100644--- a/model/src/main/java/org/openremote/model/dashboard/Dashboard.java+++ b/model/src/main/java/org/openremote/model/dashboard/Dashboard.java@@ -7,18 +7,16 @@ import jakarta.validation.constraints.NotNull;import jakarta.validation.constraints.Size;import org.hibernate.annotations.JdbcTypeCode;import org.hibernate.type.SqlTypes;+import org.openremote.model.util.HibernateUniqueIdentifierType;import java.util.Date;-import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;-@Entity@Table(name = "DASHBOARD")public class Dashboard {- @Id+ @Id @HibernateUniqueIdentifierType@Column(name = "ID", length = 22, columnDefinition = "char(22)")- @GeneratedValue(generator = PERSISTENCE_UNIQUE_ID_GENERATOR)protected String id;@Temporal(TemporalType.TIMESTAMP)diff --git a/model/src/main/java/org/openremote/model/flow/FlowObject.java b/model/src/main/java/org/openremote/model/flow/FlowObject.javaindex ede2dafaf..33786a347 100644--- a/model/src/main/java/org/openremote/model/flow/FlowObject.java+++ b/model/src/main/java/org/openremote/model/flow/FlowObject.java@@ -5,21 +5,20 @@package org.openremote.model.flow;-import jakarta.persistence.*;-import org.openremote.model.IdentifiableEntity;-+import jakarta.persistence.Column;+import jakarta.persistence.Id;+import jakarta.persistence.MappedSuperclass;import jakarta.validation.constraints.NotNull;import jakarta.validation.constraints.Size;--import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;+import org.openremote.model.IdentifiableEntity;+import org.openremote.model.util.HibernateUniqueIdentifierType;@MappedSuperclasspublic class FlowObject implements IdentifiableEntity<FlowObject> {- @Id+ @Id @HibernateUniqueIdentifierType@Column(name = "ID")- @GeneratedValue(generator = PERSISTENCE_UNIQUE_ID_GENERATOR)public String id;@NotNulldiff --git a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.javaindex ff4a3c554..37d398e6e 100644--- a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java+++ b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java@@ -22,7 +22,7 @@ package org.openremote.model.geo;import com.fasterxml.jackson.annotation.*;import com.fasterxml.jackson.databind.annotation.JsonSerialize;import com.fasterxml.jackson.databind.util.StdConverter;-import com.vividsolutions.jts.geom.Coordinate;+import org.locationtech.jts.geom.Coordinate;import java.util.Objects;@@ -35,10 +35,10 @@ public class GeoJSONPoint extends GeoJSONGeometry {@Overridepublic double[] convert(Coordinate value) {- if (Double.isNaN(value.z)) {+ if (Double.isNaN(value.getZ())) {return new double[] {value.x, value.y};}- return new double[] {value.x, value.y, value.z};+ return new double[] {value.x, value.y, value.getZ()};}}@@ -81,18 +81,18 @@ public class GeoJSONPoint extends GeoJSONGeometry {@JsonIgnorepublic Double getZ() {- return coordinates.z;+ return coordinates.getZ();}@JsonIgnorepublic boolean hasZ() {- return coordinates.z != Coordinate.NULL_ORDINATE;+ return coordinates.getZ() != Coordinate.NULL_ORDINATE;}@Overridepublic String toString() {return "GeoJSONPoint{" +- "coordinates=" + (coordinates != null ? (coordinates.x + ", " + coordinates.y + ", " + coordinates.z) : "null") ++ "coordinates=" + (coordinates != null ? (coordinates.x + ", " + coordinates.y + ", " + coordinates.getZ()) : "null") +'}';}}diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.javaindex 7b0fcbb81..75efae941 100644--- a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningData.java@@ -19,6 +19,8 @@*/package org.openremote.model.provisioning;+import java.util.Objects;+public class X509ProvisioningData {protected String CACertPEM;@@ -42,6 +44,19 @@ public class X509ProvisioningData {return this;}+ @Override+ public boolean equals(Object o) {+ if (this == o) return true;+ if (o == null || getClass() != o.getClass()) return false;+ X509ProvisioningData that = (X509ProvisioningData) o;+ return ignoreExpiryDate == that.ignoreExpiryDate && Objects.equals(CACertPEM, that.CACertPEM);+ }++ @Override+ public int hashCode() {+ return Objects.hash(CACertPEM, ignoreExpiryDate);+ }+@Overridepublic String toString() {return getClass().getSimpleName() +"{" +diff --git a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.javaindex 06bcc4c5d..bcdb0885e 100644--- a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java@@ -23,7 +23,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDescription;import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;-import com.vividsolutions.jts.geom.Coordinate;+import org.locationtech.jts.geom.Coordinate;import org.geotools.referencing.GeodeticCalculator;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.util.ValueUtil;diff --git a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.javaindex a3ff866bb..5cc0db0f4 100644--- a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java@@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonProperty;import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDescription;import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;-import com.vividsolutions.jts.geom.Coordinate;-import com.vividsolutions.jts.geom.Envelope;+import org.locationtech.jts.geom.Coordinate;+import org.locationtech.jts.geom.Envelope;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.util.ValueUtil;diff --git a/container/src/main/java/org/openremote/container/util/HibernateUniqueIdentifierGenerator.java b/model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierGenerator.javasimilarity index 90%rename from container/src/main/java/org/openremote/container/util/HibernateUniqueIdentifierGenerator.javarename to model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierGenerator.javaindex 88e81736a..37011e535 100644--- a/container/src/main/java/org/openremote/container/util/HibernateUniqueIdentifierGenerator.java+++ b/model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierGenerator.java@@ -18,19 +18,15 @@* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.container.util;+package org.openremote.model.util;import org.hibernate.HibernateException;import org.hibernate.engine.spi.SharedSessionContractImplementor;import org.hibernate.id.IdentifierGenerator;import org.openremote.model.IdentifiableEntity;-import org.openremote.model.util.UniqueIdentifierGenerator;import java.io.Serializable;-/**- * DO NOT REMOVE; String reference in package-info.java- */public class HibernateUniqueIdentifierGenerator implements IdentifierGenerator {@Overridediff --git a/model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierType.java b/model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierType.javanew file mode 100644index 000000000..768113d34--- /dev/null+++ b/model/src/main/java/org/openremote/model/util/HibernateUniqueIdentifierType.java@@ -0,0 +1,15 @@+package org.openremote.model.util;++import org.hibernate.annotations.IdGeneratorType;++import java.lang.annotation.Retention;+import java.lang.annotation.Target;++import static java.lang.annotation.ElementType.FIELD;+import static java.lang.annotation.ElementType.METHOD;+import static java.lang.annotation.RetentionPolicy.RUNTIME;++@IdGeneratorType(HibernateUniqueIdentifierGenerator.class)+@Retention(RUNTIME) @Target({METHOD,FIELD})+public @interface HibernateUniqueIdentifierType {+}diff --git a/project.gradle b/project.gradleindex 801f2b601..f55499ad1 100644--- a/project.gradle+++ b/project.gradle@@ -27,10 +27,16 @@ configurations.all {// This has been replaced with eclipse angus implementationexclude group: "com.sun.activation", module: "jakarta.activation"+ // This has been replaced with org.bouncycastle bcprov-jdk18on+ exclude group: "org.bouncycastle", module: "bcprov-jdk15on"+eachDependency { DependencyResolveDetails details ->if (details.requested.group == 'org.eclipse.angus' && details.requested.name == 'angus-activation' && details.requested.version == '1.0.0') {details.useVersion '2.0.0'}+ if (details.requested.group == 'commons-io' && details.requested.name == 'commons-io') {+ details.useVersion '2.14.0'+ }}}}@@ -146,6 +152,7 @@ subprojects {// Default repositories for dependency resolutionrepositories {mavenLocal()+ // Needs to be above central due to org.geotools:gt-main issuesmaven {url = "https://repo.osgeo.org/repository/release/"}@@ -156,6 +163,12 @@ repositories {maven {url = "https://s01.oss.sonatype.org/content/repositories/snapshots"}+ maven {+ url = "https://repo.jenkins-ci.org/releases/"+ }+ maven {+ url = 'https://jitpack.io'+ }}// Eclipse needs help@@ -379,10 +392,10 @@ task tscWatch(type: Exec) {// Configure Java buildplugins.withType(JavaPlugin).whenPluginAdded {- // Use Java 17+ // Use Java 21tasks.withType(JavaCompile) {- sourceCompatibility = JavaVersion.VERSION_17- targetCompatibility = JavaVersion.VERSION_17+ sourceCompatibility = JavaVersion.VERSION_21+ targetCompatibility = JavaVersion.VERSION_21def warnLogFile = file("$buildDir/${name}Warnings.log")logging.addStandardErrorListener(new StandardOutputListener() {void onOutput(CharSequence output) {diff --git a/test/build.gradle b/test/build.gradleindex 8cd089c69..574a7bb60 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -13,21 +13,22 @@ apply plugin: "signing"dependencies {- // SLF4J facade- testImplementation "org.slf4j:slf4j-api:$slf4jVersion"-testImplementation project(":setup").sourceSets.integration.outputtestFixturesApi project(":manager")- testFixturesImplementation "org.codehaus.groovy:groovy:$groovyVersion"+ testFixturesImplementation "org.apache.groovy:groovy-all:$groovyVersion"+ testFixturesImplementation "org.apache.groovy:groovy-test:$groovyVersion"testFixturesApi platform("org.spockframework:spock-bom:$spockVersion")testFixturesApi 'org.spockframework:spock-core'// optional dependencies for using SpocktestFixturesRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)- testFixturesRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)+ testFixturesRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)- testImplementation "com.github.calimero:calimero-server:$calimeroVersion"+ testImplementation("com.github.calimero:calimero-server:$calimeroVersion") {+ // Has a dependency on the SLF4J simple provider+ exclude group: "org.slf4j"+ }testImplementation "com.google.firebase:firebase-admin:$firebaseAdminVersion"testImplementation "org.shredzone.commons:commons-suncalc:$suncalcVersion"diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryPredicateTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryPredicateTest.groovyindex 7ac798919..fa203dba8 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryPredicateTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryPredicateTest.groovy@@ -1,15 +1,11 @@package org.openremote.test.assets-import com.vividsolutions.jts.geom.Coordinate-import org.openremote.manager.rules.AssetQueryPredicate+import org.locationtech.jts.geom.Coordinateimport org.openremote.model.query.filter.GeofencePredicateimport org.openremote.model.query.filter.RadialGeofencePredicateimport org.openremote.model.query.filter.RectangularGeofencePredicateimport spock.lang.Specification-import java.util.function.Predicate-import java.util.function.Supplier-class AssetQueryPredicateTest extends Specification {def "Rectangular Geofence Test"() {diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex 064cfb0a6..e67484350 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -1,6 +1,7 @@package org.openremote.test.assetsimport net.fortuna.ical4j.model.Recur+import net.fortuna.ical4j.transform.recurrence.*import org.openremote.agent.protocol.simulator.SimulatorAgentimport org.openremote.container.persistence.PersistenceServiceimport org.openremote.manager.asset.AssetProcessingService@@ -815,7 +816,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {def start = calendar.getTime()calendar.add(Calendar.HOUR, 2)def end = calendar.getTime()- def recur = new Recur(Recur.DAILY, 5)+ def recur = new Recur(Frequency.DAILY, 5)recur.setInterval(2)lobby.addAttributes(@@ -823,7 +824,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {)lobby = assetStorageService.merge(lobby)- recur = new Recur(Recur.DAILY, 3)+ recur = new Recur(Frequency.DAILY, 3)recur.setInterval(2)floor.addAttributes(diff --git a/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovyindex cfacbdb64..06f80c40d 100644--- a/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/KNXProtocolTest.groovy@@ -19,7 +19,7 @@*/package org.openremote.test.protocol-import org.apache.commons.lang3.SystemUtils+import org.openremote.agent.protocol.knx.KNXAgentimport org.openremote.agent.protocol.knx.KNXAgentLinkimport org.openremote.agent.protocol.knx.KNXProtocol@@ -37,10 +37,12 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport tuwien.auto.calimero.server.Launcher-import tuwien.auto.calimero.server.knxnetip.DefaultServiceContainer-import static org.openremote.model.value.MetaItemType.*-import static org.openremote.model.value.ValueType.*+import java.nio.file.Path++import static org.openremote.model.value.MetaItemType.AGENT_LINK+import static org.openremote.model.value.MetaItemType.LABEL+import static org.openremote.model.value.ValueType.BOOLEAN/*** This tests the KNX protocol and protocol implementation.@@ -53,26 +55,20 @@ class KNXProtocolTest extends Specification implements ManagerContainerTrait {def conditions = new PollingConditions(timeout: 10, delay: 0.2)and: "the KNX emulation server is started"- def configFile = SystemUtils.IS_OS_MAC ? "/org/openremote/test/protocol/knx/knx-server-config-mac.xml" : "/org/openremote/test/protocol/knx/knx-server-config.xml"- def configUri = getClass().getResource(configFile).toURI().toString()- def knxEmulationServer = new Launcher(configUri)- def sc = knxEmulationServer.xml.svcContainers.remove(0)- def sc2 = new DefaultServiceContainer(- sc.getName(),- NetworkInterface.getByInetAddress(InetAddress.getLoopbackAddress()).name,- sc.getControlEndpoint(),- sc.getMediumSettings(),- sc.reuseControlEndpoint(),- sc.isNetworkMonitoringAllowed())- knxEmulationServer.xml.svcContainers.add(sc2)- def netIf = knxEmulationServer.xml.subnetNetIf.remove(sc)- knxEmulationServer.xml.subnetNetIf.put(sc2, netIf)- def linkClasses = knxEmulationServer.xml.subnetLinkClasses.remove(sc)- knxEmulationServer.xml.subnetLinkClasses.put(sc2, linkClasses)- def groupFilters = knxEmulationServer.xml.groupAddressFilters.remove(sc)- knxEmulationServer.xml.groupAddressFilters.put(sc2, groupFilters)- def addAddresses = knxEmulationServer.xml.additionalAddresses.remove(sc)- knxEmulationServer.xml.additionalAddresses.put(sc2, addAddresses)+ def configFile = "/org/openremote/test/protocol/knx/knx-server-config.xml"+ def configUri = getClass().getResource(configFile).toURI()+ // Calimero server uses NetworkInterface.getByName for interface lookup which is un-reliable so we find it at runtime+ def configStr = getClass().getResource(configFile).text+ def ni = NetworkInterface.getByInetAddress(InetAddress.getLoopbackAddress())+ configStr = configStr.replaceAll("LOOPBACK_ADDRESS", ni.getName())+ def file = Path.of(configUri).toFile()+ if (file.exists()) {+ def w = file.newWriter()+ file.newWriter().withWriter {+ it << configStr+ }+ }+ def knxEmulationServer = new Launcher(configUri.toString())def knxServerThread = new Thread(knxEmulationServer)knxServerThread.start()KNXTestingNetworkLink knxTestingNetworkdiff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex cef7f7bed..1e4b038e9 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -74,7 +74,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContadef "Check basic functionality"() {given: "expected conditions"- def conditions = new PollingConditions(timeout: 10, delay: 0.2)+ def conditions = new PollingConditions(timeout: 20, delay: 0.2)MQTT_IOClient device1ClientMQTT_IOClient device1SnoopClientMQTT_IOClient deviceNClientdiff --git a/test/src/test/groovy/org/openremote/test/rules/AlarmRuleTest.groovy b/test/src/test/groovy/org/openremote/test/rules/AlarmRuleTest.groovyindex df12cd024..ebb9dcb3b 100644--- a/test/src/test/groovy/org/openremote/test/rules/AlarmRuleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/AlarmRuleTest.groovy@@ -122,7 +122,7 @@ class AlarmRuleTest extends Specification implements ManagerContainerTrait {((RuleActionAlarm) rulesetDef.rules[0].then[0]).assigneeId = assigneeIdrulesStr = ValueUtil.JSON.writeValueAsString(rulesetDef)def realmRuleset = new RealmRuleset(managerTestSetup.realmBuildingName, "CO2 Alarm Rule", Ruleset.Lang.JSON, rulesStr)- rulesetStorageService.merge(realmRuleset)+ realmRuleset = rulesetStorageService.merge(realmRuleset)then: "the ruleset should reach the engine"def conditions = new PollingConditions(timeout: 10, delay: 0.2)@@ -138,7 +138,7 @@ class AlarmRuleTest extends Specification implements ManagerContainerTrait {def "rule in realm with alarm action creates an alarm with severity '#severity', assignee '#assigneeId' and '#emailNotifications' emailNotifications based on attribute event"() {def realmRuleset = createAlarmRule(severity, assigneeId)-+getLOG()when: "the room linked attribute is updated"assetProcessingService.sendAttributeEvent(new AttributeEvent(managerTestSetup.apartment2LivingroomId, "co2Level", 6000))diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex 6b56ad077..7cda78845 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -162,7 +162,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerassert rulesService.globalEngine.get().deployments.size() == 3assert rulesService.globalEngine.get().runningassert !rulesService.globalEngine.get().isError()- assert rulesService.globalEngine.get().error instanceof RuntimeException+ assert rulesService.globalEngine.get().getError() instanceof RuntimeExceptionassert rulesService.globalEngine.get().deployments.values().any({ it.name == "Some global demo rules" && it.status == DEPLOYED})assert rulesService.globalEngine.get().deployments.values().any({ it.name == "Some more global rules" && it.status == DEPLOYED})assert rulesService.globalEngine.get().deployments.values().any({ it.name == "Some broken global rules" && it.status == COMPILATION_ERROR})@@ -176,7 +176,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerassert rulesService.globalEngine.get().deployments.size() == 2assert rulesService.globalEngine.get().runningassert !rulesService.globalEngine.get().isError()- assert rulesService.globalEngine.get().error == null+ assert rulesService.globalEngine.get().getError() == nullassert rulesService.globalEngine.get().deployments.values().any({ it.name == "Some global demo rules" && it.status == DEPLOYED })assert rulesService.globalEngine.get().deployments.values().any({ it.name == "Some more global rules" && it.status == DEPLOYED })}diff --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 98751c3e0..c7b9994ec 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@@ -8,6 +8,7 @@ import jakarta.ws.rs.client.ClientRequestFilterimport jakarta.ws.rs.core.MediaTypeimport jakarta.ws.rs.core.Responseimport net.fortuna.ical4j.model.Recur+import net.fortuna.ical4j.transform.recurrence.Frequencyimport org.openremote.container.timer.TimerServiceimport org.openremote.container.util.MailUtilimport org.openremote.manager.notification.LocalizedNotificationHandler@@ -576,7 +577,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {version = ruleset.versiondef validityStart = Instant.ofEpochMilli(getClockTimeOf(container)).plus(2, ChronoUnit.HOURS)def validityEnd = Instant.ofEpochMilli(getClockTimeOf(container)).plus(4, ChronoUnit.HOURS)- def recur = new Recur(Recur.Frequency.DAILY, 3)+ def recur = new Recur<>(Frequency.DAILY, 3)recur.setInterval(2)def calendarEvent = new CalendarEvent(Date.from(validityStart),@@ -1555,7 +1556,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {}when: "a schedule is added to the rule to enable it 2 hours after sunset each day"- ruleset.setValidity(new CalendarEvent(sunTimes.getSet().plusHours(2).toDate(), sunTimes.getSet().plusHours(12).toDate(), new Recur(Recur.Frequency.DAILY, 5)))+ ruleset.setValidity(new CalendarEvent(sunTimes.getSet().plusHours(2).toDate(), sunTimes.getSet().plusHours(12).toDate(), new Recur<>(Frequency.DAILY, 5)))ruleset = rulesetStorageService.merge(ruleset)then: "the rule should become paused in the engine"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 4b0dbaac8..54bd63089 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@@ -2,8 +2,8 @@ package org.openremote.test.rules.residenceimport com.google.firebase.messaging.Message-import net.fortuna.ical4j.model.Dateimport net.fortuna.ical4j.model.Recur+import net.fortuna.ical4j.transform.recurrence.Frequencyimport org.openremote.agent.protocol.simulator.SimulatorProtocolimport org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingService@@ -257,7 +257,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCostopPseudoClock()def baseTime = getClockTimeOf(container)def fromTo = getOccurrenceFromTo(baseTime, 0)- def recur = new Recur(Recur.WEEKLY, 2)+ def recur = new Recur<>(Frequency.WEEKLY, 2)def validity = new CalendarEvent(fromTo[0], fromTo[1], recur)ruleset.setValidity(validity)rulesetStorageService.merge(ruleset)@@ -266,8 +266,8 @@ 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 == fromTo[0].getTime()- assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).value == fromTo[1].getTime()+ assert ruleset.getValidity().getNextOrActiveFromTo(new java.util.Date(getClockTimeOf(container))).key == fromTo[0].getTime()+ assert ruleset.getValidity().getNextOrActiveFromTo(new java.util.Date(getClockTimeOf(container))).value == fromTo[1].getTime()assert ruleset.getValidity().getRecurrence() != nulland: "the ruleset state should be deployed and paused"diff --git a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml b/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xmldeleted file mode 100644index f99f3e904..000000000--- a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml+++ /dev/null@@ -1,22 +0,0 @@-<?xml version="1.0" encoding="UTF-8"?>-<!-- Calimero 2 server settings -->-<knxServer name="knx-server" friendlyName="Calimero KNXnet/IP Test Server">-- <!-- KNXnet/IP search & discovery -->- <discovery listenNetIf="lo0" outgoingNetIf="lo0" activate="false" />-- <!-- Provides the KNXnet/IP-side configuration for access to one KNX subnet -->- <serviceContainer activate="true" routing="false" networkMonitoring="false" udpPort="3671" listenNetIf="lo0" reuseCtrlEP="false">- <knxAddress type="individual">1.1.1</knxAddress>- <knxSubnet type="user-supplied" class="org.openremote.test.protocol.KNXTestingNetworkLink">1.1.1</knxSubnet>-- <!-- Additional KNX individual addresses assigned to KNXnet/IP connections (optional) -->- <additionalAddresses>- <knxAddress type="individual">1.1.10</knxAddress>- <knxAddress type="individual">1.1.11</knxAddress>- <knxAddress type="individual">1.1.12</knxAddress>- <knxAddress type="individual">1.1.13</knxAddress>- </additionalAddresses>- </serviceContainer>--</knxServer>diff --git a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml b/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xmlindex 9c7de00f6..f33fec8be 100644--- a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml+++ b/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml@@ -1,12 +1,12 @@<?xml version="1.0" encoding="UTF-8"?><!-- Calimero 2 server settings -->-<knxServer name="knx-server" friendlyName="Calimero KNXnet/IP Test Server">+<knxServer name="knx-server" appData="./test/build" friendlyName="Calimero KNXnet/IP Test Server"><!-- KNXnet/IP search & discovery -->- <discovery listenNetIf="lo" outgoingNetIf="lo" activate="false" />+ <discovery listenNetIf="LOOPBACK_ADDRESS" outgoingNetIf="LOOPBACK_ADDRESS" activate="false" /><!-- Provides the KNXnet/IP-side configuration for access to one KNX subnet -->- <serviceContainer activate="true" routing="false" networkMonitoring="false" udpPort="3671" listenNetIf="lo" reuseCtrlEP="false">+ <serviceContainer activate="true" routing="false" networkMonitoring="false" udpPort="3671" listenNetIf="LOOPBACK_ADDRESS" reuseCtrlEP="false"><knxAddress type="individual">1.1.1</knxAddress><knxSubnet type="user-supplied" class="org.openremote.test.protocol.KNXTestingNetworkLink">1.1.1</knxSubnet>diff --git a/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovyindex 8cc88c620..969e8b484 100644--- a/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy+++ b/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy@@ -46,7 +46,7 @@ trait ManagerContainerTrait extends ContainerTrait {*additionalServices].stream().sorted(Comparator.comparingInt{it.getPriority()})- .collect(Collectors.toList()) as Iterable<ContainerService>+ .collect(Collectors.<ContainerService>toList()) as Iterable<ContainerService>}Iterable<ContainerService> defaultServices(ContainerService... additionalServices) {