Rebased + code review n°5

Restoring pom.xml + my binding Signed-off-by: Gaël L'hopital <gael@lhopital.org>
openhab · May 26, 2024 · 9d7cb3a · 9d7cb3a
1 parent e54d2b6
commit 9d7cb3a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/bundles/org.openhab.binding.ephemeris/pom.xml b/bundles/org.openhab.binding.ephemeris/pom.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/...ephemeris/src/main/java/org/openhab/binding/ephemeris/internal/handler/CustomHandler.java b/...ephemeris/src/main/java/org/openhab/binding/ephemeris/internal/handler/CustomHandler.java
@@ -45,15 +45,23 @@ public CustomHandler(Thing thing, EphemerisManager ephemerisManager, ZoneId zone
 
     @Override
     public void initialize() {
-        FileConfiguration config = getConfigAs(FileConfiguration.class);
-        File file = new File(BINDING_DATA_PATH, config.fileName);
-        if (file.exists()) {
-            definitionFile = Optional.of(file);
-            super.initialize();
-        } else {
+        String fileName = getConfigAs(FileConfiguration.class).fileName;
+
+        if (fileName.isBlank()) {
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
+                    "'fileName' can not be blank or empty");
+            return;
+        }
+
+        File file = new File(BINDING_DATA_PATH, fileName);
+        if (!file.exists()) {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
                     "Missing file: %s".formatted(file.getAbsolutePath()));
+            return;
         }
+
+        definitionFile = Optional.of(file);
+        super.initialize();
     }
 
     @Override