fix error message in response

elixir-europe · Jul 22, 2024 · 5c6cb55 · 5c6cb55
1 parent 22cc5eb
commit 5c6cb55
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 9 deletions.
diff --git a/beacon-data-model/pom.xml b/beacon-data-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.8</version>
     </parent>
 
     <artifactId>beacon-data-model</artifactId>

diff --git a/beacon-framework/pom.xml b/beacon-framework/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.8</version>
     </parent>
 
     <artifactId>beacon-framework</artifactId>

diff --git a/...c/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/AlphanumericFilter.java b/...c/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/AlphanumericFilter.java
@@ -1,6 +1,6 @@
 /**
  * *****************************************************************************
- * Copyright (C) 2023 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
+ * Copyright (C) 2024 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
  * and Barcelona Supercomputing Center (BSC)
  *
  * Modifications to the initial code base are copyright of their respective
@@ -44,10 +44,12 @@ public AlphanumericFilter(String id, String operator, String value) {
         this.value = value;
     }
 
+    @Override
     public String getId() {
         return id;
     }
 
+    @Override
     public void setId(String id) {
         this.id = id;
     }

diff --git a/...rc/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/BeaconQueryFilter.java b/...rc/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/BeaconQueryFilter.java
@@ -1,6 +1,6 @@
 /**
  * *****************************************************************************
- * Copyright (C) 2023 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
+ * Copyright (C) 2024 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
  * and Barcelona Supercomputing Center (BSC)
  *
  * Modifications to the initial code base are copyright of their respective
@@ -39,6 +39,9 @@
 
 public interface BeaconQueryFilter {
 
+    String getId();
+    void setId(String id);
+
     public static class BeaconQueryFilterDeserializer implements JsonbDeserializer<BeaconQueryFilter> {
 
         @Override

diff --git a/...ork/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/CustomFilter.java b/...ork/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/CustomFilter.java
@@ -1,6 +1,6 @@
 /**
  * *****************************************************************************
- * Copyright (C) 2023 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
+ * Copyright (C) 2024 ELIXIR ES, Spanish National Bioinformatics Institute (INB)
  * and Barcelona Supercomputing Center (BSC)
  *
  * Modifications to the initial code base are copyright of their respective
@@ -30,5 +30,22 @@
  */
 
 public class CustomFilter implements BeaconQueryFilter {
+
+    private String id;
+
+    public CustomFilter() {}
 
+    public CustomFilter(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
 }
diff --git a/...k/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/OntologyFilter.java b/...k/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/OntologyFilter.java
@@ -42,10 +42,12 @@ public OntologyFilter(String id) {
         this.id = id;
     }
 
+    @Override
     public String getId() {
         return id;
     }
 
+    @Override
     public void setId(String id) {
         this.id = id;
     }

diff --git a/...main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/responses/BeaconErrorResponse.java b/...main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/responses/BeaconErrorResponse.java
@@ -33,11 +33,11 @@ public class BeaconErrorResponse extends AbstractBeaconResponse {
 
     private BeaconError error;
 
-    public BeaconError getBeaconError() {
+    public BeaconError getError() {
         return error;
     }
 
-    public void setBeaconError(BeaconError error) {
+    public void setError(BeaconError error) {
         this.error = error;
     }
 }
diff --git a/beacon-model/pom.xml b/beacon-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>es.bsc.inb.ga4gh</groupId>
         <artifactId>beacon-v2-api</artifactId>
-        <version>2.0.7</version>
+        <version>2.0.8</version>
     </parent>
 
     <artifactId>beacon-model</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>es.bsc.inb.ga4gh</groupId>
     <artifactId>beacon-v2-api</artifactId>
-    <version>2.0.7</version>
+    <version>2.0.8</version>
     <packaging>pom</packaging>
 
     <description>