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
Fix load2 Java compilation errors (#2304)
Wouter Born75a847b130ca
diff --git a/setup/build.gradle b/setup/build.gradleindex 7ff71d001..9988bb2b2 100644--- a/setup/build.gradle+++ b/setup/build.gradle@@ -32,9 +32,7 @@ tasks.register('load1Jar', Jar) {}tasks.register('load2Jar', Jar) {- base {- archivesName = "openremote-load2-${project.name}"- }+ archiveBaseName.set("openremote-load2-${project.name}")from sourceSets.load2.output}@@ -43,6 +41,10 @@ tasks.register('demoJar', Jar) {from sourceSets.demo.output}+tasks.named("compileJava") {+ dependsOn("load1Jar", "load2Jar", "demoJar")+}+// Use demo setup sourceset by default for jartasks.register('installDist', Copy) {def setupTask = getTasksByName("${setupJar}Jar", false)[0] as org.gradle.jvm.tasks.Jar@@ -50,5 +52,5 @@ tasks.register('installDist', Copy) {dependsOn setupTaskdependsOn resolveTask(":manager:installDist")from setupTask.archiveFile- into "${project(":manager").buildDir}/install/manager/deployment/manager/extensions"+ into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")}diff --git a/setup/src/load2/java/org/openremote/setup/load2/KeycloakSetup.java b/setup/src/load2/java/org/openremote/setup/load2/KeycloakSetup.javaindex ed9baf457..20ed24d25 100644--- a/setup/src/load2/java/org/openremote/setup/load2/KeycloakSetup.java+++ b/setup/src/load2/java/org/openremote/setup/load2/KeycloakSetup.java@@ -31,10 +31,10 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.IntStream;-import static org.openremote.container.util.MapAccess.getInteger;import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;import static org.openremote.model.Constants.MASTER_REALM;import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE;+import static org.openremote.model.util.MapAccess.getInteger;public class KeycloakSetup extends AbstractKeycloakSetup {private static final ClientRole[] CLIENT_ROLES = new ClientRole[] {diff --git a/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java b/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.javaindex 8899a68b1..9b96b85b0 100644--- a/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java+++ b/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java@@ -20,44 +20,28 @@package org.openremote.setup.load2;-import org.apache.commons.io.IOUtils;-import org.openremote.manager.mqtt.UserAssetProvisioningMQTTHandler;import org.openremote.manager.provisioning.ProvisioningService;-import org.openremote.manager.security.ManagerKeycloakIdentityProvider;-import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.asset.Asset;import org.openremote.model.asset.UserAssetLink;import org.openremote.model.asset.impl.BuildingAsset;import org.openremote.model.asset.impl.LightAsset;-import org.openremote.model.asset.impl.WeatherAsset;-import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;-import org.openremote.model.provisioning.X509ProvisioningConfig;-import org.openremote.model.provisioning.X509ProvisioningData;-import org.openremote.model.rules.RealmRuleset;-import org.openremote.model.security.ClientRole;import org.openremote.model.security.User;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.UniqueIdentifierGenerator;-import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemType;-import java.io.InputStream;-import java.nio.charset.StandardCharsets;import java.util.Collections;import java.util.concurrent.Executor;import java.util.concurrent.atomic.AtomicInteger;import java.util.logging.Logger;import java.util.stream.IntStream;-import static org.openremote.container.util.MapAccess.getBoolean;-import static org.openremote.container.util.MapAccess.getInteger;-import static org.openremote.manager.mqtt.UserAssetProvisioningMQTTHandler.UNIQUE_ID_PLACEHOLDER;import static org.openremote.model.Constants.MASTER_REALM;-import static org.openremote.model.rules.Ruleset.Lang.GROOVY;import static org.openremote.model.syslog.SyslogCategory.DATA;-import static org.openremote.model.value.ValueType.NUMBER;+import static org.openremote.model.util.MapAccess.getBoolean;+import static org.openremote.model.util.MapAccess.getInteger;import static org.openremote.setup.load2.KeycloakSetup.OR_SETUP_USERS;public class ManagerSetup extends org.openremote.manager.setup.ManagerSetup {