Fix QuantityType UNIT_PATTERN regex

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
openhab · Oct 9, 2023 · 78f3124 · 78f3124
1 parent 783c57c
commit 78f3124
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
@@ -70,11 +70,11 @@ public class QuantityType<T extends Quantity<T>> extends Number
     public static final QuantityType<Dimensionless> ZERO = new QuantityType<>(0, AbstractUnit.ONE);
     public static final QuantityType<Dimensionless> ONE = new QuantityType<>(1, AbstractUnit.ONE);
 
-    // Regular expression to split unit from value. Split on any blank character, even none (\\s*)
-    // which occurs after a digit (?<=\\d) and before a "unit" character ?=[a-zA-Z°µ\u03BC%']
-    // which itself must not be preceded by plus/minus digit (?![\\+\\-]?\\d).
+    // Regular expression to split unit from value. Split on any blank character, or
+    // between a digit (?<=\\d) and a non-digit character \\D
+    // which must not be preceded by plus/minus digit (?![\\+\\-]?\\d).
     // The latter would be an exponent from the scalar value.
-    private static final String UNIT_PATTERN = "(?<=\\d)\\s*(?=[a-zA-Z°µ\u03BC%'](?![\\+\\-]?\\d))";
+    private static final String UNIT_PATTERN = "\\s+|(?<=\\d)(?=\\D(?![\\+\\-]?\\d))";
 
     static {
         UnitInitializer.init();

diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
@@ -143,6 +143,9 @@ public void testValidConstructors(Locale locale) {
         new QuantityType<>("0E-22 m");
         new QuantityType<>("10E-3");
         new QuantityType<>("10E3");
+        new QuantityType<>("1 /s");
+        new QuantityType<>("1/s");
+        new QuantityType<>("1Ω·m");
         QuantityType.valueOf("2m");
     }