OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Catch MeasurementParseException in UnitUtils.parseUnit(String) method (#2367) 

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/2353/head
Christoph Weitkamp 2021-05-16 19:43:58 +02:00 committed by GitHub
parent ba53e8a08d
commit 22cbc9a08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
View File

@ -12,8 +12,6 @@
*/
package org.openhab.core.types.util;
import static java.util.stream.Collectors.toSet;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
@ -21,11 +19,13 @@ import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
import javax.measure.MetricPrefix;
import javax.measure.Quantity;
import javax.measure.Unit;
import javax.measure.UnitConverter;
import javax.measure.format.MeasurementParseException;
import javax.measure.spi.SystemOfUnits;
import org.eclipse.jdt.annotation.NonNullByDefault;
@ -165,7 +165,7 @@ public class UnitUtils {
try {
Quantity<?> quantity = Quantities.getQuantity("1 " + unitSymbol);
return quantity.getUnit();
} catch (IllegalArgumentException e) {
} catch (IllegalArgumentException | MeasurementParseException e) {
// we expect this exception in case the extracted string does not match any known unit
LOGGER.debug("Unknown unit from pattern: {}", unitSymbol);
}
@ -195,8 +195,8 @@ public class UnitUtils {
// Compare the unit symbols. For product units (e.g. 1km / 1h) the equality is not given in the Sets above.
if (!differentSystems) {
Set<String> siSymbols = siUnits.stream().map(Unit::getSymbol).collect(toSet());
Set<String> usSymbols = usUnits.stream().map(Unit::getSymbol).collect(toSet());
Set<String> siSymbols = siUnits.stream().map(Unit::getSymbol).collect(Collectors.toSet());
Set<String> usSymbols = usUnits.stream().map(Unit::getSymbol).collect(Collectors.toSet());
differentSystems = (siSymbols.contains(thisUnit.getSymbol()) && usSymbols.contains(thatUnit.getSymbol())) //
|| (siSymbols.contains(thatUnit.getSymbol()) && usSymbols.contains(thisUnit.getSymbol()));

6
bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
View File

@ -96,6 +96,12 @@ public class UnitUtilsTest {
assertThat(UnitUtils.parseUnit("%"), is(Units.PERCENT));
}
@Test
public void testParseUnknownUnit() {
assertNull(UnitUtils.parseUnit("123 Hello World"));
assertNull(UnitUtils.parseUnit("Lux"));
}
@Test
public void testGetDimensionName() {
assertThat(UnitUtils.getDimensionName(SIUnits.CELSIUS), is(Temperature.class.getSimpleName()));