Merge pull request #5 from launchdarkly/pk/ch1342/regex-standardization

made regex matcher return true if the pattern matches anywhere in the…
launchdarkly · Apr 25, 2017 · cda5310 · cda5310
2 parents 996cfbe + 8844964
commit cda5310
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/com/launchdarkly/client/Operator.java b/src/main/java/com/launchdarkly/client/Operator.java
@@ -42,7 +42,8 @@ public boolean apply(JsonPrimitive uValue, JsonPrimitive cValue) {
   },
   matches {
     public boolean apply(JsonPrimitive uValue, JsonPrimitive cValue) {
-      return uValue.isString() && cValue.isString() && Pattern.matches(cValue.getAsString(), uValue.getAsString());
+      return uValue.isString() && cValue.isString() &&
+              Pattern.compile(cValue.getAsString()).matcher(uValue.getAsString()).find();
     }
   },
   contains {

diff --git a/src/test/java/com/launchdarkly/client/OperatorTest.java b/src/test/java/com/launchdarkly/client/OperatorTest.java
@@ -24,4 +24,13 @@ public void testNumberComparison() {
     assertTrue(Operator.greaterThan.apply(b, a));
     assertTrue(Operator.greaterThanOrEqual.apply(b, a));
   }
+
+  @Test
+  public void testRegexComparison(){
+    JsonPrimitive uValue = new JsonPrimitive("hello world");
+    assertTrue(Operator.matches.apply(uValue, new JsonPrimitive("hello.*rld")));
+    assertTrue(Operator.matches.apply(uValue, new JsonPrimitive("hello.*orl")));
+    assertTrue(Operator.matches.apply(uValue, new JsonPrimitive("l+")));
+    assertTrue(Operator.matches.apply(uValue, new JsonPrimitive("(world|planet)")));
+  }
 }