storage: Fix compilation issue. #TASK-5448

opencb · Sep 2, 2024 · fc2e0d9 · fc2e0d9
1 parent 2c63795
commit fc2e0d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/...va/org/opencb/opencga/app/cli/main/executors/OperationsVariantStorageCommandExecutor.java b/...va/org/opencb/opencga/app/cli/main/executors/OperationsVariantStorageCommandExecutor.java
@@ -1174,14 +1174,14 @@ private RestResponse<VariantSetupResult> setupVariant() throws Exception {
                     .readValue(new java.io.File(commandOptions.jsonFile), VariantSetupParams.class);
         } else {
             ObjectMap beanParams = new ObjectMap();
-            putNestedIfNotNull(beanParams, "expectedSamples",commandOptions.expectedSamples, true);
-            putNestedIfNotNull(beanParams, "expectedFiles",commandOptions.expectedFiles, true);
-            putNestedIfNotNull(beanParams, "fileType",commandOptions.fileType, true);
-            putNestedIfNotEmpty(beanParams, "averageFileSize",commandOptions.averageFileSize, true);
-            putNestedIfNotNull(beanParams, "variantsPerSample",commandOptions.variantsPerSample, true);
-            putNestedIfNotNull(beanParams, "averageSamplesPerFile",commandOptions.averageSamplesPerFile, true);
-            putNestedIfNotNull(beanParams, "dataDistribution",commandOptions.dataDistribution, true);
-            putNestedIfNotNull(beanParams, "normalizeExtensions",commandOptions.normalizeExtensions, true);
+            putNestedIfNotNull(beanParams, "expectedSamples", commandOptions.expectedSamples, true);
+            putNestedIfNotNull(beanParams, "expectedFiles", commandOptions.expectedFiles, true);
+            putNestedIfNotNull(beanParams, "fileType", commandOptions.fileType, true);
+            putNestedIfNotEmpty(beanParams, "averageFileSize", commandOptions.averageFileSize, true);
+            putNestedIfNotNull(beanParams, "variantsPerSample", commandOptions.variantsPerSample, true);
+            putNestedIfNotNull(beanParams, "averageSamplesPerFile", commandOptions.averageSamplesPerFile, true);
+            putNestedIfNotNull(beanParams, "dataDistribution", commandOptions.dataDistribution, true);
+            putNestedIfNotNull(beanParams, "normalizeExtensions", commandOptions.normalizeExtensions, true);
 
             variantSetupParams = JacksonUtils.getDefaultObjectMapper().copy()
                     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)

diff --git a/...src/main/java/org/opencb/opencga/storage/hadoop/variant/archive/ArchiveRowKeyFactory.java b/...src/main/java/org/opencb/opencga/storage/hadoop/variant/archive/ArchiveRowKeyFactory.java
@@ -168,13 +168,6 @@ public String generateBlockIdFromSlice(int fileId, String chrom, long slice) {
         return generateBlockIdFromSliceAndBatch(getFileBatch(fileId), chrom, slice);
     }
 
-    public String generateBlockIdFromBatch(int fileBatch) {
-        StringBuilder sb = new StringBuilder(FILE_BATCH_PAD + 1);
-        sb.append(StringUtils.leftPad(String.valueOf(fileBatch), FILE_BATCH_PAD, '0'));
-        sb.append(getSeparator());
-        return sb.toString();
-    }
-
     public String generateBlockIdFromSliceAndBatch(int fileBatch, String chrom, long slice) {
         String chromosome = Region.normalizeChromosome(chrom);
         StringBuilder sb = new StringBuilder(FILE_BATCH_PAD + 1 + chromosome.length() + 1 + POSITION_PAD);