add query support for !=, in, not-in & array-contains-any

Author: kuros

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>in.kuros</groupId>
     <artifactId>jFirebase</artifactId>
-    <version>0.6.16</version>
+    <version>1.0.0</version>
 
 
     <description>This project aims at building a wrapper over nosql technologies - Firebase</description>
@@ -53,7 +53,7 @@
 
     <properties>
         <guava.version>25.1-jre</guava.version>
-        <firebase-admin.version>6.10.0</firebase-admin.version>
+        <firebase-admin.version>7.1.1</firebase-admin.version>
         <lombok.version>1.18.10</lombok.version>
         <surefire.version>2.17</surefire.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
@@ -74,9 +74,8 @@
             <version>0.9.11</version>
         </dependency>
         <dependency>
-            <groupId>com.google.firebase</groupId>
-            <artifactId>firebase-admin</artifactId>
-            <version>${firebase-admin.version}</version>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-firestore</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -93,6 +92,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>libraries-bom</artifactId>
+                <version>19.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 
     <repositories>
         <repository>

src/main/java/in/kuros/jfirebase/provider/firebase/query/QueryImpl.java

@@ -37,6 +37,23 @@ public <X> Query<T> whereEqualTo(final String field, final X value) {
         return this;
     }
 
+    @Override
+    public <X> Query<T> whereNotEqualTo(final Attribute<T, X> field, final X value) {
+        whereNotEqualTo(field.getName(), value);
+        return this;
+    }
+
+    @Override
+    public <K, V> Query<T> whereNotEqualTo(final MapAttribute<T, K, V> field, final K key, final V value) {
+        return whereNotEqualTo(field.getName() + "." + key, value);
+    }
+
+    @Override
+    public <X> Query<T> whereNotEqualTo(final String field, final X value) {
+        queries.add(query -> query.whereNotEqualTo(field, value));
+        return this;
+    }
+
     @Override
     public <X> Query<T> whereGreaterThan(final Attribute<T, X> field, final X value) {
         whereGreaterThan(field.getName(), value);
@@ -97,6 +114,42 @@ public Query<T> whereArrayContains(final String field, final Object value) {
         return this;
     }
 
+    @Override
+    public <X> Query<T> whereArrayContainsAny(final Attribute<T, X> field, final List<Object> values) {
+        whereArrayContainsAny(field.getName(), values);
+        return this;
+    }
+
+    @Override
+    public Query<T> whereArrayContainsAny(final String field, final List<Object> values) {
+        queries.add(query -> query.whereArrayContainsAny(field, values));
+        return this;
+    }
+
+    @Override
+    public <X> Query<T> whereIn(final Attribute<T, X> field, final List<X> values) {
+        whereIn(field.getName(), values);
+        return this;
+    }
+
+    @Override
+    public Query<T> whereIn(final String field, final List<?> values) {
+        queries.add(query -> query.whereArrayContainsAny(field, values));
+        return this;
+    }
+
+    @Override
+    public <X> Query<T> whereNotIn(final Attribute<T, X> field, final List<X> values) {
+        whereNotIn(field.getName(), values);
+        return this;
+    }
+
+    @Override
+    public Query<T> whereNotIn(final String field, final List<?> values) {
+        queries.add(query -> query.whereArrayContainsAny(field, values));
+        return this;
+    }
+
     @Override
     public Query<T> limit(final int limit) {
         queries.add(query -> query.limit(limit));

src/main/java/in/kuros/jfirebase/query/Query.java

@@ -4,6 +4,8 @@
 import in.kuros.jfirebase.metadata.Attribute;
 import in.kuros.jfirebase.metadata.MapAttribute;
 
+import java.util.List;
+
 public interface Query<T> {
 
     <X> Query<T> whereEqualTo(Attribute<T, X> field, X value);
@@ -12,6 +14,12 @@ public interface Query<T> {
 
     <X> Query<T> whereEqualTo(String field, X value);
 
+    <X> Query<T> whereNotEqualTo(Attribute<T, X> field, X value);
+
+    <K, V> Query<T> whereNotEqualTo(MapAttribute<T, K, V> field, K key, V value);
+
+    <X> Query<T> whereNotEqualTo(String field, X value);
+
     <X> Query<T> whereGreaterThan(Attribute<T, X> field, X value);
 
     <X> Query<T> whereGreaterThan(String field, X value);
@@ -32,6 +40,18 @@ public interface Query<T> {
 
     Query<T> whereArrayContains(String field, Object value);
 
+    <X> Query<T> whereArrayContainsAny(Attribute<T, X> field, List<Object> value);
+
+    Query<T> whereArrayContainsAny(String field, List<Object> value);
+
+    <X> Query<T> whereIn(Attribute<T, X> field, List<X> value);
+
+    Query<T> whereIn(String field, List<?> value);
+
+    <X> Query<T> whereNotIn(Attribute<T, X> field, List<X> value);
+
+    Query<T> whereNotIn(String field, List<?> value);
+
     Query<T> limit(int limit);
 
     Query<T> endAt(Object... values);