Fix build and improve exception handling (#10726)

The PercentType and QuantityType can also throw an IllegalArgumentException.

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/DimmerItemConverter.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/DimmerItemConverter.java
index d91d6898a3d4465201d10cd260b6ae06f506a5fd..090cd7b11e212b84ba0a260223ff9d37decba1af 100644 (file)
--- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/DimmerItemConverter.java
+++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/DimmerItemConverter.java
@@ -92,7 +92,7 @@ public class DimmerItemConverter extends AbstractTransformingItemConverter {
                     value = PercentType.ZERO.toBigDecimal();
                 }
                 newState = new PercentType(value);
-            } catch (NumberFormatException e) {
+            } catch (IllegalArgumentException e) {
                 // ignore
             }
         }

diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/NumberItemConverter.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/NumberItemConverter.java
index 1a6ecb07b231ddaa64df040e0bf0e56de14b6c5e..4f5d3f4039cc15a7545f2c186155e94503c0ff32 100644 (file)
--- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/NumberItemConverter.java
+++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/NumberItemConverter.java
@@ -14,8 +14,6 @@ package org.openhab.binding.http.internal.converter;
 
 import java.util.function.Consumer;
 
-import javax.measure.format.MeasurementParseException;
-
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.http.internal.config.HttpChannelConfig;
@@ -62,7 +60,7 @@ public class NumberItemConverter extends AbstractTransformingItemConverter {
                         return new QuantityType<>(trimmedValue);
                     }
                 }
-            } catch (IllegalArgumentException | MeasurementParseException e) {
+            } catch (IllegalArgumentException e) {
                 // finally failed
             }
         }

diff --git a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
index c928bd6d04606187cd85d23391edd10a85180183..1387dcc7c2b8d8793d3e82d0b1a82976458baa9c 100644 (file)
--- a/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
+++ b/bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
@@ -457,7 +457,7 @@ public class IAqualinkHandler extends BaseThingHandler {
                 default:
                     return StringType.valueOf(value);
             }
-        } catch (NumberFormatException e) {
+        } catch (IllegalArgumentException e) {
             return UnDefType.UNDEF;
         }
     }

diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTag.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTag.java
index 2c4f4867e1af45fdcf15c38ac4817a1bb7363acd..243591f12a8f4050d300554c3317fc32152ce2dd 100644 (file)
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTag.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTag.java
@@ -46,8 +46,8 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public class CommandTag {
 
-    private static final List<Class<? extends Command>> otherCommandTypes = Arrays.asList(DecimalType.class,
-            QuantityType.class, OnOffType.class, OpenClosedType.class, UpDownType.class, HSBType.class,
+    private static final List<Class<? extends Command>> otherCommandTypes = Arrays.asList(HSBType.class,
+            DecimalType.class, QuantityType.class, OnOffType.class, OpenClosedType.class, UpDownType.class,
             PlayPauseType.class, RewindFastforwardType.class, StringType.class);
 
     private static final List<Class<? extends Command>> percentCommandType = Arrays.asList(PercentType.class);

diff --git a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/WLedHandler.java b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/WLedHandler.java
index 782694442079aca0e789b0034504ab183e81ae94..084df9a4a598c9b14aea718e10679f3e14f1a561 100644 (file)
--- a/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/WLedHandler.java
+++ b/bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/WLedHandler.java
@@ -159,8 +159,8 @@ public class WLedHandler extends BaseThingHandler {
                 updateState(CHANNEL_SECONDARY_WHITE,
                         new PercentType(secondaryWhite.divide(BIG_DECIMAL_2_55, RoundingMode.HALF_UP)));
             }
-        } catch (NumberFormatException e) {
-            logger.warn("NumberFormatException when parsing the WLED colour and white fields:{}", e.getMessage());
+        } catch (IllegalArgumentException e) {
+            logger.warn("IllegalArgumentException when parsing the WLED colour and white fields:{}", e.getMessage());
         }
     }
 

diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoItemValueConverter.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoItemValueConverter.java
index cee7d4ffa029f057c1dd0500296a8b88a9553c2a..42eb1e637a0949e25fff343a8bd03dc730eab174 100644 (file)
--- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoItemValueConverter.java
+++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoItemValueConverter.java
@@ -250,7 +250,7 @@ public class NeeoItemValueConverter {
                     default:
                         break;
                 }
-            } catch (NumberFormatException e) {
+            } catch (IllegalArgumentException e) {
                 // do nothing - let it go to the other cases
             }
         }

diff --git a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java
index 367096dc8559d1ccf375651cc47cdf71f9ceaf95..588a103f579f392c33f759b96b80d2ce0e4f2c29 100644 (file)
--- a/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java
+++ b/bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java
@@ -122,7 +122,7 @@ public class ScaleTransformationService extends AbstractFileTransformationServic
             try {
                 final QuantityType<?> quantity = new QuantityType<>(source);
                 return formatResult(data, source, quantity.toBigDecimal());
-            } catch (NumberFormatException e2) {
+            } catch (IllegalArgumentException e2) {
                 String nonNumeric = data.get(null);
                 if (nonNumeric != null) {
                     return nonNumeric;