demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix Semantics default synonyms (#3511)

Browse Source 
Fix incorrect Property id

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng
2023-04-01 09:32:12 +02:00
committed by GitHub
parent 4182980ec8
commit 003635dbfa
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/Property.java
+1 -1
View File
@@ -20,6 +20,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
* @author Kai Kreuzer - Initial contribution
*/
@NonNullByDefault
@TagInfo(id = "MeasurementProperty")
@TagInfo(id = "Property")
public interface Property extends Tag {
}
bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
+5 -1
View File
@@ -22,6 +22,7 @@ import java.util.ResourceBundle.Control;
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 class SemanticTags {
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();
}
}