Saving work

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

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/FreeboxOsSession.java

@@ -147,7 +147,8 @@ private synchronized <F, T extends Response<F>> List<F> execute(URI uri, HttpMet
             if (!response.isSuccess()) {
                 throw new FreeboxException("Api request failed : %s", response.getMsg());
             }
-            return response.getResult();
+            List<F> result = response.getResult();
+            return result == null ? List.of() : result;
         } catch (FreeboxException e) {
             if (ErrorCode.AUTH_REQUIRED.equals(e.getErrorCode())) {
                 initiateConnection();

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java

@@ -21,12 +21,11 @@
 import org.openhab.binding.freeboxos.internal.api.FreeboxException;
 import org.openhab.binding.freeboxos.internal.api.Response;
 import org.openhab.binding.freeboxos.internal.api.rest.HomeManager.EndpointState.ValueType;
-import org.openhab.binding.freeboxos.internal.api.rest.HomeManager.EndpointUi.AccessType;
-import org.openhab.binding.freeboxos.internal.api.rest.HomeManager.EndpointUi.DisplayType;
 import org.openhab.binding.freeboxos.internal.api.rest.LoginManager.Session.Permission;
 import org.openhab.core.thing.ThingTypeUID;
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
 
 /**
  * The {@link HomeManager} is the Java class used to handle api requests related to home
@@ -45,23 +44,28 @@ public static class EndpointStateResponse extends Response<EndpointState> {
     public static class HomeNodesResponse extends Response<HomeNode> {
     }
 
+    public static enum AccessType {
+        R,
+        W,
+        RW,
+        UNKNOWN;
+    }
+
+    public static enum DisplayType {
+        TEXT,
+        ICON,
+        BUTTON,
+        SLIDER,
+        TOGGLE,
+        COLOR,
+        WARNING,
+        UNKNOWN;
+    }
+
     public static record EndpointUi(AccessType access, DisplayType display, String iconUrl, @Nullable String unit) {
-        public static enum AccessType {
-            R,
-            W,
-            RW,
-            UNKNOWN;
-        }
 
-        public static enum DisplayType {
-            TEXT,
-            ICON,
-            BUTTON,
-            SLIDER,
-            TOGGLE,
-            COLOR,
-            WARNING,
-            UNKNOWN;
+        public @Nullable String unit() {
+            return unit;
         }
     }
 
@@ -78,20 +82,24 @@ public static enum ValueType {
             UNKNOWN;
         }
 
-        public @Nullable Boolean asBoolean() {
+        private @Nullable JsonPrimitive getAsPrimitive() {
             final JsonElement theValue = value;
-            if (theValue != null && theValue.isJsonPrimitive() && theValue.getAsJsonPrimitive().isBoolean()) {
-                return theValue.getAsBoolean();
-            }
-            return null;
+            return theValue != null && theValue.isJsonPrimitive() ? theValue.getAsJsonPrimitive() : null;
+        }
+
+        public @Nullable Boolean asBoolean() {
+            final JsonPrimitive theValue = getAsPrimitive();
+            return theValue != null && theValue.isBoolean() ? theValue.getAsBoolean() : null;
         }
 
         public @Nullable Integer asInt() {
-            final JsonElement theValue = value;
-            if (theValue != null && theValue.isJsonPrimitive() && theValue.getAsJsonPrimitive().isNumber()) {
-                return theValue.getAsInt();
-            }
-            return null;
+            final JsonPrimitive theValue = getAsPrimitive();
+            return theValue != null && theValue.isNumber() ? theValue.getAsInt() : null;
+        }
+
+        public @Nullable String asString() {
+            final JsonPrimitive theValue = getAsPrimitive();
+            return theValue != null && theValue.isString() ? theValue.getAsString() : null;
         }
     }
 
@@ -160,7 +168,6 @@ public HomeNode getHomeNode(int nodeId) throws FreeboxException {
     }
 
     public <T> void putCommand(int nodeId, int stateSignalId, T value) throws FreeboxException {
-        put(GenericResponse.class, new EndpointValue<T>(value), ENDPOINTS_PATH, String.valueOf(nodeId),
-                String.valueOf(stateSignalId));
+        put(new EndpointValue<T>(value), ENDPOINTS_PATH, String.valueOf(nodeId), String.valueOf(stateSignalId));
     }
 }

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/RestManager.java

@@ -90,4 +90,8 @@ protected <F, T extends Response<F>> F put(Class<T> clazz, F payload, String...
             throws FreeboxException {
         return controlSingleton(session.execute(buildUri(pathElements), PUT, clazz, payload));
     }
+
+    protected <F, T extends Response<F>> void put(F payload, String... pathElements) throws FreeboxException {
+        session.execute(buildUri(pathElements), PUT, GenericResponse.class, payload);
+    }
 }

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/ApiConsumerConfiguration.java

@@ -22,6 +22,7 @@
 public class ApiConsumerConfiguration {
     public static final String PASSWORD = "password";
     public static final String PORT = "port";
+    public static final String REFRESH_INTERVAL = "refreshInterval";
 
     public int refreshInterval = 30;
     public String password = "";

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/HomeChannelConfig.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2010-2023 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.freeboxos.internal.config;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+/**
+ * The {@link HomeChannelConfig} is responsible for holding configuration informations for a dynamically create home
+ * endpoint channel
+ *
+ * @author Gaël L'hopital - Initial contribution
+ */
+@NonNullByDefault
+public class HomeChannelConfig {
+    public int id = -1;
+    public String unit = "";
+
+    public HomeChannelConfig(int id, @Nullable String unit) {
+        super();
+        this.id = id;
+        this.unit = unit != null ? unit : "";
+    }
+}

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/discovery/FreeboxOsDiscoveryService.java

@@ -17,9 +17,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -73,7 +75,8 @@ public class FreeboxOsDiscoveryService extends AbstractDiscoveryService implemen
     private @Nullable FreeboxOsHandler bridgeHandler;
 
     public FreeboxOsDiscoveryService() {
-        super(THINGS_TYPES_UIDS, DISCOVERY_TIME_SECONDS);
+        super(Stream.of(THINGS_TYPES_UIDS, HOME_TYPES_UIDS).flatMap(Set::stream).collect(Collectors.toSet()),
+                DISCOVERY_TIME_SECONDS);
     }
 
     @Override

bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/discovery/NodeConfigurationBuilder.java

@@ -20,7 +20,6 @@
 import org.openhab.binding.freeboxos.internal.api.rest.HomeManager.HomeNode;
 import org.openhab.binding.freeboxos.internal.config.BasicShutterConfiguration;
 import org.openhab.binding.freeboxos.internal.config.ClientConfiguration;
-import org.openhab.binding.freeboxos.internal.config.ShutterConfiguration;
 import org.openhab.core.config.discovery.DiscoveryResultBuilder;
 import org.openhab.core.thing.ThingUID;
 import org.slf4j.Logger;
@@ -56,9 +55,9 @@ public Optional<DiscoveryResultBuilder> configure(ThingUID bridgeUID, HomeNode n
                     case BASIC_SHUTTER:
                         BasicShutterConfiguration.configure(discoveryResultBuilder, node);
                         break;
-                    case SHUTTER:
-                        ShutterConfiguration.configure(discoveryResultBuilder, node);
-                        break;
+                    // case SHUTTER:
+                    // ShutterConfiguration.configure(discoveryResultBuilder, node);
+                    // break;
                     default:
                         break;
                 }