feat: support $NOT, $OR, $AND nested filter (#46)

* feat: support    nested filters

* feat: support    nested filters. add README

Author: thunderz99

.gitignore

@@ -10,6 +10,7 @@ deploy-settings.xml
 # Idea
 .idea
 java-cosmos.iml
+.java-version
 
 # Compiled class file
 *.class

README.md

@@ -4,48 +4,37 @@ java-cosmos is a client for Azure CosmosDB 's SQL API (also called documentdb fo
 
 [![Java CI with Maven](https://github.com/thunderz99/java-cosmos/actions/workflows/maven.yml/badge.svg)](https://github.com/thunderz99/java-cosmos/actions/workflows/maven.yml)
 
-
-
 ## Background
 
 * Microsoft's official Java CosmosDB client is verbose to use
 
-
-
 ## Disclaimer
 
 * This is an alpha version, and features are focused to CRUD and find at present.
 
-
-
 ## Quickstart
 
 ### Add dependency
 
 ```xml
-
 <!-- Add new dependency -->
 
 <dependency>
   <groupId>com.github.thunderz99</groupId>
   <artifactId>java-cosmos</artifactId>
-  <version>0.2.24</version>
+  <version>0.2.25</version>
 </dependency>
-
 ```
 
-
-
-### Start programming 
+### Start programming
 
 ```java
-
 import io.github.thunderz99.cosmos.Cosmos
 
 public static void main(String[] args) {
     var db = new Cosmos(System.getenv("YOUR_CONNECTION_STRING")).getDatabase("Database1")
     db.upsert("Collection1", new User("id011", "Tom", "Banks"))
-    
+
     var cond = Condition.filter(
       "id", "id010", // id equal to 'id010'
       "lastName", "Banks", // last name equal to Banks
@@ -54,7 +43,7 @@ public static void main(String[] args) {
     .sort("lastName", "ASC") //optional order
     .offset(0) //optional offset
     .limit(100); //optional limit
-    
+
     var users = db.find("Collection1", cond).toList(User.class)
 }
 
@@ -65,24 +54,20 @@ class User{
   public String lastName;
   public String location;
   public int age;
-  
+
   public User(String id, String firstName, String lastName){
     this.id = id;
     this.firstName = firstName;
     this.lastName = lastName;
   }
 }
-
 ```
 
-
-
 ## More examples
 
-### Work with partitions 
+### Work with partitions
 
 ```java
-
 // Save user into Coll:Collection1, partition:Users.
 // If you do not specify the partition. It will default to coll name.
 var db = new Cosmos(System.getenv("YOUR_CONNECTION_STRING")).getDatabase("Database1");
@@ -95,27 +80,23 @@ db.upsert("Collection1", new User("id011", "Tom", "Banks"), "Users");
 //    "lastName": "Banks",
 //    "_partition": "Users"
 // }
-
 ```
 
 ### Create database and collection dynamically
 
 ```java
-
 var cosmos = new Cosmos(System.getenv("YOUR_CONNECTION_STRING"));
 var db = cosmos.createIfNotExist("Database1", "Collection1");
 db.upsert("Collection1", new User("id011", "Tom", "Banks"))
-  
+
 // create a collection with uniqueIndexPolicy
 var uniqueKeyPolicy = Cosmos.getUniqueKeyPolicy(Set.of("/_uniqueKey1", "/_uniqueKey2"));
 var db = cosmos.createIfNotExist("Database1", "Collection2", uniqueKeyPolicy);
-
 ```
 
 ### CRUD
 
 ```java
-
 var db = new Cosmos(System.getenv("YOUR_CONNECTION_STRING")).getDatabase("Database1");
 
 // Create
@@ -133,24 +114,17 @@ db.upsert("Collection1", user1, "Users");
 
 // Delete
 db.delete("Collection1", user1,id, "Users");
-
 ```
 
 ### Partial Update
 
 ```java
-
 db.updatePartial("Collection", user1.id, Map.of("lastName", "UpdatedPartially"), "Users");
-
-
 ```
 
-
-
 ### Complex queries
 
 ```java
-    
     var cond = Condition.filter(
       "id", "id010", // id equal to 'id010'
       "lastName", "Banks", // last name equal to Banks
@@ -167,52 +141,51 @@ db.updatePartial("Collection", user1.id, Map.of("lastName", "UpdatedPartially"),
       "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
-      "SUB_COND_OR", List.of( // add an OR sub condition
+      "$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")
       ),
-      "SUB_COND_OR 2", List.of( // add another OR sub condition (name it SUB_COND_OR xxx in order to avoid the same key to a previous SUB_COND_OR )
+      "$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")
       ),
-      "SUB_COND_AND", List.of(
+      "$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)
+        )
       )
     )
     .fields("id", "lastName", "age", "organization.name") // select certain fields
     .sort("lastName", "ASC") //optional sort
     .offset(0) //optional offset
     .limit(100); //optional limit
-    
-    var users = db.find("Collection1", cond).toList(User.class);
-
 
+    var users = db.find("Collection1", cond).toList(User.class);
 ```
 
-
-
 ### Aggregates
 
 ```java
-    
     // support aggregate function: COUNT, AVG, SUM, MAX, MIN
     // see https://docs.microsoft.com/en-us/azure/cosmos-db/sql-query-aggregate-functions
     var aggregate = Aggregate.function("COUNT(1) AS facetCount").groupBy("location", "gender");
-    
+
     var result = db.aggregate("Collection1", aggregate, Condition.filter("age >=", 20));
 
     // will generate a sql like this:
     /* SELECT COUNT(1) as facetCount, c.location, c.gender WHERE age >= 20 GROUP BY c.location, c.gender
     */
 ```
 
-
-
 ### Cross-partition queries
 
 ```java
-
     // simple query
     var cond = Condition.filter("id", "M001").crossPartition(true);
     // when crossPartition is set to true, the partition filter will be ignored.
@@ -224,11 +197,8 @@ db.updatePartial("Collection", user1.id, Map.of("lastName", "UpdatedPartially"),
     var aggregate = Aggregate.function("COUNT(1) as facetCount").groupBy("_partition");
     var cond = Condition.filter().crossPartition(true);
     var result = db.aggregate("Collection1", aggregate, cond);
-
 ```
 
-
-
 ### Raw SQL queries
 
 ```java
@@ -237,34 +207,31 @@ db.updatePartial("Collection", user1.id, Map.of("lastName", "UpdatedPartially"),
     "    FROM Families f\n" + 
     "    JOIN c IN f.children WHERE f.address.state = @state ORDER BY f.id ASC";
 
-		var params = new SqlParameterCollection(new SqlParameter("@state", "NY"));
+        var params = new SqlParameterCollection(new SqlParameter("@state", "NY"));
 
-		var cond = Condition.rawSql(queryText, params);
-		var children = db.find(coll, cond, partition);
+        var cond = Condition.rawSql(queryText, params);
+        var children = db.find(coll, cond, partition);
 
     // use raw sql as a where condition
     var cond = Condition.filter(SubConditionType.AND, List.of(
       Condition.filter("gender", "female"), 
       Condition.rawSql("1=1"));
-    
+
     // use raw sql as a where condition with params
     var params =  new SqlParameterCollection(new SqlParameter("@state", "%NY%"));
 
     var cond = Condition.filter(
-      "SUB_COND_AND", 
+      "$AND", 
       List.of(
         Condition.filter("gender", "female"), 
         Condition.rawSql("c.state LIKE @state", params)
       ),
-      "SUB_COND_AND another", // name it SUB_COND_OR xxx in order to avoid the same key to a previous SUB_COND_AND
+      "$AND another", // name it $AND xxx in order to avoid the same key to a previous $AND
       List.of(
         Condition.filter("age > ", "22"), 
         Condition.rawSql("c.address != \"\" ")
       )
      );      
-                                
+
     db.find("Collection1", cond, "Partition1");
-                                
-    
 ```
-

pom.xml

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