Fix Semantics default synonyms (#3511)

Fix incorrect Property id Signed-off-by: Jimmy Tanagra <[email protected]>
openhab · Apr 1, 2023 · 003635d · 003635d
1 parent 4182980
commit 003635d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java
@@ -20,6 +20,6 @@
  * @author Kai Kreuzer - Initial contribution
  */
 @NonNullByDefault
-@TagInfo(id = "MeasurementProperty")
+@TagInfo(id = "Property")
 public interface Property extends Tag {
 }
diff --git a/...les/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java b/...les/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -84,7 +85,10 @@ public static List<String> getLabelAndSynonyms(Class<? extends Tag> tag, Locale
             String entry = rb.getString(tag.getAnnotation(TagInfo.class).id());
             return List.of(entry.toLowerCase(locale).split(","));
         } catch (MissingResourceException e) {
-            return List.of(tag.getAnnotation(TagInfo.class).label());
+            TagInfo tagInfo = tag.getAnnotation(TagInfo.class);
+            Stream<String> label = Stream.of(tagInfo.label());
+            Stream<String> synonyms = Stream.of(tagInfo.synonyms().split(","));
+            return Stream.concat(label, synonyms).map(s -> s.toLowerCase(locale)).distinct().toList();
         }
     }