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

YAMLThing: fix typo and minor refactor (#4748)

Browse Source 
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng
2025-04-26 08:00:44 +02:00
committed by GitHub
parent 685264295c
commit dfe4615912
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlThingDTO.java
+11 -14
View File
@@ -33,9 +33,9 @@ import org.openhab.core.model.yaml.internal.util.YamlElementUtils;
@YamlElementName("things")
public class YamlThingDTO implements YamlElement, Cloneable {
private static final Pattern THING_UID_SEGMENT_PATTERN = Pattern.compile("^[a-zA-Z0-9_][a-zA-Z0-9_-]*$");
private static final Pattern THING_UID_SEGMENT_PATTERN = Pattern.compile("[a-zA-Z0-9_][a-zA-Z0-9_-]*");
private static final Pattern CHANNEL_ID_PATTERN = Pattern
.compile("^[a-zA-Z0-9_][a-zA-Z0-9_-]*(#[a-zA-Z0-9_][a-zA-Z0-9_-]*)?$");
.compile("[a-zA-Z0-9_][a-zA-Z0-9_-]*(#[a-zA-Z0-9_][a-zA-Z0-9_-]*)?");
public String uid;
public Boolean isBridge;
@@ -90,11 +90,10 @@ public class YamlThingDTO implements YamlElement, Cloneable {
ok = false;
}
for (String segment : segments) {
if (!THING_UID_SEGMENT_PATTERN.matcher(segment).find()) {
if (!THING_UID_SEGMENT_PATTERN.matcher(segment).matches()) {
if (errors != null) {
errors.add(
"thing %s: segement \"%s\" in uid is not matching the expected syntax [a-zA-Z0-9_][a-zA-Z0-9_-]*"
.formatted(uid, segment));
errors.add("thing %s: segment \"%s\" in uid is not matching the expected syntax %s".formatted(uid,
segment, THING_UID_SEGMENT_PATTERN.pattern()));
}
ok = false;
}
@@ -109,11 +108,10 @@ public class YamlThingDTO implements YamlElement, Cloneable {
ok = false;
}
for (String segment : segments) {
if (!THING_UID_SEGMENT_PATTERN.matcher(segment).find()) {
if (!THING_UID_SEGMENT_PATTERN.matcher(segment).matches()) {
if (errors != null) {
errors.add(
"thing %s: segement \"%s\" in bridge is not matching the expected syntax [a-zA-Z0-9_][a-zA-Z0-9_-]*"
.formatted(uid, segment));
errors.add("thing %s: segment \"%s\" in bridge is not matching the expected syntax %s"
.formatted(uid, segment, THING_UID_SEGMENT_PATTERN.pattern()));
}
ok = false;
}
@@ -122,11 +120,10 @@ public class YamlThingDTO implements YamlElement, Cloneable {
if (channels != null) {
for (Map.Entry<@NonNull String, @NonNull YamlChannelDTO> entry : channels.entrySet()) {
String channelId = entry.getKey();
if (!CHANNEL_ID_PATTERN.matcher(channelId).find()) {
if (!CHANNEL_ID_PATTERN.matcher(channelId).matches()) {
if (errors != null) {
errors.add(
"thing %s: channel id \"%s\" is not matching the expected syntax [a-zA-Z0-9_][a-zA-Z0-9_-]*(#[a-zA-Z0-9_][a-zA-Z0-9_-]*)?"
.formatted(uid, channelId));
errors.add("thing %s: channel id \"%s\" is not matching the expected syntax %s".formatted(uid,
channelId, CHANNEL_ID_PATTERN.pattern()));
}
ok = false;
}
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlThingProvider.java
+1 -2
View File
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -176,7 +175,7 @@ public class YamlThingProvider extends AbstractProvider<Thing>
@Override
public Collection<Thing> getAll() {
return thingsMap.values().stream().flatMap(list -> list.stream()).collect(Collectors.toList());
return thingsMap.values().stream().flatMap(list -> list.stream()).toList();
}
@Override