storage: Do not include default values of includeSampleId nor include…

…Genotype #TASK-2420

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}
         };
     }
 

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;

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());
+    }
+}