Skip to content

Commit

Permalink
move entities to separate packages
Browse files Browse the repository at this point in the history
  • Loading branch information
bprize15 committed Nov 1, 2024
1 parent 4160079 commit 831c624
Show file tree
Hide file tree
Showing 281 changed files with 689 additions and 465 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.mskcc.oncokb.curation.domain.Alteration;
import org.mskcc.oncokb.curation.domain.Article;
import org.mskcc.oncokb.curation.domain.CancerType;
import org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice;
import org.mskcc.oncokb.curation.domain.Drug;
import org.mskcc.oncokb.curation.domain.FdaSubmission;
import org.mskcc.oncokb.curation.domain.Gene;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.Article.Article;
import org.mskcc.oncokb.curation.domain.CancerType.CancerType;
import org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice.CompanionDiagnosticDevice;
import org.mskcc.oncokb.curation.domain.Drug.Drug;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.convert.TypeDescriptor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.mskcc.oncokb.curation.domain.Alteration;
import org.mskcc.oncokb.curation.domain.Article;
import org.mskcc.oncokb.curation.domain.CancerType;
import org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice;
import org.mskcc.oncokb.curation.domain.Drug;
import org.mskcc.oncokb.curation.domain.FdaSubmission;
import org.mskcc.oncokb.curation.domain.Gene;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.Article.Article;
import org.mskcc.oncokb.curation.domain.CancerType.CancerType;
import org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice.CompanionDiagnosticDevice;
import org.mskcc.oncokb.curation.domain.Drug.Drug;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.convert.TypeDescriptor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.AbstractAuditingEntity;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Alignment;

/**
* Created by Hongxin Zhang on 10/23/20.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Alignment;

/**
* Created by Hongxin Zhang on 10/23/20.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Alignment;

import org.genome_nexus.client.EnsemblTranscript;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.AlleleState;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import org.mskcc.oncokb.curation.domain.GenomicIndicator.GenomicIndicator;

@Entity
@Table(name = "allele_state")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Alteration;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.persistence.*;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.Consequence.Consequence;
import org.mskcc.oncokb.curation.domain.Flag.Flag;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.mskcc.oncokb.curation.domain.Transcript.Transcript;
import org.mskcc.oncokb.curation.domain.enumeration.AlterationType;
import org.mskcc.oncokb.curation.util.AminoAcidConverterUtils;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.AlterationAnnotationStatus;

import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.EntityStatus.EntityStatus;
import org.mskcc.oncokb.curation.domain.dto.AnnotationDTO;

public class AlterationAnnotationStatus extends EntityStatus<Alteration> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Article;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -9,6 +9,10 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.Flag.Flag;
import org.mskcc.oncokb.curation.domain.Synonym.Synonym;
import org.mskcc.oncokb.curation.domain.enumeration.ArticleType;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Association;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.Article.Article;
import org.mskcc.oncokb.curation.domain.CancerType.CancerType;
import org.mskcc.oncokb.curation.domain.ClinicalTrial.ClinicalTrial;
import org.mskcc.oncokb.curation.domain.ClinicalTrialArm.ClinicalTrialArm;
import org.mskcc.oncokb.curation.domain.Drug.Drug;
import org.mskcc.oncokb.curation.domain.EligibilityCriteria.EligibilityCriteria;
import org.mskcc.oncokb.curation.domain.Evidence.Evidence;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.GenomicIndicator.GenomicIndicator;
import org.mskcc.oncokb.curation.domain.Rule.Rule;

/**
* An Association.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Authority;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.CancerType;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,8 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.Synonym.Synonym;
import org.mskcc.oncokb.curation.domain.enumeration.TumorForm;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.CategoricalAlteration;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import org.mskcc.oncokb.curation.domain.Consequence.Consequence;
import org.mskcc.oncokb.curation.domain.enumeration.AlterationType;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.ClinicalTrial;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,9 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.ClinicalTrialArm.ClinicalTrialArm;
import org.mskcc.oncokb.curation.domain.EligibilityCriteria.EligibilityCriteria;

/**
* A ClinicalTrial.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.ClinicalTrialArm;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,8 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.ClinicalTrial.ClinicalTrial;

/**
* A ClinicalTrialArm.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,8 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.SpecimenType.SpecimenType;

/**
* A CompanionDiagnosticDevice.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Consequence;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,8 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.CategoricalAlteration.CategoricalAlteration;

/**
* A Consequence.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Drug;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,10 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.FdaDrug.FdaDrug;
import org.mskcc.oncokb.curation.domain.Flag.Flag;
import org.mskcc.oncokb.curation.domain.NciThesaurus.NciThesaurus;

/**
* A Drug.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.EligibilityCriteria;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,8 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.ClinicalTrial.ClinicalTrial;
import org.mskcc.oncokb.curation.domain.enumeration.EligibilityCriteriaType;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.EnsemblGene;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,9 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.mskcc.oncokb.curation.domain.SeqRegion.SeqRegion;
import org.mskcc.oncokb.curation.domain.Transcript.Transcript;
import org.mskcc.oncokb.curation.domain.enumeration.ReferenceGenome;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.EntityStatus;

import org.mskcc.oncokb.curation.domain.enumeration.EntityStatusType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Evidence;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,9 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.mskcc.oncokb.curation.domain.LevelOfEvidence.LevelOfEvidence;

/**
* A Evidence.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.FdaDrug;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,8 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Drug.Drug;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;

/**
* A FdaDrug.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.FdaSubmission;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -9,6 +9,11 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Article.Article;
import org.mskcc.oncokb.curation.domain.Association.Association;
import org.mskcc.oncokb.curation.domain.CompanionDiagnosticDevice.CompanionDiagnosticDevice;
import org.mskcc.oncokb.curation.domain.FdaDrug.FdaDrug;
import org.mskcc.oncokb.curation.domain.FdaSubmissionType.FdaSubmissionType;

/**
* A FdaSubmission.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.FdaSubmissionType;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -7,6 +7,7 @@
import java.util.HashSet;
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.mskcc.oncokb.curation.domain.FdaSubmission.FdaSubmission;
import org.mskcc.oncokb.curation.domain.enumeration.FdaSubmissionTypeKey;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Flag;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,11 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.Article.Article;
import org.mskcc.oncokb.curation.domain.Drug.Drug;
import org.mskcc.oncokb.curation.domain.Gene.Gene;
import org.mskcc.oncokb.curation.domain.Transcript.Transcript;

/**
* A Flag.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.mskcc.oncokb.curation.domain;
package org.mskcc.oncokb.curation.domain.Gene;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
Expand All @@ -8,6 +8,12 @@
import java.util.Set;
import org.javers.core.metamodel.annotation.DiffIgnore;
import org.javers.core.metamodel.annotation.ShallowReference;
import org.mskcc.oncokb.curation.domain.Alteration.Alteration;
import org.mskcc.oncokb.curation.domain.EnsemblGene.EnsemblGene;
import org.mskcc.oncokb.curation.domain.Evidence.Evidence;
import org.mskcc.oncokb.curation.domain.Flag.Flag;
import org.mskcc.oncokb.curation.domain.Synonym.Synonym;
import org.mskcc.oncokb.curation.domain.Transcript.Transcript;

/**
* A Gene.
Expand Down
Loading

0 comments on commit 831c624

Please sign in to comment.