make custom and clinical binning switch case more readable

cBioPortal · Sep 26, 2024 · 5b2e73a · 5b2e73a
1 parent f14e457
commit 5b2e73a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/org/cbioportal/web/columnar/BasicDataBinner.java b/src/main/java/org/cbioportal/web/columnar/BasicDataBinner.java
@@ -98,12 +98,7 @@ public <T extends DataBinCountFilter, S extends DataBinFilter, U extends DataBin
         Map<String, ClinicalDataType> attributeDatatypeMap;
         switch (dataBinCountFilter) {
             // TODO: first case is to support clinical data, but clinical data is not using this now. We should update controller to use this method later
-            case ClinicalDataBinCountFilter clinicalDataBinCountFilter when customDataService.getCustomDataSessions(uniqueKeys).isEmpty() -> {
-                unfilteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(partialFilter, uniqueKeys);
-                filteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(studyViewFilter, uniqueKeys);
-                attributeDatatypeMap = studyViewColumnarService.getClinicalAttributeDatatypeMap();
-            }
-            case ClinicalDataBinCountFilter clinicalDataBinCountFilter -> {
+            case ClinicalDataBinCountFilter clinicalDataBinCountFilter when !customDataService.getCustomDataSessions(uniqueKeys).isEmpty() -> {
                 Map<String, CustomDataSession> customDataSessions = customDataService.getCustomDataSessions(uniqueKeys);
                 List<SampleIdentifier> unfilteredSampleIdentifiers = studyViewColumnarService.getFilteredSamples(partialFilter).stream().map(sample -> studyViewFilterUtil.buildSampleIdentifier(sample.getCancerStudyIdentifier(), sample.getStableId())).toList();
                 unfilteredClinicalDataCounts = customDataFilterUtil.getCustomDataCounts(unfilteredSampleIdentifiers, customDataSessions);
@@ -114,6 +109,11 @@ public <T extends DataBinCountFilter, S extends DataBinFilter, U extends DataBin
                     NewClinicalDataBinUtil::getDataType
                 ));
             }
+            case ClinicalDataBinCountFilter clinicalDataBinCountFilter -> {
+                unfilteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(partialFilter, uniqueKeys);
+                filteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(studyViewFilter, uniqueKeys);
+                attributeDatatypeMap = studyViewColumnarService.getClinicalAttributeDatatypeMap();
+            }
             case GenomicDataBinCountFilter genomicDataBinCountFilter -> {
                 unfilteredClinicalDataCounts = studyViewColumnarService.getGenomicDataBinCounts(partialFilter, uniqueKeys);
                 filteredClinicalDataCounts = studyViewColumnarService.getGenomicDataBinCounts(studyViewFilter, uniqueKeys);