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
Java17 migration (#586)
Michael Rademakerf4818462b435
diff --git a/.github/workflows/manager-mvp.yml b/.github/workflows/manager-mvp.ymlindex c8c97d211..ebfac0195 100644--- a/.github/workflows/manager-mvp.yml+++ b/.github/workflows/manager-mvp.yml@@ -104,10 +104,10 @@ jobs:- uses: n1hility/cancel-previous-runs@v2with:token: ${{ secrets.GITHUB_TOKEN }}- - name: set up JDK 1.8+ - name: set up JDK 17uses: actions/setup-java@v1with:- java-version: 1.8+ java-version: 17- name: grant execute permission for gradlewrun: chmod +x gradlew- name: build with Gradlediff --git a/.github/workflows/manager.yml b/.github/workflows/manager.ymlindex 3189c02ff..521946448 100644--- a/.github/workflows/manager.yml+++ b/.github/workflows/manager.yml@@ -84,17 +84,17 @@ jobs:name: dist-build- name: build and push imagesrun: |- docker build --push --platform $PLATFORM -t openremote/manager:latest manager/build/install/manager+ #docker build --push --platform $PLATFORM -t openremote/manager:latest manager/build/install/managerbuild:runs-on: ubuntu-lateststeps:- uses: actions/checkout@v2- - name: set up JDK 1.8+ - name: set up JDK 17uses: actions/setup-java@v1with:- java-version: 1.8+ java-version: 17- name: grant execute permission for gradlewrun: chmod +x gradlew- name: build with Gradlediff --git a/.github/workflows/tests.yml b/.github/workflows/tests.ymlindex b4ab542b0..96fa51238 100644--- a/.github/workflows/tests.yml+++ b/.github/workflows/tests.yml@@ -30,7 +30,7 @@ jobs:- name: set up JDKuses: actions/setup-java@v1with:- java-version: 1.8+ java-version: 17- name: Login to DockerHubuses: docker/login-action@v1with:@@ -44,7 +44,7 @@ jobs:- name: Save docker images to cacheif: steps.cache-images.outputs.cache-hit != 'true'run: |- docker pull gradle:6.9.0-jdk8-hotspot+ docker pull gradle:7.3.3-jdk17docker-compose -f profile/dev-testing.yml pulldocker images --filter 'reference=openremote/*' --format "{{.Repository}}:{{.Tag}}"postgres=$(docker images --filter 'reference=openremote/postgresql' --format "{{.Repository}}:{{.Tag}}")diff --git a/agent/build.gradle b/agent/build.gradleindex 0385fc607..f374f6450 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -1,38 +1,38 @@-apply plugin: "java"+apply plugin: "java-library"apply plugin: "groovy"dependencies {- compile resolveProject(":container")+ api resolveProject(":container")- compile "io.netty:netty-codec:$nettyVersion"- compile "io.netty:netty-codec-http:$nettyVersion"+ api "io.netty:netty-codec:$nettyVersion"+ api "io.netty:netty-codec-http:$nettyVersion"- compile "com.fazecast:jSerialComm:$jSerialCommVersion"+ api "com.fazecast:jSerialComm:$jSerialCommVersion"- compile("com.github.calimero:calimero-core:$calimeroVersion") {+ api("com.github.calimero:calimero-core:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!exclude group: "org.slf4j"}- compile ("com.github.calimero:calimero-tools:$calimeroVersion") {+ api ("com.github.calimero:calimero-tools:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!exclude group: "org.slf4j"}- compile "net.sf.saxon:Saxon-HE:$saxonHEVersion"+ api "net.sf.saxon:Saxon-HE:$saxonHEVersion"//IKEA Tradfri agent dependencies- compile "org.eclipse.californium:californium-core:$californiumCoreVersion"- compile "org.eclipse.californium:scandium:$californiumScandiumVersion"-- compile("org.openremote:or-zwave:$zwaveVersion") {+ api "org.eclipse.californium:californium-core:$californiumCoreVersion"+ api "org.eclipse.californium:scandium:$californiumScandiumVersion"++ api("org.openremote:or-zwave:$zwaveVersion") {exclude group: "org.bidib.com.neuronrobotics"}- compile "com.hivemq:hivemq-mqtt-client:$hiveMQClientVersion"+ api "com.hivemq:hivemq-mqtt-client:$hiveMQClientVersion"- compile ("com.github.weliem.blessed-bluez:blessed:$bluetoothVersion") {+ api ("com.github.weliem.blessed-bluez:blessed:$bluetoothVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!exclude group: "org.slf4j"diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetPacket.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetPacket.javaindex dc84c991c..85961431b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetPacket.java+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetPacket.java@@ -1,7 +1,7 @@package org.openremote.agent.protocol.artnet;import io.netty.buffer.ByteBuf;-import org.apache.commons.lang.ArrayUtils;+import org.apache.commons.lang3.ArrayUtils;import java.util.Collections;import java.util.Comparator;diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/provisionerstates/ProvisioningPublicKeyState.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/provisionerstates/ProvisioningPublicKeyState.javaindex 0f305c7ed..71a3e7079 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/provisionerstates/ProvisioningPublicKeyState.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/provisionerstates/ProvisioningPublicKeyState.java@@ -162,7 +162,7 @@ public class ProvisioningPublicKeyState extends ProvisioningState {final ECParameterSpec ecParameters = ECNamedCurveTable.getParameterSpec("secp256r1");ECCurve curve = ecParameters.getCurve();- ECPoint ecPoint = curve.validatePoint(x, y);+ ECPoint ecPoint = curve.createPoint(x, y);ECPublicKeySpec keySpec = new ECPublicKeySpec(ecPoint, ecParameters);diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/LowerTransportLayer.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/LowerTransportLayer.javaindex 7977bf8c1..19a24200f 100644--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/LowerTransportLayer.java+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/transport/LowerTransportLayer.java@@ -763,7 +763,7 @@ abstract class LowerTransportLayer extends UpperTransportLayer {LOG.info("Acknowledgement timer expiring");sendBlockAck(seqZero, ttl, src, dst, segN);- }}, new Integer(duration).longValue()+ }}, Integer.valueOf(duration).longValue());}}@@ -787,7 +787,7 @@ abstract class LowerTransportLayer extends UpperTransportLayer {() -> {synchronized (LowerTransportLayer.this) {sendBlockAck(seqZero, ttl, src, dst, segN);- }}, new Integer(duration).longValue()+ }}, Integer.valueOf(duration).longValue());}}diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/VelbusDeviceType.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/VelbusDeviceType.javaindex 2fdac3d34..ab90cbdbd 100644--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/VelbusDeviceType.java+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/VelbusDeviceType.java@@ -80,7 +80,7 @@ public enum VelbusDeviceType {processorClazz,clazz -> {try {- return clazz.newInstance();+ return clazz.getDeclaredConstructor().newInstance();} catch (Exception e) {LOG.log(Level.SEVERE, "Failed to instantiate feature processor: " + clazz.getSimpleName(), e);return null;diff --git a/container/build.gradle b/container/build.gradleindex 559d03f9e..4c584a064 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -1,62 +1,62 @@-apply plugin: "java"+apply plugin: "java-library"apply plugin: "groovy"dependencies {- compile resolveProject(":model")+ api resolveProject(":model")- compile "org.codehaus.groovy:groovy:$groovyVersion"- compile "org.kohsuke:groovy-sandbox:$groovySandboxVersion"+ api "org.codehaus.groovy:groovy-all:$groovyVersion"+ api "org.kohsuke:groovy-sandbox:$groovySandboxVersion"- compile "org.slf4j:slf4j-api:$slf4jVersion"- compile "org.slf4j:slf4j-jdk14:$slf4jVersion"- compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"- compile "org.slf4j:log4j-over-slf4j:$slf4jVersion"+ api "org.slf4j:slf4j-api:$slf4jVersion"+ api "org.slf4j:slf4j-jdk14:$slf4jVersion"+ api "org.slf4j:jcl-over-slf4j:$slf4jVersion"+ api "org.slf4j:log4j-over-slf4j:$slf4jVersion"- compile "com.google.guava:guava:$guavaVersion"- compile "com.devskiller.friendly-id:friendly-id:$friendlyIdVersion"+ api "com.google.guava:guava:$guavaVersion"+ api "com.devskiller.friendly-id:friendly-id:$friendlyIdVersion"- compile "io.undertow:undertow-servlet:$undertowVersion"- compile "io.undertow:undertow-websockets-jsr:$undertowVersion"+ api "io.undertow:undertow-servlet:$undertowVersion"+ api "io.undertow:undertow-websockets-jsr:$undertowVersion"- compile "org.jboss.resteasy:resteasy-jaxrs:$resteasyVersion"- compile "org.jboss.resteasy:resteasy-client:$resteasyVersion"- compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasyVersion"- compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasyVersion"- compile("org.jboss.resteasy:resteasy-cache-core:$resteasyVersion") {+ api "org.jboss.resteasy:resteasy-jaxrs:$resteasyVersion"+ 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"}- compile "org.jboss.resteasy:resteasy-validator-provider:$resteasyVersion"- compile "org.jboss.resteasy:async-http-servlet-3.0:$resteasyVersionAsyncHttpServlet"+ api "org.jboss.resteasy:resteasy-validator-provider:$resteasyVersion"+ api "org.jboss.resteasy:async-http-servlet-3.0:$resteasyVersionAsyncHttpServlet"- compile "org.keycloak:keycloak-client-registration-api:$keycloakVersion"- compile "org.keycloak:keycloak-undertow-adapter:$keycloakVersion"- compile "org.keycloak:keycloak-admin-client:$keycloakVersion"+ api "org.keycloak:keycloak-client-registration-api:$keycloakVersion"+ api "org.keycloak:keycloak-undertow-adapter:$keycloakVersion"+ api "org.keycloak:keycloak-admin-client:$keycloakVersion"- compile "org.postgresql:postgresql:$postgresJdbcVersion"- compile "org.flywaydb:flyway-core:$flywaydbVersion"- compile "com.zaxxer:HikariCP:$hikaricpVersion"- compile "org.hibernate:hibernate-core:$hibernateVersion"- compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion"+ 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"- compile "javax.el:javax.el-api:3.0.0"+ api "javax.el:javax.el-api:3.0.0"- compile "org.apache.camel:camel-core:$camelVersion"- compile "org.apache.camel:camel-jackson:$camelVersion"- compile "org.apache.camel:camel-snmp:$camelVersion"+ api "org.apache.camel:camel-core:$camelVersion"+ api "org.apache.camel:camel-jackson:$camelVersion"+ api "org.apache.camel:camel-snmp:$camelVersion"- compile("com.fasterxml.uuid:java-uuid-generator:$uuidGeneratorVersion") {+ api("com.fasterxml.uuid:java-uuid-generator:$uuidGeneratorVersion") {exclude group: "log4j"}- compile("org.cyclopsgroup:jmxterm:$jmxtermVersion") {+ api("org.cyclopsgroup:jmxterm:$jmxtermVersion") {exclude group: "javax.servlet"exclude group: "log4j"exclude group: "logkit"exclude group: "commons-logging"}- compile "com.vladmihalcea:hibernate-types-52:$hibernateTypesVersion"+ api "com.vladmihalcea:hibernate-types-52:$hibernateTypesVersion"}jar {diff --git a/container/src/main/java/org/openremote/container/concurrent/ContainerThreadFactory.java b/container/src/main/java/org/openremote/container/concurrent/ContainerThreadFactory.javaindex e8d4d8585..d5cf81ebc 100644--- a/container/src/main/java/org/openremote/container/concurrent/ContainerThreadFactory.java+++ b/container/src/main/java/org/openremote/container/concurrent/ContainerThreadFactory.java@@ -36,10 +36,7 @@ public class ContainerThreadFactory implements ThreadFactory {public ContainerThreadFactory(String name) {this.name = name;- SecurityManager securityManager = System.getSecurityManager();- group = (securityManager != null)- ? securityManager.getThreadGroup()- : Thread.currentThread().getThreadGroup();+ group = Thread.currentThread().getThreadGroup();}public Thread newThread(Runnable r) {diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex bee00483c..21358abb6 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -22,6 +22,7 @@ package org.openremote.container.persistence;import org.apache.camel.ExchangePattern;import org.flywaydb.core.Flyway;import org.flywaydb.core.api.MigrationInfo;+import org.flywaydb.core.api.output.MigrateResult;import org.hibernate.Session;import org.hibernate.cfg.AvailableSettings;import org.hibernate.engine.spi.SharedSessionContractImplementor;@@ -488,8 +489,8 @@ public class PersistenceService implements ContainerService {for (MigrationInfo i : flyway.info().pending()) {LOG.info("Pending task: " + i.getVersion() + ", " + i.getDescription() + ", " + i.getScript());}- int applied = flyway.migrate();- LOG.info("Applied database schema migrations: " + applied);+ MigrateResult result = flyway.migrate();+ LOG.info("Applied database schema migrations: " + result.migrationsExecuted);flyway.validate();}diff --git a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.javaindex 79c96575a..afaaa9708 100644--- a/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java+++ b/container/src/main/java/org/openremote/container/web/WebTargetBuilder.java@@ -183,9 +183,9 @@ public class WebTargetBuilder {//Create all of this config code in order to deal with expires cookies in responsesRequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD)- .setConnectionRequestTimeout(new Long(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())- .setConnectTimeout(new Long(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())- .setSocketTimeout(new Long(overrideSocketTimeout).intValue())+ .setConnectionRequestTimeout(Long.valueOf(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())+ .setConnectTimeout(Long.valueOf(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())+ .setSocketTimeout(Long.valueOf(overrideSocketTimeout).intValue()).build();HttpClient apacheClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig)diff --git a/container/src/main/java/org/openremote/container/xml/NamespaceContextMap.java b/container/src/main/java/org/openremote/container/xml/NamespaceContextMap.javadeleted file mode 100644index 0d401c4fd..000000000--- a/container/src/main/java/org/openremote/container/xml/NamespaceContextMap.java+++ /dev/null@@ -1,61 +0,0 @@-/*- * Copyright 2016, OpenRemote Inc.- *- * See the CONTRIBUTORS.txt file in the distribution for a- * full listing of individual contributors.- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU Affero General Public License as- * published by the Free Software Foundation, either version 3 of the- * License, or (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU Affero General Public License for more details.- *- * You should have received a copy of the GNU Affero General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.- */-package org.openremote.container.xml;--import javax.xml.XMLConstants;-import javax.xml.namespace.NamespaceContext;-import java.util.HashMap;-import java.util.Iterator;--/**- * This should have been part of the JDK.- * <p>- * The dumb XPath API needs a map to lookup namespace URIs using prefix keys. Unfortunately,- * the authors did not know <tt>java.util.Map</tt>.- * </p>- *- * @author Christian Bauer- */-public abstract class NamespaceContextMap extends HashMap<String, String> implements NamespaceContext {-- public String getNamespaceURI(String prefix) {- if (prefix == null) {- throw new IllegalArgumentException("No prefix provided!");- } else if (prefix.equals(XMLConstants.DEFAULT_NS_PREFIX)) {- return getDefaultNamespaceURI();- } else if (get(prefix) != null) {- return get(prefix);- } else {- return XMLConstants.NULL_NS_URI;- }- }-- // Whatever, we don't care- public String getPrefix(String namespaceURI) {- return null;- }-- // Whatever, we don't care- public Iterator<?> getPrefixes(String s) {- return null;- }-- protected abstract String getDefaultNamespaceURI();-}diff --git a/container/src/main/java/org/openremote/container/xml/SAXParser.java b/container/src/main/java/org/openremote/container/xml/SAXParser.javaindex 894826527..de366bf73 100644--- a/container/src/main/java/org/openremote/container/xml/SAXParser.java+++ b/container/src/main/java/org/openremote/container/xml/SAXParser.java@@ -22,7 +22,6 @@ package org.openremote.container.xml;import org.xml.sax.*;import org.xml.sax.helpers.AttributesImpl;import org.xml.sax.helpers.DefaultHandler;-import org.xml.sax.helpers.XMLReaderFactory;import javax.xml.XMLConstants;import javax.xml.parsers.SAXParserFactory;@@ -56,16 +55,16 @@ public class SAXParser {protected XMLReader create() {try {+ SAXParserFactory factory = SAXParserFactory.newInstance();+if (getSchemaSources() != null) {// Jump through all the hoops and create a validating reader- SAXParserFactory factory = SAXParserFactory.newInstance();factory.setNamespaceAware(true);factory.setSchema(createSchema(getSchemaSources()));- XMLReader xmlReader = factory.newSAXParser().getXMLReader();- xmlReader.setErrorHandler(getErrorHandler());- return xmlReader;}- return XMLReaderFactory.createXMLReader();+ XMLReader xmlReader = factory.newSAXParser().getXMLReader();+ xmlReader.setErrorHandler(getErrorHandler());+ return xmlReader;} catch (Exception ex) {throw new RuntimeException(ex);}diff --git a/gradle.properties b/gradle.propertiesindex c45052447..335c14ed0 100644--- a/gradle.properties+++ b/gradle.properties@@ -12,17 +12,17 @@ undertowVersion = 2.2.3.FinalresteasyVersion = 3.14.0.FinalresteasyVersionAsyncHttpServlet = 3.0.19.FinaljbossLoggingAnnotationsVersion = 2.0.2.Final-keycloakVersion = 13.0.1-jacksonVersion = 2.11.4-groovyVersion = 2.5.15+keycloakVersion = 16.0.0+jacksonVersion = 2.13.1+groovyVersion = 3.0.9groovySandboxVersion = 1.19sqliteVersion = 3.34.0hibernateVersion = 5.4.25.FinalhibernateValidatorVersion = 6.1.6.FinalpostgresJdbcVersion = 42.2.18hikaricpVersion = 3.4.5-junitVersion = 4.12-spockVersion = 1.3-groovy-2.5+junitVersion = 4.13.2+spockVersion = 2.0-groovy-3.0byteBuddyVersion = 1.9.3objenesisVersion = 2.6camelVersion = 2.19.0@@ -35,8 +35,8 @@ uuidGeneratorVersion = 3.1.3jSerialCommVersion = 2.7.0saxonHEVersion = 9.8.0-3jmxtermVersion = 1.0.0-nettyVersion = 4.1.69.Final-flywaydbVersion = 6.4.3+nettyVersion = 4.1.72.Final+flywaydbVersion = 8.4.0ical4jVersion = 2.1.5jafamaVersion = 2.3.1friendlyIdVersion = 1.0.1@@ -55,3 +55,4 @@ swaggerVersion=2.1.9jsonSchemaVersion=4.18.0hiveMQClientVersion=1.2.2bluetoothVersion = 0.39+nashornVersion=15.3diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 838e6bc85..84d1f85fd 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,5 +1,5 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zipzipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/manager/Dockerfile b/manager/Dockerfileindex 68abb3dee..8f14688f5 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -1,4 +1,4 @@-FROM registry.access.redhat.com/ubi8/openjdk-11-runtime+FROM registry.access.redhat.com/ubi8/openjdk-17-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 f5bd2fc68..d1eccc696 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -1,4 +1,4 @@-apply plugin: "java"+apply plugin: "java-library"apply plugin: "application"apply plugin: "distribution"@@ -6,29 +6,30 @@ mainClassName = "org.openremote.manager.Main"dependencies {- compile resolveProject(":container")- compile resolveProject(":agent")- compile resolveProject(":model")+ api resolveProject(":container")+ api resolveProject(":agent")+ api resolveProject(":model")- compile "org.xerial:sqlite-jdbc:$sqliteVersion"+ api "org.xerial:sqlite-jdbc:$sqliteVersion"- compile "org.mnode.ical4j:ical4j:$ical4jVersion"+ api "org.mnode.ical4j:ical4j:$ical4jVersion"- compile "net.jafama:jafama:$jafamaVersion"- compile "org.geotools:gt-main:$geotoolsVersion"- compile "com.google.firebase:firebase-admin:$firebaseAdminVersion"- compile "org.simplejavamail:simple-java-mail:$simpleJavaMailVersion"- compile "io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion"+ api "net.jafama:jafama:$jafamaVersion"+ api "org.geotools:gt-main:$geotoolsVersion"+ api "com.google.firebase:firebase-admin:$firebaseAdminVersion"+ api "org.simplejavamail:simple-java-mail:$simpleJavaMailVersion"+ api "io.swagger.core.v3:swagger-jaxrs2:$swaggerVersion"+ api "org.openjdk.nashorn:nashorn-core:$nashornVersion"- compile ("io.netty:netty-codec-http:$nettyVersion") {+ api ("io.netty:netty-codec-http:$nettyVersion") {force = true}- compile ("io.moquette:moquette-broker:$moquetteVersion") {+ api ("io.moquette:moquette-broker:$moquetteVersion") {exclude module: "slf4j-log4j12" // Don't want log4J}- compile("org.quartz-scheduler:quartz:$quartzVersion") {+ api("org.quartz-scheduler:quartz:$quartzVersion") {exclude group: "c3p0"}}diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 82c809c85..07f529d61 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -19,6 +19,7 @@*/package org.openremote.manager.agent;+import groovy.util.MapEntry;import org.apache.camel.builder.RouteBuilder;import org.openremote.agent.protocol.ProtocolAssetService;import org.openremote.container.message.MessageBrokerService;@@ -592,7 +593,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse.filter(agentAttribute -> agentAttribute.key != null).collect(Collectors.groupingBy(agentAttribute -> agentAttribute.key,- mapping(agentAttribute -> agentAttribute.value, toList())+ Collectors.collectingAndThen(Collectors.toList(), agentAttribute -> agentAttribute.stream().map(item->item.value).collect(toList())) //TODO had to change to this because compiler has issues with inferring types, need to check for a better solution));}@@ -707,7 +708,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse}try {- ProtocolInstanceDiscovery instanceDiscovery = instanceDiscoveryProviderClass.newInstance();+ ProtocolInstanceDiscovery instanceDiscovery = instanceDiscoveryProviderClass.getDeclaredConstructor().newInstance();Future<Void> discoveryFuture = instanceDiscovery.startInstanceDiscovery(onDiscovered);discoveryFuture.get();} catch (InterruptedException e) {diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javaindex 60a58f516..f1b91a4dc 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java@@ -20,6 +20,7 @@ import org.openremote.model.asset.impl.ElectricityProducerSolarAsset;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.query.AssetQuery;+import org.openremote.model.syslog.SyslogCategory;import javax.ws.rs.core.Response;import java.io.IOException;@@ -34,7 +35,6 @@ import java.util.concurrent.ScheduledFuture;import java.util.concurrent.TimeUnit;import java.util.logging.Level;import java.util.logging.Logger;-import java.util.stream.Collectors;import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;@@ -43,6 +43,7 @@ import static org.openremote.container.persistence.PersistenceEvent.isPersistencimport static org.openremote.container.util.MapAccess.getString;import static org.openremote.container.web.WebTargetBuilder.createClient;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;+import static org.openremote.model.syslog.SyslogCategory.DATA;/*** Fills in power forecast from ForecastSolar (https://forecast.solar) for {@link ElectricityProducerSolarAsset}.@@ -81,7 +82,7 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServiprotected RulesService rulesService;protected TimerService timerService;- protected static final Logger LOG = Logger.getLogger(ForecastSolarService.class.getName());+ protected static final Logger LOG = SyslogCategory.getLogger(DATA, ForecastSolarService.class.getName());protected static ResteasyClient resteasyClient;protected ResteasyWebTarget forecastSolarTarget;@@ -140,7 +141,7 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi.stream().map(asset -> (ElectricityProducerSolarAsset) asset).filter(electricityProducerSolarAsset -> electricityProducerSolarAsset.isIncludeForecastSolarService().orElse(false))- .collect(Collectors.toList());+ .toList();LOG.fine("Found includes producer solar asset count = " + electricityProducerSolarAssets.size());diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.javaindex 1f9f04547..23eca168c 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java@@ -19,6 +19,7 @@ import org.openremote.model.asset.impl.ElectricityProducerSolarAsset;import org.openremote.model.asset.impl.ElectricityProducerWindAsset;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 java.io.IOException;@@ -34,13 +35,13 @@ import java.util.concurrent.ScheduledFuture;import java.util.concurrent.TimeUnit;import java.util.logging.Level;import java.util.logging.Logger;-import java.util.stream.Collectors;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.container.web.WebTargetBuilder.createClient;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;+import static org.openremote.model.syslog.SyslogCategory.DATA;/*** Calculates power generation for {@link ElectricityProducerWindAsset}.@@ -109,7 +110,7 @@ public class ForecastWindService extends RouteBuilder implements ContainerServicpublic static final String OPEN_WEATHER_API_APP_ID = "OPEN_WEATHER_API_APP_ID";- protected static final Logger LOG = Logger.getLogger(ForecastWindService.class.getName());+ protected static final Logger LOG = SyslogCategory.getLogger(DATA, ForecastWindService.class.getName());protected AssetStorageService assetStorageService;protected AssetProcessingService assetProcessingService;protected GatewayService gatewayService;@@ -179,7 +180,7 @@ public class ForecastWindService extends RouteBuilder implements ContainerServic.map(asset -> (ElectricityProducerWindAsset) asset).filter(electricityProducerWindAsset -> electricityProducerWindAsset.isIncludeForecastWindService().orElse(false)&& electricityProducerWindAsset.getLocation().isPresent())- .collect(Collectors.toList());+ .toList();LOG.fine("Found includes producer wind asset count = " + electricityProducerWindAssets.size());diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex 19a1486ca..81a3439e8 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -386,7 +386,7 @@ public class MapService implements ContainerService {public byte[] getMapTile(int zoom, int column, int row) {// Flip y, oh why- row = new Double(Math.pow(2, zoom) - 1 - row).intValue();+ row = Double.valueOf(Math.pow(2, zoom) - 1 - row).intValue();PreparedStatement query = null;ResultSet result = null;diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.javaindex 4100c400a..b4380c18d 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java@@ -22,7 +22,6 @@ package org.openremote.manager.rules;import groovy.lang.Binding;import groovy.lang.GroovyShell;import groovy.lang.Script;-import jdk.nashorn.api.scripting.ScriptObjectMirror;import org.codehaus.groovy.control.CompilerConfiguration;import org.jeasy.rules.api.Action;import org.jeasy.rules.api.Condition;@@ -31,6 +30,7 @@ import org.jeasy.rules.api.Rules;import org.jeasy.rules.core.RuleBuilder;import org.kohsuke.groovy.sandbox.GroovyValueFilter;import org.kohsuke.groovy.sandbox.SandboxTransformer;+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.model.calendar.CalendarEvent;diff --git a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.javaindex d990742fc..bca6cafa7 100644--- a/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java+++ b/manager/src/main/java/org/openremote/manager/system/SystemHealthStatusProvider.java@@ -69,9 +69,9 @@ public class SystemHealthStatusProvider implements HealthStatusProvider, Containcom.sun.management.OperatingSystemMXBean operatingSystemMXBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();File[] roots = File.listRoots();- objectValue.put("systemLoadPercentage", operatingSystemMXBean.getSystemCpuLoad()*100);- objectValue.put("totalPhysicalMemoryMB", operatingSystemMXBean.getTotalPhysicalMemorySize() / (1024F*1024F));- objectValue.put("freePhysicalMemoryMB", operatingSystemMXBean.getFreePhysicalMemorySize() / (1024F*1024F));+ objectValue.put("systemLoadPercentage", operatingSystemMXBean.getCpuLoad()*100);+ objectValue.put("totalPhysicalMemoryMB", operatingSystemMXBean.getTotalMemorySize() / (1024F*1024F));+ objectValue.put("freePhysicalMemoryMB", operatingSystemMXBean.getFreeMemorySize() / (1024F*1024F));objectValue.put("committedVirtualMemoryMB", operatingSystemMXBean.getCommittedVirtualMemorySize() / (1024F*1024F));objectValue.put("totalSwapSpaceMB", operatingSystemMXBean.getTotalSwapSpaceSize() / (1024F*1024F));objectValue.put("freeSwapSpaceMB", operatingSystemMXBean.getFreeSwapSpaceSize() / (1024F*1024F));diff --git a/model/build.gradle b/model/build.gradleindex 435165154..9608963ff 100644--- a/model/build.gradle+++ b/model/build.gradle@@ -1,41 +1,41 @@-apply plugin: "java"+apply plugin: "java-library"compileJava.options.compilerArgs.add '-parameters'compileTestJava.options.compilerArgs.add '-parameters'dependencies {- compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- compile "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"+ api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"+ api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"+ api "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"- compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$javaxPersistenceVersion"- compile "org.hibernate:hibernate-core:$hibernateVersion"- compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion"- compile "com.vladmihalcea:hibernate-types-52:$hibernateTypesVersion"- compile "org.glassfish.web:javax.el:$javaxELVersion"- compile "org.jboss.logging:jboss-logging-annotations:$jbossLoggingAnnotationsVersion"+ 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.jboss.logging:jboss-logging-annotations:$jbossLoggingAnnotationsVersion"- compile "org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:$javaxAnnotationsVersion"- compile "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:$jaxrsSpecVersion"+ 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"- compile "org.keycloak:keycloak-core:$keycloakVersion"- compile "org.keycloak:keycloak-core:$keycloakVersion:sources"+ api "org.keycloak:keycloak-core:$keycloakVersion"+ api "org.keycloak:keycloak-core:$keycloakVersion:sources"- compile "org.geotools:gt-main:$geotoolsVersion"- compile "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"- compile "org.jeasy:easy-rules-core:$easyRulesVersion"- compile "org.mnode.ical4j:ical4j:$ical4jVersion"- compile "org.reflections:reflections:$reflectionsVersion"- compile "com.google.guava:guava:$guavaVersion"+ api "org.geotools:gt-main:$geotoolsVersion"+ api "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"+ api "org.jeasy:easy-rules-core:$easyRulesVersion"+ api "org.mnode.ical4j:ical4j:$ical4jVersion"+ api "org.reflections:reflections:$reflectionsVersion"+ api "com.google.guava:guava:$guavaVersion"- compile "io.swagger.core.v3:swagger-annotations:$swaggerVersion"+ api "io.swagger.core.v3:swagger-annotations:$swaggerVersion"// Custom build from https://github.com/richturner/mbknor-jackson-jsonSchema- compile files("libs/mbknor-jackson-jsonschema_2.12-1.0.40-SNAPSHOT.jar")- implementation "org.scala-lang:scala-library:2.12.10"- implementation "io.github.classgraph:classgraph:4.8.21"- //compile "com.kjetland:mbknor-jackson-jsonschema_2.12:1.0.39"+ api files("libs/mbknor-jackson-jsonschema_2.12-1.0.40-SNAPSHOT.jar")+ api "org.scala-lang:scala-library:2.12.10"+ api "io.github.classgraph:classgraph:4.8.21"+ //api "com.kjetland:mbknor-jackson-jsonschema_2.12:1.0.39"}jar {diff --git a/model/src/main/java/org/openremote/model/attribute/Attribute.java b/model/src/main/java/org/openremote/model/attribute/Attribute.javaindex 6a2a3da7e..4babcf131 100644--- a/model/src/main/java/org/openremote/model/attribute/Attribute.java+++ b/model/src/main/java/org/openremote/model/attribute/Attribute.java@@ -57,9 +57,9 @@ public class Attribute<T> extends AbstractNameValueHolder<T> implements MetaHold@SuppressWarnings({"unchecked", "rawtypes"})@Overridepublic Attribute<?> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {-// Need to find the type field to know how to deserialise the value- TokenBuffer tokenBuffer = TokenBuffer.asCopyOfValue(jp);+ TokenBuffer tokenBuffer = new TokenBuffer(jp);+ tokenBuffer.copyCurrentStructure(jp);JsonParser jp2 = tokenBuffer.asParser();JsonParser jp3 = tokenBuffer.asParser();String attributeValueType = null;diff --git a/project.gradle b/project.gradleindex 06e462ef3..d579823be 100644--- a/project.gradle+++ b/project.gradle@@ -236,10 +236,10 @@ task tscWatch(type: Exec) {// Configure Java buildplugins.withType(JavaPlugin).whenPluginAdded {- // Use Java 8+ // Use Java 17tasks.withType(JavaCompile) {- sourceCompatibility = "1.8"- targetCompatibility = "1.8"+ sourceCompatibility = JavaVersion.VERSION_17+ targetCompatibility = JavaVersion.VERSION_17def warnLogFile = file("$buildDir/${name}Warnings.log")logging.addStandardErrorListener(new StandardOutputListener() {void onOutput(CharSequence output) {diff --git a/test/build.gradle b/test/build.gradleindex 31e76d543..79ea3da5f 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -1,24 +1,24 @@import org.gradle.api.tasks.testing.logging.TestExceptionFormatimport org.gradle.api.tasks.testing.logging.TestLogEvent-apply plugin: "java"+apply plugin: "java-library"apply plugin: "groovy"dependencies {- compile "org.codehaus.groovy:groovy:$groovyVersion"+ api resolveProject(":manager")- compile resolveProject(":manager")+ api "org.codehaus.groovy:groovy-all:$groovyVersion"- compile "junit:junit:$junitVersion"- compile "org.spockframework:spock-core:$spockVersion"+ api "junit:junit:$junitVersion"+ api "org.spockframework:spock-core:$spockVersion"- compile "org.glassfish.tyrus:tyrus-client:$tyrusVersion"- compile "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"- compile "org.objenesis:objenesis:$objenesisVersion"- compile "net.bytebuddy:byte-buddy:$byteBuddyVersion"+ api "org.glassfish.tyrus:tyrus-client:$tyrusVersion"+ api "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"+ api "org.objenesis:objenesis:$objenesisVersion"+ api "net.bytebuddy:byte-buddy:$byteBuddyVersion"- compile("com.github.calimero:calimero-server:$calimeroVersion") {+ api("com.github.calimero:calimero-server:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!exclude group: "org.slf4j"}@@ -27,6 +27,7 @@ dependencies {test {workingDir = findProject(":openremote") != null ? resolveProject("").projectDir : rootProject.projectDiroutputs.upToDateWhen {false}+ useJUnitPlatform()testLogging {// set options for log level LIFECYCLEevents TestLogEvent.FAILED,diff --git a/test/src/main/java/org/openremote/test/TestFixture.java b/test/src/main/java/org/openremote/test/TestFixture.javaindex 1ec217f05..5112a11da 100644--- a/test/src/main/java/org/openremote/test/TestFixture.java+++ b/test/src/main/java/org/openremote/test/TestFixture.java@@ -27,18 +27,15 @@ import org.openremote.model.gateway.GatewayConnection;import org.openremote.model.rules.AssetRuleset;import org.openremote.model.rules.GlobalRuleset;import org.openremote.model.rules.TenantRuleset;-import org.openremote.model.security.Role;import org.openremote.model.security.User;-import org.openremote.model.util.Pair;-import org.spockframework.runtime.extension.AbstractGlobalExtension;+import org.spockframework.runtime.extension.IGlobalExtension;import java.util.List;-import java.util.Map;/*** Used to store state for tests to help improve test performance*/-public class TestFixture extends AbstractGlobalExtension {+public class TestFixture implements IGlobalExtension {// Store the container here to allow stopping it after all tests runprotected static Container container;@@ -56,7 +53,6 @@ public class TestFixture extends AbstractGlobalExtension {AbstractNettyIOClient.RECONNECT_DELAY_INITIAL_MILLIS = 50;AbstractNettyIOClient.RECONNECT_DELAY_JITTER_MILLIS = 0;AbstractNettyIOClient.RECONNECT_DELAY_MAX_MILLIS = 50;- super.start();}@Overridediff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex 45614457a..82af64d89 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -629,13 +629,13 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {messages.clear()and: "another 10 consoles are added to the system"- def id = testUser3Console1.id+ def testUser3Console1Id = testUser3Console1.iddef extraConsoles = IntStream.rangeClosed(3, 12).mapToObj({testUser3Console1.id = nulltestUser3Console1.name = "Test Console $it"return assetStorageService.merge(testUser3Console1)}).collect({ it })- testUser3Console1.id = id+ testUser3Console1.id = testUser3Console1Idthen: "the extra consoles should have been added"assert extraConsoles.size() == 10diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovyindex da17d0c5e..f4ab25fa1 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy@@ -622,7 +622,7 @@ class ForecastWindServiceTest extends Specification implements ManagerContainerT" }\n" +" ],\n" +" \"pop\": 0.05\n" +- " },\n" ++ " }\n" +" ]\n" +"}"def responseBody = ValueUtil.JSON.readValue(content, ForecastWindService.WeatherForecastResponseModel.class)diff --git a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovyindex 85f663884..908135c7d 100644--- a/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy+++ b/test/src/test/groovy/org/openremote/test/gateway/GatewayTest.groovy@@ -152,12 +152,12 @@ class GatewayTest extends Specification implements ManagerContainerTrait {assert clientReceivedMessages[0].startsWith(EventRequestResponseWrapper.MESSAGE_PREFIX)def response = ValueUtil.JSON.readValue(clientReceivedMessages[0].substring(EventRequestResponseWrapper.MESSAGE_PREFIX.length()), EventRequestResponseWrapper.class)assert response.messageId == GatewayConnector.ASSET_READ_EVENT_NAME_INITIAL- def readAssetsEvent = response.event as ReadAssetsEvent- assert readAssetsEvent.assetQuery != null- assert readAssetsEvent.assetQuery.select.excludeAttributes- assert readAssetsEvent.assetQuery.select.excludePath- assert readAssetsEvent.assetQuery.select.excludeParentInfo- assert readAssetsEvent.assetQuery.recursive+ def localReadAssetsEvent = response.event as ReadAssetsEvent+ assert localReadAssetsEvent.assetQuery != null+ assert localReadAssetsEvent.assetQuery.select.excludeAttributes+ assert localReadAssetsEvent.assetQuery.select.excludePath+ assert localReadAssetsEvent.assetQuery.select.excludeParentInfo+ assert localReadAssetsEvent.assetQuery.recursive}when: "the previously received messages are cleared"diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex a2f903417..053f39d5d 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -174,10 +174,10 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaassert device1Responses.size() == 1assert device1Responses.get(0) instanceof SuccessResponseMessageassert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant- def asset = ((SuccessResponseMessage)device1Responses.get(0)).asset- assert asset != null- assert asset instanceof WeatherAsset- assert asset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId+ def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset+ assert weatherAsset != null+ assert weatherAsset instanceof WeatherAsset+ assert weatherAsset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId}when: "the client gets abruptly disconnected"@@ -211,10 +211,10 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaassert device1Responses.size() == 1assert device1Responses.get(0) instanceof SuccessResponseMessageassert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingTenant- def asset = ((SuccessResponseMessage)device1Responses.get(0)).asset- assert asset != null- assert asset instanceof WeatherAsset- assert asset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId+ def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset+ assert weatherAsset != null+ assert weatherAsset instanceof WeatherAsset+ assert weatherAsset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId}when: "the client then subscribes to attribute events for the generated asset and asset events for all assets"diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex 572112c09..03945457d 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -18,15 +18,15 @@ dependencies {if (isCustomProject()) {def customModel = findProject(":model")if (customModel != null) {- compile customModel+ implementation customModel}}- compile resolveProject(":model")- compile resolveProject(":agent")- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- compile "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"- compile "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"+ implementation resolveProject(":model")+ implementation resolveProject(":agent")+ implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"+ implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"+ implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"}generateTypeScript {diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 060e7e9ea..9eaf913ae 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -15,15 +15,15 @@ dependencies {if (isCustomProject()) {def customModel = findProject(":model")if (customModel != null) {- compile customModel+ implementation customModel}}- compile resolveProject(":model")- compile resolveProject(":ui:component:model")- compile "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- compile "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"+ implementation resolveProject(":model")+ implementation resolveProject(":ui:component:model")+ implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"+ implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"+ implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"}task generateTypescriptModelInfo(type: cz.habarta.typescript.generator.gradle.GenerateTask) {