]> git.basschouten.com Git - openhab-addons.git/commitdiff
[deconz] Fix compiler warning (#12403)
authorJacob Laursen <jacob-github@vindvejr.dk>
Thu, 3 Mar 2022 09:15:45 +0000 (10:15 +0100)
committerGitHub <noreply@github.com>
Thu, 3 Mar 2022 09:15:45 +0000 (10:15 +0100)
* Fix compiler warning and info.

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/DeconzDynamicStateDescriptionProvider.java
bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java

index f35b24100358c70804c07f0ec4b83528540a1337..d5d36831b2b72b8cb7a6fcd2d21e4f9e8e79a696 100644 (file)
@@ -24,6 +24,7 @@ import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.ThingUID;
 import org.openhab.core.thing.binding.BaseDynamicStateDescriptionProvider;
 import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
 import org.openhab.core.thing.type.DynamicStateDescriptionProvider;
 import org.openhab.core.types.StateDescription;
 import org.openhab.core.types.StateDescriptionFragment;
@@ -58,6 +59,7 @@ public class DeconzDynamicStateDescriptionProvider extends BaseDynamicStateDescr
         if (!stateDescriptionFragment.equals(oldStateDescriptionFragment)) {
             logger.trace("adding state description for channel {}", channelUID);
             stateDescriptionFragments.put(channelUID, stateDescriptionFragment);
+            ItemChannelLinkRegistry itemChannelLinkRegistry = this.itemChannelLinkRegistry;
             postEvent(ThingEventFactory.createChannelDescriptionChangedEvent(channelUID,
                     itemChannelLinkRegistry != null ? itemChannelLinkRegistry.getLinkedItemNames(channelUID) : Set.of(),
                     stateDescriptionFragment, oldStateDescriptionFragment));
index 0e930355563f2a1a35f7910554752c91c29b3bb8..5b496479b266f74e803d17a197de99de38d02da0 100644 (file)
@@ -175,7 +175,7 @@ public class DeconzBridgeHandler extends BaseBridgeHandler implements WebSocketC
         String url = buildUrl(config.getHostWithoutPort(), config.httpPort, config.apikey);
         return http.get(url, config.timeout).thenApply(r -> {
             if (r.getResponseCode() == 403) {
-                return Optional.ofNullable((BridgeFullState) null);
+                return Optional.<BridgeFullState> empty();
             } else if (r.getResponseCode() == 200) {
                 return Optional.ofNullable(gson.fromJson(r.getBody(), BridgeFullState.class));
             } else {