-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support case insenstive patterns for toPatternExpr (#1127)
Allows mapping case insensitive regex to systems that only support simpler regex like RE2. Fixes #1126.
- Loading branch information
1 parent
576c9f2
commit 77566c5
Showing
3 changed files
with
164 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
...rc/test/java/com/netflix/spectator/impl/matcher/Re2CaseInsensitivePatternMatcherTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Copyright 2014-2024 Netflix, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.netflix.spectator.impl.matcher; | ||
|
|
||
| import com.netflix.spectator.impl.PatternExpr; | ||
| import com.netflix.spectator.impl.PatternMatcher; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| public class Re2CaseInsensitivePatternMatcherTest extends AbstractPatternMatcherTest { | ||
|
|
||
| @Test | ||
| public void ignoreCasePatternExpr() { | ||
| PatternMatcher m = PatternMatcher.compile("foo"); | ||
| Assertions.assertNotNull(m.toPatternExpr(50)); | ||
| Assertions.assertNotNull(m.ignoreCase().toPatternExpr(50)); | ||
| } | ||
|
|
||
| private boolean shouldCheckRegex(String regex) { | ||
| // Java regex has inconsistent behavior for POSIX character classes and the literal version | ||
| // of the same character class. For now we skip regex that use POSIX classes. | ||
| // https://bugs.openjdk.java.net/browse/JDK-8214245 | ||
| // Bug was fixed in jdk15. | ||
| return JavaVersion.major() < 15 | ||
| && !regex.contains("\\p{") | ||
| && !regex.contains("\\P{") | ||
| && !regex.contains("[^"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void testRE(String regex, String value) { | ||
| if (shouldCheckRegex(regex)) { | ||
| PatternExpr expr = PatternMatcher.compile(regex).ignoreCase().toPatternExpr(1000); | ||
| com.google.re2j.Pattern re2; | ||
| if (expr == null) { | ||
| return; | ||
| } else { | ||
| // Validate that all remaining patterns can be processed with RE2 | ||
| expr.toQueryString(new Re2Encoder()); | ||
| if (expr instanceof PatternExpr.Regex) | ||
| re2 = compileRE2(((PatternExpr.Regex) expr).matcher().toString()); | ||
| else | ||
| re2 = null; | ||
| /*try { | ||
| re2 = compileRE2(encoded); | ||
| } catch (Exception e) { | ||
| re2 = null; | ||
| }*/ | ||
| } | ||
|
|
||
|
|
||
| Pattern pattern = Pattern.compile("^.*(" + regex + ")", Pattern.DOTALL | Pattern.CASE_INSENSITIVE); | ||
| if (pattern.matcher(value).find()) { | ||
| Assertions.assertTrue(expr.matches(value), regex + " should match " + value); | ||
| if (re2 != null) | ||
| Assertions.assertTrue(re2.matcher(value).find(), re2 + " should match " + value); | ||
| } else { | ||
| Assertions.assertFalse(expr.matches(value), regex + " shouldn't match " + value); | ||
| if (re2 != null) | ||
| Assertions.assertFalse(re2.matcher(value).find(), re2 + " shouldn't match " + value); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static com.google.re2j.Pattern compileRE2(String matcher) { | ||
| // RE2 unicode escape is \\x{NNNN} instead of \\uNNNN | ||
| String re = matcher.replaceAll("\\\\u([0-9a-fA-F]{4})", "\\\\x{$1}"); | ||
| return com.google.re2j.Pattern.compile("^.*(" + re + ")", com.google.re2j.Pattern.DOTALL); | ||
| } | ||
|
|
||
| private static class Re2Encoder implements PatternExpr.Encoder { | ||
|
|
||
| @Override | ||
| public String regex(PatternMatcher matcher) { | ||
| return compileRE2(matcher.toString()).pattern(); | ||
| } | ||
|
|
||
| @Override | ||
| public String startAnd() { | ||
| return "("; | ||
| } | ||
|
|
||
| @Override | ||
| public String separatorAnd() { | ||
| return " AND "; | ||
| } | ||
|
|
||
| @Override | ||
| public String endAnd() { | ||
| return ")"; | ||
| } | ||
|
|
||
| @Override | ||
| public String startOr() { | ||
| return "("; | ||
| } | ||
|
|
||
| @Override | ||
| public String separatorOr() { | ||
| return " OR "; | ||
| } | ||
|
|
||
| @Override | ||
| public String endOr() { | ||
| return ")"; | ||
| } | ||
|
|
||
| @Override | ||
| public String startNot() { | ||
| return "NOT "; | ||
| } | ||
|
|
||
| @Override | ||
| public String endNot() { | ||
| return ""; | ||
| } | ||
| } | ||
| } |