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

[touchwand] - remove Thing state update on unit discovery, causing expire to fail (#12736)

Browse Source 
* remove listeners from unit discovery 

Signed-off-by: Roie Geron <roie.geron@gmail.com>
This commit is contained in:
Roie Geron 2022-05-16 17:49:53 +03:00 committed by GitHub
parent 91ee684a06
commit d7f8fe6411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/discovery/TouchWandUnitDiscoveryService.java
View File

@ -18,7 +18,6 @@ import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -26,7 +25,6 @@ import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.touchwand.internal.TouchWandBridgeHandler; import org.openhab.binding.touchwand.internal.TouchWandBridgeHandler;
import org.openhab.binding.touchwand.internal.TouchWandUnitStatusUpdateListener;
import org.openhab.binding.touchwand.internal.dto.TouchWandUnitData; import org.openhab.binding.touchwand.internal.dto.TouchWandUnitData;
import org.openhab.binding.touchwand.internal.dto.TouchWandUnitFromJson; import org.openhab.binding.touchwand.internal.dto.TouchWandUnitFromJson;
import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.AbstractDiscoveryService;
@ -61,7 +59,6 @@ public class TouchWandUnitDiscoveryService extends AbstractDiscoveryService impl
private final Logger logger = LoggerFactory.getLogger(TouchWandUnitDiscoveryService.class); private final Logger logger = LoggerFactory.getLogger(TouchWandUnitDiscoveryService.class);
private @Nullable ScheduledFuture<?> scanningJob; private @Nullable ScheduledFuture<?> scanningJob;
private CopyOnWriteArraySet<TouchWandUnitStatusUpdateListener> listeners = new CopyOnWriteArraySet<>();
public TouchWandUnitDiscoveryService() { public TouchWandUnitDiscoveryService() {
super(SUPPORTED_THING_TYPES_UIDS, SEARCH_TIME_SEC, true); super(SUPPORTED_THING_TYPES_UIDS, SEARCH_TIME_SEC, true);
@ -123,7 +120,6 @@ public class TouchWandUnitDiscoveryService extends AbstractDiscoveryService impl
default: default:
continue; continue;
} }
notifyListeners(touchWandUnit);
} }
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {
logger.warn("Could not parse unit {}", e.getMessage()); logger.warn("Could not parse unit {}", e.getMessage());
@ -134,12 +130,6 @@ public class TouchWandUnitDiscoveryService extends AbstractDiscoveryService impl
} }
} }
private void notifyListeners(TouchWandUnitData touchWandUnit) {
for (TouchWandUnitStatusUpdateListener listener : listeners) {
listener.onDataReceived(touchWandUnit);
}
}
@Override @Override
protected void stopScan() { protected void stopScan() {
removeOlderResults(getTimestampOfLastScan()); removeOlderResults(getTimestampOfLastScan());
@ -176,18 +166,6 @@ public class TouchWandUnitDiscoveryService extends AbstractDiscoveryService impl
} }
} }
public void registerListener(TouchWandUnitStatusUpdateListener listener) {
if (!listeners.contains(listener)) {
logger.debug("Adding TouchWandWebSocket listener {}", listener);
listeners.add(listener);
}
}
public void unregisterListener(TouchWandUnitStatusUpdateListener listener) {
logger.debug("Removing TouchWandWebSocket listener {}", listener);
listeners.remove(listener);
}
@Override @Override
public int getScanTimeout() { public int getScanTimeout() {
return SEARCH_TIME_SEC; return SEARCH_TIME_SEC;
@ -215,7 +193,6 @@ public class TouchWandUnitDiscoveryService extends AbstractDiscoveryService impl
public void setThingHandler(@NonNullByDefault({}) ThingHandler handler) { public void setThingHandler(@NonNullByDefault({}) ThingHandler handler) {
if (handler instanceof TouchWandBridgeHandler) { if (handler instanceof TouchWandBridgeHandler) {
touchWandBridgeHandler = (TouchWandBridgeHandler) handler; touchWandBridgeHandler = (TouchWandBridgeHandler) handler;
registerListener(touchWandBridgeHandler);
} }
} }