Merge pull request #5 from viktoryoo/v130

Expose where condition for query builder with filter param

Author: bgizdov

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>in.kuros</groupId>
     <artifactId>jFirebase</artifactId>
-    <version>1.2.7</version>
+    <version>1.3.0</version>
 
 
     <description>This project aims at building a wrapper over nosql technologies - Firebase</description>
@@ -110,7 +110,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>19.0.0</version>
+                <version>26.10.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

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

@@ -1,20 +1,20 @@
 package in.kuros.jfirebase.provider.firebase.query;
 
+import static com.google.cloud.firestore.Query.Direction.DESCENDING;
+
 import com.google.cloud.firestore.DocumentSnapshot;
+import com.google.cloud.firestore.Filter;
 import in.kuros.jfirebase.metadata.Attribute;
 import in.kuros.jfirebase.metadata.MapAttribute;
 import in.kuros.jfirebase.provider.firebase.EntityHelper;
 import in.kuros.jfirebase.query.Query;
 import in.kuros.jfirebase.util.PropertyNamingStrategy;
-
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
-
-import static com.google.cloud.firestore.Query.Direction.DESCENDING;
+import javax.annotation.Nonnull;
 
 abstract class QueryImpl<T> implements Query<T> {
 
@@ -26,6 +26,12 @@ abstract class QueryImpl<T> implements Query<T> {
         this.namingStrategy = EntityHelper.INSTANCE.getPropertyNamingStrategy();
     }
 
+    @Override
+    public <X> Query<T> where (Filter filter) {
+        queries.add(query -> query.where(filter));
+        return this;
+    }
+
     @Override
     public <X> Query<T> whereEqualTo(final Attribute<T, X> field, final X value) {
         whereEqualTo(getNameWithStrategy(field), value);

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

@@ -1,14 +1,14 @@
 package in.kuros.jfirebase.query;
 
-
 import com.google.cloud.firestore.DocumentSnapshot;
+import com.google.cloud.firestore.Filter;
 import in.kuros.jfirebase.metadata.Attribute;
 import in.kuros.jfirebase.metadata.MapAttribute;
-
 import java.util.List;
 
 public interface Query<T> {
 
+    <X> Query<T> where(Filter filter);
     <X> Query<T> whereEqualTo(Attribute<T, X> field, X value);
 
     <K, V> Query<T> whereEqualTo(MapAttribute<T, K, V> field, K key, V value);

src/test/java/in/kuros/jfirebase/provider/firebase/AttributeValueHelperTest.java

@@ -1,6 +1,11 @@
 package in.kuros.jfirebase.provider.firebase;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import com.google.cloud.firestore.FieldPath;
 import com.google.common.collect.Lists;
 import in.kuros.jfirebase.entity.TestClass;
@@ -9,20 +14,13 @@
 import in.kuros.jfirebase.metadata.AttributeValue;
 import in.kuros.jfirebase.metadata.MetadataProcessor;
 import in.kuros.jfirebase.metadata.ValuePath;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class AttributeValueHelperTest {
 
@@ -78,7 +76,7 @@ void shouldCreateFieldPathForAttributeValues() {
     }
 
     @Test
-    void shouldAddValuePathsToMap() throws JsonProcessingException {
+    void shouldAddValuePathsToMap() {
         final Map<String, Object> map = new HashMap<>();
         map.put("xyz", "lkasd");