diff --git a/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/AnnotationMetadata.java b/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/AnnotationMetadata.java index 31d19d5d..2b40606d 100644 --- a/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/AnnotationMetadata.java +++ b/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/AnnotationMetadata.java @@ -33,7 +33,7 @@ public class AnnotationMetadata implements IAnnotationMetadata { public AnnotationMetadata(IAnnotationMetadata annotationMetadata) { this(annotationMetadata.getVepVersion(), annotationMetadata.getCacheVersion(), - annotationMetadata.isDefaultVersion()); + annotationMetadata.isDefaultVersion()); } public AnnotationMetadata(String vepVersion, String cacheVersion) { @@ -61,6 +61,10 @@ public boolean isDefaultVersion() { return defaultVersion; } + public void setDefaultVersion(boolean defaultVersion) { + this.defaultVersion = defaultVersion; + } + @Override public String toString() { return "AnnotationMetadata{" + diff --git a/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/VariantStatistics.java b/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/VariantStatistics.java index 802378e3..8fb44d84 100644 --- a/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/VariantStatistics.java +++ b/variation-commons-core/src/main/java/uk/ac/ebi/eva/commons/core/models/VariantStatistics.java @@ -250,7 +250,7 @@ private Genotype normalizeGenotypeAlleles(Genotype g) { } } - void setGenotypesCount(Map genotypesCount) { + public void setGenotypesCount(Map genotypesCount) { this.genotypesCount = genotypesCount; } diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/AnnotationMongo.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/AnnotationMongo.java index 0c35d6a5..2049b720 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/AnnotationMongo.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/AnnotationMongo.java @@ -212,11 +212,11 @@ public AnnotationMongo concatenate(AnnotationMongo annotation) { return temp; } - private void addConsequenceTypes(Set consequenceTypes) { + public void addConsequenceTypes(Set consequenceTypes) { consequenceTypes.forEach(this::addConsequenceType); } - private void addConsequenceType(ConsequenceTypeMongo consequenceType) { + public void addConsequenceType(ConsequenceTypeMongo consequenceType) { consequenceTypes.add(consequenceType); xrefs.addAll(generateXrefsFromConsequenceType(consequenceType)); } diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantMongo.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantMongo.java index e23846a3..6556a56d 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantMongo.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantMongo.java @@ -321,14 +321,35 @@ public Set getSourceEntries() { return variantSourceEntries; } + public void setSourceEntries(Set variantSourceEntries) { + this.variantSourceEntries = new HashSet<>(); + if (variantSourceEntries != null && !variantSourceEntries.isEmpty()) { + this.variantSourceEntries.addAll(variantSourceEntries); + } + } + public Set getVariantStatsMongo() { return variantStatsMongo; } + public void setVariantStatsMongo(Set variantStatsMongo) { + this.variantStatsMongo = new HashSet<>(); + if (variantStatsMongo != null && !variantStatsMongo.isEmpty()) { + this.variantStatsMongo.addAll(variantStatsMongo); + } + } + public Set getIndexedAnnotations() { return indexedAnnotations; } + public void setIndexedAnnotations(Set indexedAnnotations) { + this.indexedAnnotations = new HashSet<>(); + if (indexedAnnotations != null && !indexedAnnotations.isEmpty()) { + this.indexedAnnotations.addAll(indexedAnnotations); + } + } + public Set getAnnotationIds() { Set ids = new HashSet<>(); for (AnnotationIndexMongo indexedAnnotation : indexedAnnotations) { diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantSourceMongo.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantSourceMongo.java index 8bbbd985..c9f39874 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantSourceMongo.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/VariantSourceMongo.java @@ -21,7 +21,6 @@ import uk.ac.ebi.eva.commons.core.models.IVariantGlobalStats; import uk.ac.ebi.eva.commons.core.models.IVariantSource; import uk.ac.ebi.eva.commons.core.models.StudyType; -import uk.ac.ebi.eva.commons.core.models.stats.VariantGlobalStats; import uk.ac.ebi.eva.commons.mongodb.entities.subdocuments.VariantGlobalStatsMongo; import java.util.Calendar; diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/projections/SimplifiedVariant.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/projections/SimplifiedVariant.java index 2c8d55ed..2a867ff4 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/projections/SimplifiedVariant.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/projections/SimplifiedVariant.java @@ -97,4 +97,43 @@ public SimplifiedVariant(VariantType variantType, String chromosome, long start, } } + public String getId() { + return id; + } + + public VariantType getVariantType() { + return variantType; + } + + public String getChromosome() { + return chromosome; + } + + public long getStart() { + return start; + } + + public long getEnd() { + return end; + } + + public int getLength() { + return length; + } + + public String getReference() { + return reference; + } + + public String getAlternate() { + return alternate; + } + + public VariantAtMongo getAt() { + return at; + } + + public Set getHgvs() { + return hgvs; + } } diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/subdocuments/ConsequenceTypeMongo.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/subdocuments/ConsequenceTypeMongo.java index f5e502dd..de4540f3 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/subdocuments/ConsequenceTypeMongo.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/entities/subdocuments/ConsequenceTypeMongo.java @@ -96,7 +96,7 @@ public class ConsequenceTypeMongo implements IConsequenceType { @Field(value = RELATIVE_POS_FIELD) private Integer relativePosition; - ConsequenceTypeMongo() { + public ConsequenceTypeMongo() { this(null, null, null, null, null, null, null, null, null, null, null, null, null, null); } diff --git a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/writers/VariantMongoWriter.java b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/writers/VariantMongoWriter.java index 781b5ab1..92c291fa 100644 --- a/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/writers/VariantMongoWriter.java +++ b/variation-commons-mongodb/src/main/java/uk/ac/ebi/eva/commons/mongodb/writers/VariantMongoWriter.java @@ -15,7 +15,6 @@ */ package uk.ac.ebi.eva.commons.mongodb.writers; -import com.mongodb.BulkWriteOperation; import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.UpdateOneModel; import com.mongodb.client.model.UpdateOptions; @@ -104,7 +103,7 @@ private void createIndexes() { } @Override - protected void doWrite(List variants) { + public void doWrite(List variants) { List> updates = new ArrayList<>(); for (IVariant variant : variants) { updates.add(new UpdateOneModel<>(generateQuery(variant), generateUpdate(variant),