Skip to content

Commit 11b5f16

Browse files
committed
Drop the pattern list constant
1 parent 64cc078 commit 11b5f16

File tree

1 file changed

+10
-12
lines changed
  • modules/ingest-common/src/main/java/org/elasticsearch/ingest/common

1 file changed

+10
-12
lines changed

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,17 @@ final class CefParser {
6868
);
6969

7070
// Comprehensive regex pattern to match various MAC address formats
71-
private static final List<String> MAC_ADDRESS_REGEXES = List.of(
72-
// Combined colon and hyphen separated 6-group patterns
73-
"(([0-9A-Fa-f]{2}[:|-]){5}[0-9A-Fa-f]{2})",
74-
// Dot-separated 6-group pattern
75-
"([0-9A-Fa-f]{4}\\.){2}[0-9A-Fa-f]{4}",
76-
// Combined colon and hyphen separated 8-group patterns
77-
"([0-9A-Fa-f]{2}[:|-]){7}[0-9A-Fa-f]{2}",
78-
// Dot-separated EUI-64
79-
"([0-9A-Fa-f]{4}\\.){3}[0-9A-Fa-f]{4}"
80-
);
81-
8271
private static final Pattern MAC_ADDRESS_PATTERN = Pattern.compile(
83-
MAC_ADDRESS_REGEXES.stream().collect(Collectors.joining("|", "^(", ")$"))
72+
Stream.of(
73+
// Combined colon and hyphen separated 6-group patterns
74+
"(([0-9A-Fa-f]{2}[:|-]){5}[0-9A-Fa-f]{2})",
75+
// Dot-separated 6-group pattern
76+
"([0-9A-Fa-f]{4}\\.){2}[0-9A-Fa-f]{4}",
77+
// Combined colon and hyphen separated 8-group patterns
78+
"([0-9A-Fa-f]{2}[:|-]){7}[0-9A-Fa-f]{2}",
79+
// Dot-separated EUI-64
80+
"([0-9A-Fa-f]{4}\\.){3}[0-9A-Fa-f]{4}"
81+
).collect(Collectors.joining("|", "^(", ")$"))
8482
);
8583
private static final int EUI48_HEX_LENGTH = 48 / 4;
8684
private static final int EUI64_HEX_LENGTH = 64 / 4;

0 commit comments

Comments
 (0)