[groheondus] Fix warnings and SAT (#20551)

Signed-off-by: Leo Siepel <leosiepel@gmail.com>

Author: lsiepel

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/GroheOndusAccountConfiguration.java

@@ -12,11 +12,14 @@
  */
 package org.openhab.binding.groheondus.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * @author Florian Schmidt and Arne Wohlert - Initial contribution
  */
+@NonNullByDefault
 public class GroheOndusAccountConfiguration {
 
-    public String username;
-    public String password;
+    public String username = "";
+    public String password = "";
 }

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/GroheOndusApplianceConfiguration.java

@@ -12,13 +12,16 @@
  */
 package org.openhab.binding.groheondus.internal;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * @author Florian Schmidt and Arne Wohlert - Initial contribution
  */
+@NonNullByDefault
 public class GroheOndusApplianceConfiguration {
 
-    public String applianceId;
+    public String applianceId = "";
     public int roomId;
     public int locationId;
-    public int pollingInterval;
+    public int pollingInterval = 0;
 }

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/GroheOndusBindingConstants.java

@@ -38,4 +38,6 @@ public class GroheOndusBindingConstants {
     public static final String CHANNEL_BATTERY = "battery";
 
     public static final String CHANNEL_CONFIG_TIMEFRAME = "timeframe";
+
+    public static final int DEFAULT_POLLING_INTERVAL = 900;
 }

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusAccountHandler.java

@@ -70,9 +70,9 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
     @Override
     public void dispose() {
-        if (ondusService != null) {
-            ondusService = null;
-        }
+        this.ondusService = null;
+
+        ScheduledFuture<?> reloginFuture = this.reloginFuture;
         if (reloginFuture != null) {
             reloginFuture.cancel(true);
         }
@@ -81,7 +81,7 @@ public void dispose() {
 
     private void login() {
         GroheOndusAccountConfiguration config = getConfigAs(GroheOndusAccountConfiguration.class);
-        if (config.username == null || config.password == null) {
+        if (config.username.isBlank() || config.password.isBlank()) {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
                     "@text/error.login.missing.credentials");
         } else {

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusBaseHandler.java

@@ -42,7 +42,7 @@
 public abstract class GroheOndusBaseHandler<T extends BaseAppliance, M> extends BaseThingHandler {
     private final Logger logger = LoggerFactory.getLogger(GroheOndusBaseHandler.class);
 
-    protected @Nullable GroheOndusApplianceConfiguration config;
+    protected @NonNullByDefault({}) GroheOndusApplianceConfiguration config;
 
     private @Nullable ScheduledFuture<?> poller;
 
@@ -154,7 +154,8 @@ protected Location getLocation() {
 
     protected @Nullable T getAppliance(OndusService ondusService) {
         try {
-            BaseAppliance appliance = ondusService.getAppliance(getRoom(), config.applianceId).orElse(null);
+            BaseAppliance appliance = config.applianceId.isEmpty() ? null
+                    : ondusService.getAppliance(getRoom(), config.applianceId).orElse(null);
             if (appliance != null) {
                 if (appliance.getType() != getType()) {
                     updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "@text/error.wrongtype");

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusHandlerFactory.java

@@ -74,9 +74,9 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
             onAccountCreated(thing, handler);
             return handler;
         } else if (THING_TYPE_SENSEGUARD.equals(thingTypeUID)) {
-            return new GroheOndusSenseGuardHandler(thing, thingCounter++);
+            return new GroheOndusSenseGuardHandler<>(thing, thingCounter++);
         } else if (THING_TYPE_SENSE.equals(thingTypeUID)) {
-            return new GroheOndusSenseHandler(thing, thingCounter++);
+            return new GroheOndusSenseHandler<>(thing, thingCounter++);
         }
 
         return null;

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseGuardHandler.java

@@ -12,13 +12,7 @@
  */
 package org.openhab.binding.groheondus.internal.handler;
 
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_CONFIG_TIMEFRAME;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_NAME;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_PRESSURE;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_TEMPERATURE_GUARD;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_VALVE_OPEN;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_WATERCONSUMPTION;
-import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.CHANNEL_WATERCONSUMPTION_SINCE_MIDNIGHT;
+import static org.openhab.binding.groheondus.internal.GroheOndusBindingConstants.*;
 
 import java.io.IOException;
 import java.math.BigDecimal;

bundles/org.openhab.binding.groheondus/src/main/java/org/openhab/binding/groheondus/internal/handler/GroheOndusSenseHandler.java

@@ -27,6 +27,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.openhab.binding.groheondus.internal.GroheOndusBindingConstants;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.types.StringType;
@@ -56,8 +57,6 @@
 @NonNullByDefault
 public class GroheOndusSenseHandler<T, M> extends GroheOndusBaseHandler<Appliance, Measurement> {
 
-    private static final int DEFAULT_POLLING_INTERVAL = 900;
-
     private final Logger logger = LoggerFactory.getLogger(GroheOndusSenseHandler.class);
 
     public GroheOndusSenseHandler(Thing thing, int thingCounter) {
@@ -69,7 +68,7 @@ protected int getPollingInterval(Appliance appliance) {
         if (config.pollingInterval > 0) {
             return config.pollingInterval;
         }
-        return DEFAULT_POLLING_INTERVAL;
+        return GroheOndusBindingConstants.DEFAULT_POLLING_INTERVAL;
     }
 
     @Override