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

Use a precompiled pattern in ChannelUID.validateSegment (#4327)

Browse Source 
Signed-off-by: Jörg Sautter <joerg.sautter@gmx.net>
This commit is contained in:
joerg1985
2024-07-23 08:30:24 +02:00
committed by GitHub
parent 8557666f0a
commit f502e9d4e3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
+3 -2
View File
@@ -14,6 +14,7 @@ package org.openhab.core.thing;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -30,7 +31,7 @@ import org.eclipse.jdt.annotation.Nullable;
@NonNullByDefault
public class ChannelUID extends UID {
public static final String CHANNEL_SEGMENT_PATTERN = "[\\w-]*|[\\w-]*#[\\w-]*";
public static final Pattern CHANNEL_SEGMENT_PATTERN = Pattern.compile("[\\w-]*(?:#[\\w-]*)?");
public static final String CHANNEL_GROUP_SEPARATOR = "#";
/**
@@ -132,7 +133,7 @@ public class ChannelUID extends UID {
if (index < length - 1) {
super.validateSegment(segment, index, length);
} else {
if (!segment.matches(CHANNEL_SEGMENT_PATTERN)) {
if (!CHANNEL_SEGMENT_PATTERN.matcher(segment).matches()) {
throw new IllegalArgumentException(String.format(
"UID segment '%s' contains invalid characters. The last segment of the channel UID must match the pattern '%s'.",
segment, CHANNEL_SEGMENT_PATTERN));