Adressing code review n°1

Signed-off-by: root <gael@lhopital.org>
openhab · Apr 28, 2024 · 995841a · 995841a
1 parent 6fe3c32
commit 995841a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/....netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/HomeStatusModule.java b/....netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/HomeStatusModule.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.netatmo.internal.api.dto;
 
-import java.util.Objects;
 import java.util.Optional;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -96,8 +95,8 @@ public SirenStatus getSirenStatus() {
         return sirenStatus;
     }
 
-    public String getVpnUrl() {
-        return Objects.requireNonNull(vpnUrl);
+    public @Nullable String getVpnUrl() {
+        return vpnUrl;
     }
 
     public boolean isLocal() {

diff --git a/...c/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java b/...c/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java
@@ -87,7 +87,7 @@ public void updateHomeStatusModule(HomeStatusModule newData) {
         super.updateHomeStatusModule(newData);
         // Per documentation vpn_url expires every 3 hours and on camera reboot. So useless to reping it if not changed
         String newVpnUrl = newData.getVpnUrl();
-        if (!newVpnUrl.equals(vpnUrl)) {
+        if (newVpnUrl != null && !newVpnUrl.equals(vpnUrl)) {
             // This will also decrease the number of requests emitted toward Netatmo API.
             localUrl = newData.isLocal() ? ping(newVpnUrl) : null;
             logger.debug("localUrl set to {} for camera {}", localUrl, thingUID);

diff --git a/.../java/org/openhab/binding/netatmo/internal/handler/channelhelper/CameraChannelHelper.java b/.../java/org/openhab/binding/netatmo/internal/handler/channelhelper/CameraChannelHelper.java
@@ -46,8 +46,8 @@ public CameraChannelHelper(Set<String> providedGroups) {
     }
 
     public void setUrls(String vpnUrl, @Nullable String localUrl) {
-        this.vpnUrl = vpnUrl;
         this.localUrl = localUrl;
+        this.vpnUrl = vpnUrl;
     }
 
     @Override
@@ -65,7 +65,7 @@ public void setUrls(String vpnUrl, @Nullable String localUrl) {
     }
 
     public @Nullable String getLivePictureURL(boolean local, boolean isMonitoring) {
-        if (!isMonitoring || (local && (localUrl != null))) {
+        if (!isMonitoring || (local && (localUrl == null))) {
             return null;
         }
         return "%s%s".formatted(getUrl(local), LIVE_PICTURE);
@@ -94,8 +94,8 @@ public void setUrls(String vpnUrl, @Nullable String localUrl) {
         };
     }
 
-    private String getUrl(boolean local) {
-        return Objects.requireNonNull(local ? localUrl : vpnUrl);
+    private @Nullable String getUrl(boolean local) {
+        return local ? localUrl : vpnUrl;
     }
 
     private State getLiveStreamURL(boolean local, @Nullable String configQual, boolean isMonitoring) {