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
Finished ForecastSolarServiceTest
Michael Rademaker03414c4ba47b
diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.javaindex d9c2106ca..60a58f516 100644--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java@@ -7,7 +7,6 @@ import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;import org.openremote.container.message.MessageBrokerService;import org.openremote.container.persistence.PersistenceEvent;import org.openremote.container.timer.TimerService;-import org.openremote.container.web.WebTargetBuilder;import org.openremote.manager.asset.AssetProcessingService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.datapoint.AssetPredictedDatapointService;@@ -42,6 +41,7 @@ import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;import static org.openremote.container.util.MapAccess.getString;+import static org.openremote.container.web.WebTargetBuilder.createClient;import static org.openremote.manager.gateway.GatewayService.isNotForGateway;/**@@ -83,12 +83,16 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServiprotected static final Logger LOG = Logger.getLogger(ForecastSolarService.class.getName());- protected ResteasyClient resteasyClient;+ protected static ResteasyClient resteasyClient;protected ResteasyWebTarget forecastSolarTarget;private String forecastSolarApiKey;private final Map<String, ScheduledFuture<?>> calculationFutures = new HashMap<>();+ static {+ resteasyClient = createClient(org.openremote.container.Container.EXECUTOR_SERVICE);+ }+@SuppressWarnings("unchecked")@Overridepublic void configure() throws Exception {@@ -110,7 +114,6 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServirulesService = container.getService(RulesService.class);timerService = container.getService(TimerService.class);- resteasyClient = WebTargetBuilder.createClient(executorService);forecastSolarApiKey = getString(container.getConfig(), FORECAST_SOLAR_API_KEY, null);}@@ -155,9 +158,7 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi}protected void processAttributeEvent(AttributeEvent attributeEvent) {- if (attributeEvent.getAttributeName().equals(ElectricityProducerSolarAsset.INCLUDE_FORECAST_SOLAR_SERVICE.getName())) {- processElectricityProducerSolarAssetAttributeEvent(attributeEvent);- }+ processElectricityProducerSolarAssetAttributeEvent(attributeEvent);}protected synchronized void processElectricityProducerSolarAssetAttributeEvent(AttributeEvent attributeEvent) {@@ -177,16 +178,26 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi// Nothing to do herereturn;}- }- LOG.info("Processing producer solar asset attribute event: " + attributeEvent);- stopProcessing(attributeEvent.getAssetId());+ LOG.info("Processing producer solar asset attribute event: " + attributeEvent);+ stopProcessing(attributeEvent.getAssetId());- // Get latest asset from storage- ElectricityProducerSolarAsset asset = (ElectricityProducerSolarAsset) assetStorageService.find(attributeEvent.getAssetId());+ // Get latest asset from storage+ ElectricityProducerSolarAsset asset = (ElectricityProducerSolarAsset) assetStorageService.find(attributeEvent.getAssetId());- if (asset != null && asset.isIncludeForecastSolarService().orElse(false)) {- startProcessing(asset);+ if (asset != null && asset.isIncludeForecastSolarService().orElse(false)) {+ startProcessing(asset);+ }+ }++ if (attributeEvent.getAttributeName().equals(ElectricityProducerSolarAsset.SET_ACTUAL_VALUE_WITH_FORECAST.getName())) {+ // Get latest asset from storage+ ElectricityProducerSolarAsset asset = (ElectricityProducerSolarAsset) assetStorageService.find(attributeEvent.getAssetId());++ // Check if power is currently zero and set it if power forecast has an value+ if (asset.getPower().orElse(0d) == 0d && asset.getPowerForecast().orElse(0d) != 0d) {+ assetProcessingService.sendAttributeEvent(new AttributeEvent(asset.getId(), ElectricityProducerSolarAsset.POWER, asset.getPowerForecast().orElse(0d)));+ }}}diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.javaindex 99fddd1d1..e838bf063 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java@@ -24,8 +24,10 @@ import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueType;import javax.persistence.Entity;+import java.util.Optional;-import static org.openremote.model.Constants.*;+import static org.openremote.model.Constants.UNITS_KILO;+import static org.openremote.model.Constants.UNITS_WATT;@Entitypublic class ElectricityProducerAsset extends ElectricityAsset<ElectricityProducerAsset> {@@ -55,4 +57,8 @@ public class ElectricityProducerAsset extends ElectricityAsset<ElectricityProducpublic ElectricityProducerAsset(String name) {super(name);}++ public Optional<Double> getPowerForecast() {+ return getAttributes().getOrCreate(POWER_FORECAST).getValue();+ }}diff --git a/model/src/main/java/org/openremote/model/security/RealmRole.java b/model/src/main/java/org/openremote/model/security/RealmRole.javaindex 6b217f3ae..6e074a8ef 100644--- a/model/src/main/java/org/openremote/model/security/RealmRole.java+++ b/model/src/main/java/org/openremote/model/security/RealmRole.java@@ -21,6 +21,7 @@ package org.openremote.model.security;import com.fasterxml.jackson.annotation.JsonCreator;import com.fasterxml.jackson.annotation.JsonIgnore;+import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.annotation.JsonValue;import org.hibernate.annotations.Subselect;@@ -46,7 +47,7 @@ public class RealmRole {protected RealmRole() {}@JsonCreator- public RealmRole(String name, String description) {+ public RealmRole(@JsonProperty("name") String name, @JsonProperty("description") String description) {this.name = name;this.description = description;}diff --git a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovyindex 45f3b3c6b..439510c33 100644--- a/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/energy/ForecastSolarServiceTest.groovy@@ -1,8 +1,8 @@package org.openremote.test.energyimport com.fasterxml.jackson.databind.ObjectMapper+import com.google.common.collect.Listsimport org.junit.Ignore-import org.openremote.agent.protocol.websocket.WebsocketAgentProtocolimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.energy.ForecastSolarService@@ -10,6 +10,7 @@ import org.openremote.manager.setup.SetupServiceimport org.openremote.model.asset.impl.ElectricityProducerSolarAssetimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.geo.GeoJSONPoint+import org.openremote.model.util.ValueUtilimport org.openremote.test.ManagerContainerTraitimport org.openremote.test.setup.ManagerTestSetupimport spock.lang.Shared@@ -38,86 +39,86 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainerswitch (requestUri.host) {case "api.forecast.solar":def now = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS)- def content = "\"{\\n\" +\n" +- " \" \\\"result\\\": {\\n\" +\n" +- " \" \\\"watts\\\": {\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.toLocalTime().toString()}\\\": 0,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(15).toLocalTime().toString()}\\\": 780000,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(30).toLocalTime().toString()}\\\": 3904036,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(45).toLocalTime().toString()}\\\": 3854598,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(60).toLocalTime().toString()}\\\": 3746874,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(75).toLocalTime().toString()}\\\": 3675780,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(90).toLocalTime().toString()}\\\": 3553500,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(105).toLocalTime().toString()}\\\": 3439679,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(120).toLocalTime().toString()}\\\": 3278604,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(135).toLocalTime().toString()}\\\": 3137450,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(150).toLocalTime().toString()}\\\": 2954064,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(165).toLocalTime().toString()}\\\": 2739056,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(180).toLocalTime().toString()}\\\": 2493609,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(195).toLocalTime().toString()}\\\": 2254420,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(210).toLocalTime().toString()}\\\": 1949976,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(225).toLocalTime().toString()}\\\": 1697104,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(240).toLocalTime().toString()}\\\": 1452142,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(255).toLocalTime().toString()}\\\": 1194060,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(270).toLocalTime().toString()}\\\": 925642,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(285).toLocalTime().toString()}\\\": 761949,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(300).toLocalTime().toString()}\\\": 594217,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(315).toLocalTime().toString()}\\\": 423624,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(330).toLocalTime().toString()}\\\": 80000,\\n\" +\n" +- " \" \\\"${now.plusDays(1).toLocalDate().toString()} ${now.toLocalTime().toString()}\\\": 0\\n\" +\n" +- " \" },\\n\" +\n" +- " \" \\\"watt_hours\\\": {\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.toLocalTime().toString()}\\\": 0,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(15).toLocalTime().toString()}\\\": 3471000,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(30).toLocalTime().toString()}\\\": 20778893,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(45).toLocalTime().toString()}\\\": 21742542,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(60).toLocalTime().toString()}\\\": 22679261,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(75).toLocalTime().toString()}\\\": 23598206,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(90).toLocalTime().toString()}\\\": 24486581,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(105).toLocalTime().toString()}\\\": 25346501,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(120).toLocalTime().toString()}\\\": 26166152,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(135).toLocalTime().toString()}\\\": 26950514,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(150).toLocalTime().toString()}\\\": 27689030,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(165).toLocalTime().toString()}\\\": 28373794,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(180).toLocalTime().toString()}\\\": 28997196,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(195).toLocalTime().toString()}\\\": 29560801,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(210).toLocalTime().toString()}\\\": 30048295,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(225).toLocalTime().toString()}\\\": 30472571,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(240).toLocalTime().toString()}\\\": 30835607,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(255).toLocalTime().toString()}\\\": 31134122,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(270).toLocalTime().toString()}\\\": 31365532,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(285).toLocalTime().toString()}\\\": 31556020,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(300).toLocalTime().toString()}\\\": 31704574,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(315).toLocalTime().toString()}\\\": 31810480,\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()} ${now.plusMinutes(330).toLocalTime().toString()}\\\": 31817147,\\n\" +\n" +- " \" \\\"${now.plusDays(1).toLocalDate().toString()} ${now.toLocalTime().toString()}\\\": 0\\n\" +\n" +- " \" },\\n\" +\n" +- " \" \\\"watt_hours_day\\\": {\\n\" +\n" +- " \" \\\"${now.toLocalDate().toString()}\\\": 31817147\\n\" +\n" +- " \" }\\n\" +\n" +- " \" },\\n\" +\n" +- " \" \\\"message\\\": {\\n\" +\n" +- " \" \\\"code\\\": 0,\\n\" +\n" +- " \" \\\"type\\\": \\\"success\\\",\\n\" +\n" +- " \" \\\"text\\\": \\\"\\\",\\n\" +\n" +- " \" \\\"info\\\": {\\n\" +\n" +- " \" \\\"latitude\\\": 51.4969,\\n\" +\n" +- " \" \\\"longitude\\\": -0.2773,\\n\" +\n" +- " \" \\\"place\\\": \\\"W3 8BZ Turnham Green, Hounslow London Boro, England, GB\\\",\\n\" +\n" +- " \" \\\"timezone\\\": \\\"Europe/London\\\"\\n\" +\n" +- " \" },\\n\" +\n" +- " \" \\\"ratelimit\\\": {\\n\" +\n" +- " \" \\\"period\\\": 60,\\n\" +\n" +- " \" \\\"limit\\\": 5,\\n\" +\n" +- " \" \\\"remaining\\\": 4\\n\" +\n" +- " \" }\\n\" +\n" +- " \" }\\n\" +\n" +- " \"}\""- def responseBody = new ObjectMapper().readValue(content, ForecastSolarService.EstimateResponse.class)+ def content = "{\n" ++ " \"result\": {\n" ++ " \"watts\": {\n"++ " \"${now.toLocalDate().toString()} ${now.toLocalTime().toString()}\": 0,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(15).toLocalTime().toString()}\": 780000,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(30).toLocalTime().toString()}\": 3904036,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(45).toLocalTime().toString()}\": 3854598,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(60).toLocalTime().toString()}\": 3746874,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(75).toLocalTime().toString()}\": 3675780,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(90).toLocalTime().toString()}\": 3553500,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(105).toLocalTime().toString()}\": 3439679,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(120).toLocalTime().toString()}\": 3278604,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(135).toLocalTime().toString()}\": 3137450,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(150).toLocalTime().toString()}\": 2954064,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(165).toLocalTime().toString()}\": 2739056,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(180).toLocalTime().toString()}\": 2493609,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(195).toLocalTime().toString()}\": 2254420,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(210).toLocalTime().toString()}\": 1949976,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(225).toLocalTime().toString()}\": 1697104,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(240).toLocalTime().toString()}\": 1452142,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(255).toLocalTime().toString()}\": 1194060,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(270).toLocalTime().toString()}\": 925642,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(285).toLocalTime().toString()}\": 761949,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(300).toLocalTime().toString()}\": 594217,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(315).toLocalTime().toString()}\": 423624,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(330).toLocalTime().toString()}\": 80000,\n"++ " \"${now.plusDays(1).toLocalDate().toString()} ${now.toLocalTime().toString()}\": 0\n"++ " },\n"++ " \"watt_hours\": {\n"++ " \"${now.toLocalDate().toString()} ${now.toLocalTime().toString()}\": 0,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(15).toLocalTime().toString()}\": 3471000,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(30).toLocalTime().toString()}\": 20778893,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(45).toLocalTime().toString()}\": 21742542,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(60).toLocalTime().toString()}\": 22679261,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(75).toLocalTime().toString()}\": 23598206,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(90).toLocalTime().toString()}\": 24486581,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(105).toLocalTime().toString()}\": 25346501,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(120).toLocalTime().toString()}\": 26166152,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(135).toLocalTime().toString()}\": 26950514,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(150).toLocalTime().toString()}\": 27689030,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(165).toLocalTime().toString()}\": 28373794,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(180).toLocalTime().toString()}\": 28997196,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(195).toLocalTime().toString()}\": 29560801,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(210).toLocalTime().toString()}\": 30048295,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(225).toLocalTime().toString()}\": 30472571,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(240).toLocalTime().toString()}\": 30835607,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(255).toLocalTime().toString()}\": 31134122,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(270).toLocalTime().toString()}\": 31365532,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(285).toLocalTime().toString()}\": 31556020,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(300).toLocalTime().toString()}\": 31704574,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(315).toLocalTime().toString()}\": 31810480,\n"++ " \"${now.toLocalDate().toString()} ${now.plusMinutes(330).toLocalTime().toString()}\": 31817147,\n"++ " \"${now.plusDays(1).toLocalDate().toString()} ${now.toLocalTime().toString()}\": 0\n"++ " },\n"++ " \"watt_hours_day\": {\n"++ " \"${now.toLocalDate().toString()}\": 31817147\n"++ " }\n"++ " },\n"++ " \"message\": {\n"++ " \"code\": 0,\n"++ " \"type\": \"success\",\n"++ " \"text\": \"\",\n"++ " \"info\": {\n"++ " \"latitude\": 51.4969,\n"++ " \"longitude\": -0.2773,\n"++ " \"place\": \"W3 8BZ Turnham Green, Hounslow London Boro, England, GB\",\n"++ " \"timezone\": \"Europe/London\"\n"++ " },\n"++ " \"ratelimit\": {\n"++ " \"period\": 60,\n"++ " \"limit\": 5,\n"++ " \"remaining\": 4\n"++ " }\n"++ " }\n"++ "}"+ def responseBody = ValueUtil.JSON.readValue(content, ForecastSolarService.EstimateResponse.class)requestContext.abortWith(Response.ok(responseBody, MediaType.APPLICATION_JSON_TYPE).build())- break+ return}requestContext.abortWith(Response.serverError().build())@@ -129,17 +130,18 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainerdef conditions = new PollingConditions(timeout: 10, delay: 0.2)def config = defaultConfig()config << [(FORECAST_SOLAR_API_KEY): System.getenv(FORECAST_SOLAR_API_KEY)]+++ if (!ForecastSolarService.resteasyClient.configuration.isRegistered(mockServer)) {+ ForecastSolarService.resteasyClient.register(mockServer, Integer.MAX_VALUE)+ }+def container = startContainer(config, defaultServices())def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)def assetStorageService = container.getService(AssetStorageService.class)def assetProcessingService = container.getService(AssetProcessingService.class)def forecastSolarService = container.getService(ForecastSolarService.class)- and: "the web client is configured to use the mock HTTP server"- if (!forecastSolarService.resteasyClient.configuration.isRegistered(mockServer)) {- forecastSolarService.resteasyClient.register(mockServer, Integer.MAX_VALUE)- }-expect: "a Future for calculation should exist and the asset should have filled in value for power and powerForecast"conditions.eventually {assert !forecastSolarService.calculationFutures.isEmpty()@@ -194,8 +196,26 @@ class ForecastSolarServiceTest extends Specification implements ManagerContainerthen: "it should be present present in the calculationFutures"conditions.eventually {assert forecastSolarService.calculationFutures.get(newSolarAsset2.getId()) != null+ newSolarAsset2 = 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}++ when: "an asset updated it's setActualValueWithForecast to true"+ assetProcessingService.sendAttributeEvent(new AttributeEvent(newSolarAsset2.getId(), ElectricityProducerSolarAsset.SET_ACTUAL_VALUE_WITH_FORECAST.name, true))++ then: "it power should be updated too"+ conditions.eventually {+ newSolarAsset2 = assetStorageService.find(newSolarAsset2.getId())+ assert 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+ }}}