fix error message in response

redmitry · redmitry · commit 5c6cb55c888d · 2024-07-22T15:02:49.000+02:00
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/beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/AlphanumericFilter.java b/beacon-framework/src/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/beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/BeaconQueryFilter.java b/beacon-framework/src/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/beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/CustomFilter.java b/beacon-framework/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/beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/requests/OntologyFilter.java b/beacon-framework/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/beacon-framework/src/main/java/es/bsc/inb/ga4gh/beacon/framework/model/v200/responses/BeaconErrorResponse.java b/beacon-framework/src/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>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* *****************************************************************************`
`3`		`- * Copyright (C) 2023 ELIXIR ES, Spanish National Bioinformatics Institute (INB)`
	`3`	`+ * Copyright (C) 2024 ELIXIR ES, Spanish National Bioinformatics Institute (INB)`
`4`	`4`	`* and Barcelona Supercomputing Center (BSC)`
`5`	`5`	`*`
`6`	`6`	`* Modifications to the initial code base are copyright of their respective`
`@@ -44,10 +44,12 @@ public AlphanumericFilter(String id, String operator, String value) {`
`44`	`44`	`this.value = value;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ @Override`
`47`	`48`	`public String getId() {`
`48`	`49`	`return id;`
`49`	`50`	`}`
`50`	`51`
	`52`	`+ @Override`
`51`	`53`	`public void setId(String id) {`
`52`	`54`	`this.id = id;`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,12 @@ public OntologyFilter(String id) {`
`42`	`42`	`this.id = id;`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @Override`
`45`	`46`	`public String getId() {`
`46`	`47`	`return id;`
`47`	`48`	`}`
`48`	`49`
	`50`	`+ @Override`
`49`	`51`	`public void setId(String id) {`
`50`	`52`	`this.id = id;`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,11 @@ public class BeaconErrorResponse extends AbstractBeaconResponse {`
`33`	`33`
`34`	`34`	`private BeaconError error;`
`35`	`35`
`36`		`- public BeaconError getBeaconError() {`
	`36`	`+ public BeaconError getError() {`
`37`	`37`	`return error;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public void setBeaconError(BeaconError error) {`
	`40`	`+ public void setError(BeaconError error) {`
`41`	`41`	`this.error = error;`
`42`	`42`	`}`
`43`	`43`	`}`