[netatmo] Add support for the Presence camera events - Line-endings fixed

bundles/org.openhab.binding.netatmo/pom.xml

@@ -69,7 +69,7 @@
               <goal>generate</goal>
             </goals>
             <configuration>
-              <inputSpec>https://raw.githubusercontent.com/cbornet/netatmo-swagger-decl/master/spec/swagger.yaml</inputSpec>
+              <inputSpec>https://raw.githubusercontent.com/cbornet/netatmo-swagger-decl/c95b5f5003d91ac9e73e9c855569263cb9013cc2/spec/swagger.yaml</inputSpec>
               <language>java</language>
               <library>retrofit</library>
               <configOptions>

bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/camera/CameraHandler.java

@@ -1,161 +1,161 @@
-/**
- * Copyright (c) 2010-2020 Contributors to the openHAB project
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.openhab.binding.netatmo.internal.camera;
-
-import static org.openhab.binding.netatmo.internal.ChannelTypeUtils.*;
-import static org.openhab.binding.netatmo.internal.NetatmoBindingConstants.*;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.io.net.http.HttpUtil;
-import org.openhab.binding.netatmo.internal.handler.NetatmoModuleHandler;
-
-import io.swagger.client.model.NAWelcomeCamera;
-
-/**
- * {@link CameraHandler} is the class used to handle Camera Data
- *
- * @author Sven Strohschein (partly moved code from NAWelcomeCameraHandler to introduce inheritance, see
- *         NAWelcomeCameraHandler)
- *
- */
-public class CameraHandler extends NetatmoModuleHandler<NAWelcomeCamera> {
-
-    private static final String LIVE_PICTURE = "/live/snapshot_720.jpg";
-
-    public CameraHandler(@NonNull Thing thing, final TimeZoneProvider timeZoneProvider) {
-        super(thing, timeZoneProvider);
-    }
-
-    @Override
-    protected void updateProperties(NAWelcomeCamera moduleData) {
-        updateProperties(null, moduleData.getType());
-    }
-
-    @SuppressWarnings("null")
-    @Override
-    protected State getNAThingProperty(@NonNull String channelId) {
-        switch (channelId) {
-            case CHANNEL_CAMERA_STATUS:
-                return getStatusState();
-            case CHANNEL_CAMERA_SDSTATUS:
-                return getSdStatusState();
-            case CHANNEL_CAMERA_ALIMSTATUS:
-                return getAlimStatusState();
-            case CHANNEL_CAMERA_ISLOCAL:
-                return getIsLocalState();
-            case CHANNEL_CAMERA_LIVEPICTURE_URL:
-                return getLivePictureURLState();
-            case CHANNEL_CAMERA_LIVEPICTURE:
-                return getLivePictureState();
-            case CHANNEL_CAMERA_LIVESTREAM_URL:
-                return getLiveStreamState();
-        }
-        return super.getNAThingProperty(channelId);
-    }
-
-    protected State getStatusState() {
-        return module != null ? toOnOffType(module.getStatus()) : UnDefType.UNDEF;
-    }
-
-    protected State getSdStatusState() {
-        return module != null ? toOnOffType(module.getSdStatus()) : UnDefType.UNDEF;
-    }
-
-    protected State getAlimStatusState() {
-        return module != null ? toOnOffType(module.getAlimStatus()) : UnDefType.UNDEF;
-    }
-
-    protected State getIsLocalState() {
-        return module != null ? toOnOffType(module.getIsLocal()) : UnDefType.UNDEF;
-    }
-
-    protected State getLivePictureURLState() {
-        String livePictureURL = getLivePictureURL();
-        return livePictureURL == null ? UnDefType.UNDEF : toStringType(livePictureURL);
-    }
-
-    protected State getLivePictureState() {
-        String livePictureURL = getLivePictureURL();
-        return livePictureURL == null ? UnDefType.UNDEF : HttpUtil.downloadImage(livePictureURL);
-    }
-
-    protected State getLiveStreamState() {
-        String liveStreamURL = getLiveStreamURL();
-        return liveStreamURL == null ? UnDefType.UNDEF : new StringType(liveStreamURL);
-    }
-
-    /**
-     * Get the url for the live snapshot
-     *
-     * @return Url of the live snapshot
-     */
-    private String getLivePictureURL() {
-        String result = getVpnUrl();
-        if (result != null) {
-            result += LIVE_PICTURE;
-        }
-        return result;
-    }
-
-    /**
-     * Get the url for the live stream depending wether local or not
-     *
-     * @return Url of the live stream
-     */
-    private String getLiveStreamURL() {
-        String result = getVpnUrl();
-        if (result == null) {
-            return null;
-        }
-
-        StringBuilder resultStringBuilder = new StringBuilder(result);
-        resultStringBuilder.append("/live/index");
-        if (isLocal()) {
-            resultStringBuilder.append("_local");
-        }
-        resultStringBuilder.append(".m3u8");
-        return resultStringBuilder.toString();
-    }
-
-    @SuppressWarnings("null")
-    private String getVpnUrl() {
-        return (module == null) ? null : module.getVpnUrl();
-    }
-
-    public String getStreamURL(String videoId) {
-        String result = getVpnUrl();
-        if (result == null) {
-            return null;
-        }
-
-        StringBuilder resultStringBuilder = new StringBuilder(result);
-        resultStringBuilder.append("/vod/");
-        resultStringBuilder.append(videoId);
-        resultStringBuilder.append("/index");
-        if (isLocal()) {
-            resultStringBuilder.append("_local");
-        }
-        resultStringBuilder.append(".m3u8");
-        return resultStringBuilder.toString();
-    }
-
-    @SuppressWarnings("null")
-    private boolean isLocal() {
-        return (module == null || module.getIsLocal() == null) ? false : module.getIsLocal();
-    }
-}
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.netatmo.internal.camera;
+
+import static org.openhab.binding.netatmo.internal.ChannelTypeUtils.*;
+import static org.openhab.binding.netatmo.internal.NetatmoBindingConstants.*;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
+import org.eclipse.smarthome.core.library.types.StringType;
+import org.eclipse.smarthome.core.thing.Thing;
+import org.eclipse.smarthome.core.types.State;
+import org.eclipse.smarthome.core.types.UnDefType;
+import org.eclipse.smarthome.io.net.http.HttpUtil;
+import org.openhab.binding.netatmo.internal.handler.NetatmoModuleHandler;
+
+import io.swagger.client.model.NAWelcomeCamera;
+
+/**
+ * {@link CameraHandler} is the class used to handle Camera Data
+ *
+ * @author Sven Strohschein (partly moved code from NAWelcomeCameraHandler to introduce inheritance, see
+ *         NAWelcomeCameraHandler)
+ *
+ */
+public class CameraHandler extends NetatmoModuleHandler<NAWelcomeCamera> {
+
+    private static final String LIVE_PICTURE = "/live/snapshot_720.jpg";
+
+    public CameraHandler(@NonNull Thing thing, final TimeZoneProvider timeZoneProvider) {
+        super(thing, timeZoneProvider);
+    }
+
+    @Override
+    protected void updateProperties(NAWelcomeCamera moduleData) {
+        updateProperties(null, moduleData.getType());
+    }
+
+    @SuppressWarnings("null")
+    @Override
+    protected State getNAThingProperty(@NonNull String channelId) {
+        switch (channelId) {
+            case CHANNEL_CAMERA_STATUS:
+                return getStatusState();
+            case CHANNEL_CAMERA_SDSTATUS:
+                return getSdStatusState();
+            case CHANNEL_CAMERA_ALIMSTATUS:
+                return getAlimStatusState();
+            case CHANNEL_CAMERA_ISLOCAL:
+                return getIsLocalState();
+            case CHANNEL_CAMERA_LIVEPICTURE_URL:
+                return getLivePictureURLState();
+            case CHANNEL_CAMERA_LIVEPICTURE:
+                return getLivePictureState();
+            case CHANNEL_CAMERA_LIVESTREAM_URL:
+                return getLiveStreamState();
+        }
+        return super.getNAThingProperty(channelId);
+    }
+
+    protected State getStatusState() {
+        return module != null ? toOnOffType(module.getStatus()) : UnDefType.UNDEF;
+    }
+
+    protected State getSdStatusState() {
+        return module != null ? toOnOffType(module.getSdStatus()) : UnDefType.UNDEF;
+    }
+
+    protected State getAlimStatusState() {
+        return module != null ? toOnOffType(module.getAlimStatus()) : UnDefType.UNDEF;
+    }
+
+    protected State getIsLocalState() {
+        return module != null ? toOnOffType(module.getIsLocal()) : UnDefType.UNDEF;
+    }
+
+    protected State getLivePictureURLState() {
+        String livePictureURL = getLivePictureURL();
+        return livePictureURL == null ? UnDefType.UNDEF : toStringType(livePictureURL);
+    }
+
+    protected State getLivePictureState() {
+        String livePictureURL = getLivePictureURL();
+        return livePictureURL == null ? UnDefType.UNDEF : HttpUtil.downloadImage(livePictureURL);
+    }
+
+    protected State getLiveStreamState() {
+        String liveStreamURL = getLiveStreamURL();
+        return liveStreamURL == null ? UnDefType.UNDEF : new StringType(liveStreamURL);
+    }
+
+    /**
+     * Get the url for the live snapshot
+     *
+     * @return Url of the live snapshot
+     */
+    private String getLivePictureURL() {
+        String result = getVpnUrl();
+        if (result != null) {
+            result += LIVE_PICTURE;
+        }
+        return result;
+    }
+
+    /**
+     * Get the url for the live stream depending wether local or not
+     *
+     * @return Url of the live stream
+     */
+    private String getLiveStreamURL() {
+        String result = getVpnUrl();
+        if (result == null) {
+            return null;
+        }
+
+        StringBuilder resultStringBuilder = new StringBuilder(result);
+        resultStringBuilder.append("/live/index");
+        if (isLocal()) {
+            resultStringBuilder.append("_local");
+        }
+        resultStringBuilder.append(".m3u8");
+        return resultStringBuilder.toString();
+    }
+
+    @SuppressWarnings("null")
+    private String getVpnUrl() {
+        return (module == null) ? null : module.getVpnUrl();
+    }
+
+    public String getStreamURL(String videoId) {
+        String result = getVpnUrl();
+        if (result == null) {
+            return null;
+        }
+
+        StringBuilder resultStringBuilder = new StringBuilder(result);
+        resultStringBuilder.append("/vod/");
+        resultStringBuilder.append(videoId);
+        resultStringBuilder.append("/index");
+        if (isLocal()) {
+            resultStringBuilder.append("_local");
+        }
+        resultStringBuilder.append(".m3u8");
+        return resultStringBuilder.toString();
+    }
+
+    @SuppressWarnings("null")
+    private boolean isLocal() {
+        return (module == null || module.getIsLocal() == null) ? false : module.getIsLocal();
+    }
+}

bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/NetatmoBridgeHandler.java

@@ -260,7 +260,7 @@ public void dispose() {
     }
 
     public NAStationDataBody getStationsDataBody(String equipmentId) {
-        NAStationDataBody data = getStationApi().getstationsdata(equipmentId).getBody();
+        NAStationDataBody data = getStationApi().getstationsdata(equipmentId, false).getBody();
         updateStatus(ThingStatus.ONLINE);
         return data;
     }