demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build and improve exception handling (#10726)

Browse Source 
The PercentType and QuantityType can also throw an IllegalArgumentException.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2021-05-20 19:15:23 +02:00 committed by GitHub
parent b049d3d13b
commit a032118213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/DimmerItemConverter.java
View File

@ -92,7 +92,7 @@ public class DimmerItemConverter extends AbstractTransformingItemConverter {
value = PercentType.ZERO.toBigDecimal();
}
newState = new PercentType(value);
} catch (NumberFormatException e) {
} catch (IllegalArgumentException e) {
// ignore
}
}

4
bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/converter/NumberItemConverter.java
View File

@ -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
}
}

2
bundles/org.openhab.binding.iaqualink/src/main/java/org/openhab/binding/iaqualink/internal/handler/IAqualinkHandler.java
View File

@ -457,7 +457,7 @@ public class IAqualinkHandler extends BaseThingHandler {
default:
return StringType.valueOf(value);
}
} catch (NumberFormatException e) {
} catch (IllegalArgumentException e) {
return UnDefType.UNDEF;
}
}

4
bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/logic/CommandTag.java
View File

@ -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);

4
bundles/org.openhab.binding.wled/src/main/java/org/openhab/binding/wled/internal/WLedHandler.java
View File

@ -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());
}
}

2
bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoItemValueConverter.java
View File

@ -250,7 +250,7 @@ public class NeeoItemValueConverter {
default:
break;
}
} catch (NumberFormatException e) {
} catch (IllegalArgumentException e) {
// do nothing - let it go to the other cases
}
}

2
bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java
View File

@ -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;