feat: support RegexMatch for cosmosdb (#103)

Author: thunderz99

README.md

@@ -23,7 +23,7 @@ java-cosmos is a client for Azure CosmosDB 's SQL API (also called documentdb fo
 <dependency>
   <groupId>com.github.thunderz99</groupId>
     <artifactId>java-cosmos</artifactId>
-    <version>0.6.6</version>
+    <version>0.6.7</version>
 </dependency>
 ```
 
@@ -243,36 +243,37 @@ The main difference between Partial update and Patch is that:
 ### Complex queries
 
 ```java
-    var cond = Condition.filter(
-      "id", "id010", // id equal to 'id010'
-      "lastName", "Banks", // last name equal to Banks
-      "firstName !=", "Andy", // not equal
-      "firstName LIKE", "%dy%", // see cosmosdb LIKE
-      "location",  List.of("New York", "Paris"), // location is 'New York' or 'Paris'. see cosmosdb IN 
-      "skills =", List.of("Java", "React"), // skills equals array ["Java", "React"] exactly 
-      "age >=", 20, // see cosmosdb compare operators
-      "middleName OR firstName STARTSWITH", "H", // see cosmosdb STARTSWITH
-      "desciption CONTAINS", "Project manager",// see cosmosdb CONTAINS
-      "certificates IS_DEFINED", true, // see cosmosdb IS_DEFINED
-      "families.villa IS_DEFINED", false, // see cosmosdb IS_DEFINED
-      "age IS_NUMBER", true, // see cosmosdb type check functions
-      "tagIds ARRAY_CONTAINS", "T001", // see cosmosdb ARRAY_CONTAINS
-      "tagIds ARRAY_CONTAINS_ANY", List.of("T001", "T002"), // see cosmosdb EXISTS
-      "tags ARRAY_CONTAINS_ALL name", List.of("Java", "React"), // see cosmosdb EXISTS
-      "$OR", List.of( // add an OR sub condition
-        Condition.filter("position", "leader"),  // subquery's fields/order/offset/limit will be ignored
-        Condition.filter("organization.id", "executive_committee")
-      ),
-      "$OR 2", List.of( // add another OR sub condition (name it $OR xxx in order to avoid the same key to a previous $OR )
-        Condition.filter("position", "leader"),  // subquery's fields/order/offset/limit will be ignored
-        Condition.filter("organization.id", "executive_committee")
-      ),
-      "$AND", List.of(
-        Condition.filter("tagIds ARRAY_CONTAINS_ALL", List.of("T001", "T002")).not() // A negative condition. see cosmosdb NOT
-        Condition.filter("city", "Tokyo")
-      ),
-      "$NOT", Map.of("lastName CONTAINS", "Willington"), // A negative query using $NOT
-      "$NOT 2", Map.of("$OR 3",  // A nested filter using $NOT and $OR
+    var cond=Condition.filter(
+        "id","id010", // id equal to 'id010'
+        "lastName","Banks", // last name equal to Banks
+        "firstName !=","Andy", // not equal
+        "firstName LIKE","%dy%", // see cosmosdb LIKE
+        "location",List.of("New York","Paris"), // location is 'New York' or 'Paris'. see cosmosdb IN 
+        "skills =",List.of("Java","React"), // skills equals array ["Java", "React"] exactly 
+        "age >=",20, // see cosmosdb compare operators
+        "firstName STARTSWITH","H", // see cosmosdb STARTSWITH
+        "desciption CONTAINS","Project manager",// see cosmosdb CONTAINS
+        "fullName.last RegexMatch","[A-Z]{1}ank\\w+$", // see cosmosdb RegexMatch
+        "certificates IS_DEFINED",true, // see cosmosdb IS_DEFINED
+        "families.villa IS_DEFINED",false, // see cosmosdb IS_DEFINED
+        "age IS_NUMBER",true, // see cosmosdb type check functions
+        "tagIds ARRAY_CONTAINS","T001", // see cosmosdb ARRAY_CONTAINS
+        "tagIds ARRAY_CONTAINS_ANY",List.of("T001","T002"), // see cosmosdb EXISTS
+        "tags ARRAY_CONTAINS_ALL name",List.of("Java","React"), // see cosmosdb EXISTS
+        "$OR",List.of( // add an OR sub condition
+        Condition.filter("position","leader"),  // subquery's fields/order/offset/limit will be ignored
+        Condition.filter("organization.id","executive_committee")
+        ),
+        "$OR 2",List.of( // add another OR sub condition (name it $OR xxx in order to avoid the same key to a previous $OR )
+        Condition.filter("position","leader"),  // subquery's fields/order/offset/limit will be ignored
+        Condition.filter("organization.id","executive_committee")
+        ),
+        "$AND",List.of(
+        Condition.filter("tagIds ARRAY_CONTAINS_ALL",List.of("T001","T002")).not() // A negative condition. see cosmosdb NOT
+        Condition.filter("city","Tokyo")
+        ),
+        "$NOT",Map.of("lastName CONTAINS","Willington"), // A negative query using $NOT
+        "$NOT 2",Map.of("$OR 3",  // A nested filter using $NOT and $OR
         List.of(
           Map.of("lastName", ""),  // note they will do the same thing using Condition.filter or Map.of
           Map.of("age >=", 20)

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.github.thunderz99</groupId>
     <artifactId>java-cosmos</artifactId>
     <packaging>jar</packaging>
-    <version>0.6.6</version>
+    <version>0.6.7</version>
     <name>${project.groupId}:${project.artifactId}$</name>
     <description>A lightweight Azure CosmosDB client for Java</description>
     <url>https://github.com/thunderz99/java-cosmos</url>

src/main/java/io/github/thunderz99/cosmos/condition/Condition.java

@@ -97,7 +97,7 @@ public enum OperatorType {
 
 
     public static final Pattern simpleExpressionPattern = Pattern
-            .compile("(.+)\\s(STARTSWITH|ENDSWITH|CONTAINS|ARRAY_CONTAINS|LIKE|IN|" + TYPE_CHECK_FUNCTIONS + "|=|!=|<|<=|>|>=)\\s*$");
+            .compile("(.+)\\s(STARTSWITH|ENDSWITH|CONTAINS|ARRAY_CONTAINS|LIKE|IN|RegexMatch|" + TYPE_CHECK_FUNCTIONS + "|=|!=|<|<=|>|>=)\\s*$");
 
     public static final Pattern typeCheckFunctionPattern = Pattern
             .compile(TYPE_CHECK_FUNCTIONS);

src/test/java/io/github/thunderz99/cosmos/CosmosDatabaseTest.java

@@ -820,6 +820,25 @@ public void find_should_work_with_filter() throws Exception {
 
     }
 
+    @Test
+    public void regex_should_work_with_filter() throws Exception {
+
+        // test regex match
+        {
+            var cond = Condition.filter("fullName.last RegexMatch", "[A-Z]{1}ank\\w+$", //
+                            "fullName.first", "Elise" //
+                    ).sort("id", "ASC") //
+                    .limit(10) //
+                    .offset(0);
+
+            var users = db.find(coll, cond, "Users").toList(FullNameUser.class);
+
+            assertThat(users.size()).isEqualTo(1);
+            assertThat(users.get(0)).hasToString(user1.toString());
+        }
+
+    }
+    
     @Test
     void aggregate_should_work() throws Exception {
         // test aggregate(simple)