public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bluetooth] Expire discovery snapshots so that devices can be rediscovered (#10099)

Browse Source 
Signed-off-by: Connor Petty <mistercpp2000+gitsignoff@gmail.com>
This commit is contained in:
Connor Petty 2021-02-14 10:52:18 -08:00 committed by GitHub
parent 77c9138598
commit b9c5a0d158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDiscoveryService.java
View File

@ -12,6 +12,7 @@
*/ */
package org.openhab.binding.bluetooth.discovery.internal; package org.openhab.binding.bluetooth.discovery.internal;
import java.time.Duration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
@ -30,6 +31,7 @@ import org.openhab.binding.bluetooth.BluetoothBindingConstants;
import org.openhab.binding.bluetooth.BluetoothDevice; import org.openhab.binding.bluetooth.BluetoothDevice;
import org.openhab.binding.bluetooth.BluetoothDiscoveryListener; import org.openhab.binding.bluetooth.BluetoothDiscoveryListener;
import org.openhab.binding.bluetooth.discovery.BluetoothDiscoveryParticipant; import org.openhab.binding.bluetooth.discovery.BluetoothDiscoveryParticipant;
import org.openhab.core.cache.ExpiringCache;
import org.openhab.core.config.discovery.AbstractDiscoveryService; import org.openhab.core.config.discovery.AbstractDiscoveryService;
import org.openhab.core.config.discovery.DiscoveryResult; import org.openhab.core.config.discovery.DiscoveryResult;
import org.openhab.core.config.discovery.DiscoveryResultBuilder; import org.openhab.core.config.discovery.DiscoveryResultBuilder;
@ -172,7 +174,8 @@ public class BluetoothDiscoveryService extends AbstractDiscoveryService implemen
private final Map<BluetoothAdapter, SnapshotFuture> discoveryFutures = new HashMap<>(); private final Map<BluetoothAdapter, SnapshotFuture> discoveryFutures = new HashMap<>();
private final Map<BluetoothAdapter, Set<DiscoveryResult>> discoveryResults = new ConcurrentHashMap<>(); private final Map<BluetoothAdapter, Set<DiscoveryResult>> discoveryResults = new ConcurrentHashMap<>();
private @Nullable BluetoothDeviceSnapshot latestSnapshot; private ExpiringCache<BluetoothDeviceSnapshot> latestSnapshot = new ExpiringCache<>(Duration.ofMinutes(1),
() -> null);
/** /**
* This is meant to be used as part of a Map.compute function * This is meant to be used as part of a Map.compute function
@ -209,7 +212,7 @@ public class BluetoothDiscoveryService extends AbstractDiscoveryService implemen
CompletableFuture<DiscoveryResult> future = null; CompletableFuture<DiscoveryResult> future = null;
BluetoothDeviceSnapshot snapshot = new BluetoothDeviceSnapshot(device); BluetoothDeviceSnapshot snapshot = new BluetoothDeviceSnapshot(device);
BluetoothDeviceSnapshot latestSnapshot = this.latestSnapshot; BluetoothDeviceSnapshot latestSnapshot = this.latestSnapshot.getValue();
if (latestSnapshot != null) { if (latestSnapshot != null) {
snapshot.merge(latestSnapshot); snapshot.merge(latestSnapshot);
@ -236,7 +239,7 @@ public class BluetoothDiscoveryService extends AbstractDiscoveryService implemen
} }
} }
} }
this.latestSnapshot = snapshot; this.latestSnapshot.putValue(snapshot);
if (future == null) { if (future == null) {
// we pass in the snapshot since it acts as a delegate for the device. It will also retain any new // we pass in the snapshot since it acts as a delegate for the device. It will also retain any new