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
Move energy code into separate extension (#2309)
Wouter Bornba0cae8244d1
diff --git a/deployment/build.gradle b/deployment/build.gradleindex 4af814236..4d54c2b23 100644--- a/deployment/build.gradle+++ b/deployment/build.gradle@@ -11,16 +11,11 @@ dependencies {tasks.register('license') {doLast {- def toConcatenate = files("${rootDir}/LICENSE.txt")- def outputFileName = "${buildDir}/image/manager/app/LICENSE.txt"- def output = new File(outputFileName)- if (output.exists()) {- output.delete()- }- output.getParentFile().mkdirs()- output.createNewFile()- output.write('') // truncate output if needed- toConcatenate.each { f -> output << f.text }+ def sourceFile = file("${rootDir}/LICENSE.txt")+ def outputFile = layout.buildDirectory.file("image/manager/app/LICENSE.txt").get().asFile++ outputFile.parentFile.mkdirs()+ outputFile.text = sourceFile.text}}@@ -30,8 +25,9 @@ tasks.register('installDist', Copy) {// Don't create circular dependency or depend on built in openremote submodule appsit.project != project && !it.project.path.startsWith(":openremote:ui:app")})+ dependsOn(tasks.named('license'))- into("$buildDir")+ into(layout.buildDirectory)from "Dockerfile"@@ -47,4 +43,8 @@ tasks.register('installDist', Copy) {// Don't include any ui packaged JARs (used for dev purposes only)exclude { (it.file.path.contains(".gradle") || it.file.path.contains(".m2")) && it.file.path.contains("io.openremote.ui") }}++ into("image/manager/extensions") {+ from project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")+ }}diff --git a/extension/demo-setup/build.gradle b/extension/demo-setup/build.gradlenew file mode 100644index 000000000..5a2f172aa--- /dev/null+++ b/extension/demo-setup/build.gradle@@ -0,0 +1,88 @@+apply plugin: "java-library"+apply plugin: "maven-publish"+apply plugin: "signing"++base {+ archivesName = "openremote-${project.name}"+}++dependencies {+ implementation project(":manager")+ implementation project(":extension:energy")+}++jar {+ from sourceSets.main.allJava+}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote.extension"+ artifactId = "openremote-${project.name}"+ from components.java+ pom {+ name = 'OpenRemote Demo setup'+ description = 'Adds the OpenRemote Demo setup'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ if (signingKey && signingPassword) {+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+ }+}++tasks.register('installDist', Copy) {+ dependsOn resolveTask(":manager:installDist")+ onlyIf { !project.hasProperty("SETUP_JAR") || project.getProperties().get("SETUP_JAR") == "demo" }+ from jar.archiveFile+ into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")+}diff --git a/setup/src/demo/java/org/openremote/setup/demo/DemoSetupTasks.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/DemoSetupTasks.javasimilarity index 97%rename from setup/src/demo/java/org/openremote/setup/demo/DemoSetupTasks.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/DemoSetupTasks.javaindex e91964ed1..633046a7a 100644--- a/setup/src/demo/java/org/openremote/setup/demo/DemoSetupTasks.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/DemoSetupTasks.java@@ -17,7 +17,7 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.openremote.model.Container;import org.openremote.model.setup.Setup;diff --git a/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/KeycloakDemoSetup.javasimilarity index 98%rename from setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/KeycloakDemoSetup.javaindex 01568a63c..2566a8c83 100644--- a/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/KeycloakDemoSetup.java@@ -17,7 +17,7 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.openremote.manager.setup.AbstractKeycloakSetup;import org.openremote.model.Constants;diff --git a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoAgentSetup.javasimilarity index 98%rename from setup/src/demo/java/org/openremote/setup/demo/ManagerDemoAgentSetup.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoAgentSetup.javaindex 07f3b6a92..de20ca6e1 100644--- a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoAgentSetup.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoAgentSetup.java@@ -17,7 +17,7 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.openremote.agent.protocol.knx.KNXAgent;import org.openremote.agent.protocol.velbus.VelbusTCPAgent;diff --git a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoDashboardSetup.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoDashboardSetup.javasimilarity index 97%rename from setup/src/demo/java/org/openremote/setup/demo/ManagerDemoDashboardSetup.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoDashboardSetup.javaindex 3c3ba6322..91773dae2 100644--- a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoDashboardSetup.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoDashboardSetup.java@@ -17,7 +17,7 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.openremote.manager.dashboard.DashboardStorageService;import org.openremote.manager.setup.ManagerSetup;diff --git a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoSetup.javasimilarity index 98%rename from setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoSetup.javaindex 234e0a865..ec88bfcef 100644--- a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/ManagerDemoSetup.java@@ -17,12 +17,23 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.openremote.agent.protocol.http.HTTPAgent;import org.openremote.agent.protocol.http.HTTPAgentLink;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.agent.protocol.simulator.SimulatorAgentLink;+import org.openremote.extension.demosetup.model.HarvestRobotAsset;+import org.openremote.extension.demosetup.model.HarvestRobotAsset.OperationMode;+import org.openremote.extension.demosetup.model.HarvestRobotAsset.VegetableType;+import org.openremote.extension.demosetup.model.IrrigationAsset;+import org.openremote.extension.demosetup.model.SoilSensorAsset;+import org.openremote.extension.energy.model.ElectricityBatteryAsset;+import org.openremote.extension.energy.model.ElectricityChargerAsset;+import org.openremote.extension.energy.model.ElectricityConsumerAsset;+import org.openremote.extension.energy.model.ElectricityProducerAsset;+import org.openremote.extension.energy.model.ElectricityProducerSolarAsset;+import org.openremote.extension.energy.model.ElectricityStorageAsset;import org.openremote.model.attribute.AttributeMap;import org.openremote.model.datapoint.ValueDatapoint;import org.openremote.model.query.AssetQuery;@@ -43,11 +54,6 @@ import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.security.Realm;import org.openremote.model.simulator.SimulatorReplayDatapoint;import org.openremote.model.value.*;-import org.openremote.setup.demo.model.HarvestRobotAsset;-import org.openremote.setup.demo.model.HarvestRobotAsset.OperationMode;-import org.openremote.setup.demo.model.HarvestRobotAsset.VegetableType;-import org.openremote.setup.demo.model.IrrigationAsset;-import org.openremote.setup.demo.model.SoilSensorAsset;import java.time.Duration;import java.time.LocalTime;@@ -112,7 +118,7 @@ public class ManagerDemoSetup extends ManagerSetup {.setValue(vegetableType);harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.DIRECTION).addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY))- .setValue(direction);;+ .setValue(direction);harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.SPEED).addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));@@ -2343,4 +2349,40 @@ public class ManagerDemoSetup extends ManagerSetup {}}}++ protected ElectricityStorageAsset createDemoElectricityStorageAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityStorageAsset electricityStorageAsset = new ElectricityBatteryAsset(name);+ electricityStorageAsset.setParent(area);+ electricityStorageAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityStorageAsset;+ }++ protected ElectricityProducerSolarAsset createDemoElectricitySolarProducerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityProducerSolarAsset electricityProducerAsset = new ElectricityProducerSolarAsset(name);+ electricityProducerAsset.setParent(area);+ electricityProducerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityProducerAsset;+ }++ protected ElectricityConsumerAsset createDemoElectricityConsumerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset(name);+ electricityConsumerAsset.setParent(area);+ electricityConsumerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityConsumerAsset;+ }++ protected ElectricityChargerAsset createDemoElectricityChargerAsset(String name, Asset<?> area,+ GeoJSONPoint location) {+ ElectricityChargerAsset electricityChargerAsset = new ElectricityChargerAsset(name);+ electricityChargerAsset.setParent(area);+ electricityChargerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));++ return electricityChargerAsset;+ }}diff --git a/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/RulesDemoSetup.javasimilarity index 99%rename from setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/RulesDemoSetup.javaindex 533a994a2..6379b670d 100644--- a/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/RulesDemoSetup.java@@ -17,7 +17,7 @@* 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.setup.demo;+package org.openremote.extension.demosetup;import org.apache.commons.io.IOUtils;import org.openremote.manager.setup.ManagerSetup;diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/HarvestRobotAsset.javasimilarity index 98%rename from setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/HarvestRobotAsset.javaindex d82f45df2..04a28c511 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/HarvestRobotAsset.java@@ -17,7 +17,7 @@* 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.setup.demo.model;+package org.openremote.extension.demosetup.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/IrrigationAsset.javasimilarity index 97%rename from setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/IrrigationAsset.javaindex 5f6874b69..a0f9b057c 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/IrrigationAsset.java@@ -17,7 +17,7 @@* 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.setup.demo.model;+package org.openremote.extension.demosetup.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/ManufacturerAssetModelProvider.javasimilarity index 95%rename from setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/ManufacturerAssetModelProvider.javaindex 44ebac364..8e99a6ae7 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/ManufacturerAssetModelProvider.java@@ -17,7 +17,7 @@* 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.setup.demo.model;+package org.openremote.extension.demosetup.model;import org.openremote.model.AssetModelProvider;diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/SoilSensorAsset.javasimilarity index 98%rename from setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.javarename to extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/SoilSensorAsset.javaindex 4e7c80ba8..0d05adfcc 100644--- a/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java+++ b/extension/demo-setup/src/main/java/org/openremote/extension/demosetup/model/SoilSensorAsset.java@@ -17,7 +17,7 @@* 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.setup.demo.model;+package org.openremote.extension.demosetup.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider b/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvidernew file mode 100644index 000000000..03fd3586e--- /dev/null+++ b/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider@@ -0,0 +1 @@+org.openremote.extension.demosetup.model.ManufacturerAssetModelProviderdiff --git a/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.setup.SetupTasksnew file mode 100644index 000000000..6f4ff5b79--- /dev/null+++ b/extension/demo-setup/src/main/resources/META-INF/services/org.openremote.model.setup.SetupTasks@@ -0,0 +1 @@+org.openremote.extension.demosetup.DemoSetupTasksdiff --git a/setup/src/demo/resources/demo/dashboards/manufacturer/harvesting.json b/extension/demo-setup/src/main/resources/demo/dashboards/manufacturer/harvesting.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/dashboards/manufacturer/harvesting.jsonrename to extension/demo-setup/src/main/resources/demo/dashboards/manufacturer/harvesting.jsondiff --git a/setup/src/demo/resources/demo/dashboards/smartcity/parking.json b/extension/demo-setup/src/main/resources/demo/dashboards/smartcity/parking.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/dashboards/smartcity/parking.jsonrename to extension/demo-setup/src/main/resources/demo/dashboards/smartcity/parking.jsondiff --git a/setup/src/demo/resources/demo/rules/manufacturer/FlowPerMeter.flow b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/FlowPerMeter.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/FlowPerMeter.flowrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/FlowPerMeter.flowdiff --git a/setup/src/demo/resources/demo/rules/manufacturer/IrrigationTankLow.json b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/IrrigationTankLow.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/IrrigationTankLow.jsonrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/IrrigationTankLow.jsondiff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityBetween20And25.json b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityBetween20And25.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/SalinityBetween20And25.jsonrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityBetween20And25.jsondiff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityGreaterThan25.json b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityGreaterThan25.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/SalinityGreaterThan25.jsonrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityGreaterThan25.jsondiff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityLessThan3.json b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityLessThan3.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/SalinityLessThan3.jsonrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/SalinityLessThan3.jsondiff --git a/setup/src/demo/resources/demo/rules/manufacturer/TotalFlow.flow b/extension/demo-setup/src/main/resources/demo/rules/manufacturer/TotalFlow.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/manufacturer/TotalFlow.flowrename to extension/demo-setup/src/main/resources/demo/rules/manufacturer/TotalFlow.flowdiff --git a/setup/src/demo/resources/demo/rules/smartcity/DeKuip.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/DeKuip.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/DeKuip.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/DeKuip.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/EnvironmentAlerts.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/EnvironmentAlerts.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/EnvironmentAlerts.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/EnvironmentAlerts.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/Euromast.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/Euromast.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/Euromast.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/Euromast.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/LightGroupOnOff.flow b/extension/demo-setup/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/LightGroupOnOff.flowrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/LightGroupOnOff.flowdiff --git a/setup/src/demo/resources/demo/rules/smartcity/Markthal.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/Markthal.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/Markthal.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/Markthal.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/MarkthalChargersInUse.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/MarkthalChargersInUse.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/MarkthalChargersInUse.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/OnsParkBrightStrongWinds.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/OnsParkDimLightWinds.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/OnsParkDimLightWinds.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/ParkingFull.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/ParkingFull.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/ParkingFull.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/ParkingFull.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flow b/extension/demo-setup/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/ParkingOccupiedPercentage.flowdiff --git a/setup/src/demo/resources/demo/rules/smartcity/RotterdamBatteryUse.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/RotterdamPowerBalance.flow b/extension/demo-setup/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/RotterdamPowerBalance.flowrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flowdiff --git a/setup/src/demo/resources/demo/rules/smartcity/StationCrowded.json b/extension/demo-setup/src/main/resources/demo/rules/smartcity/StationCrowded.jsonsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/StationCrowded.jsonrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/StationCrowded.jsondiff --git a/setup/src/demo/resources/demo/rules/smartcity/TotalPowerConsumption.flow b/extension/demo-setup/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/TotalPowerConsumption.flowrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/TotalPowerConsumption.flowdiff --git a/setup/src/demo/resources/demo/rules/smartcity/TotalSolarProduction.flow b/extension/demo-setup/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flowsimilarity index 100%rename from setup/src/demo/resources/demo/rules/smartcity/TotalSolarProduction.flowrename to extension/demo-setup/src/main/resources/demo/rules/smartcity/TotalSolarProduction.flowdiff --git a/extension/energy/build.gradle b/extension/energy/build.gradlenew file mode 100644index 000000000..3d8856e19--- /dev/null+++ b/extension/energy/build.gradle@@ -0,0 +1,93 @@+apply plugin: "groovy"+apply plugin: "java-library"+apply plugin: "maven-publish"+apply plugin: "signing"++base {+ archivesName = "openremote-${project.name}-extension"+}++dependencies {+ api "org.apache.camel:camel-core-model:$camelVersion"+ api "org.jboss.resteasy:resteasy-client-api:$resteasyVersion"++ api resolveProject(":manager")+ api resolveProject(":model")++ testImplementation resolveProject(":test")+}++jar {+ from sourceSets.main.allJava+}++javadoc {+ failOnError = false+}++java {+ withJavadocJar()+ withSourcesJar()+}++publishing {+ publications {+ maven(MavenPublication) {+ group = "io.openremote.extension"+ artifactId = "openremote-${project.name}-extension"+ from components.java+ pom {+ name = 'OpenRemote energy extension'+ description = 'Adds the energy domain extension'+ url = 'https://github.com/openremote/openremote'+ licenses {+ license {+ name = 'GNU Affero General Public License v3.0'+ url = 'https://www.gnu.org/licenses/agpl-3.0.en.html'+ }+ }+ developers {+ developer {+ id = 'developers'+ name = 'Developers'+ email = '[email protected]'+ organization = 'OpenRemote'+ organizationUrl = 'https://openremote.io'+ }+ }+ scm {+ connection = 'scm:git:git://github.com/openremote/openremote.git'+ developerConnection = 'scm:git:ssh://github.com:openremote/openremote.git'+ url = 'https://github.com/openremote/openremote/tree/master'+ }+ }+ }+ }++ repositories {+ maven {+ if (!version.endsWith('-LOCAL')) {+ credentials {+ username findProperty("publishUsername")+ password findProperty("publishPassword")+ }+ }+ url = version.endsWith('-LOCAL') ? layout.buildDirectory.dir('repo') : version.endsWith('-SNAPSHOT') ? findProperty("snapshotsRepoUrl") : findProperty("releasesRepoUrl")+ }+ }+}++signing {+ def signingKey = findProperty("signingKey")+ def signingPassword = findProperty("signingPassword")+ if (signingKey && signingPassword) {+ useInMemoryPgpKeys(signingKey, signingPassword)+ sign publishing.publications.maven+ }+}++tasks.register('installDist', Copy) {+ dependsOn resolveTask(":manager:installDist")+ from jar.archiveFile+ into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")+}diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimisationService.javasimilarity index 98%rename from manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.javarename to extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimisationService.javaindex ad7347e18..bd1e75dc2 100644--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimisationService.java@@ -17,11 +17,19 @@* 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.manager.energy;+package org.openremote.extension.energy.manager;import org.apache.camel.builder.RouteBuilder;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.timer.TimerService;+import org.openremote.extension.energy.model.ElectricVehicleAsset;+import org.openremote.extension.energy.model.ElectricityAsset;+import org.openremote.extension.energy.model.ElectricityChargerAsset;+import org.openremote.extension.energy.model.ElectricityConsumerAsset;+import org.openremote.extension.energy.model.ElectricityProducerAsset;+import org.openremote.extension.energy.model.ElectricityStorageAsset;+import org.openremote.extension.energy.model.ElectricitySupplierAsset;+import org.openremote.extension.energy.model.EnergyOptimisationAsset;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.datapoint.AssetPredictedDatapointService;diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java b/extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimiser.javasimilarity index 99%rename from manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.javarename to extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimiser.javaindex 5196643ce..920e4d681 100644--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/manager/EnergyOptimiser.java@@ -17,7 +17,7 @@* 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.manager.energy;+package org.openremote.extension.energy.manager;import org.openremote.model.util.Pair;@@ -36,7 +36,7 @@ import java.util.logging.Level;import java.util.stream.Collectors;import java.util.stream.IntStream;-import static org.openremote.manager.energy.EnergyOptimisationService.LOG;+import static org.openremote.extension.energy.manager.EnergyOptimisationService.LOG;public class EnergyOptimiser {diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastSolarService.javasimilarity index 99%rename from manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javarename to extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastSolarService.javaindex 4b978b29d..3fa986152 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastSolarService.java@@ -1,4 +1,4 @@-package org.openremote.manager.energy;+package org.openremote.extension.energy.manager;import com.fasterxml.jackson.annotation.JsonProperty;import jakarta.ws.rs.core.Response;@@ -7,6 +7,7 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.timer.TimerService;+import org.openremote.extension.energy.model.ElectricityProducerSolarAsset;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.datapoint.AssetPredictedDatapointService;@@ -18,7 +19,6 @@ import org.openremote.model.ContainerService;import org.openremote.model.PersistenceEvent;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetFilter;-import org.openremote.model.asset.impl.ElectricityProducerSolarAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeRef;diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastWindService.javasimilarity index 98%rename from manager/src/main/java/org/openremote/manager/energy/ForecastWindService.javarename to extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastWindService.javaindex 483d7d1a1..e578e5798 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/manager/ForecastWindService.java@@ -1,4 +1,4 @@-package org.openremote.manager.energy;+package org.openremote.extension.energy.manager;import com.fasterxml.jackson.annotation.JsonProperty;import jakarta.ws.rs.core.Response;@@ -6,6 +6,8 @@ import org.apache.camel.builder.RouteBuilder;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.openremote.container.message.MessageBrokerService;+import org.openremote.extension.energy.model.ElectricityProducerAsset;+import org.openremote.extension.energy.model.ElectricityProducerWindAsset;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.datapoint.AssetPredictedDatapointService;@@ -15,8 +17,6 @@ import org.openremote.manager.rules.RulesService;import org.openremote.model.Container;import org.openremote.model.ContainerService;import org.openremote.model.PersistenceEvent;-import org.openremote.model.asset.impl.ElectricityProducerAsset;-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;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleAsset.javaindex 919f141f9..f312f3b68 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleFleetGroupAsset.javasimilarity index 98%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleFleetGroupAsset.javaindex e01b9e091..3182dfded 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricVehicleFleetGroupAsset.java@@ -17,10 +17,11 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.asset.impl.GroupAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeMap;import org.openremote.model.geo.GeoJSONPoint;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityAsset.javaindex 8f1a6a74f..678587658 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.attribute.MetaItem;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityBatteryAsset.javasimilarity index 97%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityBatteryAsset.javaindex dd02ef449..f725a40e0 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityBatteryAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityChargerAsset.javasimilarity index 98%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityChargerAsset.javaindex c131190a4..88690d80a 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityChargerAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityConsumerAsset.javasimilarity index 98%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityConsumerAsset.javaindex b6c013ed1..8a3d4f805 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityConsumerAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.value.*;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerAsset.javasimilarity index 98%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerAsset.javaindex f4844fc60..aef906d1f 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerSolarAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerSolarAsset.javaindex a73244a8b..136d3ba90 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerSolarAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerWindAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerWindAsset.javaindex 8d6d32aaa..e5d414dfe 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityProducerWindAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityStorageAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityStorageAsset.javaindex 73b2d38a6..9fc17b921 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricityStorageAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.attribute.AttributeExecuteStatus;import org.openremote.model.attribute.MetaItem;diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricitySupplierAsset.javasimilarity index 99%rename from model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricitySupplierAsset.javaindex 2163664d4..802dacbf7 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/ElectricitySupplierAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.MetaItem;diff --git a/extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyModelProvider.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyModelProvider.javanew file mode 100644index 000000000..8640a4460--- /dev/null+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyModelProvider.java@@ -0,0 +1,33 @@+/*+ * Copyright 2025, 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.extension.energy.model;++import org.openremote.model.AssetModelProvider;++/**+ * Provides the energy asset classes.+ */+public class EnergyModelProvider implements AssetModelProvider {++ @Override+ public boolean useAutoScan() {+ return true;+ }+}diff --git a/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.java b/extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyOptimisationAsset.javasimilarity index 98%rename from model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.javarename to extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyOptimisationAsset.javaindex ec9bf3fbd..70124adcf 100644--- a/model/src/main/java/org/openremote/model/asset/impl/EnergyOptimisationAsset.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/model/EnergyOptimisationAsset.java@@ -17,7 +17,7 @@* You should have received a copy of the GNU Affero General Public License* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package org.openremote.model.asset.impl;+package org.openremote.extension.energy.model;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.java b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgent.javasimilarity index 96%rename from agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.javarename to extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgent.javaindex 64ecc3bbf..8f8577187 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgent.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgent.java@@ -17,7 +17,7 @@* 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.agent.protocol.simulator.storage;+package org.openremote.extension.energy.storage;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgentLink.java b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgentLink.javasimilarity index 95%rename from agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgentLink.javarename to extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgentLink.javaindex 28afd0a08..92d6975ba 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorAgentLink.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorAgentLink.java@@ -17,7 +17,7 @@* 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.agent.protocol.simulator.storage;+package org.openremote.extension.energy.storage;import org.openremote.model.asset.agent.AgentLink;diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorProtocol.javasimilarity index 97%rename from agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.javarename to extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorProtocol.javaindex 1714066b7..b7e2e0ff9 100644--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java+++ b/extension/energy/src/main/java/org/openremote/extension/energy/storage/StorageSimulatorProtocol.java@@ -17,13 +17,13 @@* 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.agent.protocol.simulator.storage;+package org.openremote.extension.energy.storage;import org.openremote.agent.protocol.AbstractProtocol;import org.openremote.model.Container;import org.openremote.model.asset.Asset;import org.openremote.model.asset.agent.ConnectionStatus;-import org.openremote.model.asset.impl.ElectricityStorageAsset;+import org.openremote.extension.energy.model.ElectricityStorageAsset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeRef;@@ -40,7 +40,7 @@ import java.util.concurrent.locks.ReentrantLock;import java.util.logging.Level;import java.util.logging.Logger;-import static org.openremote.model.asset.impl.ElectricityStorageAsset.*;+import static org.openremote.extension.energy.model.ElectricityStorageAsset.*;import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;public class StorageSimulatorProtocol extends AbstractProtocol<StorageSimulatorAgent, StorageSimulatorAgentLink> {diff --git a/extension/energy/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider b/extension/energy/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvidernew file mode 100644index 000000000..fb222e24b--- /dev/null+++ b/extension/energy/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider@@ -0,0 +1 @@+org.openremote.extension.energy.model.EnergyModelProviderdiff --git a/extension/energy/src/main/resources/META-INF/services/org.openremote.model.ContainerService b/extension/energy/src/main/resources/META-INF/services/org.openremote.model.ContainerServicenew file mode 100644index 000000000..028baa279--- /dev/null+++ b/extension/energy/src/main/resources/META-INF/services/org.openremote.model.ContainerService@@ -0,0 +1,3 @@+org.openremote.extension.energy.manager.EnergyOptimisationService+org.openremote.extension.energy.manager.ForecastWindService+org.openremote.extension.energy.manager.ForecastSolarServicediff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationAssetTest.groovysimilarity index 97%rename from test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovyrename to extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationAssetTest.groovyindex ed6f84028..55c41d97a 100644--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationAssetTest.groovy@@ -1,19 +1,24 @@-package org.openremote.test.energy+package org.openremote.extension.energyimport com.google.common.collect.Listsimport org.openremote.container.timer.TimerService+import org.openremote.extension.energy.model.ElectricityAsset+import org.openremote.extension.energy.model.ElectricityBatteryAsset+import org.openremote.extension.energy.model.ElectricityConsumerAsset+import org.openremote.extension.energy.model.ElectricityProducerSolarAsset+import org.openremote.extension.energy.model.ElectricityStorageAsset+import org.openremote.extension.energy.model.ElectricitySupplierAsset+import org.openremote.extension.energy.model.EnergyOptimisationAsset+import org.openremote.extension.energy.manager.EnergyOptimisationService+import org.openremote.extension.energy.manager.EnergyOptimiserimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.datapoint.AssetPredictedDatapointService-import org.openremote.manager.energy.EnergyOptimisationService-import org.openremote.manager.energy.EnergyOptimiserimport org.openremote.manager.setup.SetupService-import org.openremote.model.asset.impl.*import org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRefimport org.openremote.model.datapoint.query.AssetDatapointIntervalQueryimport org.openremote.model.util.ValueUtil-import org.openremote.setup.integration.ManagerTestSetupimport org.openremote.test.ManagerContainerTraitimport spock.lang.Ignoreimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationTest.groovysimilarity index 99%rename from test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovyrename to extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationTest.groovyindex e061e57a2..5666b1f0f 100644--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationTest.groovy+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/EnergyOptimisationTest.groovy@@ -1,7 +1,7 @@-package org.openremote.test.energy+package org.openremote.extension.energy+import org.openremote.extension.energy.manager.EnergyOptimiserimport org.openremote.model.util.UniqueIdentifierGenerator-import org.openremote.manager.energy.EnergyOptimiserimport org.openremote.model.util.Pairimport spock.lang.Specificationdiff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastSolarServiceTest.groovysimilarity index 90%rename from test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovyrename to extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastSolarServiceTest.groovyindex 725a46536..2b6bed715 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastSolarServiceTest.groovy@@ -1,18 +1,16 @@-package org.openremote.test.energy-+package org.openremote.extension.energy+import org.openremote.extension.energy.model.ElectricityProducerSolarAsset+import org.openremote.extension.energy.manager.ForecastSolarServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.datapoint.AssetPredictedDatapointService-import org.openremote.manager.energy.ForecastSolarServiceimport org.openremote.manager.setup.SetupService-import org.openremote.model.asset.impl.ElectricityProducerSolarAssetimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRefimport org.openremote.model.geo.GeoJSONPointimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Ignoreimport spock.lang.Sharedimport spock.lang.Specification@@ -25,7 +23,7 @@ import jakarta.ws.rs.core.Responseimport java.time.LocalDateTimeimport java.time.temporal.ChronoUnit-import static org.openremote.manager.energy.ForecastSolarService.OR_FORECAST_SOLAR_API_KEY+import static org.openremote.extension.energy.manager.ForecastSolarService.OR_FORECAST_SOLAR_API_KEY@Ignoreclass ForecastSolarServiceTest extends Specification implements ManagerContainerTrait {@@ -144,10 +142,8 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainerdef assetProcessingService = container.getService(AssetProcessingService.class)def forecastSolarService = container.getService(ForecastSolarService.class)- expect: "a Future for calculation should exist and the asset should have filled in value for power and powerForecast"+ expect: "the asset should have filled in value for power and powerForecast"conditions.eventually {- assert !forecastSolarService.calculationFutures.isEmpty()- assert forecastSolarService.calculationFutures.get(managerTestSetup.electricitySolarAssetId) != nulldef solarAsset = assetStorageService.find(managerTestSetup.electricitySolarAssetId)assert solarAsset.getAttribute(ElectricityProducerSolarAsset.POWER).flatMap { it.value }.orElse(0d) != 0dassert solarAsset.getAttribute(ElectricityProducerSolarAsset.POWER_FORECAST).flatMap { it.value }.orElse(0d) != 0d@@ -168,9 +164,8 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainernewSolarAsset.setIncludeForecastSolarService(true)newSolarAsset = assetStorageService.merge(newSolarAsset)- then: "the assetId should be present in the calculationFutures"+ then: "the asset attributes and datapoints should be updated"conditions.eventually {- assert forecastSolarService.calculationFutures.get(newSolarAsset.getId()) != nullnewSolarAsset = assetStorageService.find(newSolarAsset.getId())assert newSolarAsset.getAttribute(ElectricityProducerSolarAsset.POWER).flatMap { it.value }.orElse(0d) != 0dassert newSolarAsset.getAttribute(ElectricityProducerSolarAsset.POWER_FORECAST).flatMap { it.value }.orElse(0d) != 0d@@ -191,17 +186,11 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainernewSolarAsset2.setIncludeForecastSolarService(false);newSolarAsset2 = assetStorageService.merge(newSolarAsset2)- then: "the assetId shouldn't be present in the calculationFutures"- conditions.eventually {- assert forecastSolarService.calculationFutures.get(newSolarAsset2.getId()) == null- }-- when: "an asset updated it's includeForecastSolarService to true"+ and: "an asset updated its includeForecastSolarService to true"assetProcessingService.sendAttributeEvent(new AttributeEvent(newSolarAsset2.getId(), ElectricityProducerSolarAsset.INCLUDE_FORECAST_SOLAR_SERVICE.name, true))- then: "it should be present present in the calculationFutures"+ then: "the asset attributes and datapoints should be updated"conditions.eventually {- assert forecastSolarService.calculationFutures.get(newSolarAsset2.getId()) != nullnewSolarAsset2 = assetStorageService.find(newSolarAsset2.getId())assert newSolarAsset2.getAttribute(ElectricityProducerSolarAsset.POWER).flatMap { it.value }.orElse(0d) == 0dassert newSolarAsset2.getAttribute(ElectricityProducerSolarAsset.POWER_FORECAST).flatMap { it.value }.orElse(0d) != 0d@@ -218,14 +207,6 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainerassert newSolarAsset2.getAttribute(ElectricityProducerSolarAsset.POWER).flatMap { it.value }.orElse(0d) != 0d}- when: "an asset updated it's includeForecastSolarService to false"- assetProcessingService.sendAttributeEvent(new AttributeEvent(newSolarAsset2.getId(), ElectricityProducerSolarAsset.INCLUDE_FORECAST_SOLAR_SERVICE.name, false))-- then: "it shouldn't be present present in the calculationFutures"- conditions.eventually {- assert forecastSolarService.calculationFutures.get(newSolarAsset2.getId()) == null- }-cleanup: "remove mock"if (ForecastSolarService.resteasyClient.get() != null) {ForecastSolarService.resteasyClient.set(null)diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastWindServiceTest.groovysimilarity index 99%rename from test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovyrename to extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastWindServiceTest.groovyindex 87b91b165..ee828e1e3 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastWindServiceTest.groovy+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/ForecastWindServiceTest.groovy@@ -1,19 +1,18 @@-package org.openremote.test.energy+package org.openremote.extension.energy+import org.openremote.extension.energy.model.ElectricityProducerWindAsset+import org.openremote.extension.energy.manager.ForecastSolarService+import org.openremote.extension.energy.manager.ForecastWindServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.datapoint.AssetPredictedDatapointService-import org.openremote.manager.energy.ForecastSolarService-import org.openremote.manager.energy.ForecastWindServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.Asset-import org.openremote.model.asset.impl.ElectricityProducerWindAssetimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRefimport org.openremote.model.geo.GeoJSONPointimport org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTrait-import org.openremote.setup.integration.ManagerTestSetupimport spock.lang.Ignoreimport spock.lang.Sharedimport spock.lang.Specification@@ -27,7 +26,7 @@ import java.time.LocalDateTimeimport java.time.ZoneOffsetimport java.time.temporal.ChronoUnit-import static org.openremote.manager.energy.ForecastWindService.OR_OPEN_WEATHER_API_APP_ID+import static org.openremote.extension.energy.manager.ForecastWindService.OR_OPEN_WEATHER_API_APP_ID@Ignoreclass ForecastWindServiceTest extends Specification implements ManagerContainerTrait {diff --git a/extension/energy/src/test/groovy/org/openremote/extension/energy/KeycloakTestSetup.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/KeycloakTestSetup.groovynew file mode 100644index 000000000..2f94b58b1--- /dev/null+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/KeycloakTestSetup.groovy@@ -0,0 +1,20 @@+package org.openremote.extension.energy++import org.openremote.manager.setup.AbstractKeycloakSetup+import org.openremote.model.Container+import org.openremote.model.security.Realm++class KeycloakTestSetup extends AbstractKeycloakSetup {++ Realm realmEnergy++ KeycloakTestSetup(Container container) {+ super(container)+ }++ @Override+ void onStart() throws Exception {+ super.onStart()+ realmEnergy = createRealm("energy", "Energy Test", true)+ }+}diff --git a/extension/energy/src/test/groovy/org/openremote/extension/energy/ManagerTestSetup.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/ManagerTestSetup.groovynew file mode 100644index 000000000..c083bdad9--- /dev/null+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/ManagerTestSetup.groovy@@ -0,0 +1,118 @@+package org.openremote.extension.energy++import static org.openremote.model.value.MetaItemType.*++import org.openremote.extension.energy.model.ElectricityAsset+import org.openremote.extension.energy.model.ElectricityBatteryAsset+import org.openremote.extension.energy.model.ElectricityConsumerAsset+import org.openremote.extension.energy.model.ElectricityProducerSolarAsset+import org.openremote.extension.energy.model.ElectricityProducerWindAsset+import org.openremote.extension.energy.model.ElectricitySupplierAsset+import org.openremote.extension.energy.model.EnergyOptimisationAsset+import org.openremote.manager.setup.ManagerSetup+import org.openremote.model.Container+import org.openremote.model.attribute.MetaItem+import org.openremote.model.geo.GeoJSONPoint++class ManagerTestSetup extends ManagerSetup {++ String realmEnergyName+ String electricityOptimisationAssetId+ String electricityConsumerAssetId+ String electricitySolarAssetId+ String electricityWindAssetId+ String electricitySupplierAssetId+ String electricityBatteryAssetId++ ManagerTestSetup(Container container) {+ super(container)+ }++ @Override+ void onStart() throws Exception {+ super.onStart()++ KeycloakTestSetup keycloakTestSetup = setupService.getTaskOfType(KeycloakTestSetup.class)+ realmEnergyName = keycloakTestSetup.realmEnergy.getName()++ EnergyOptimisationAsset electricityOptimisationAsset = new EnergyOptimisationAsset("Optimisation")+ electricityOptimisationAsset.setIntervalSize(3d)+ electricityOptimisationAsset.setRealm(keycloakTestSetup.realmEnergy.getName())+ electricityOptimisationAsset.setFinancialWeighting(100)+ electricityOptimisationAsset = assetStorageService.merge(electricityOptimisationAsset)+ electricityOptimisationAssetId = electricityOptimisationAsset.getId()++ ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset("Consumer")+ electricityConsumerAsset.setParent(electricityOptimisationAsset)+ electricityConsumerAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricityConsumerAsset = assetStorageService.merge(electricityConsumerAsset)+ electricityConsumerAssetId = electricityConsumerAsset.getId()++ ElectricityProducerSolarAsset electricitySolarAsset = new ElectricityProducerSolarAsset("Producer")+ electricitySolarAsset.setParent(electricityOptimisationAsset)+ electricitySolarAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricitySolarAsset.setPanelOrientation(ElectricityProducerSolarAsset.PanelOrientation.SOUTH)+ electricitySolarAsset.setPanelAzimuth(0)+ electricitySolarAsset.setPanelPitch(30)+ electricitySolarAsset.setEfficiencyExport(100)+ electricitySolarAsset.setPowerExportMax(2.5)+ electricitySolarAsset.setLocation(new GeoJSONPoint(9.195285, 48.787418))+ electricitySolarAsset.setSetActualSolarValueWithForecast(true)+ electricitySolarAsset.setIncludeForecastSolarService(true)+ electricitySolarAsset = assetStorageService.merge(electricitySolarAsset)+ electricitySolarAssetId = electricitySolarAsset.getId()++ ElectricityProducerWindAsset electricityWindAsset = new ElectricityProducerWindAsset("Wind Turbine")+ electricityWindAsset.setParent(electricityOptimisationAsset)+ electricityWindAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricityWindAsset.setWindSpeedMax(18d)+ electricityWindAsset.setWindSpeedMin(2d)+ electricityWindAsset.setWindSpeedReference(12d)+ electricityWindAsset.setPowerExportMax(9000d)+ electricityWindAsset.setEfficiencyExport(100)+ electricityWindAsset.setPowerExportMax(2.5)+ electricityWindAsset.setLocation(new GeoJSONPoint(9.195285, 48.787418))+ electricityWindAsset.setSetActualWindValueWithForecast(true)+ electricityWindAsset.setIncludeForecastWindService(true)+ electricityWindAsset = assetStorageService.merge(electricityWindAsset)+ electricityWindAssetId = electricityWindAsset.getId()++ ElectricityBatteryAsset electricityBatteryAsset = new ElectricityBatteryAsset("Battery")+ electricityBatteryAsset.setParent(electricityOptimisationAsset)+ electricityBatteryAsset.setEnergyCapacity(200d)+ electricityBatteryAsset.setEnergyLevelPercentageMin(20)+ electricityBatteryAsset.setEnergyLevelPercentageMax(80)+ electricityBatteryAsset.setEnergyLevel(100d)+ electricityBatteryAsset.setPowerImportMax(7d)+ electricityBatteryAsset.setPowerExportMax(20d)+ electricityBatteryAsset.setPowerSetpoint(0d)+ electricityBatteryAsset.setEfficiencyImport(95)+ electricityBatteryAsset.setEfficiencyExport(98)+ electricityBatteryAsset.setSupportsExport(true)+ electricityBatteryAsset.setSupportsImport(true)+ electricityBatteryAsset.getAttribute(ElectricityAsset.POWER_SETPOINT).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricityBatteryAsset = assetStorageService.merge(electricityBatteryAsset)+ electricityBatteryAssetId = electricityBatteryAsset.getId()++ ElectricitySupplierAsset electricitySupplierAsset = new ElectricitySupplierAsset("Supplier")+ electricitySupplierAsset.setParent(electricityOptimisationAsset)+ electricitySupplierAsset.setTariffExport(-0.05)+ electricitySupplierAsset.setTariffImport(0.08)+ electricitySupplierAsset.getAttribute(ElectricityAsset.TARIFF_IMPORT).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricitySupplierAsset.getAttribute(ElectricityAsset.TARIFF_EXPORT).ifPresent(attr ->+ attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))+ )+ electricitySupplierAsset = assetStorageService.merge(electricitySupplierAsset)+ electricitySupplierAssetId = electricitySupplierAsset.getId()+ }+}diff --git a/extension/energy/src/test/groovy/org/openremote/extension/energy/TestSetupTasks.groovy b/extension/energy/src/test/groovy/org/openremote/extension/energy/TestSetupTasks.groovynew file mode 100644index 000000000..da8e1de0f--- /dev/null+++ b/extension/energy/src/test/groovy/org/openremote/extension/energy/TestSetupTasks.groovy@@ -0,0 +1,13 @@+package org.openremote.extension.energy++import org.openremote.model.Container+import org.openremote.model.setup.Setup+import org.openremote.model.setup.SetupTasks++class TestSetupTasks implements SetupTasks {++ @Override+ List<Setup> createTasks(Container container, String setupType, boolean keycloakEnabled) {+ return List.of(new KeycloakTestSetup(container), new ManagerTestSetup(container))+ }+}diff --git a/extension/energy/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/extension/energy/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasksnew file mode 100644index 000000000..f97023d1d--- /dev/null+++ b/extension/energy/src/test/resources/META-INF/services/org.openremote.model.setup.SetupTasks@@ -0,0 +1 @@+org.openremote.extension.energy.TestSetupTasksdiff --git a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.javaindex 3488ee6ad..c8e0871b9 100644--- a/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/ManagerSetup.java@@ -392,42 +392,6 @@ public class ManagerSetup implements Setup {return lightAsset;}- protected ElectricityStorageAsset createDemoElectricityStorageAsset(String name, Asset<?> area,- GeoJSONPoint location) {- ElectricityStorageAsset electricityStorageAsset = new ElectricityBatteryAsset(name);- electricityStorageAsset.setParent(area);- electricityStorageAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));-- return electricityStorageAsset;- }-- protected ElectricityProducerSolarAsset createDemoElectricitySolarProducerAsset(String name, Asset<?> area,- GeoJSONPoint location) {- ElectricityProducerSolarAsset electricityProducerAsset = new ElectricityProducerSolarAsset(name);- electricityProducerAsset.setParent(area);- electricityProducerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));-- return electricityProducerAsset;- }-- protected ElectricityConsumerAsset createDemoElectricityConsumerAsset(String name, Asset<?> area,- GeoJSONPoint location) {- ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset(name);- electricityConsumerAsset.setParent(area);- electricityConsumerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));-- return electricityConsumerAsset;- }-- protected ElectricityChargerAsset createDemoElectricityChargerAsset(String name, Asset<?> area,- GeoJSONPoint location) {- ElectricityChargerAsset electricityChargerAsset = new ElectricityChargerAsset(name);- electricityChargerAsset.setParent(area);- electricityChargerAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));-- return electricityChargerAsset;- }-protected GroundwaterSensorAsset createDemoGroundwaterAsset(String name, Asset<?> area, GeoJSONPoint location) {GroundwaterSensorAsset groundwaterAsset = new GroundwaterSensorAsset(name);groundwaterAsset.setParent(area);diff --git a/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService b/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerServiceindex 4765b5517..288f25105 100644--- a/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService+++ b/manager/src/main/resources/META-INF/services/org.openremote.model.ContainerService@@ -26,9 +26,6 @@ org.openremote.manager.gateway.GatewayServiceorg.openremote.manager.gateway.GatewayClientServiceorg.openremote.manager.mqtt.MQTTBrokerServiceorg.openremote.manager.asset.AssetModelService-org.openremote.manager.energy.EnergyOptimisationService-org.openremote.manager.energy.ForecastWindService-org.openremote.manager.energy.ForecastSolarServiceorg.openremote.manager.provisioning.ProvisioningServiceorg.openremote.manager.dashboard.DashboardStorageServiceorg.openremote.manager.security.AuthorisationServicediff --git a/project.gradle b/project.gradleindex b3c58e812..b404335ac 100644--- a/project.gradle+++ b/project.gradle@@ -149,7 +149,7 @@ if (project == rootProject) {workingDirectory = projectDir.toString()}"Demo Setup"(Application) {- moduleName = getProject().idea.module.name + ".setup.demo"+ moduleName = getProject().idea.module.name + ".extension.demo-setup.main"envs = [OR_SETUP_TYPE: "demo"]diff --git a/setup/build.gradle b/setup/build.gradleindex 9988bb2b2..01fd19204 100644--- a/setup/build.gradle+++ b/setup/build.gradle@@ -1,6 +1,6 @@apply plugin: "java-library"-var setupJar = project.hasProperty("SETUP_JAR") ? "${project.getProperties().get("SETUP_JAR")}" : "demo"+var setupJar = project.hasProperty("SETUP_JAR") ? project.getProperties().get("SETUP_JAR") : "demo"base {archivesName = "openremote-${setupJar}-${project.name}"@@ -8,7 +8,6 @@ base {sourceSets {integration- demoload1load2}@@ -16,7 +15,6 @@ sourceSets {// dependencies declarationconfigurations {integrationImplementation.extendsFrom(implementation)- demoImplementation.extendsFrom(implementation)load1Implementation.extendsFrom(implementation)load2Implementation.extendsFrom(implementation)}@@ -25,7 +23,6 @@ dependencies {implementation project(":manager")}-tasks.register('load1Jar', Jar) {archiveBaseName.set("openremote-load1-${project.name}")from sourceSets.load1.output@@ -36,21 +33,17 @@ tasks.register('load2Jar', Jar) {from sourceSets.load2.output}-tasks.register('demoJar', Jar) {- archiveBaseName.set("openremote-demo-${project.name}")- from sourceSets.demo.output-}-tasks.named("compileJava") {- dependsOn("load1Jar", "load2Jar", "demoJar")+ dependsOn("load1Jar", "load2Jar")}-// Use demo setup sourceset by default for jartasks.register('installDist', Copy) {def setupTask = getTasksByName("${setupJar}Jar", false)[0] as org.gradle.jvm.tasks.Jar- System.out.println(setupTask.name)- dependsOn setupTask- dependsOn resolveTask(":manager:installDist")- from setupTask.archiveFile- into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")+ if (setupTask != null) {+ System.out.println(setupTask.name)+ dependsOn setupTask+ dependsOn resolveTask(":manager:installDist")+ from setupTask.archiveFile+ into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")+ }}diff --git a/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProvider b/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProviderdeleted file mode 100644index 8f24a2d32..000000000--- a/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProvider+++ /dev/null@@ -1 +0,0 @@-org.openremote.setup.demo.model.ManufacturerAssetModelProviderdiff --git a/setup/src/demo/resources/META-INF/services/org.openremote.model.setup.SetupTasks b/setup/src/demo/resources/META-INF/services/org.openremote.model.setup.SetupTasksdeleted file mode 100644index 628b9706b..000000000--- a/setup/src/demo/resources/META-INF/services/org.openremote.model.setup.SetupTasks+++ /dev/null@@ -1 +0,0 @@-org.openremote.setup.demo.DemoSetupTasksdiff --git a/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.javaindex dc38b4501..93652ca3b 100644--- a/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/KeycloakTestSetup.java@@ -65,7 +65,6 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {public String buildingUserId;public Realm realmMaster;public Realm realmBuilding;- public Realm realmEnergy;public Realm realmCity;public User testuser1;public User testuser2;@@ -91,7 +90,6 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {realmMaster = identityProvider.getRealm(Constants.MASTER_REALM);realmBuilding = createRealm("building", "Building", true);realmCity = createRealm("smartcity", "Smart City", true);- realmEnergy = createRealm("energy", "Energy Test", true);// Add a test realm roleskeycloakProvider.getRealms(realmsResource -> {diff --git a/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.java b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.javaindex 3dc780537..a160115aa 100644--- a/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.java+++ b/setup/src/integration/java/org/openremote/setup/integration/ManagerTestSetup.java@@ -87,19 +87,12 @@ public class ManagerTestSetup extends ManagerSetup {public String realmMasterName;public String realmBuildingName;public String realmCityName;- public String realmEnergyName;public String smartCityServiceAgentId;public String area1Id;public String microphone1Id;public String peopleCounter1AssetId;public String peopleCounter2AssetId;public String peopleCounter3AssetId;- public String electricityOptimisationAssetId;- public String electricityConsumerAssetId;- public String electricitySolarAssetId;- public String electricityWindAssetId;- public String electricitySupplierAssetId;- public String electricityBatteryAssetId;public String light1Id;public String light2Id;@@ -119,7 +112,6 @@ public class ManagerTestSetup extends ManagerSetup {realmMasterName = realmMaster.getName();realmBuildingName = realmBuilding.getName();realmCityName = realmCity.getName();- realmEnergyName = keycloakTestSetup.realmEnergy.getName();// ################################ Assets for 'master' realm ###################################@@ -208,87 +200,6 @@ public class ManagerTestSetup extends ManagerSetup {thing = assetStorageService.merge(thing);thingId = thing.getId();- // ################################ Assets for 'energy' realm ###################################- EnergyOptimisationAsset electricityOptimisationAsset = new EnergyOptimisationAsset("Optimisation");- electricityOptimisationAsset.setIntervalSize(3d);- electricityOptimisationAsset.setRealm(keycloakTestSetup.realmEnergy.getName());- electricityOptimisationAsset.setFinancialWeighting(100);- electricityOptimisationAsset = assetStorageService.merge(electricityOptimisationAsset);- electricityOptimisationAssetId = electricityOptimisationAsset.getId();-- ElectricityConsumerAsset electricityConsumerAsset = new ElectricityConsumerAsset("Consumer");- electricityConsumerAsset.setParent(electricityOptimisationAsset);- electricityConsumerAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricityConsumerAsset = assetStorageService.merge(electricityConsumerAsset);- electricityConsumerAssetId = electricityConsumerAsset.getId();-- ElectricityProducerSolarAsset electricitySolarAsset = new ElectricityProducerSolarAsset("Producer");- electricitySolarAsset.setParent(electricityOptimisationAsset);- electricitySolarAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricitySolarAsset.setPanelOrientation(ElectricityProducerSolarAsset.PanelOrientation.SOUTH);- electricitySolarAsset.setPanelAzimuth(0);- electricitySolarAsset.setPanelPitch(30);- electricitySolarAsset.setEfficiencyExport(100);- electricitySolarAsset.setPowerExportMax(2.5);- electricitySolarAsset.setLocation(new GeoJSONPoint(9.195285, 48.787418));- electricitySolarAsset.setSetActualSolarValueWithForecast(true);- electricitySolarAsset.setIncludeForecastSolarService(true);- electricitySolarAsset = assetStorageService.merge(electricitySolarAsset);- electricitySolarAssetId = electricitySolarAsset.getId();-- ElectricityProducerWindAsset electricityWindAsset = new ElectricityProducerWindAsset("Wind Turbine");- electricityWindAsset.setParent(electricityOptimisationAsset);- electricityWindAsset.getAttribute(ElectricityAsset.POWER).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricityWindAsset.setWindSpeedMax(18d);- electricityWindAsset.setWindSpeedMin(2d);- electricityWindAsset.setWindSpeedReference(12d);- electricityWindAsset.setPowerExportMax(9000d);- electricityWindAsset.setEfficiencyExport(100);- electricityWindAsset.setPowerExportMax(2.5);- electricityWindAsset.setLocation(new GeoJSONPoint(9.195285, 48.787418));- electricityWindAsset.setSetActualWindValueWithForecast(true);- electricityWindAsset.setIncludeForecastWindService(true);- electricityWindAsset = assetStorageService.merge(electricityWindAsset);- electricityWindAssetId = electricityWindAsset.getId();-- ElectricityBatteryAsset electricityBatteryAsset = new ElectricityBatteryAsset("Battery");- electricityBatteryAsset.setParent(electricityOptimisationAsset);- electricityBatteryAsset.setEnergyCapacity(200d);- electricityBatteryAsset.setEnergyLevelPercentageMin(20);- electricityBatteryAsset.setEnergyLevelPercentageMax(80);- electricityBatteryAsset.setEnergyLevel(100d);- electricityBatteryAsset.setPowerImportMax(7d);- electricityBatteryAsset.setPowerExportMax(20d);- electricityBatteryAsset.setPowerSetpoint(0d);- electricityBatteryAsset.setEfficiencyImport(95);- electricityBatteryAsset.setEfficiencyExport(98);- electricityBatteryAsset.setSupportsExport(true);- electricityBatteryAsset.setSupportsImport(true);- electricityBatteryAsset.getAttribute(ElectricityAsset.POWER_SETPOINT).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricityBatteryAsset = assetStorageService.merge(electricityBatteryAsset);- electricityBatteryAssetId = electricityBatteryAsset.getId();-- ElectricitySupplierAsset electricitySupplierAsset = new ElectricitySupplierAsset("Supplier");- electricitySupplierAsset.setParent(electricityOptimisationAsset);- electricitySupplierAsset.setTariffExport(-0.05);- electricitySupplierAsset.setTariffImport(0.08);- electricitySupplierAsset.getAttribute(ElectricityAsset.TARIFF_IMPORT).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricitySupplierAsset.getAttribute(ElectricityAsset.TARIFF_EXPORT).ifPresent(attr ->- attr.addMeta(new MetaItem<>(HAS_PREDICTED_DATA_POINTS))- );- electricitySupplierAsset = assetStorageService.merge(electricitySupplierAsset);- electricitySupplierAssetId = electricitySupplierAsset.getId();-// ################################ Assets for 'building' realm ###################################BuildingAsset smartBuilding = new BuildingAsset("Smart building");diff --git a/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java b/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.javaindex 9b96b85b0..6414a9149 100644--- a/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java+++ b/setup/src/load2/java/org/openremote/setup/load2/ManagerSetup.java@@ -19,7 +19,6 @@*/package org.openremote.setup.load2;-import org.openremote.manager.provisioning.ProvisioningService;import org.openremote.model.Container;import org.openremote.model.asset.Asset;diff --git a/test/src/test/groovy/org/openremote/test/assets/ForecastServiceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/ForecastServiceTest.groovyindex a1ab6b79c..a24010c68 100644--- a/test/src/test/groovy/org/openremote/test/assets/ForecastServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/ForecastServiceTest.groovy@@ -70,7 +70,7 @@ class ForecastServiceTest extends Specification implements ManagerContainerTrait// TODO: RT - Not too sure the intention with the offset and seems to be used only in ignored tests so skip for now// def setupSpec() {-// forecastThing2 = addForecastAsset(assetStorageService, managerTestSetup.realmEnergyName, forecastAttributeName, forecastConfig)+// forecastThing2 = addForecastAsset(assetStorageService, managerTestSetup.realmMasterName, forecastAttributeName, forecastConfig)// Long offset = ((forecastConfig.getForecastPeriod().toMillis() * 2) / 3) * (-1)// insertHistoryTestDataToDb(new AttributeRef(forecastThing2.id, forecastAttributeName), forecastHistoricalData, offset, forecastConfig)//@@ -168,7 +168,7 @@ class ForecastServiceTest extends Specification implements ManagerContainerTraitadvancePseudoClock(now.toEpochMilli()-timerService.getCurrentTimeMillis(), MILLISECONDS, container)and: "forecast asset is added"- def forecastThing1 = addForecastAsset(assetStorageService, managerTestSetup.realmEnergyName, forecastAttributeName, forecastConfig)+ def forecastThing1 = addForecastAsset(assetStorageService, managerTestSetup.realmMasterName, forecastAttributeName, forecastConfig)def attributeRef = new AttributeRef(forecastThing1.id, forecastAttributeName)then: "attribute should be registered at the forecast service"