#5 added IN operator in criteria

Author: eaxdev

build.gradle

@@ -63,6 +63,12 @@ dependencies {
 signing {
     sign publishing.publications
 }
+/*spotbugsMain {
+    reports {
+        xml.enabled = false
+        html.enabled = true
+    }
+}*/
 
 publishing {
     publications {

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/And.java

@@ -20,4 +20,9 @@ public And(List<Criteria> criteria) {
     public GroupConditionalOperator getGroupConditionalOperator() {
         return GroupConditionalOperator.AND;
     }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.GROUP;
+    }
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/Criteria.java

@@ -9,10 +9,11 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)
 @JsonSubTypes({
         @JsonSubTypes.Type(value = SimpleCriteria.class),
-        @JsonSubTypes.Type(value = GroupCriteria.class)
+        @JsonSubTypes.Type(value = GroupCriteria.class),
+        @JsonSubTypes.Type(value = MultiValueCriteria.class)
 })
-public abstract class Criteria {
+public interface Criteria {
 
-    public abstract boolean isGroup();
+    CriteriaType getCriteriaType();
 
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/CriteriaType.java

@@ -0,0 +1,14 @@
+package io.github.eaxdev.jsonsql4j.model.criteria;
+
+/**
+ * @author eaxdev
+ */
+public enum CriteriaType {
+
+    GROUP,
+
+    SIMPLE,
+
+    MULTI_VALUE
+
+}

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/Eq.java

@@ -20,4 +20,9 @@ public Eq(String fieldName, String value) {
     public SimpleConditionalOperator getSimpleConditionalOperator() {
         return SimpleConditionalOperator.EQUALS_TO;
     }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.SIMPLE;
+    }
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/Ge.java

@@ -20,4 +20,10 @@ public Ge(String fieldName, String value) {
     public SimpleConditionalOperator getSimpleConditionalOperator() {
         return SimpleConditionalOperator.GREATER_THAN_EQUALS;
     }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.SIMPLE;
+    }
+
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/GroupCriteria.java

@@ -18,15 +18,10 @@
 @Getter
 @AllArgsConstructor
 @JsonDeserialize(using = GroupCriteriaDeserializer.class)
-public abstract class GroupCriteria extends Criteria {
+public abstract class GroupCriteria implements Criteria {
 
     protected final List<Criteria> criteria;
 
     public abstract GroupConditionalOperator getGroupConditionalOperator();
 
-    @Override
-    public boolean isGroup() {
-        return true;
-    }
-
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/Gt.java

@@ -20,4 +20,10 @@ public Gt(String fieldName, String value) {
     public SimpleConditionalOperator getSimpleConditionalOperator() {
         return SimpleConditionalOperator.GREATER_THAN;
     }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.SIMPLE;
+    }
+
 }

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/In.java

@@ -0,0 +1,30 @@
+package io.github.eaxdev.jsonsql4j.model.criteria;
+
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author eaxdev
+ */
+@Getter
+@JsonTypeName("in")
+@NoArgsConstructor
+public class In extends MultiValueCriteria {
+
+    public In(String fieldName, List<String> values) {
+        super(fieldName, values);
+    }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.MULTI_VALUE;
+    }
+
+    @Override
+    public MultiValueConditionalOperator getMultiValueConditionalOperator() {
+        return MultiValueConditionalOperator.IN;
+    }
+}

src/main/java/io/github/eaxdev/jsonsql4j/model/criteria/Le.java

@@ -20,4 +20,10 @@ public Le(String fieldName, String value) {
     public SimpleConditionalOperator getSimpleConditionalOperator() {
         return SimpleConditionalOperator.LESS_THAN_EQUALS;
     }
+
+    @Override
+    public CriteriaType getCriteriaType() {
+        return CriteriaType.SIMPLE;
+    }
+
 }