diff --git a/beacon-data-model/pom.xml b/beacon-data-model/pom.xml index 01b0ace..feda2ae 100644 --- a/beacon-data-model/pom.xml +++ b/beacon-data-model/pom.xml @@ -27,7 +27,7 @@ es.bsc.inb.ga4gh beacon-v2-api - 2.0.7 + 2.0.8 beacon-data-model diff --git a/beacon-framework/pom.xml b/beacon-framework/pom.xml index e288264..29b4396 100644 --- a/beacon-framework/pom.xml +++ b/beacon-framework/pom.xml @@ -27,7 +27,7 @@ es.bsc.inb.ga4gh beacon-v2-api - 2.0.7 + 2.0.8 beacon-framework 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 index 222f3a3..0305025 100644 --- 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 index 676b2a3..9890467 100644 --- 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 { @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 index 910be04..9f98fd6 100644 --- 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 index e376e4d..3f94f6d 100644 --- 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 index 2b14514..eefa6e9 100644 --- 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 index 042bde9..7e976f3 100644 --- a/beacon-model/pom.xml +++ b/beacon-model/pom.xml @@ -27,7 +27,7 @@ es.bsc.inb.ga4gh beacon-v2-api - 2.0.7 + 2.0.8 beacon-model diff --git a/pom.xml b/pom.xml index 63c5355..b2d54e0 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 4.0.0 es.bsc.inb.ga4gh beacon-v2-api - 2.0.7 + 2.0.8 pom