Review comments

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

Author: lsiepel

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/AbstractTypeConverter.java

@@ -74,11 +74,12 @@ protected boolean isStateInvertDatapoint(HmDatapoint dp) {
     /**
      * Rounds a double value.
      */
-    protected BigDecimal round(@Nullable Double number) {
-        BigDecimal bd = new BigDecimal(number == null ? "0" : number.toString());
-        String stringBd = bd.toPlainString();
-        int scale = stringBd.length() - (stringBd.lastIndexOf('.') + 1);
-        return bd.setScale(scale > 2 ? 6 : 2, RoundingMode.HALF_UP);
+    protected BigDecimal round(double number) {
+        BigDecimal bd = new BigDecimal(Double.toString(number));
+        int scale = bd.scale();
+        final int maxScale = 6;
+        final int minScale = 2;
+        return bd.setScale(scale > minScale ? maxScale : minScale, RoundingMode.HALF_UP);
     }
 
     @SuppressWarnings("unchecked")

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/converter/type/PercentTypeConverter.java

@@ -73,7 +73,7 @@ protected boolean toBindingValidation(HmDatapoint dp, Class<? extends Type> type
     @Override
     protected Object toBinding(PercentType type, HmDatapoint dp) throws ConverterException {
         double maxValue = getCorrectedMaxValue(dp);
-        Double number = (type.doubleValue() / 100) * maxValue;
+        double number = (type.doubleValue() / 100) * maxValue;
 
         if (MetadataUtils.isRollerShutter(dp)) {
             if (PercentType.HUNDRED.equals(type)) { // means DOWN
@@ -88,7 +88,7 @@ protected Object toBinding(PercentType type, HmDatapoint dp) throws ConverterExc
             number = number < 0.0 ? 0.0 : 100.0;
         }
         if (dp.isIntegerType()) {
-            return number.intValue();
+            return (int) Math.round(number);
         }
         return round(number).doubleValue();
     }

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java

@@ -661,7 +661,6 @@ public void handleConfigurationUpdate(Map<String, Object> configurationParameter
         }
     }
 
-    @SuppressWarnings("null")
     @Override
     public synchronized void handleRemoval() {
         final Bridge bridge;

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/model/HmDatapoint.java

@@ -175,9 +175,6 @@ public int getOptionIndex(@Nullable String option) {
 
     public @Nullable Integer getIntegerValue() {
         Object value = this.value;
-        if (value instanceof Integer intValue) {
-            return intValue;
-        }
         if (value instanceof Number numberValue) {
             return numberValue.intValue();
         }
@@ -470,12 +467,13 @@ public HmDatapoint clone() {
 
     @Override
     public String toString() {
-        String[] options = Objects.requireNonNullElse(this.options, new String[0]);
+        String @Nullable [] options = this.options;
         return String.format("""
                 %s[name=%s,value=%s,defaultValue=%s,type=%s,minValue=%s,maxValue=%s,specialValues=%s,options=%s,\
                 readOnly=%b,readable=%b,unit=%s,description=%s,info=%s,paramsetType=%s,virtual=%b,trigger=%b]\
                 """, getClass().getSimpleName(), name, value, defaultValue, type, minValue, maxValue, specialValues,
-                String.join(";", options), readOnly, readable, unit, description, info, paramsetType, virtual, trigger);
+                (options == null ? null : String.join(";", options)), readOnly, readable, unit, description, info,
+                paramsetType, virtual, trigger);
     }
 
     private String sanitizeName(String name) {

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/model/HmRssiInfo.java

@@ -37,6 +37,7 @@ public HmRssiInfo(String address, Integer device, Integer peer) {
      */
     private int convert(Integer intValue) {
         if (intValue == 65536) {
+            return 0;
         }
         return intValue;
     }

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java

@@ -78,25 +78,11 @@ private static void loadStandardDatapoints() {
         try (InputStream stream = bundle.getResource("homematic/standard-datapoints.properties").openStream();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {
             String line;
-            int lineNumber = 0;
             while ((line = reader.readLine()) != null) {
-                lineNumber++;
-                if (!line.trim().isEmpty() && !line.startsWith("#")) {
+                if (!line.isBlank() && !line.startsWith("#")) {
                     String[] parts = line.split("\\|");
-                    String channelType = null;
-                    String datapointName = null;
-                    if (parts.length > 0) {
-                        channelType = parts[0].trim();
-                        if (parts.length > 1) {
-                            datapointName = parts[1].trim();
-                        }
-                    }
-
-                    if (channelType == null || channelType.isEmpty() || datapointName == null
-                            || datapointName.isEmpty()) {
-                        throw new IllegalStateException(
-                                String.format("Malformed standard datapoint entry at line %d: %s", lineNumber, line));
-                    }
+                    String channelType = parts[0].trim();
+                    String datapointName = parts.length > 1 ? parts[1].trim() : null;
 
                     Set<@Nullable String> channelDatapoints = standardDatapoints.get(channelType);
                     if (channelDatapoints == null) {
@@ -107,8 +93,8 @@ private static void loadStandardDatapoints() {
                     channelDatapoints.add(datapointName);
                 }
             }
-        } catch (IOException e) {
-            throw new IllegalStateException("Can't load standard-datapoints.properties file!", e);
+        } catch (IllegalStateException | IOException e) {
+            throw new IllegalStateException("Cannot load standard-datapoints.properties file!", e);
         }
     }