openhab#47 Fixed code analysis warnings

Signed-off-by: Christian Oeing <[email protected]> Signed-off-by: Gerd Zanker <[email protected]>
GerdZanker · Jan 7, 2021 · ca62d36 · ca62d36
1 parent 3c4e1bb
commit ca62d36
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 23 deletions.
diff --git a/bundles/org.openhab.binding.boschshc/README.md b/bundles/org.openhab.binding.boschshc/README.md
@@ -35,6 +35,7 @@ A keystore file with a self signed certificate is created automatically. This ce
 Bosch IDs for found devices are displayed in the openHAB log on bootup (`OPENHAB_FOLDER/userdata/logs/openhab.log`)
 
 Example:
+
 ```
 2020-08-11 12:42:49.490 [INFO ] [chshc.internal.BoschSHCBridgeHandler] - Found device: name=Heizung id=hdm:HomeMaticIP:3014F711A000XXXXXXXXXXXX
 2020-08-11 12:42:49.495 [INFO ] [chshc.internal.BoschSHCBridgeHandler] - Found device: name=-RoomClimateControl- id=roomClimateControl_hz_1

diff --git a/...a/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java b/...a/org/openhab/binding/boschshc/internal/devices/climatecontrol/ClimateControlHandler.java
@@ -33,7 +33,7 @@
 /**
  * A virtual device which controls up to six Bosch Smart Home radiator thermostats in a room.
  * 
- * @author Christian Oeing ([email protected])
+ * @author Christian Oeing - Initial contribution
  */
 @NonNullByDefault
 public final class ClimateControlHandler extends BoschSHCHandler {

diff --git a/...a/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlHandler.java b/...a/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlHandler.java
@@ -14,7 +14,6 @@
 
 import static org.openhab.binding.boschshc.internal.devices.BoschSHCBindingConstants.*;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.core.library.types.PercentType;
@@ -31,28 +30,27 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSyntaxException;
 
-/**
- * Utility functions to convert data between Bosch things and openHAB items
- * 
- * @author Christian Oeing - Initial contribution
- */
-final class DataConversion {
-    public static int levelToOpenPercentage(double level) {
-        return (int) Math.round((1 - level) * 100);
-    }
-
-    public static double openPercentageToLevel(double openPercentage) {
-        return (100 - openPercentage) / 100.0;
-    }
-}
-
 /**
  * Handler for a shutter control device
  * 
  * @author Christian Oeing - Initial contribution
  */
 @NonNullByDefault
 public class ShutterControlHandler extends BoschSHCHandler {
+    /**
+     * Utility functions to convert data between Bosch things and openHAB items
+     * 
+     * @author Christian Oeing - Initial contribution
+     */
+    static final class DataConversion {
+        public static int levelToOpenPercentage(double level) {
+            return (int) Math.round((1 - level) * 100);
+        }
+
+        public static double openPercentageToLevel(double openPercentage) {
+            return (100 - openPercentage) / 100.0;
+        }
+    }
 
     final String ShutterControlServiceName = "ShutterControl";
 
@@ -96,7 +94,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
     }
 
     @Override
-    public void processUpdate(String id, @NonNull JsonElement state) {
+    public void processUpdate(String id, JsonElement state) {
         try {
             Gson gson = new Gson();
             updateState(gson.fromJson(state, ShutterControlState.class));

diff --git a/...ava/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlState.java b/...ava/org/openhab/binding/boschshc/internal/devices/shuttercontrol/ShutterControlState.java
@@ -14,11 +14,14 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * State for a shutter control device
  * 
  * @author Christian Oeing - Initial contribution
  */
+@NonNullByDefault
 public class ShutterControlState {
     @SerializedName("@type")
     public String type = "shutterControlState";
@@ -35,9 +38,11 @@ public class ShutterControlState {
 
     public ShutterControlState() {
         this.level = 0.0;
+        this.operationState = OperationState.STOPPED;
     }
 
     public ShutterControlState(double level) {
         this.level = level;
+        this.operationState = OperationState.STOPPED;
     }
 }
diff --git a/...hc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCServiceState.java b/...hc/src/main/java/org/openhab/binding/boschshc/internal/services/BoschSHCServiceState.java
@@ -14,11 +14,14 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * Base Bosch Smart Home Controller service state.
  * 
  * @author Christian Oeing - Initial contribution
  */
+@NonNullByDefault
 public class BoschSHCServiceState {
     @SerializedName("@type")
     private final String type;

diff --git a/...c/main/java/org/openhab/binding/boschshc/internal/services/JsonRestExceptionResponse.java b/...c/main/java/org/openhab/binding/boschshc/internal/services/JsonRestExceptionResponse.java
@@ -12,14 +12,19 @@
  */
 package org.openhab.binding.boschshc.internal.services;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * Generic error response of the Bosch REST API.
  * 
- * @author Christian Oeing ([email protected])
+ * @author Christian Oeing - Initial contribution
  */
+@NonNullByDefault
 public class JsonRestExceptionResponse extends BoschSHCServiceState {
     public JsonRestExceptionResponse() {
         super("JsonRestExceptionResponseEntity");
+        this.errorCode = "";
+        this.statusCode = 0;
     }
 
     /**

diff --git a/...nhab/binding/boschshc/internal/services/roomclimatecontrol/RoomClimateControlService.java b/...nhab/binding/boschshc/internal/services/roomclimatecontrol/RoomClimateControlService.java
@@ -12,17 +12,16 @@
  */
 package org.openhab.binding.boschshc.internal.services.roomclimatecontrol;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.boschshc.internal.services.BoschSHCService;
 
 /**
  * Service of a virtual device which controls the radiator thermostats in a room.
  * 
- * @author Christian Oeing ([email protected])
+ * @author Christian Oeing - Initial contribution
  */
 @NonNullByDefault
-public class RoomClimateControlService extends BoschSHCService<@NonNull RoomClimateControlServiceState> {
+public class RoomClimateControlService extends BoschSHCService<RoomClimateControlServiceState> {
     /**
      * Constructor.
      */

diff --git a/...binding/boschshc/internal/services/roomclimatecontrol/RoomClimateControlServiceState.java b/...binding/boschshc/internal/services/roomclimatecontrol/RoomClimateControlServiceState.java
@@ -24,7 +24,7 @@
 /**
  * State for {@link RoomClimateControlService} to get and set the desired temperature of a room.
  * 
- * @author Christian Oeing ([email protected])
+ * @author Christian Oeing - Initial contribution
  */
 @NonNullByDefault
 public class RoomClimateControlServiceState extends BoschSHCServiceState {