demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-31 13:34:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix DAY_AHEAD_AVAILABLE event (#18583)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen
2025-04-24 10:56:33 +02:00
committed by GitHub
parent f62e6327b8
commit a63e7c0c54
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/provider/AbstractProvider.java
-1
View File
@@ -76,7 +76,6 @@ public abstract class AbstractProvider<L extends SubscriptionListener> {
}
Set<L> listenersForSubscription = subscriptionToListeners.get(subscription);
boolean isLastDistinctSubscription = false;
if (listenersForSubscription != null) {
listenersForSubscription.remove(listener);
bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/provider/ElectricityPriceProvider.java
+5 -7
View File
@@ -23,7 +23,6 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -142,7 +141,6 @@ public class ElectricityPriceProvider extends AbstractProvider<ElectricityPriceL
private void refreshElectricityPrices() {
RetryStrategy retryPolicy;
try {
Set<ElectricityPriceListener> spotPricesUpdatedListeners = new HashSet<>();
boolean spotPricesSubscribed = false;
boolean arePricesFullyCached = true;
@@ -151,12 +149,9 @@ public class ElectricityPriceProvider extends AbstractProvider<ElectricityPriceL
Subscription subscription = subscriptionListener.getKey();
Set<ElectricityPriceListener> listeners = subscriptionListener.getValue();
boolean pricesUpdated = downloadPrices(subscription, false);
downloadPrices(subscription, false);
if (subscription instanceof SpotPriceSubscription) {
spotPricesSubscribed = true;
if (pricesUpdated) {
spotPricesUpdatedListeners.addAll(listeners);
}
boolean arePricesFullyCachedForSubscription = getSpotPriceSubscriptionDataCache(subscription)
.arePricesFullyCached();
if (!arePricesFullyCachedForSubscription) {
@@ -171,7 +166,6 @@ public class ElectricityPriceProvider extends AbstractProvider<ElectricityPriceL
if (spotPricesSubscribed) {
if (arePricesFullyCached) {
spotPricesUpdatedListeners.forEach(listener -> listener.onDayAheadAvailable());
retryPolicy = RetryPolicyFactory.atFixedTime(DAILY_REFRESH_TIME_CET, NORD_POOL_TIMEZONE);
} else {
logger.warn("Spot prices are not available, retry scheduled (see details in Thing properties)");
@@ -291,6 +285,10 @@ public class ElectricityPriceProvider extends AbstractProvider<ElectricityPriceL
isUpdated = cache.put(spotPriceRecords);
} finally {
listenerToSubscriptions.keySet().forEach(listener -> listener.onPropertiesUpdated(properties));
if (isUpdated && cache.arePricesFullyCached()) {
getListeners(subscription).forEach(listener -> listener.onDayAheadAvailable());
}
}
return isUpdated;
}