[boschshc] fix Boolean type with "boolean isValid()" for the dto classes

Signed-off-by: Gerd Zanker <gerd.zanker@web.de>
openhab · Feb 26, 2024 · 2ee73a2 · 2ee73a2
1 parent b6d19f9
commit 2ee73a2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/...schshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/Device.java b/...schshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/Device.java
@@ -55,7 +55,7 @@ public class Device {
     public String status;
     public List<String> childDeviceIds;
 
-    public static Boolean isValid(Device obj) {
+    public static boolean isValid(Device obj) {
         return obj != null && obj.id != null;
     }
 

diff --git a/...main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/PublicInformation.java b/...main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/PublicInformation.java
@@ -44,8 +44,8 @@ public PublicInformation() {
     public String shcGeneration;
     public SoftwareUpdateState softwareUpdateState;
 
-    public static Boolean isValid(PublicInformation obj) {
+    public static boolean isValid(PublicInformation obj) {
         return obj != null && obj.shcIpAddress != null && obj.shcGeneration != null && obj.apiVersions != null
-                && obj.softwareUpdateState != null && SoftwareUpdateState.isValid(obj.softwareUpdateState);
+                && SoftwareUpdateState.isValid(obj.softwareUpdateState);
     }
 }
diff --git a/...hshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/Scenario.java b/...hshc/src/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/Scenario.java
@@ -48,17 +48,13 @@ public static Scenario createScenario(final String id, final String name, final
         return scenario;
     }
 
-    public static Boolean isValid(Scenario[] scenarios) {
+    public static boolean isValid(Scenario[] scenarios) {
         return Arrays.stream(scenarios).allMatch(scenario -> (scenario.id != null));
     }
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("Scenario{");
-        sb.append("name='").append(name).append("'");
-        sb.append(", id='").append(id).append("'");
-        sb.append(", lastTimeTriggered='").append(lastTimeTriggered).append("'");
-        sb.append('}');
-        return sb.toString();
+        return "Scenario{" + "name='" + name + "'" + ", id='" + id + "'" + ", lastTimeTriggered='" + lastTimeTriggered
+                + "'" + '}';
     }
 }
diff --git a/...in/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/SoftwareUpdateState.java b/...in/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/SoftwareUpdateState.java
@@ -23,7 +23,7 @@ public class SoftwareUpdateState {
     public String swInstalledVersion;
     public String swUpdateAvailableVersion;
 
-    public static Boolean isValid(SoftwareUpdateState obj) {
+    public static boolean isValid(SoftwareUpdateState obj) {
         return obj != null && obj.swUpdateState != null && obj.swInstalledVersion != null
                 && obj.swUpdateAvailableVersion != null;
     }

diff --git a/...c/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/SubscribeResult.java b/...c/main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/SubscribeResult.java
@@ -31,7 +31,7 @@ public String getJsonrpc() {
         return this.jsonrpc;
     }
 
-    public static Boolean isValid(SubscribeResult obj) {
+    public static boolean isValid(SubscribeResult obj) {
         return obj != null && obj.result != null && obj.jsonrpc != null;
     }
 }
diff --git a/.../main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/UserDefinedState.java b/.../main/java/org/openhab/binding/boschshc/internal/devices/bridge/dto/UserDefinedState.java
@@ -70,7 +70,7 @@ public String toString() {
                 + type + '\'' + '}';
     }
 
-    public static Boolean isValid(UserDefinedState obj) {
+    public static boolean isValid(UserDefinedState obj) {
         return obj != null && obj.id != null;
     }
 }