update

cBioPortal · Aug 11, 2023 · 3c91d6c · 3c91d6c
1 parent ddcf44e
commit 3c91d6c
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 212 deletions.
diff --git a/service/src/main/java/org/cbioportal/service/GenericAssayEnrichmentService.java b/service/src/main/java/org/cbioportal/service/GenericAssayEnrichmentService.java
@@ -1,23 +1,23 @@
-package org.cbioportal.service;
-
-import org.cbioportal.model.EnrichmentType;
-import org.cbioportal.model.GenericAssayBinaryEnrichment;
-import org.cbioportal.model.GenericAssayCategoricalEnrichment;
-import org.cbioportal.model.MolecularProfileCaseIdentifier;
-import org.cbioportal.service.exception.MolecularProfileNotFoundException;
-
-import java.util.List;
-import java.util.Map;
-
-public interface GenericAssayEnrichmentService {
-    List<GenericAssayBinaryEnrichment> getGenericAssayBinaryEnrichments(
-        String molecularProfileId,
-        Map<String, List<MolecularProfileCaseIdentifier>> molecularProfileCaseSets,
-        EnrichmentType enrichmentType)
-        throws MolecularProfileNotFoundException;
-
-    List<GenericAssayCategoricalEnrichment> getGenericAssayCategoricalEnrichments(String molecularProfileId,
-                                                                                  Map<String, List<MolecularProfileCaseIdentifier>> molecularProfileCaseSets,
-                                                                                  EnrichmentType enrichmentType)
-        throws MolecularProfileNotFoundException;
-}
+//package org.cbioportal.service;
+//
+//import org.cbioportal.model.EnrichmentType;
+//import org.cbioportal.model.GenericAssayBinaryEnrichment;
+//import org.cbioportal.model.GenericAssayCategoricalEnrichment;
+//import org.cbioportal.model.MolecularProfileCaseIdentifier;
+//import org.cbioportal.service.exception.MolecularProfileNotFoundException;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+//public interface GenericAssayEnrichmentService {
+//    List<GenericAssayBinaryEnrichment> getGenericAssayBinaryEnrichments(
+//        String molecularProfileId,
+//        Map<String, List<MolecularProfileCaseIdentifier>> molecularProfileCaseSets,
+//        EnrichmentType enrichmentType)
+//        throws MolecularProfileNotFoundException;
+//
+//    List<GenericAssayCategoricalEnrichment> getGenericAssayCategoricalEnrichments(String molecularProfileId,
+//                                                                                  Map<String, List<MolecularProfileCaseIdentifier>> molecularProfileCaseSets,
+//                                                                                  EnrichmentType enrichmentType)
+//        throws MolecularProfileNotFoundException;
+//}
diff --git a/service/src/main/java/org/cbioportal/service/impl/ExpressionEnrichmentServiceImpl.java b/service/src/main/java/org/cbioportal/service/impl/ExpressionEnrichmentServiceImpl.java
@@ -5,9 +5,19 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.cbioportal.model.*;
 import org.cbioportal.model.MolecularProfile.MolecularAlterationType;
 import org.cbioportal.model.meta.GenericAssayMeta;
+import org.cbioportal.model.EnrichmentType;
+import org.cbioportal.model.GenericAssayBinaryEnrichment;
+import org.cbioportal.model.GenericAssayCategoricalEnrichment;
+import org.cbioportal.model.GenericAssayMolecularAlteration;
+import org.cbioportal.model.MolecularProfileCaseIdentifier;
+import org.cbioportal.model.MolecularProfile;
+import org.cbioportal.model.Sample;
+import org.cbioportal.model.GenericAssayEnrichment;
+import org.cbioportal.model.GenomicEnrichment;
+import org.cbioportal.model.Gene;
+import org.cbioportal.model.GeneMolecularAlteration;
 import org.cbioportal.persistence.MolecularDataRepository;
 import org.cbioportal.service.ExpressionEnrichmentService;
 import org.cbioportal.service.GeneService;