provide "logic" property to filters

Author: redmitry

beacon-data-model/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2023 Spanish National Bioinformatics Institute (INB) and
+  Copyright (C) 2024 Spanish National Bioinformatics Institute (INB) and
   Barcelona Supercomputing Center
 
   Modifications to the initial code base are copyright of their respective
@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>beacon-data-model</artifactId>

beacon-framework/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>beacon-framework</artifactId>

beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/AlphanumericFilter.java

@@ -35,6 +35,7 @@ public class AlphanumericFilter implements BeaconQueryFilter {
     private String operator;
     private String value;
     private String scope;
+    private String logic;
 
     public AlphanumericFilter() {}
 
@@ -74,6 +75,14 @@ public String getScope() {
     public void setScope(String scope) {
         this.scope = scope;
     }
+
+    public String getLogic() {
+        return logic;
+    }
+
+    public void setLogic(String logic) {
+        this.logic = logic;
+    }
 
     @Override
     public String toString() {

beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/BeaconQueryFilter.java

@@ -39,6 +39,10 @@
 
 public interface BeaconQueryFilter {
 
+    default String getLogic() {
+        return null;
+    }
+    
     public static class BeaconQueryFilterDeserializer implements JsonbDeserializer<BeaconQueryFilter> {
 
         @Override

beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/OntologyFilter.java

@@ -35,6 +35,7 @@ public class OntologyFilter implements BeaconQueryFilter {
     private Boolean include_descendant_terms;
     private String scope;
     private String similarity;
+    private String logic;
 
     public OntologyFilter() {}
 
@@ -74,6 +75,14 @@ public void setSimilarity(String similarity) {
         this.similarity = similarity;
     }
 
+    public String getLogic() {
+        return logic;
+    }
+
+    public void setLogic(String logic) {
+        this.logic = logic;
+    }
+
     @Override
     public String toString() {
         return getId();

beacon-model/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2023 Spanish National Bioinformatics Institute (INB) and
+  Copyright (C) 2024 Spanish National Bioinformatics Institute (INB) and
   Barcelona Supercomputing Center
 
   Modifications to the initial code base are copyright of their respective
@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>beacon-model</artifactId>
@@ -71,13 +71,13 @@
         <dependency>        
             <groupId>es.bsc.inb.ga4gh</groupId>
             <artifactId>beacon-framework</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>        
             <groupId>es.bsc.inb.ga4gh</groupId>
             <artifactId>beacon-data-model</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2023 Spanish National Bioinformatics Institute (INB) and
+  Copyright (C) 2024 Spanish National Bioinformatics Institute (INB) and
   Barcelona Supercomputing Center
 
   Modifications to the initial code base are copyright of their respective
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>es.bsc.inb.ga4gh</groupId>
     <artifactId>beacon-v2-api</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>