Merge pull request #25 from quantori/feature/change-model-source

update criteria implementation

Author: mselivanovaQuantori

cqp-api/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 group = "com.quantori"
 description = "Chem query platform. Storage API"
-version = "0.0.12"
+version = "0.0.13"
 
 dependencies {
     implementation("commons-codec:commons-codec:1.15")

cqp-api/src/main/java/com/quantori/cqp/api/model/ConjunctionCriteria.java

@@ -15,7 +15,7 @@
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode
-public class ConjunctionCriteria {
+public class ConjunctionCriteria implements Criteria {
 
   public static final Operator DEFAULT_OPERATOR = Operator.AND;
 

cqp-api/src/main/java/com/quantori/cqp/api/model/FieldCriteria.java

@@ -1,5 +1,6 @@
 package com.quantori.cqp.api.model;
 
+import com.quantori.cqp.core.model.Criteria;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -13,7 +14,7 @@
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode
-public class FieldCriteria {
+public class FieldCriteria implements Criteria {
 
   public static final Operator DEFAULT_OPERATOR = Operator.EQUAL;