demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[windcentrale] Discover windmills when account goes online (#14807)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2023-04-14 23:08:25 +02:00 committed by GitHub
parent b3dfba8cf5
commit 7a26af7164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.windcentrale/src/main/java/org/openhab/binding/windcentrale/internal/WindcentraleDiscoveryService.java
View File

@ -31,8 +31,11 @@ import org.openhab.binding.windcentrale.internal.exception.FailedGettingDataExce
import org.openhab.binding.windcentrale.internal.exception.InvalidAccessTokenException;
import org.openhab.binding.windcentrale.internal.handler.WindcentraleAccountHandler;
import org.openhab.binding.windcentrale.internal.handler.WindcentraleWindmillHandler;
import org.openhab.binding.windcentrale.internal.listener.ThingStatusListener;
import org.openhab.core.config.discovery.AbstractDiscoveryService;
import org.openhab.core.config.discovery.DiscoveryResultBuilder;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
import org.openhab.core.thing.ThingUID;
import org.openhab.core.thing.binding.ThingHandler;
import org.openhab.core.thing.binding.ThingHandlerService;
@ -47,7 +50,8 @@ import org.slf4j.LoggerFactory;
* @author Wouter Born - Initial contribution
*/
@NonNullByDefault
public class WindcentraleDiscoveryService extends AbstractDiscoveryService implements ThingHandlerService {
public class WindcentraleDiscoveryService extends AbstractDiscoveryService
implements ThingHandlerService, ThingStatusListener {
private final Logger logger = LoggerFactory.getLogger(WindcentraleDiscoveryService.class);
private @NonNullByDefault({}) WindcentraleAccountHandler accountHandler;
@ -64,6 +68,7 @@ public class WindcentraleDiscoveryService extends AbstractDiscoveryService imple
public void deactivate() {
cancelDiscoveryJob();
super.deactivate();
accountHandler.removeThingStatusListener(this);
}
@Override
@ -74,12 +79,14 @@ public class WindcentraleDiscoveryService extends AbstractDiscoveryService imple
@Override
public void setThingHandler(ThingHandler handler) {
if (handler instanceof WindcentraleAccountHandler accountHandler) {
accountHandler.addThingStatusListener(this);
this.accountHandler = accountHandler;
}
}
@Override
protected void startScan() {
logger.debug("Discover windmills (manual discovery)");
cancelDiscoveryJob();
discoveryJob = scheduler.submit(this::discoverWindmills);
}
@ -90,6 +97,14 @@ public class WindcentraleDiscoveryService extends AbstractDiscoveryService imple
super.stopScan();
}
@Override
public void thingStatusChanged(Thing thing, ThingStatus status) {
if (ThingStatus.ONLINE.equals(status)) {
logger.debug("Discover windmills (account online)");
discoverWindmills();
}
}
private void cancelDiscoveryJob() {
Future<?> localDiscoveryJob = discoveryJob;
if (localDiscoveryJob != null) {

26
bundles/org.openhab.binding.windcentrale/src/main/java/org/openhab/binding/windcentrale/internal/handler/WindcentraleAccountHandler.java
View File

@ -17,6 +17,7 @@ import static java.util.function.Predicate.not;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -30,6 +31,7 @@ import org.openhab.binding.windcentrale.internal.api.WindcentraleAPI;
import org.openhab.binding.windcentrale.internal.config.AccountConfiguration;
import org.openhab.binding.windcentrale.internal.exception.FailedGettingDataException;
import org.openhab.binding.windcentrale.internal.exception.InvalidAccessTokenException;
import org.openhab.binding.windcentrale.internal.listener.ThingStatusListener;
import org.openhab.core.io.net.http.HttpClientFactory;
import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.ChannelUID;
@ -52,6 +54,7 @@ public class WindcentraleAccountHandler extends BaseBridgeHandler {
private final Logger logger = LoggerFactory.getLogger(WindcentraleAccountHandler.class);
private final HttpClientFactory httpClientFactory;
private final List<ThingStatusListener> thingStatusListeners = new CopyOnWriteArrayList<>();
private @Nullable WindcentraleAPI api;
private @Nullable Exception apiException;
@ -80,6 +83,11 @@ public class WindcentraleAccountHandler extends BaseBridgeHandler {
this.httpClientFactory = httpClientFactory;
}
public void addThingStatusListener(ThingStatusListener listener) {
thingStatusListeners.add(listener);
listener.thingStatusChanged(thing, thing.getStatus());
}
@Override
public void dispose() {
Future<?> localFuture = initializeFuture;
@ -135,6 +143,24 @@ public class WindcentraleAccountHandler extends BaseBridgeHandler {
public void handleCommand(ChannelUID channelUID, Command command) {
}
public void removeThingStatusListener(ThingStatusListener listener) {
thingStatusListeners.remove(listener);
}
@Override
protected void updateStatus(ThingStatus status, ThingStatusDetail detail, @Nullable String comment) {
ThingStatus oldStatus = thing.getStatus();
super.updateStatus(status, detail, comment);
ThingStatus newStatus = thing.getStatus();
if (!oldStatus.equals(newStatus)) {
logger.debug("Updating listeners with status {}", status);
for (ThingStatusListener listener : thingStatusListeners) {
listener.thingStatusChanged(thing, status);
}
}
}
private void updateThingStatus() {
Exception e = apiException;
if (e != null) {

28
bundles/org.openhab.binding.windcentrale/src/main/java/org/openhab/binding/windcentrale/internal/listener/ThingStatusListener.java Normal file
View File

@ -0,0 +1,28 @@
/**
* Copyright (c) 2010-2023 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.windcentrale.internal.listener;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
/**
* Interface for listeners of thing status changes.
*
* @author Wouter Born - Initial contribution
*/
@NonNullByDefault
public interface ThingStatusListener {
public void thingStatusChanged(Thing thing, ThingStatus status);
}