diff --git a/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/FieldNames.java b/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/FieldNames.java index bee1512c..fd3c6e9a 100644 --- a/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/FieldNames.java +++ b/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/FieldNames.java @@ -436,4 +436,12 @@ public static String getTestedTypeCountFieldName(FeatureType featureType) { return SYNTHETIC_PREFIX + featureType.getId() + TESTED_DONOR_COUNT_SUFFIX; } + + /** + * Variant field names. + */ + public static final String CIVIC_VARIANT_ID = "variantID"; + public static final String CLINVAR_ALLELE_ID = "alleleID"; + public static final String CLINVAR_ASSEMBLY = "assembly"; + } diff --git a/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/ReleaseCollection.java b/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/ReleaseCollection.java index 72c8add2..33b19612 100644 --- a/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/ReleaseCollection.java +++ b/dcc-common-core/src/main/java/org/icgc/dcc/common/core/model/ReleaseCollection.java @@ -21,13 +21,7 @@ import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; -import static org.icgc.dcc.common.core.model.FieldNames.DIAGRAM_ID; -import static org.icgc.dcc.common.core.model.FieldNames.DRUG_ID; -import static org.icgc.dcc.common.core.model.FieldNames.FILE_ID; -import static org.icgc.dcc.common.core.model.FieldNames.GENE_SET_ID; -import static org.icgc.dcc.common.core.model.FieldNames.MONGO_INTERNAL_ID; -import static org.icgc.dcc.common.core.model.FieldNames.PATHWAY_REACTOME_ID; -import static org.icgc.dcc.common.core.model.FieldNames.RELEASE_ID; +import static org.icgc.dcc.common.core.model.FieldNames.*; import static org.icgc.dcc.common.core.model.FieldNames.IdentifierFieldNames.SURROGATE_DONOR_ID; import static org.icgc.dcc.common.core.model.FieldNames.IdentifierFieldNames.SURROGATE_MUTATION_ID; import static org.icgc.dcc.common.core.model.FieldNames.ImporterFieldNames.CGC_ID; @@ -62,7 +56,9 @@ public enum ReleaseCollection implements Identifiable { GENE_SET_COLLECTION(UNDETERMINED, "GeneSet", newArrayList(GENE_SET_ID)), DIAGRAM_COLLECTION(UNDETERMINED, "Diagram", newArrayList(DIAGRAM_ID)), FILE_COLLECTION(UNDETERMINED, "File", newArrayList(FILE_ID)), - DRUG_COLLECTION(UNDETERMINED, "Drug", newArrayList(DRUG_ID)); + DRUG_COLLECTION(UNDETERMINED, "Drug", newArrayList(DRUG_ID)), + CIVIC_COLLECTION(UNDETERMINED, "Civic", newArrayList(CIVIC_VARIANT_ID)), + CLINVAR_COLLECTION(UNDETERMINED, "Clinvar", newArrayList(CLINVAR_ALLELE_ID, CLINVAR_ASSEMBLY)); private final ReleaseDatabase parentDatabase;