Enable home being both energy and security (#16026)

Signed-off-by: clinique <gael@lhopital.org>

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/NAHomeStatus.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/NAHomeStatus.java
index 5583bc4aef831635f81d09dfed7c8ba50294f3b9..d889e9c8bcbd49991c34e83b417fc1083aa009a9 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/NAHomeStatus.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/dto/NAHomeStatus.java
@@ -33,24 +33,18 @@ public class NAHomeStatus {
 
     public class HomeStatus extends NAThing {
         private @Nullable NAObjectMap<HomeStatusModule> modules;
+        private @Nullable NAObjectMap<Room> rooms;
+        private @Nullable NAObjectMap<HomeStatusPerson> persons;
 
         public NAObjectMap<HomeStatusModule> getModules() {
             NAObjectMap<HomeStatusModule> local = modules;
             return local != null ? local : new NAObjectMap<>();
         }
-    }
-
-    public class Energy extends HomeStatus {
-        private @Nullable NAObjectMap<Room> rooms;
 
         public NAObjectMap<Room> getRooms() {
             NAObjectMap<Room> local = rooms;
             return local != null ? local : new NAObjectMap<>();
         }
-    }
-
-    public class Security extends HomeStatus {
-        private @Nullable NAObjectMap<HomeStatusPerson> persons;
 
         public NAObjectMap<HomeStatusPerson> getPersons() {
             NAObjectMap<HomeStatusPerson> local = persons;

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/NADeserializer.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/NADeserializer.java
index 93c931d3c1581aa4fcf0c20cc0e97a3f2acbc25a..e1dcdf69ef27fb28be5014b3533d1b8c35b14f54 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/NADeserializer.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/deserialization/NADeserializer.java
@@ -20,8 +20,6 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.netatmo.internal.api.NetatmoException;
 import org.openhab.binding.netatmo.internal.api.data.ModuleType;
 import org.openhab.binding.netatmo.internal.api.dto.HomeData;
-import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus;
-import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus.HomeStatus;
 import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.OpenClosedType;
@@ -52,10 +50,6 @@ public class NADeserializer {
                 .registerTypeAdapter(NAObjectMap.class, new NAObjectMapDeserializer())
                 .registerTypeAdapter(NAPushType.class, new NAPushTypeDeserializer())
                 .registerTypeAdapter(ModuleType.class, new ModuleTypeDeserializer())
-                .registerTypeAdapter(HomeStatus.class,
-                        (JsonDeserializer<HomeStatus>) (json, type, context) -> context.deserialize(json,
-                                json.getAsJsonObject().has("persons") ? NAHomeStatus.Security.class
-                                        : NAHomeStatus.Energy.class))
                 .registerTypeAdapter(HomeData.class,
                         (JsonDeserializer<HomeData>) (json, type, context) -> context.deserialize(json,
                                 json.getAsJsonObject().has("therm_mode") ? HomeData.Energy.class

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java
index 39752014ec589365d6920b9e09df310a37814a3f..0b6903edf3f7420832b8129a0b790c47172ebdce 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java
@@ -25,7 +25,6 @@ import org.openhab.binding.netatmo.internal.api.dto.HomeData;
 import org.openhab.binding.netatmo.internal.api.dto.HomeDataModule;
 import org.openhab.binding.netatmo.internal.api.dto.HomeDataRoom;
 import org.openhab.binding.netatmo.internal.api.dto.HomeStatusModule;
-import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus;
 import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus.HomeStatus;
 import org.openhab.binding.netatmo.internal.api.dto.Room;
 import org.openhab.binding.netatmo.internal.config.HomeConfiguration;
@@ -85,29 +84,27 @@ public class EnergyCapability extends RestCapability<EnergyApi> {
     }
 
     @Override
-    protected void updateHomeStatus(HomeStatus homeStatus) {
-        if (homeStatus instanceof NAHomeStatus.Energy energyStatus) {
-            NAObjectMap<Room> rooms = energyStatus.getRooms();
-            NAObjectMap<HomeStatusModule> modules = energyStatus.getModules();
-            handler.getActiveChildren(FeatureArea.ENERGY).forEach(childHandler -> {
-                String childId = childHandler.getId();
-                logger.trace("childId: {}", childId);
-                rooms.getOpt(childId).ifPresentOrElse(roomData -> {
-                    logger.trace("roomData: {}", roomData);
-                    childHandler.setNewData(roomData);
-                }, () -> {
-                    modules.getOpt(childId).ifPresent(moduleData -> {
-                        logger.trace("moduleData: {}", moduleData);
-                        childHandler.setNewData(moduleData);
-                        modules.values().stream().filter(module -> childId.equals(module.getBridge()))
-                                .forEach(bridgedModule -> {
-                                    logger.trace("bridgedModule: {}", bridgedModule);
-                                    childHandler.setNewData(bridgedModule);
-                                });
-                    });
+    protected void updateHomeStatus(HomeStatus energyStatus) {
+        NAObjectMap<Room> rooms = energyStatus.getRooms();
+        NAObjectMap<HomeStatusModule> modules = energyStatus.getModules();
+        handler.getActiveChildren(FeatureArea.ENERGY).forEach(childHandler -> {
+            String childId = childHandler.getId();
+            logger.trace("childId: {}", childId);
+            rooms.getOpt(childId).ifPresentOrElse(roomData -> {
+                logger.trace("roomData: {}", roomData);
+                childHandler.setNewData(roomData);
+            }, () -> {
+                modules.getOpt(childId).ifPresent(moduleData -> {
+                    logger.trace("moduleData: {}", moduleData);
+                    childHandler.setNewData(moduleData);
+                    modules.values().stream().filter(module -> childId.equals(module.getBridge()))
+                            .forEach(bridgedModule -> {
+                                logger.trace("bridgedModule: {}", bridgedModule);
+                                childHandler.setNewData(bridgedModule);
+                            });
                 });
             });
-        }
+        });
     }
 
     public void setThermPoint(String roomId, SetpointMode mode, long endtime, double temp) {

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
index f412ce57baf998ad7e17ff3236b941133dad4614..76c57429b658e74051cc6fcf02e7727e6eb5febf 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
@@ -32,7 +32,6 @@ import org.openhab.binding.netatmo.internal.api.dto.HomeDataPerson;
 import org.openhab.binding.netatmo.internal.api.dto.HomeEvent;
 import org.openhab.binding.netatmo.internal.api.dto.HomeStatusModule;
 import org.openhab.binding.netatmo.internal.api.dto.HomeStatusPerson;
-import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus;
 import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus.HomeStatus;
 import org.openhab.binding.netatmo.internal.api.dto.NAObject;
 import org.openhab.binding.netatmo.internal.config.HomeConfiguration;
@@ -88,21 +87,19 @@ class SecurityCapability extends RestCapability<SecurityApi> {
     }
 
     @Override
-    protected void updateHomeStatus(HomeStatus homeStatus) {
-        if (homeStatus instanceof NAHomeStatus.Security securityStatus) {
-            NAObjectMap<HomeStatusPerson> persons = securityStatus.getPersons();
-            NAObjectMap<HomeStatusModule> modules = securityStatus.getModules();
-            handler.getActiveChildren(FeatureArea.SECURITY).forEach(childHandler -> {
-                String childId = childHandler.getId();
-                persons.getOpt(childId).ifPresentOrElse(personData -> childHandler.setNewData(personData), () -> {
-                    modules.getOpt(childId).ifPresent(childData -> {
-                        childHandler.setNewData(childData);
-                        modules.values().stream().filter(module -> childId.equals(module.getBridge()))
-                                .forEach(bridgedModule -> childHandler.setNewData(bridgedModule));
-                    });
+    protected void updateHomeStatus(HomeStatus securityStatus) {
+        NAObjectMap<HomeStatusPerson> persons = securityStatus.getPersons();
+        NAObjectMap<HomeStatusModule> modules = securityStatus.getModules();
+        handler.getActiveChildren(FeatureArea.SECURITY).forEach(childHandler -> {
+            String childId = childHandler.getId();
+            persons.getOpt(childId).ifPresentOrElse(personData -> childHandler.setNewData(personData), () -> {
+                modules.getOpt(childId).ifPresent(childData -> {
+                    childHandler.setNewData(childData);
+                    modules.values().stream().filter(module -> childId.equals(module.getBridge()))
+                            .forEach(bridgedModule -> childHandler.setNewData(bridgedModule));
                 });
             });
-        }
+        });
     }
 
     @Override

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SecurityChannelHelper.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SecurityChannelHelper.java
index ea1886122e6562bed4dd587ba8257b1b593544ad..a3c12aad88253ad64c87e9b9a7cd027ad47e81e7 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SecurityChannelHelper.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/SecurityChannelHelper.java
@@ -23,7 +23,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.netatmo.internal.api.dto.HomeData;
 import org.openhab.binding.netatmo.internal.api.dto.HomeDataPerson;
 import org.openhab.binding.netatmo.internal.api.dto.HomeStatusPerson;
-import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus;
+import org.openhab.binding.netatmo.internal.api.dto.NAHomeStatus.HomeStatus;
 import org.openhab.binding.netatmo.internal.api.dto.NAObject;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.types.State;
@@ -51,7 +51,7 @@ public class SecurityChannelHelper extends ChannelHelper {
         super.setNewData(data);
         if (data instanceof HomeData.Security securityData) {
             knownIds = securityData.getKnownPersons().stream().map(HomeDataPerson::getId).toList();
-        } else if (data instanceof NAHomeStatus.Security securityStatus) {
+        } else if (data instanceof HomeStatus securityStatus) {
             List<HomeStatusPerson> present = securityStatus.getPersons().values().stream()
                     .filter(HomeStatusPerson::atHome).toList();