Skip to content

fix(Segments): Standardise regex matching in the Java server-side SDK #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linear-code wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(Segments): Standardise regex matching in the Java server-side SDK #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/flagsmith/flagengine/segments/SegmentEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private static Boolean contextMatchesCondition(
if (contextValue != null) {
try {
Pattern pattern = Pattern.compile(conditionValue.toString());
return pattern.matcher(contextValue.toString()).find();
return pattern.matcher(contextValue.toString()).lookingAt();
} catch (PatternSyntaxException pse) {
return false;
}
Expand Down
14 changes: 13 additions & 1 deletion src/test/java/com/flagsmith/flagengine/unit/segments/SegmentModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@ private static Stream<Arguments> conditionTestData() {
Arguments.of(SegmentConditions.REGEX, "FOO", "[a-z]+", false),
Arguments.of(SegmentConditions.REGEX, 42, "[a-z]+", false),
Arguments.of(SegmentConditions.REGEX, 42, "\\d+", true),
Arguments.of(SegmentConditions.REGEX, "production", "prod", true),
Arguments.of(SegmentConditions.REGEX, "nonproduction", "prod", false),
Arguments.of(SegmentConditions.REGEX, "development", "prod|dev", true),
Arguments.of(SegmentConditions.REGEX, "nondev", "prod|dev", false),
Arguments.of(SegmentConditions.REGEX, "jane@example.com", "@example\\.com$", false),
Arguments.of(SegmentConditions.REGEX, "jane@example.com", "^[^@]+@example\\.com$", true),
Arguments.of(SegmentConditions.REGEX, "jane@example.com.br", "^[^@]+@example\\.com$", false),
Arguments.of(SegmentConditions.REGEX, "Production", "prod", false),
Arguments.of(SegmentConditions.REGEX, "Production", "[Pp]rod", true),
Arguments.of(SegmentConditions.REGEX, "a)(b", "a)(b", false),
Arguments.of(SegmentConditions.MODULO, 2, "2|0", true),
Arguments.of(SegmentConditions.MODULO, 3, "2|0", false),
Arguments.of(SegmentConditions.MODULO, 2.0, "2|0", true),
Expand Down Expand Up @@ -113,7 +123,7 @@ public void testSegmentConditionMatchesTraitValue(
Object traitValue,
Object conditionValue,
Boolean expectedResponse) {

// Given
final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext(
FlagsmithTestHelper.evaluationContext(), "foo",
Collections.singletonMap("foo", traitValue));
Expand All @@ -125,8 +135,10 @@ public void testSegmentConditionMatchesTraitValue(
.withOperator(condition).withProperty("foo")
.withValue(conditionValue)))));

// When
Boolean actualResult = SegmentEvaluator.isContextInSegment(context, segmentContext);

// Then
assertEquals(expectedResponse, actualResult);
}

Expand Down
Loading