From 9e6b952b66afaff04c4a29ce2494679bfe8dd6d2 Mon Sep 17 00:00:00 2001 From: eugen Date: Tue, 22 Feb 2022 06:50:19 +0100 Subject: [PATCH] fix storage usage (#12305) Signed-off-by: Eugen Freiter --- .../io/homekit/internal/HomekitChangeListener.java | 5 ++--- .../java/org/openhab/io/homekit/internal/HomekitImpl.java | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java index e3148fd19..2a44a93b8 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java @@ -35,7 +35,6 @@ import org.openhab.core.items.Metadata; import org.openhab.core.items.MetadataKey; import org.openhab.core.items.MetadataRegistry; import org.openhab.core.storage.Storage; -import org.openhab.core.storage.StorageService; import org.openhab.io.homekit.internal.accessories.HomekitAccessoryFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,11 +78,11 @@ public class HomekitChangeListener implements ItemRegistryChangeListener { private final Debouncer applyUpdatesDebouncer; HomekitChangeListener(ItemRegistry itemRegistry, HomekitSettings settings, MetadataRegistry metadataRegistry, - StorageService storageService) { + Storage storage) { this.itemRegistry = itemRegistry; this.settings = settings; this.metadataRegistry = metadataRegistry; - storage = storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY); + this.storage = storage; this.applyUpdatesDebouncer = new Debouncer("update-homekit-devices", scheduler, Duration.ofMillis(1000), Clock.systemUTC(), this::applyUpdates); metadataChangeListener = new RegistryChangeListener() { diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java index 77c78a8fc..7fa41890f 100644 --- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java +++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java @@ -37,6 +37,7 @@ import org.openhab.core.items.MetadataRegistry; import org.openhab.core.net.CidrAddress; import org.openhab.core.net.NetworkAddressChangeListener; import org.openhab.core.net.NetworkAddressService; +import org.openhab.core.storage.Storage; import org.openhab.core.storage.StorageService; import org.openhab.io.homekit.Homekit; import org.osgi.framework.Constants; @@ -70,6 +71,7 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener { private final NetworkAddressService networkAddressService; private final ConfigurationAdmin configAdmin; + private final Storage storage; private HomekitAuthInfoImpl authInfo; private HomekitSettings settings; @@ -92,11 +94,11 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener { this.configAdmin = configAdmin; this.settings = processConfig(properties); this.mdnsClient = mdnsClient; + this.storage = storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY); networkAddressService.addNetworkAddressChangeListener(this); - this.changeListener = new HomekitChangeListener(itemRegistry, settings, metadataRegistry, storageService); + this.changeListener = new HomekitChangeListener(itemRegistry, settings, metadataRegistry, storage); try { - authInfo = new HomekitAuthInfoImpl(storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY), settings.pin, - settings.setupId, settings.blockUserDeletion); + authInfo = new HomekitAuthInfoImpl(storage, settings.pin, settings.setupId, settings.blockUserDeletion); startHomekitServer(); } catch (IOException | InvalidAlgorithmParameterException e) { logger.warn("cannot activate HomeKit binding. {}", e.getMessage());