@lolodomo review of 7/12:

fix bad error message on status when config is not valid
fix initialization of config : now done in initialize

Signed-off-by: Laurent ARNAL <[email protected]>

Author: lo92fr

bundles/org.openhab.binding.sedif/src/main/java/org/openhab/binding/sedif/internal/discovery/SedifDiscoveryService.java

@@ -16,6 +16,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -139,9 +140,7 @@ private void detectNewWaterMeterFromContract(final Contract contract) {
                         properties.put(PROPERTY_ELMB, compteInfo.eLmb);
                         properties.put(PROPERTY_NUM_METER, compteInfo.numCompteur);
                         properties.put(PROPERTY_ID_PDS, compteInfo.idPds);
-                        if (contract.name != null) {
-                            properties.put(PROPERTY_CONTRACT_ID, contract.name);
-                        }
+                        properties.put(PROPERTY_CONTRACT_ID, Objects.requireNonNull(contract.name));
 
                         DiscoveryResult discoveryResult = DiscoveryResultBuilder.create(thingUID)
                                 .withProperties(properties).withLabel("Water Meter " + compteInfo.numCompteur)

bundles/org.openhab.binding.sedif/src/main/java/org/openhab/binding/sedif/internal/handler/ThingSedifHandler.java

@@ -102,7 +102,7 @@ public class ThingSedifHandler extends BaseThingHandler {
 
     protected final Gson gson;
 
-    protected SedifConfiguration config;
+    protected @Nullable SedifConfiguration config;
 
     public ThingSedifHandler(Thing thing, LocaleProvider localeProvider, TimeZoneProvider timeZoneProvider, Gson gson) {
         super(thing);
@@ -173,12 +173,13 @@ public ThingSedifHandler(Thing thing, LocaleProvider localeProvider, TimeZonePro
                         return null;
                     }
                 });
-
-        config = getConfigAs(SedifConfiguration.class);
     }
 
     @Override
     public synchronized void initialize() {
+        SedifConfiguration lcConfig = getConfigAs(SedifConfiguration.class);
+        config = lcConfig;
+
         loadSedifState();
 
         if (sedifState.getLastIndexDate() == null) {
@@ -189,9 +190,9 @@ public synchronized void initialize() {
         this.contractDetail.invalidate();
         this.consumption.invalidate();
 
-        if (config.seemsValid()) {
-            contractName = config.contractId;
-            numCompteur = config.meterId;
+        if (lcConfig.seemsValid()) {
+            contractName = lcConfig.contractId;
+            numCompteur = lcConfig.meterId;
             updateStatus(ThingStatus.UNKNOWN);
         } else {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,

bundles/org.openhab.binding.sedif/src/main/resources/OH-INF/i18n/sedif.properties

@@ -21,6 +21,10 @@ thing-type.config.sedif.meter.contractId.description = Your Contract Id
 thing-type.config.sedif.meter.meterId.label = Meter Id
 thing-type.config.sedif.meter.meterId.description = Your Meter Id
 
+
+offline.config-error-mandatory-settings = Incomplete configuration
+
+
 # channel group types
 
 channel-group-type.sedif.base.label = Standard Base