From 9772ee8bce6e241d18a9a1d56592a88be280f71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Coll=20Morag=C3=B3n?= Date: Tue, 29 Nov 2022 18:40:22 +0000 Subject: [PATCH] storage: Do not include default values of includeSampleId nor includeGenotype #TASK-2420 --- .../analysis/variant/VariantAnalysisTest.java | 2 +- .../core/models/variant/VariantQueryParams.java | 5 ++++- .../models/variant/VariantQueryParamsTest.java | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 opencga-core/src/test/java/org/opencb/opencga/core/models/variant/VariantQueryParamsTest.java diff --git a/opencga-analysis/src/test/java/org/opencb/opencga/analysis/variant/VariantAnalysisTest.java b/opencga-analysis/src/test/java/org/opencb/opencga/analysis/variant/VariantAnalysisTest.java index 64e80e97d43..8d13a664edf 100644 --- a/opencga-analysis/src/test/java/org/opencb/opencga/analysis/variant/VariantAnalysisTest.java +++ b/opencga-analysis/src/test/java/org/opencb/opencga/analysis/variant/VariantAnalysisTest.java @@ -119,7 +119,7 @@ public class VariantAnalysisTest { public static Object[][] parameters() { return new Object[][]{ {MongoDBVariantStorageEngine.STORAGE_ENGINE_ID}, -// {HadoopVariantStorageEngine.STORAGE_ENGINE_ID} + {HadoopVariantStorageEngine.STORAGE_ENGINE_ID} }; } diff --git a/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/VariantQueryParams.java b/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/VariantQueryParams.java index d7fb9772cba..2af30adc926 100644 --- a/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/VariantQueryParams.java +++ b/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/VariantQueryParams.java @@ -20,7 +20,8 @@ import org.opencb.commons.datastore.core.Query; /** - * Do not use native values (like boolean or int), so they are null by default. + * When using native values (like boolean or int), set add + * {@code @JsonInclude(JsonInclude.Include.NON_DEFAULT)} so they are null by default. */ public class VariantQueryParams extends BasicVariantQueryParams { @@ -35,7 +36,9 @@ public class VariantQueryParams extends BasicVariantQueryParams { private String includeSample; private String includeFile; private String includeSampleData; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private boolean includeSampleId; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) private boolean includeGenotype; private String file; diff --git a/opencga-core/src/test/java/org/opencb/opencga/core/models/variant/VariantQueryParamsTest.java b/opencga-core/src/test/java/org/opencb/opencga/core/models/variant/VariantQueryParamsTest.java new file mode 100644 index 00000000000..457ed4f6ee1 --- /dev/null +++ b/opencga-core/src/test/java/org/opencb/opencga/core/models/variant/VariantQueryParamsTest.java @@ -0,0 +1,15 @@ +package org.opencb.opencga.core.models.variant; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class VariantQueryParamsTest { + + @Test + public void test() { + VariantQueryParams params = new VariantQueryParams(); + assertEquals(0, params.toObjectMap().size()); + assertEquals(0, params.toParams().size()); + } +} \ No newline at end of file