From ea4456a9ae0f0e6627f5f9c48b8b4456f3e5af85 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 16 Jun 2025 22:05:25 +0200 Subject: [PATCH] Use Project Lombok --- build.gradle | 6 + .../java/dev/pcvolkmer/mv64e/mtb/Address.java | 14 +- .../java/dev/pcvolkmer/mv64e/mtb/Age.java | 21 ++- .../mtb/AtcUnregisteredMedicationCoding.java | 35 ++--- .../mtb/BaseVariantLocalizationCoding.java | 35 ++--- .../BaseVariantLocalizationCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/Brcaness.java | 42 +++--- ...PlanNoSequencingPerformedReasonCoding.java | 35 ++--- .../dev/pcvolkmer/mv64e/mtb/Chromosome.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Claim.java | 53 +++---- .../pcvolkmer/mv64e/mtb/ClaimResponse.java | 53 +++---- .../mv64e/mtb/ClaimResponseStatusCoding.java | 35 ++--- .../mtb/ClaimResponseStatusCodingCode.java | 4 +- .../mtb/ClaimResponseStatusReasonCoding.java | 35 ++--- .../ClaimResponseStatusReasonCodingCode.java | 4 +- .../pcvolkmer/mv64e/mtb/ClaimStageCoding.java | 35 ++--- .../mv64e/mtb/ClaimStageCodingCode.java | 4 +- .../pcvolkmer/mv64e/mtb/ClinVarCoding.java | 35 ++--- .../mv64e/mtb/ClinVarCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Cnv.java | 113 +++++---------- .../dev/pcvolkmer/mv64e/mtb/CnvCoding.java | 35 ++--- .../pcvolkmer/mv64e/mtb/CnvCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Coding.java | 35 ++--- .../dev/pcvolkmer/mv64e/mtb/Collection.java | 29 ++-- .../dev/pcvolkmer/mv64e/mtb/Components.java | 28 ++-- .../pcvolkmer/mv64e/mtb/ConfidenceRange.java | 21 ++- .../pcvolkmer/mv64e/mtb/ConsentProvision.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/DnaFusion.java | 57 +++----- .../mtb/DnaFusionFusionPartner3Prime.java | 28 ++-- .../mtb/DnaFusionFusionPartner5Prime.java | 28 ++-- .../dev/pcvolkmer/mv64e/mtb/EcogCoding.java | 35 ++--- .../pcvolkmer/mv64e/mtb/EcogCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/EndRange.java | 21 ++- .../pcvolkmer/mv64e/mtb/ExternalIdSystem.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/FollowUp.java | 39 +++-- .../mtb/FollowUpPatientStatusCoding.java | 35 ++--- .../mtb/FollowUpPatientStatusCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/GenderCoding.java | 35 ++--- .../pcvolkmer/mv64e/mtb/GenderCodingCode.java | 4 +- .../mv64e/mtb/GeneAlterationReference.java | 28 ++-- .../mtb/GeneticCounselingRecommendation.java | 39 +++-- ...cCounselingRecommendationReasonCoding.java | 35 ++--- ...nselingRecommendationReasonCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Grading.java | 15 +- .../pcvolkmer/mv64e/mtb/HealthInsurance.java | 21 ++- .../mv64e/mtb/HealthInsuranceCoding.java | 35 ++--- .../mv64e/mtb/HealthInsuranceCodingCode.java | 4 +- .../mtb/HistologyReevaluationRequest.java | 39 +++-- .../pcvolkmer/mv64e/mtb/HistologyReport.java | 46 +++--- .../mv64e/mtb/HistologyReportResults.java | 21 ++- .../java/dev/pcvolkmer/mv64e/mtb/History.java | 25 ++-- .../dev/pcvolkmer/mv64e/mtb/HrdScore.java | 49 +++---- .../mtb/HrdScoreInterpretationCoding.java | 35 ++--- .../dev/pcvolkmer/mv64e/mtb/IhcReport.java | 60 +++----- .../pcvolkmer/mv64e/mtb/IhcReportResults.java | 22 +-- .../mv64e/mtb/InterpretationCodingCode.java | 4 +- .../pcvolkmer/mv64e/mtb/LevelOfEvidence.java | 29 ++-- .../mtb/LevelOfEvidenceAddendumCoding.java | 35 ++--- .../LevelOfEvidenceAddendumCodingCode.java | 4 +- .../mtb/LevelOfEvidenceGradingCoding.java | 35 ++--- .../mtb/LevelOfEvidenceGradingCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java | 56 +++----- .../mv64e/mtb/ModelProjectConsent.java | 29 ++-- .../mv64e/mtb/ModelProjectConsentPurpose.java | 4 +- .../mtb/MolecularDiagnosticReportCoding.java | 35 ++--- .../MolecularDiagnosticReportCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Mtb.java | 134 ++++++------------ .../dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java | 102 +++++-------- ...lanRecommendationsMissingReasonCoding.java | 35 ++--- ...ecommendationsMissingReasonCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java | 95 +++++-------- .../mv64e/mtb/MtbDiagnosisCoding.java | 35 ++--- ...agnosisGuidelineTreatmentStatusCoding.java | 35 ++--- ...sisGuidelineTreatmentStatusCodingCode.java | 4 +- .../pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java | 36 ++--- .../mtb/MtbMedicationRecommendation.java | 81 ++++------- ...edicationRecommendationCategoryCoding.java | 35 ++--- ...ationRecommendationCategoryCodingCode.java | 4 +- ...MedicationRecommendationUseTypeCoding.java | 35 ++--- ...cationRecommendationUseTypeCodingCode.java | 4 +- ...ProcedureRecommendationCategoryCoding.java | 35 ++--- ...edureRecommendationCategoryCodingCode.java | 4 +- .../mtb/MtbStudyEnrollmentRecommendation.java | 74 ++++------ .../mv64e/mtb/MtbSystemicTherapy.java | 116 +++++---------- .../mtb/MtbSystemicTherapyCategoryCoding.java | 35 ++--- .../MtbSystemicTherapyCategoryCodingCode.java | 4 +- ...MtbSystemicTherapyDosageDensityCoding.java | 35 ++--- ...ystemicTherapyDosageDensityCodingCode.java | 4 +- ...RecommendationFulfillmentStatusCoding.java | 35 ++--- ...mmendationFulfillmentStatusCodingCode.java | 4 +- .../mv64e/mtb/MtbTherapyIntentCoding.java | 35 ++--- .../mv64e/mtb/MtbTherapyIntentCodingCode.java | 4 +- .../mtb/MtbTherapyStatusReasonCoding.java | 35 ++--- .../mtb/MtbTherapyStatusReasonCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/MvhMetadata.java | 36 ++--- .../mv64e/mtb/MvhSubmissionType.java | 4 +- .../pcvolkmer/mv64e/mtb/NgsReportCoding.java | 35 ++--- .../mv64e/mtb/NgsReportCodingCode.java | 4 +- .../mv64e/mtb/NgsReportMetadata.java | 42 +++--- .../pcvolkmer/mv64e/mtb/NgsReportResults.java | 71 ++++------ .../mtb/NoSequencingPerformedReasonCode.java | 4 +- .../pcvolkmer/mv64e/mtb/OncoProcedure.java | 95 +++++-------- .../mv64e/mtb/OncoProcedureCoding.java | 35 ++--- .../mv64e/mtb/OncoProcedureCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Patient.java | 74 ++++------ .../mv64e/mtb/PerformanceStatus.java | 39 +++-- .../dev/pcvolkmer/mv64e/mtb/PeriodDate.java | 25 ++-- .../dev/pcvolkmer/mv64e/mtb/Position.java | 21 ++- .../mv64e/mtb/PriorDiagnosticReport.java | 60 +++----- .../mv64e/mtb/ProcedureRecommendation.java | 67 ++++----- .../mv64e/mtb/ProteinExpression.java | 56 +++----- .../mtb/ProteinExpressionIcScoreCoding.java | 35 ++--- .../ProteinExpressionIcScoreCodingCode.java | 4 +- .../mtb/ProteinExpressionResultCoding.java | 35 ++--- .../ProteinExpressionResultCodingCode.java | 4 +- .../mtb/ProteinExpressionTcScoreCoding.java | 35 ++--- .../ProteinExpressionTcScoreCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/Provision.java | 32 ++--- .../mv64e/mtb/PublicationReference.java | 35 ++--- .../mv64e/mtb/PublicationSystem.java | 4 +- .../pcvolkmer/mv64e/mtb/RebiopsyRequest.java | 39 +++-- .../dev/pcvolkmer/mv64e/mtb/RecistCoding.java | 35 ++--- .../pcvolkmer/mv64e/mtb/RecistCodingCode.java | 4 +- .../mtb/RecommendationPriorityCoding.java | 35 ++--- .../mtb/RecommendationPriorityCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/Reference.java | 35 ++--- .../mv64e/mtb/RequestedMedicationSystem.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/Response.java | 53 +++---- .../mv64e/mtb/ResponseMethodCoding.java | 35 ++--- .../mv64e/mtb/ResponseMethodCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/RnaFusion.java | 64 +++------ .../mtb/RnaFusionFusionPartner3Prime.java | 42 +++--- .../mtb/RnaFusionFusionPartner5Prime.java | 42 +++--- .../pcvolkmer/mv64e/mtb/RnaFusionStrand.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/RnaSeq.java | 92 ++++-------- .../java/dev/pcvolkmer/mv64e/mtb/Snv.java | 120 +++++----------- .../pcvolkmer/mv64e/mtb/SomaticNgsReport.java | 60 +++----- .../java/dev/pcvolkmer/mv64e/mtb/Staging.java | 15 +- .../dev/pcvolkmer/mv64e/mtb/StartRange.java | 21 ++- .../pcvolkmer/mv64e/mtb/StudyReference.java | 35 ++--- .../dev/pcvolkmer/mv64e/mtb/StudySystem.java | 4 +- .../pcvolkmer/mv64e/mtb/SystemicTherapy.java | 15 +- .../mv64e/mtb/TherapyStatusCoding.java | 35 ++--- .../mv64e/mtb/TherapyStatusCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Tmb.java | 42 +++--- .../mv64e/mtb/TmbInterpretationCoding.java | 35 ++--- .../dev/pcvolkmer/mv64e/mtb/TmbResult.java | 21 ++- .../mv64e/mtb/TnmClassification.java | 28 ++-- .../dev/pcvolkmer/mv64e/mtb/TranscriptId.java | 21 ++- .../mv64e/mtb/TranscriptIdSystem.java | 4 +- .../pcvolkmer/mv64e/mtb/TumorCellContent.java | 42 +++--- .../mtb/TumorCellContentMethodCoding.java | 35 ++--- .../mtb/TumorCellContentMethodCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/TumorGrading.java | 25 ++-- .../pcvolkmer/mv64e/mtb/TumorMorphology.java | 42 +++--- .../pcvolkmer/mv64e/mtb/TumorSpecimen.java | 42 +++--- .../mv64e/mtb/TumorSpecimenCoding.java | 35 ++--- .../mv64e/mtb/TumorSpecimenCodingCode.java | 4 +- ...rSpecimenCollectionLocalizationCoding.java | 35 ++--- ...cimenCollectionLocalizationCodingCode.java | 4 +- .../TumorSpecimenCollectionMethodCoding.java | 35 ++--- ...morSpecimenCollectionMethodCodingCode.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/TumorStaging.java | 39 +++-- .../mv64e/mtb/TumorStagingMethodCoding.java | 35 ++--- .../mtb/TumorStagingMethodCodingCode.java | 4 +- .../java/dev/pcvolkmer/mv64e/mtb/Type.java | 15 +- .../java/dev/pcvolkmer/mv64e/mtb/Unit.java | 4 +- .../dev/pcvolkmer/mv64e/mtb/ValueCode.java | 4 +- .../mv64e/mtb/VariantExternalId.java | 21 ++- .../mv64e/mtb/VitalStatusCoding.java | 35 ++--- .../mv64e/mtb/VitalStatusCodingCode.java | 4 +- 171 files changed, 2056 insertions(+), 3025 deletions(-) diff --git a/build.gradle b/build.gradle index 4785192..0c8436d 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,12 @@ repositories { dependencies { api 'com.fasterxml.jackson.core:jackson-databind:2.12.7.2' + compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor("org.projectlombok:lombok:1.18.38") + + testCompileOnly("org.projectlombok:lombok:1.18.38") + testAnnotationProcessor("org.projectlombok:lombok:1.18.38") + testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Address.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Address.java index ccf286d..df9b747 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Address.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Address.java @@ -1,12 +1,14 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Address { + @Getter(onMethod_ = {@JsonProperty("municipalityCode")}) + @Setter(onMethod_ = {@JsonProperty("municipalityCode")}) private String municipalityCode; - - @JsonProperty("municipalityCode") - public String getMunicipalityCode() { return municipalityCode; } - @JsonProperty("municipalityCode") - public void setMunicipalityCode(String value) { this.municipalityCode = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Age.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Age.java index 10b8d5e..90810cf 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Age.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Age.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Age { + @Getter(onMethod_ = {@JsonProperty("unit")}) + @Setter(onMethod_ = {@JsonProperty("unit")}) private Unit unit; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private double value; - - @JsonProperty("unit") - public Unit getUnit() { return unit; } - @JsonProperty("unit") - public void setUnit(Unit value) { this.unit = value; } - - @JsonProperty("value") - public double getValue() { return value; } - @JsonProperty("value") - public void setValue(double value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/AtcUnregisteredMedicationCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/AtcUnregisteredMedicationCoding.java index 56441ce..e403cb0 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/AtcUnregisteredMedicationCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/AtcUnregisteredMedicationCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class AtcUnregisteredMedicationCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private String code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private RequestedMedicationSystem system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public String getCode() { return code; } - @JsonProperty("code") - public void setCode(String value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public RequestedMedicationSystem getSystem() { return system; } - @JsonProperty("system") - public void setSystem(RequestedMedicationSystem value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCoding.java index d21eb00..cd15510 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class BaseVariantLocalizationCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private BaseVariantLocalizationCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public BaseVariantLocalizationCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(BaseVariantLocalizationCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCodingCode.java index 4634632..4e2670d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum BaseVariantLocalizationCodingCode { CODING_REGION, INTERGENIC, INTRONIC, REGULATORY_REGION, SPLICING_REGION; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Brcaness.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Brcaness.java index c0f731b..1e62863 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Brcaness.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Brcaness.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Brcaness { + @Getter(onMethod_ = {@JsonProperty("confidenceRange")}) + @Setter(onMethod_ = {@JsonProperty("confidenceRange")}) private ConfidenceRange confidenceRange; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private double value; - - @JsonProperty("confidenceRange") - public ConfidenceRange getConfidenceRange() { return confidenceRange; } - @JsonProperty("confidenceRange") - public void setConfidenceRange(ConfidenceRange value) { this.confidenceRange = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("value") - public double getValue() { return value; } - @JsonProperty("value") - public void setValue(double value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/CarePlanNoSequencingPerformedReasonCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/CarePlanNoSequencingPerformedReasonCoding.java index 22949b3..f5e83aa 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/CarePlanNoSequencingPerformedReasonCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/CarePlanNoSequencingPerformedReasonCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class CarePlanNoSequencingPerformedReasonCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private NoSequencingPerformedReasonCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public NoSequencingPerformedReasonCode getCode() { return code; } - @JsonProperty("code") - public void setCode(NoSequencingPerformedReasonCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Chromosome.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Chromosome.java index 92b2c18..f67110b 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Chromosome.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Chromosome.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum Chromosome { CHR1, CHR10, CHR11, CHR12, CHR13, CHR14, CHR15, CHR16, CHR17, CHR18, CHR19, CHR2, CHR20, CHR21, CHR22, CHR3, CHR4, CHR5, CHR6, CHR7, CHR8, CHR9, CHR_X, CHR_Y; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java index 7de8f51..85b107a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java @@ -1,46 +1,33 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Claim { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("recommendation")}) + @Setter(onMethod_ = {@JsonProperty("recommendation")}) private Reference recommendation; + @Getter(onMethod_ = {@JsonProperty("requestedMedication")}) + @Setter(onMethod_ = {@JsonProperty("requestedMedication")}) private List requestedMedication; + @Getter(onMethod_ = {@JsonProperty("stage")}) + @Setter(onMethod_ = {@JsonProperty("stage")}) private ClaimStageCoding stage; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("recommendation") - public Reference getRecommendation() { return recommendation; } - @JsonProperty("recommendation") - public void setRecommendation(Reference value) { this.recommendation = value; } - - @JsonProperty("requestedMedication") - public List getRequestedMedication() { return requestedMedication; } - @JsonProperty("requestedMedication") - public void setRequestedMedication(List value) { this.requestedMedication = value; } - - @JsonProperty("stage") - public ClaimStageCoding getStage() { return stage; } - @JsonProperty("stage") - public void setStage(ClaimStageCoding value) { this.stage = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java index 9304d51..781f7d0 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java @@ -1,45 +1,32 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ClaimResponse { + @Getter(onMethod_ = {@JsonProperty("claim")}) + @Setter(onMethod_ = {@JsonProperty("claim")}) private Reference claim; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("status")}) + @Setter(onMethod_ = {@JsonProperty("status")}) private ClaimResponseStatusCoding status; + @Getter(onMethod_ = {@JsonProperty("statusReason")}) + @Setter(onMethod_ = {@JsonProperty("statusReason")}) private ClaimResponseStatusReasonCoding statusReason; - - @JsonProperty("claim") - public Reference getClaim() { return claim; } - @JsonProperty("claim") - public void setClaim(Reference value) { this.claim = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("status") - public ClaimResponseStatusCoding getStatus() { return status; } - @JsonProperty("status") - public void setStatus(ClaimResponseStatusCoding value) { this.status = value; } - - @JsonProperty("statusReason") - public ClaimResponseStatusReasonCoding getStatusReason() { return statusReason; } - @JsonProperty("statusReason") - public void setStatusReason(ClaimResponseStatusReasonCoding value) { this.statusReason = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCoding.java index 37e3f44..72bb26d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ClaimResponseStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ClaimResponseStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ClaimResponseStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ClaimResponseStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCodingCode.java index 79be481..400f913 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ClaimResponseStatusCodingCode { ACCEPTED, REJECTED, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCoding.java index 1d09a1b..bbbf09c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ClaimResponseStatusReasonCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ClaimResponseStatusReasonCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ClaimResponseStatusReasonCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ClaimResponseStatusReasonCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCodingCode.java index 581e8a8..a709d5f 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ClaimResponseStatusReasonCodingCode { APPROVAL_REVOCATION, FORMAL_REASONS, INCLUSION_IN_STUDY, INSUFFICIENT_EVIDENCE, OTHER, OTHER_THERAPY_RECOMMENDED, STANDARD_THERAPY_NOT_EXHAUSTED, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCoding.java index 8c8d7fb..a577dd9 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ClaimStageCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ClaimStageCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ClaimStageCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ClaimStageCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCodingCode.java index d879dd6..8780beb 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ClaimStageCodingCode { FOLLOW_UP_CLAIM, INITIAL_CLAIM, REVOCATION, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCoding.java index 0a36498..a2daa4d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ClinVarCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ClinVarCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ClinVarCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ClinVarCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCodingCode.java index 34f203c..8c94f08 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ClinVarCodingCode { CODE_1, CODE_2, CODE_3, CODE_4, CODE_5; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java index b36a812..a09a1ea 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java @@ -1,97 +1,58 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Cnv { + @Getter(onMethod_ = {@JsonProperty("chromosome")}) + @Setter(onMethod_ = {@JsonProperty("chromosome")}) private Chromosome chromosome; + @Getter(onMethod_ = {@JsonProperty("cnA")}) + @Setter(onMethod_ = {@JsonProperty("cnA")}) private Double cnA; + @Getter(onMethod_ = {@JsonProperty("cnB")}) + @Setter(onMethod_ = {@JsonProperty("cnB")}) private Double cnB; + @Getter(onMethod_ = {@JsonProperty("copyNumberNeutralLoH")}) + @Setter(onMethod_ = {@JsonProperty("copyNumberNeutralLoH")}) private List copyNumberNeutralLoH; + @Getter(onMethod_ = {@JsonProperty("endRange")}) + @Setter(onMethod_ = {@JsonProperty("endRange")}) private EndRange endRange; + @Getter(onMethod_ = {@JsonProperty("externalIds")}) + @Setter(onMethod_ = {@JsonProperty("externalIds")}) private List externalIds; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private List localization; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("relativeCopyNumber")}) + @Setter(onMethod_ = {@JsonProperty("relativeCopyNumber")}) private Double relativeCopyNumber; + @Getter(onMethod_ = {@JsonProperty("reportedAffectedGenes")}) + @Setter(onMethod_ = {@JsonProperty("reportedAffectedGenes")}) private List reportedAffectedGenes; + @Getter(onMethod_ = {@JsonProperty("reportedFocality")}) + @Setter(onMethod_ = {@JsonProperty("reportedFocality")}) private String reportedFocality; + @Getter(onMethod_ = {@JsonProperty("startRange")}) + @Setter(onMethod_ = {@JsonProperty("startRange")}) private StartRange startRange; + @Getter(onMethod_ = {@JsonProperty("totalCopyNumber")}) + @Setter(onMethod_ = {@JsonProperty("totalCopyNumber")}) private Long totalCopyNumber; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private CnvCoding type; - - @JsonProperty("chromosome") - public Chromosome getChromosome() { return chromosome; } - @JsonProperty("chromosome") - public void setChromosome(Chromosome value) { this.chromosome = value; } - - @JsonProperty("cnA") - public Double getCnA() { return cnA; } - @JsonProperty("cnA") - public void setCnA(Double value) { this.cnA = value; } - - @JsonProperty("cnB") - public Double getCnB() { return cnB; } - @JsonProperty("cnB") - public void setCnB(Double value) { this.cnB = value; } - - @JsonProperty("copyNumberNeutralLoH") - public List getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; } - @JsonProperty("copyNumberNeutralLoH") - public void setCopyNumberNeutralLoH(List value) { this.copyNumberNeutralLoH = value; } - - @JsonProperty("endRange") - public EndRange getEndRange() { return endRange; } - @JsonProperty("endRange") - public void setEndRange(EndRange value) { this.endRange = value; } - - @JsonProperty("externalIds") - public List getExternalIds() { return externalIds; } - @JsonProperty("externalIds") - public void setExternalIds(List value) { this.externalIds = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("localization") - public List getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(List value) { this.localization = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("relativeCopyNumber") - public Double getRelativeCopyNumber() { return relativeCopyNumber; } - @JsonProperty("relativeCopyNumber") - public void setRelativeCopyNumber(Double value) { this.relativeCopyNumber = value; } - - @JsonProperty("reportedAffectedGenes") - public List getReportedAffectedGenes() { return reportedAffectedGenes; } - @JsonProperty("reportedAffectedGenes") - public void setReportedAffectedGenes(List value) { this.reportedAffectedGenes = value; } - - @JsonProperty("reportedFocality") - public String getReportedFocality() { return reportedFocality; } - @JsonProperty("reportedFocality") - public void setReportedFocality(String value) { this.reportedFocality = value; } - - @JsonProperty("startRange") - public StartRange getStartRange() { return startRange; } - @JsonProperty("startRange") - public void setStartRange(StartRange value) { this.startRange = value; } - - @JsonProperty("totalCopyNumber") - public Long getTotalCopyNumber() { return totalCopyNumber; } - @JsonProperty("totalCopyNumber") - public void setTotalCopyNumber(Long value) { this.totalCopyNumber = value; } - - @JsonProperty("type") - public CnvCoding getType() { return type; } - @JsonProperty("type") - public void setType(CnvCoding value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCoding.java index 9081da5..f3e5509 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class CnvCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private CnvCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public CnvCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(CnvCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCodingCode.java index 858c544..7b8f182 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum CnvCodingCode { HIGH_LEVEL_GAIN, LOSS, LOW_LEVEL_GAIN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Coding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Coding.java index 78d2b20..bf50f34 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Coding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Coding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Coding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private String code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public String getCode() { return code; } - @JsonProperty("code") - public void setCode(String value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java index 5518efa..0a0f82e 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java @@ -1,25 +1,22 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Collection { + @Getter(onMethod_ = {@JsonProperty("date")}) + @Setter(onMethod_ = {@JsonProperty("date")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private TumorSpecimenCollectionLocalizationCoding localization; + @Getter(onMethod_ = {@JsonProperty("method")}) + @Setter(onMethod_ = {@JsonProperty("method")}) private TumorSpecimenCollectionMethodCoding method; - - @JsonProperty("date") - public Date getDate() { return date; } - @JsonProperty("date") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("localization") - public TumorSpecimenCollectionLocalizationCoding getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(TumorSpecimenCollectionLocalizationCoding value) { this.localization = value; } - - @JsonProperty("method") - public TumorSpecimenCollectionMethodCoding getMethod() { return method; } - @JsonProperty("method") - public void setMethod(TumorSpecimenCollectionMethodCoding value) { this.method = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Components.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Components.java index aa4f340..534f352 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Components.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Components.java @@ -1,24 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Components { + @Getter(onMethod_ = {@JsonProperty("loh")}) + @Setter(onMethod_ = {@JsonProperty("loh")}) private double loh; + @Getter(onMethod_ = {@JsonProperty("lst")}) + @Setter(onMethod_ = {@JsonProperty("lst")}) private double lst; + @Getter(onMethod_ = {@JsonProperty("tai")}) + @Setter(onMethod_ = {@JsonProperty("tai")}) private double tai; - - @JsonProperty("loh") - public double getLoh() { return loh; } - @JsonProperty("loh") - public void setLoh(double value) { this.loh = value; } - - @JsonProperty("lst") - public double getLst() { return lst; } - @JsonProperty("lst") - public void setLst(double value) { this.lst = value; } - - @JsonProperty("tai") - public double getTai() { return tai; } - @JsonProperty("tai") - public void setTai(double value) { this.tai = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ConfidenceRange.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ConfidenceRange.java index ce71b18..ed03933 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ConfidenceRange.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ConfidenceRange.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ConfidenceRange { + @Getter(onMethod_ = {@JsonProperty("max")}) + @Setter(onMethod_ = {@JsonProperty("max")}) private double max; + @Getter(onMethod_ = {@JsonProperty("min")}) + @Setter(onMethod_ = {@JsonProperty("min")}) private double min; - - @JsonProperty("max") - public double getMax() { return max; } - @JsonProperty("max") - public void setMax(double value) { this.max = value; } - - @JsonProperty("min") - public double getMin() { return min; } - @JsonProperty("min") - public void setMin(double value) { this.min = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ConsentProvision.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ConsentProvision.java index 5698f9d..7b07fdb 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ConsentProvision.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ConsentProvision.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ConsentProvision { DENY, PERMIT; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusion.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusion.java index 48b32cc..74f1cf3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusion.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusion.java @@ -1,49 +1,34 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class DnaFusion { + @Getter(onMethod_ = {@JsonProperty("externalIds")}) + @Setter(onMethod_ = {@JsonProperty("externalIds")}) private List externalIds; + @Getter(onMethod_ = {@JsonProperty("fusionPartner3prime")}) + @Setter(onMethod_ = {@JsonProperty("fusionPartner3prime")}) private DnaFusionFusionPartner3Prime fusionPartner3Prime; + @Getter(onMethod_ = {@JsonProperty("fusionPartner5prime")}) + @Setter(onMethod_ = {@JsonProperty("fusionPartner5prime")}) private DnaFusionFusionPartner5Prime fusionPartner5Prime; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private List localization; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("reportedNumReads")}) + @Setter(onMethod_ = {@JsonProperty("reportedNumReads")}) private long reportedNumReads; - - @JsonProperty("externalIds") - public List getExternalIds() { return externalIds; } - @JsonProperty("externalIds") - public void setExternalIds(List value) { this.externalIds = value; } - - @JsonProperty("fusionPartner3prime") - public DnaFusionFusionPartner3Prime getFusionPartner3Prime() { return fusionPartner3Prime; } - @JsonProperty("fusionPartner3prime") - public void setFusionPartner3Prime(DnaFusionFusionPartner3Prime value) { this.fusionPartner3Prime = value; } - - @JsonProperty("fusionPartner5prime") - public DnaFusionFusionPartner5Prime getFusionPartner5Prime() { return fusionPartner5Prime; } - @JsonProperty("fusionPartner5prime") - public void setFusionPartner5Prime(DnaFusionFusionPartner5Prime value) { this.fusionPartner5Prime = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("localization") - public List getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(List value) { this.localization = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("reportedNumReads") - public long getReportedNumReads() { return reportedNumReads; } - @JsonProperty("reportedNumReads") - public void setReportedNumReads(long value) { this.reportedNumReads = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner3Prime.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner3Prime.java index ee7170c..5c49ad2 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner3Prime.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner3Prime.java @@ -1,24 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class DnaFusionFusionPartner3Prime { + @Getter(onMethod_ = {@JsonProperty("chromosome")}) + @Setter(onMethod_ = {@JsonProperty("chromosome")}) private Chromosome chromosome; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("position")}) + @Setter(onMethod_ = {@JsonProperty("position")}) private double position; - - @JsonProperty("chromosome") - public Chromosome getChromosome() { return chromosome; } - @JsonProperty("chromosome") - public void setChromosome(Chromosome value) { this.chromosome = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("position") - public double getPosition() { return position; } - @JsonProperty("position") - public void setPosition(double value) { this.position = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner5Prime.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner5Prime.java index 83b9414..d37b5fe 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner5Prime.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusionFusionPartner5Prime.java @@ -1,24 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class DnaFusionFusionPartner5Prime { + @Getter(onMethod_ = {@JsonProperty("chromosome")}) + @Setter(onMethod_ = {@JsonProperty("chromosome")}) private Chromosome chromosome; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("position")}) + @Setter(onMethod_ = {@JsonProperty("position")}) private double position; - - @JsonProperty("chromosome") - public Chromosome getChromosome() { return chromosome; } - @JsonProperty("chromosome") - public void setChromosome(Chromosome value) { this.chromosome = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("position") - public double getPosition() { return position; } - @JsonProperty("position") - public void setPosition(double value) { this.position = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCoding.java index 668ead2..5a51dab 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class EcogCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private EcogCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public EcogCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(EcogCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCodingCode.java index 2101049..aa2975a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum EcogCodingCode { CODE_0, CODE_1, CODE_2, CODE_3, CODE_4, CODE_5; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/EndRange.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/EndRange.java index 4b0ace1..a89cde9 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/EndRange.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/EndRange.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class EndRange { + @Getter(onMethod_ = {@JsonProperty("end")}) + @Setter(onMethod_ = {@JsonProperty("end")}) private Double end; + @Getter(onMethod_ = {@JsonProperty("start")}) + @Setter(onMethod_ = {@JsonProperty("start")}) private double start; - - @JsonProperty("end") - public Double getEnd() { return end; } - @JsonProperty("end") - public void setEnd(Double value) { this.end = value; } - - @JsonProperty("start") - public double getStart() { return start; } - @JsonProperty("start") - public void setStart(double value) { this.start = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java index 967450c..900d30c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ExternalIdSystem { CANCER_SANGER_AC_UK_COSMIC, ENSEMBL_ORG, NCBI_NLM_NIH_GOV_ENTREZ, NCBI_NLM_NIH_GOV_SNP; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java index 6e9c011..714f673 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java @@ -1,33 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class FollowUp { + @Getter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("lastContactDate")}) + @Setter(onMethod_ = {@JsonProperty("lastContactDate")}) private Date lastContactDate; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("patientStatus")}) + @Setter(onMethod_ = {@JsonProperty("patientStatus")}) private FollowUpPatientStatusCoding patientStatus; - - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getDate() { return date; } - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("lastContactDate") - public Date getLastContactDate() { return lastContactDate; } - @JsonProperty("lastContactDate") - public void setLastContactDate(Date value) { this.lastContactDate = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("patientStatus") - public FollowUpPatientStatusCoding getPatientStatus() { return patientStatus; } - @JsonProperty("patientStatus") - public void setPatientStatus(FollowUpPatientStatusCoding value) { this.patientStatus = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCoding.java index bf63271..9f3ce77 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class FollowUpPatientStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private FollowUpPatientStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public FollowUpPatientStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(FollowUpPatientStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCodingCode.java index d4fd47a..457e652 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum FollowUpPatientStatusCodingCode { LOST_TO_FU; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCoding.java index 924e282..d10ea25 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class GenderCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private GenderCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public GenderCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(GenderCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCodingCode.java index dcc094e..ed93597 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum GenderCodingCode { FEMALE, MALE, OTHER, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneAlterationReference.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneAlterationReference.java index 99c60b4..c69727a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneAlterationReference.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneAlterationReference.java @@ -1,24 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class GeneAlterationReference { + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("variant")}) + @Setter(onMethod_ = {@JsonProperty("variant")}) private Reference variant; - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("variant") - public Reference getVariant() { return variant; } - @JsonProperty("variant") - public void setVariant(Reference value) { this.variant = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java index 57b3f65..475a703 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java @@ -1,33 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class GeneticCounselingRecommendation { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private GeneticCounselingRecommendationReasonCoding reason; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("reason") - public GeneticCounselingRecommendationReasonCoding getReason() { return reason; } - @JsonProperty("reason") - public void setReason(GeneticCounselingRecommendationReasonCoding value) { this.reason = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCoding.java index 47cdd8d..720052d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class GeneticCounselingRecommendationReasonCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private GeneticCounselingRecommendationReasonCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public GeneticCounselingRecommendationReasonCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(GeneticCounselingRecommendationReasonCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCodingCode.java index 290130b..80af9f7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum GeneticCounselingRecommendationReasonCodingCode { FAMILY_ANAMNESIS, OTHER, SECONDARY_TUMOR, SELF_ANAMNESIS, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Grading.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Grading.java index bad3bfb..d01ed78 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Grading.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Grading.java @@ -1,13 +1,16 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Grading { + @Getter(onMethod_ = {@JsonProperty("history")}) + @Setter(onMethod_ = {@JsonProperty("history")}) private List history; - - @JsonProperty("history") - public List getHistory() { return history; } - @JsonProperty("history") - public void setHistory(List value) { this.history = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java index 912a090..7cd6c3a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HealthInsurance { + @Getter(onMethod_ = {@JsonProperty("reference")}) + @Setter(onMethod_ = {@JsonProperty("reference")}) private Reference reference; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private HealthInsuranceCoding type; - - @JsonProperty("reference") - public Reference getReference() { return reference; } - @JsonProperty("reference") - public void setReference(Reference value) { this.reference = value; } - - @JsonProperty("type") - public HealthInsuranceCoding getType() { return type; } - @JsonProperty("type") - public void setType(HealthInsuranceCoding value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCoding.java index 0b8c011..6ab3caf 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HealthInsuranceCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private HealthInsuranceCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public HealthInsuranceCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(HealthInsuranceCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCodingCode.java index 0c93b4a..7c15ac3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum HealthInsuranceCodingCode { BEI, BG, GKV, GPV, PKV, PPV, SEL, SKT, SOZ, UNK; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReevaluationRequest.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReevaluationRequest.java index 5738fe1..bbec169 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReevaluationRequest.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReevaluationRequest.java @@ -1,33 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HistologyReevaluationRequest { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReport.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReport.java index ca47785..b918fb7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReport.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReport.java @@ -1,39 +1,29 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HistologyReport { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("results")}) + @Setter(onMethod_ = {@JsonProperty("results")}) private HistologyReportResults results; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("results") - public HistologyReportResults getResults() { return results; } - @JsonProperty("results") - public void setResults(HistologyReportResults value) { this.results = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReportResults.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReportResults.java index 0445f30..b2e6263 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReportResults.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HistologyReportResults.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HistologyReportResults { + @Getter(onMethod_ = {@JsonProperty("tumorCellContent")}) + @Setter(onMethod_ = {@JsonProperty("tumorCellContent")}) private TumorCellContent tumorCellContent; + @Getter(onMethod_ = {@JsonProperty("tumorMorphology")}) + @Setter(onMethod_ = {@JsonProperty("tumorMorphology")}) private TumorMorphology tumorMorphology; - - @JsonProperty("tumorCellContent") - public TumorCellContent getTumorCellContent() { return tumorCellContent; } - @JsonProperty("tumorCellContent") - public void setTumorCellContent(TumorCellContent value) { this.tumorCellContent = value; } - - @JsonProperty("tumorMorphology") - public TumorMorphology getTumorMorphology() { return tumorMorphology; } - @JsonProperty("tumorMorphology") - public void setTumorMorphology(TumorMorphology value) { this.tumorMorphology = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/History.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/History.java index 71ffc74..3b2b078 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/History.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/History.java @@ -1,21 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class History { + @Getter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private MtbDiagnosisCoding value; - - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getDate() { return date; } - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("value") - public MtbDiagnosisCoding getValue() { return value; } - @JsonProperty("value") - public void setValue(MtbDiagnosisCoding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScore.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScore.java index d552859..57c14fd 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScore.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScore.java @@ -1,42 +1,29 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HrdScore { + @Getter(onMethod_ = {@JsonProperty("components")}) + @Setter(onMethod_ = {@JsonProperty("components")}) private Components components; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("interpretation")}) + @Setter(onMethod_ = {@JsonProperty("interpretation")}) private HrdScoreInterpretationCoding interpretation; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private double value; - - @JsonProperty("components") - public Components getComponents() { return components; } - @JsonProperty("components") - public void setComponents(Components value) { this.components = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("interpretation") - public HrdScoreInterpretationCoding getInterpretation() { return interpretation; } - @JsonProperty("interpretation") - public void setInterpretation(HrdScoreInterpretationCoding value) { this.interpretation = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("value") - public double getValue() { return value; } - @JsonProperty("value") - public void setValue(double value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScoreInterpretationCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScoreInterpretationCoding.java index d69bf48..cc18d71 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScoreInterpretationCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScoreInterpretationCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class HrdScoreInterpretationCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private InterpretationCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public InterpretationCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(InterpretationCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReport.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReport.java index c24ebfa..2e1b440 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReport.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReport.java @@ -1,52 +1,36 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class IhcReport { + @Getter(onMethod_ = {@JsonProperty("blockIds")}) + @Setter(onMethod_ = {@JsonProperty("blockIds")}) private List blockIds; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("journalId")}) + @Setter(onMethod_ = {@JsonProperty("journalId")}) private String journalId; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("results")}) + @Setter(onMethod_ = {@JsonProperty("results")}) private IhcReportResults results; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; - - @JsonProperty("blockIds") - public List getBlockIds() { return blockIds; } - @JsonProperty("blockIds") - public void setBlockIds(List value) { this.blockIds = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("journalId") - public String getJournalId() { return journalId; } - @JsonProperty("journalId") - public void setJournalId(String value) { this.journalId = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("results") - public IhcReportResults getResults() { return results; } - @JsonProperty("results") - public void setResults(IhcReportResults value) { this.results = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReportResults.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReportResults.java index c074484..2743f7f 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReportResults.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReportResults.java @@ -1,19 +1,19 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class IhcReportResults { + @Getter(onMethod_ = {@JsonProperty("msiMmr")}) + @Setter(onMethod_ = {@JsonProperty("msiMmr")}) private List msiMmr; + @Getter(onMethod_ = {@JsonProperty("proteinExpression")}) + @Setter(onMethod_ = {@JsonProperty("proteinExpression")}) private List proteinExpression; - - @JsonProperty("msiMmr") - public List getMsiMmr() { return msiMmr; } - @JsonProperty("msiMmr") - public void setMsiMmr(List value) { this.msiMmr = value; } - - @JsonProperty("proteinExpression") - public List getProteinExpression() { return proteinExpression; } - @JsonProperty("proteinExpression") - public void setProteinExpression(List value) { this.proteinExpression = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/InterpretationCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/InterpretationCodingCode.java index 1704310..6ccf653 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/InterpretationCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/InterpretationCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum InterpretationCodingCode { HIGH, INTERMEDIATE, LOW; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidence.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidence.java index c1d2cff..b4a7694 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidence.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidence.java @@ -1,25 +1,22 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class LevelOfEvidence { + @Getter(onMethod_ = {@JsonProperty("addendums")}) + @Setter(onMethod_ = {@JsonProperty("addendums")}) private List addendums; + @Getter(onMethod_ = {@JsonProperty("grading")}) + @Setter(onMethod_ = {@JsonProperty("grading")}) private LevelOfEvidenceGradingCoding grading; + @Getter(onMethod_ = {@JsonProperty("publications")}) + @Setter(onMethod_ = {@JsonProperty("publications")}) private List publications; - - @JsonProperty("addendums") - public List getAddendums() { return addendums; } - @JsonProperty("addendums") - public void setAddendums(List value) { this.addendums = value; } - - @JsonProperty("grading") - public LevelOfEvidenceGradingCoding getGrading() { return grading; } - @JsonProperty("grading") - public void setGrading(LevelOfEvidenceGradingCoding value) { this.grading = value; } - - @JsonProperty("publications") - public List getPublications() { return publications; } - @JsonProperty("publications") - public void setPublications(List value) { this.publications = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCoding.java index 09f9821..628d025 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class LevelOfEvidenceAddendumCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private LevelOfEvidenceAddendumCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public LevelOfEvidenceAddendumCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(LevelOfEvidenceAddendumCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCodingCode.java index 3c74d8f..c0a0cb3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum LevelOfEvidenceAddendumCodingCode { IS, IV, R, Z; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCoding.java index f9f0433..af0d901 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class LevelOfEvidenceGradingCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private LevelOfEvidenceGradingCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public LevelOfEvidenceGradingCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(LevelOfEvidenceGradingCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCodingCode.java index d836518..cee0b21 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum LevelOfEvidenceGradingCodingCode { M1A, M1B, M1C, M2A, M2B, M2C, M3, M4, UNDEFINED; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java index c7c8b69..92a66e8 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java @@ -1,48 +1,32 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MSIMmr { + @Getter(onMethod_ = {@JsonProperty("icScore")}) + @Setter(onMethod_ = {@JsonProperty("icScore")}) private ProteinExpressionIcScoreCoding icScore; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("protein")}) + @Setter(onMethod_ = {@JsonProperty("protein")}) private Coding protein; + @Getter(onMethod_ = {@JsonProperty("tcScore")}) + @Setter(onMethod_ = {@JsonProperty("tcScore")}) private ProteinExpressionTcScoreCoding tcScore; + @Getter(onMethod_ = {@JsonProperty("tpsScore")}) + @Setter(onMethod_ = {@JsonProperty("tpsScore")}) private Long tpsScore; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private ProteinExpressionResultCoding value; - - @JsonProperty("icScore") - public ProteinExpressionIcScoreCoding getIcScore() { return icScore; } - @JsonProperty("icScore") - public void setIcScore(ProteinExpressionIcScoreCoding value) { this.icScore = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("protein") - public Coding getProtein() { return protein; } - @JsonProperty("protein") - public void setProtein(Coding value) { this.protein = value; } - - @JsonProperty("tcScore") - public ProteinExpressionTcScoreCoding getTcScore() { return tcScore; } - @JsonProperty("tcScore") - public void setTcScore(ProteinExpressionTcScoreCoding value) { this.tcScore = value; } - - @JsonProperty("tpsScore") - public Long getTpsScore() { return tpsScore; } - @JsonProperty("tpsScore") - public void setTpsScore(Long value) { this.tpsScore = value; } - - @JsonProperty("value") - public ProteinExpressionResultCoding getValue() { return value; } - @JsonProperty("value") - public void setValue(ProteinExpressionResultCoding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsent.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsent.java index db8a0f9..f6c841a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsent.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsent.java @@ -1,26 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ModelProjectConsent { + @Getter(onMethod_ = {@JsonProperty("date")}) + @Setter(onMethod_ = {@JsonProperty("date")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("provisions")}) + @Setter(onMethod_ = {@JsonProperty("provisions")}) private List provisions; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("date") - public Date getDate() { return date; } - @JsonProperty("date") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("provisions") - public List getProvisions() { return provisions; } - @JsonProperty("provisions") - public void setProvisions(List value) { this.provisions = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsentPurpose.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsentPurpose.java index 05626da..5348fea 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsentPurpose.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsentPurpose.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ModelProjectConsentPurpose { CASE_IDENTIFICATION, REIDENTIFICATION, SEQUENCING; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCoding.java index 429f2ed..40dd028 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MolecularDiagnosticReportCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MolecularDiagnosticReportCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MolecularDiagnosticReportCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MolecularDiagnosticReportCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCodingCode.java index 9f7380e..0d3c19f 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MolecularDiagnosticReportCodingCode { ARRAY, EXOME, FISH, FUSION_PANEL, GENE_PANEL, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, PCR, SINGLE; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Mtb.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Mtb.java index d2081d7..a29a7aa 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Mtb.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Mtb.java @@ -1,115 +1,67 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Mtb { + @Getter(onMethod_ = {@JsonProperty("carePlans")}) + @Setter(onMethod_ = {@JsonProperty("carePlans")}) private List carePlans; + @Getter(onMethod_ = {@JsonProperty("claimResponses")}) + @Setter(onMethod_ = {@JsonProperty("claimResponses")}) private List claimResponses; + @Getter(onMethod_ = {@JsonProperty("claims")}) + @Setter(onMethod_ = {@JsonProperty("claims")}) private List claims; + @Getter(onMethod_ = {@JsonProperty("diagnoses")}) + @Setter(onMethod_ = {@JsonProperty("diagnoses")}) private List diagnoses; + @Getter(onMethod_ = {@JsonProperty("episodesOfCare")}) + @Setter(onMethod_ = {@JsonProperty("episodesOfCare")}) private List episodesOfCare; + @Getter(onMethod_ = {@JsonProperty("followUps")}) + @Setter(onMethod_ = {@JsonProperty("followUps")}) private List followUps; + @Getter(onMethod_ = {@JsonProperty("guidelineProcedures")}) + @Setter(onMethod_ = {@JsonProperty("guidelineProcedures")}) private List guidelineProcedures; + @Getter(onMethod_ = {@JsonProperty("guidelineTherapies")}) + @Setter(onMethod_ = {@JsonProperty("guidelineTherapies")}) private List guidelineTherapies; + @Getter(onMethod_ = {@JsonProperty("histologyReports")}) + @Setter(onMethod_ = {@JsonProperty("histologyReports")}) private List histologyReports; + @Getter(onMethod_ = {@JsonProperty("ihcReports")}) + @Setter(onMethod_ = {@JsonProperty("ihcReports")}) private List ihcReports; + @Getter(onMethod_ = {@JsonProperty("metadata")}) + @Setter(onMethod_ = {@JsonProperty("metadata")}) private MvhMetadata metadata; + @Getter(onMethod_ = {@JsonProperty("ngsReports")}) + @Setter(onMethod_ = {@JsonProperty("ngsReports")}) private List ngsReports; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Patient patient; + @Getter(onMethod_ = {@JsonProperty("performanceStatus")}) + @Setter(onMethod_ = {@JsonProperty("performanceStatus")}) private List performanceStatus; + @Getter(onMethod_ = {@JsonProperty("priorDiagnosticReports")}) + @Setter(onMethod_ = {@JsonProperty("priorDiagnosticReports")}) private List priorDiagnosticReports; + @Getter(onMethod_ = {@JsonProperty("responses")}) + @Setter(onMethod_ = {@JsonProperty("responses")}) private List responses; + @Getter(onMethod_ = {@JsonProperty("specimens")}) + @Setter(onMethod_ = {@JsonProperty("specimens")}) private List specimens; + @Getter(onMethod_ = {@JsonProperty("systemicTherapies")}) + @Setter(onMethod_ = {@JsonProperty("systemicTherapies")}) private List systemicTherapies; - - @JsonProperty("carePlans") - public List getCarePlans() { return carePlans; } - @JsonProperty("carePlans") - public void setCarePlans(List value) { this.carePlans = value; } - - @JsonProperty("claimResponses") - public List getClaimResponses() { return claimResponses; } - @JsonProperty("claimResponses") - public void setClaimResponses(List value) { this.claimResponses = value; } - - @JsonProperty("claims") - public List getClaims() { return claims; } - @JsonProperty("claims") - public void setClaims(List value) { this.claims = value; } - - @JsonProperty("diagnoses") - public List getDiagnoses() { return diagnoses; } - @JsonProperty("diagnoses") - public void setDiagnoses(List value) { this.diagnoses = value; } - - @JsonProperty("episodesOfCare") - public List getEpisodesOfCare() { return episodesOfCare; } - @JsonProperty("episodesOfCare") - public void setEpisodesOfCare(List value) { this.episodesOfCare = value; } - - @JsonProperty("followUps") - public List getFollowUps() { return followUps; } - @JsonProperty("followUps") - public void setFollowUps(List value) { this.followUps = value; } - - @JsonProperty("guidelineProcedures") - public List getGuidelineProcedures() { return guidelineProcedures; } - @JsonProperty("guidelineProcedures") - public void setGuidelineProcedures(List value) { this.guidelineProcedures = value; } - - @JsonProperty("guidelineTherapies") - public List getGuidelineTherapies() { return guidelineTherapies; } - @JsonProperty("guidelineTherapies") - public void setGuidelineTherapies(List value) { this.guidelineTherapies = value; } - - @JsonProperty("histologyReports") - public List getHistologyReports() { return histologyReports; } - @JsonProperty("histologyReports") - public void setHistologyReports(List value) { this.histologyReports = value; } - - @JsonProperty("ihcReports") - public List getIhcReports() { return ihcReports; } - @JsonProperty("ihcReports") - public void setIhcReports(List value) { this.ihcReports = value; } - - @JsonProperty("metadata") - public MvhMetadata getMetadata() { return metadata; } - @JsonProperty("metadata") - public void setMetadata(MvhMetadata value) { this.metadata = value; } - - @JsonProperty("ngsReports") - public List getNgsReports() { return ngsReports; } - @JsonProperty("ngsReports") - public void setNgsReports(List value) { this.ngsReports = value; } - - @JsonProperty("patient") - public Patient getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Patient value) { this.patient = value; } - - @JsonProperty("performanceStatus") - public List getPerformanceStatus() { return performanceStatus; } - @JsonProperty("performanceStatus") - public void setPerformanceStatus(List value) { this.performanceStatus = value; } - - @JsonProperty("priorDiagnosticReports") - public List getPriorDiagnosticReports() { return priorDiagnosticReports; } - @JsonProperty("priorDiagnosticReports") - public void setPriorDiagnosticReports(List value) { this.priorDiagnosticReports = value; } - - @JsonProperty("responses") - public List getResponses() { return responses; } - @JsonProperty("responses") - public void setResponses(List value) { this.responses = value; } - - @JsonProperty("specimens") - public List getSpecimens() { return specimens; } - @JsonProperty("specimens") - public void setSpecimens(List value) { this.specimens = value; } - - @JsonProperty("systemicTherapies") - public List getSystemicTherapies() { return systemicTherapies; } - @JsonProperty("systemicTherapies") - public void setSystemicTherapies(List value) { this.systemicTherapies = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java index 15d1286..9767225 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java @@ -1,88 +1,54 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbCarePlan { + @Getter(onMethod_ = {@JsonProperty("geneticCounselingRecommendation")}) + @Setter(onMethod_ = {@JsonProperty("geneticCounselingRecommendation")}) private GeneticCounselingRecommendation geneticCounselingRecommendation; + @Getter(onMethod_ = {@JsonProperty("histologyReevaluationRequests")}) + @Setter(onMethod_ = {@JsonProperty("histologyReevaluationRequests")}) private List histologyReevaluationRequests; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("medicationRecommendations")}) + @Setter(onMethod_ = {@JsonProperty("medicationRecommendations")}) private List medicationRecommendations; + @Getter(onMethod_ = {@JsonProperty("noSequencingPerformedReason")}) + @Setter(onMethod_ = {@JsonProperty("noSequencingPerformedReason")}) private CarePlanNoSequencingPerformedReasonCoding noSequencingPerformedReason; + @Getter(onMethod_ = {@JsonProperty("notes")}) + @Setter(onMethod_ = {@JsonProperty("notes")}) private List notes; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("procedureRecommendations")}) + @Setter(onMethod_ = {@JsonProperty("procedureRecommendations")}) private List procedureRecommendations; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("rebiopsyRequests")}) + @Setter(onMethod_ = {@JsonProperty("rebiopsyRequests")}) private List rebiopsyRequests; + @Getter(onMethod_ = {@JsonProperty("recommendationsMissingReason")}) + @Setter(onMethod_ = {@JsonProperty("recommendationsMissingReason")}) private MtbCarePlanRecommendationsMissingReasonCoding recommendationsMissingReason; + @Getter(onMethod_ = {@JsonProperty("studyEnrollmentRecommendations")}) + @Setter(onMethod_ = {@JsonProperty("studyEnrollmentRecommendations")}) private List studyEnrollmentRecommendations; - - @JsonProperty("geneticCounselingRecommendation") - public GeneticCounselingRecommendation getGeneticCounselingRecommendation() { return geneticCounselingRecommendation; } - @JsonProperty("geneticCounselingRecommendation") - public void setGeneticCounselingRecommendation(GeneticCounselingRecommendation value) { this.geneticCounselingRecommendation = value; } - - @JsonProperty("histologyReevaluationRequests") - public List getHistologyReevaluationRequests() { return histologyReevaluationRequests; } - @JsonProperty("histologyReevaluationRequests") - public void setHistologyReevaluationRequests(List value) { this.histologyReevaluationRequests = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("medicationRecommendations") - public List getMedicationRecommendations() { return medicationRecommendations; } - @JsonProperty("medicationRecommendations") - public void setMedicationRecommendations(List value) { this.medicationRecommendations = value; } - - @JsonProperty("noSequencingPerformedReason") - public CarePlanNoSequencingPerformedReasonCoding getNoSequencingPerformedReason() { return noSequencingPerformedReason; } - @JsonProperty("noSequencingPerformedReason") - public void setNoSequencingPerformedReason(CarePlanNoSequencingPerformedReasonCoding value) { this.noSequencingPerformedReason = value; } - - @JsonProperty("notes") - public List getNotes() { return notes; } - @JsonProperty("notes") - public void setNotes(List value) { this.notes = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("procedureRecommendations") - public List getProcedureRecommendations() { return procedureRecommendations; } - @JsonProperty("procedureRecommendations") - public void setProcedureRecommendations(List value) { this.procedureRecommendations = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("rebiopsyRequests") - public List getRebiopsyRequests() { return rebiopsyRequests; } - @JsonProperty("rebiopsyRequests") - public void setRebiopsyRequests(List value) { this.rebiopsyRequests = value; } - - @JsonProperty("recommendationsMissingReason") - public MtbCarePlanRecommendationsMissingReasonCoding getRecommendationsMissingReason() { return recommendationsMissingReason; } - @JsonProperty("recommendationsMissingReason") - public void setRecommendationsMissingReason(MtbCarePlanRecommendationsMissingReasonCoding value) { this.recommendationsMissingReason = value; } - - @JsonProperty("studyEnrollmentRecommendations") - public List getStudyEnrollmentRecommendations() { return studyEnrollmentRecommendations; } - @JsonProperty("studyEnrollmentRecommendations") - public void setStudyEnrollmentRecommendations(List value) { this.studyEnrollmentRecommendations = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCoding.java index 4c1ee61..de6d6e8 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbCarePlanRecommendationsMissingReasonCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbCarePlanRecommendationsMissingReasonCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbCarePlanRecommendationsMissingReasonCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbCarePlanRecommendationsMissingReasonCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCodingCode.java index eb48fbc..e2a1959 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbCarePlanRecommendationsMissingReasonCodingCode { NO_TARGET; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java index bdf6e3b..2d16481 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java @@ -1,82 +1,51 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbDiagnosis { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private Coding code; + @Getter(onMethod_ = {@JsonProperty("germlineCodes")}) + @Setter(onMethod_ = {@JsonProperty("germlineCodes")}) private List germlineCodes; + @Getter(onMethod_ = {@JsonProperty("grading")}) + @Setter(onMethod_ = {@JsonProperty("grading")}) private Grading grading; + @Getter(onMethod_ = {@JsonProperty("guidelineTreatmentStatus")}) + @Setter(onMethod_ = {@JsonProperty("guidelineTreatmentStatus")}) private MtbDiagnosisGuidelineTreatmentStatusCoding guidelineTreatmentStatus; + @Getter(onMethod_ = {@JsonProperty("histology")}) + @Setter(onMethod_ = {@JsonProperty("histology")}) private List histology; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("notes")}) + @Setter(onMethod_ = {@JsonProperty("notes")}) private List notes; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date recordedOn; + @Getter(onMethod_ = {@JsonProperty("staging")}) + @Setter(onMethod_ = {@JsonProperty("staging")}) private Staging staging; + @Getter(onMethod_ = {@JsonProperty("topography")}) + @Setter(onMethod_ = {@JsonProperty("topography")}) private Coding topography; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private Type type; - - @JsonProperty("code") - public Coding getCode() { return code; } - @JsonProperty("code") - public void setCode(Coding value) { this.code = value; } - - @JsonProperty("germlineCodes") - public List getGermlineCodes() { return germlineCodes; } - @JsonProperty("germlineCodes") - public void setGermlineCodes(List value) { this.germlineCodes = value; } - - @JsonProperty("grading") - public Grading getGrading() { return grading; } - @JsonProperty("grading") - public void setGrading(Grading value) { this.grading = value; } - - @JsonProperty("guidelineTreatmentStatus") - public MtbDiagnosisGuidelineTreatmentStatusCoding getGuidelineTreatmentStatus() { return guidelineTreatmentStatus; } - @JsonProperty("guidelineTreatmentStatus") - public void setGuidelineTreatmentStatus(MtbDiagnosisGuidelineTreatmentStatusCoding value) { this.guidelineTreatmentStatus = value; } - - @JsonProperty("histology") - public List getHistology() { return histology; } - @JsonProperty("histology") - public void setHistology(List value) { this.histology = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("notes") - public List getNotes() { return notes; } - @JsonProperty("notes") - public void setNotes(List value) { this.notes = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getRecordedOn() { return recordedOn; } - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setRecordedOn(Date value) { this.recordedOn = value; } - - @JsonProperty("staging") - public Staging getStaging() { return staging; } - @JsonProperty("staging") - public void setStaging(Staging value) { this.staging = value; } - - @JsonProperty("topography") - public Coding getTopography() { return topography; } - @JsonProperty("topography") - public void setTopography(Coding value) { this.topography = value; } - - @JsonProperty("type") - public Type getType() { return type; } - @JsonProperty("type") - public void setType(Type value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisCoding.java index c2c7fa1..bc3efde 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbDiagnosisCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ValueCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ValueCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ValueCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCoding.java index 42bf335..376f099 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbDiagnosisGuidelineTreatmentStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbDiagnosisGuidelineTreatmentStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbDiagnosisGuidelineTreatmentStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbDiagnosisGuidelineTreatmentStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCodingCode.java index 7b376ac..99ae25c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbDiagnosisGuidelineTreatmentStatusCodingCode { EXHAUSTED, IMPOSSIBLE, NON_EXHAUSTED, NO_GUIDELINES_AVAILABLE, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java index ce70f33..0965dc8 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java @@ -1,31 +1,25 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbEpisodeOfCare { + @Getter(onMethod_ = {@JsonProperty("diagnoses")}) + @Setter(onMethod_ = {@JsonProperty("diagnoses")}) private List diagnoses; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("period")}) + @Setter(onMethod_ = {@JsonProperty("period")}) private PeriodDate period; - - @JsonProperty("diagnoses") - public List getDiagnoses() { return diagnoses; } - @JsonProperty("diagnoses") - public void setDiagnoses(List value) { this.diagnoses = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("period") - public PeriodDate getPeriod() { return period; } - @JsonProperty("period") - public void setPeriod(PeriodDate value) { this.period = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendation.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendation.java index 1f5de01..cbadad3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendation.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendation.java @@ -1,70 +1,45 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbMedicationRecommendation { + @Getter(onMethod_ = {@JsonProperty("category")}) + @Setter(onMethod_ = {@JsonProperty("category")}) private MtbMedicationRecommendationCategoryCoding category; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("levelOfEvidence")}) + @Setter(onMethod_ = {@JsonProperty("levelOfEvidence")}) private LevelOfEvidence levelOfEvidence; + @Getter(onMethod_ = {@JsonProperty("medication")}) + @Setter(onMethod_ = {@JsonProperty("medication")}) private List medication; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("priority")}) + @Setter(onMethod_ = {@JsonProperty("priority")}) private RecommendationPriorityCoding priority; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("supportingVariants")}) + @Setter(onMethod_ = {@JsonProperty("supportingVariants")}) private List supportingVariants; + @Getter(onMethod_ = {@JsonProperty("useType")}) + @Setter(onMethod_ = {@JsonProperty("useType")}) private MtbMedicationRecommendationUseTypeCoding useType; - - @JsonProperty("category") - public MtbMedicationRecommendationCategoryCoding getCategory() { return category; } - @JsonProperty("category") - public void setCategory(MtbMedicationRecommendationCategoryCoding value) { this.category = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("levelOfEvidence") - public LevelOfEvidence getLevelOfEvidence() { return levelOfEvidence; } - @JsonProperty("levelOfEvidence") - public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; } - - @JsonProperty("medication") - public List getMedication() { return medication; } - @JsonProperty("medication") - public void setMedication(List value) { this.medication = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("priority") - public RecommendationPriorityCoding getPriority() { return priority; } - @JsonProperty("priority") - public void setPriority(RecommendationPriorityCoding value) { this.priority = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("supportingVariants") - public List getSupportingVariants() { return supportingVariants; } - @JsonProperty("supportingVariants") - public void setSupportingVariants(List value) { this.supportingVariants = value; } - - @JsonProperty("useType") - public MtbMedicationRecommendationUseTypeCoding getUseType() { return useType; } - @JsonProperty("useType") - public void setUseType(MtbMedicationRecommendationUseTypeCoding value) { this.useType = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCoding.java index 0cc5589..20d8ff7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbMedicationRecommendationCategoryCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbMedicationRecommendationCategoryCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbMedicationRecommendationCategoryCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbMedicationRecommendationCategoryCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCodingCode.java index 6ca31ca..d4e4d1f 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbMedicationRecommendationCategoryCodingCode { CH, HO, IM, SO, SZ, ZS; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCoding.java index c0fd439..5727d2a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbMedicationRecommendationUseTypeCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbMedicationRecommendationUseTypeCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbMedicationRecommendationUseTypeCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbMedicationRecommendationUseTypeCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCodingCode.java index 08e2c5c..4278849 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbMedicationRecommendationUseTypeCodingCode { COMPASSIONATE, IN_LABEL, OFF_LABEL, SEC_PREVENTIVE, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCoding.java index 6257192..4ae4825 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbProcedureRecommendationCategoryCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbProcedureRecommendationCategoryCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbProcedureRecommendationCategoryCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbProcedureRecommendationCategoryCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCodingCode.java index 5b2b21e..4c2a475 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbProcedureRecommendationCategoryCodingCode { AS, OP, SO, ST, WS, WW; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbStudyEnrollmentRecommendation.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbStudyEnrollmentRecommendation.java index bc780a1..39f6d80 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbStudyEnrollmentRecommendation.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbStudyEnrollmentRecommendation.java @@ -1,64 +1,42 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbStudyEnrollmentRecommendation { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("levelOfEvidence")}) + @Setter(onMethod_ = {@JsonProperty("levelOfEvidence")}) private LevelOfEvidence levelOfEvidence; + @Getter(onMethod_ = {@JsonProperty("medication")}) + @Setter(onMethod_ = {@JsonProperty("medication")}) private List medication; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("priority")}) + @Setter(onMethod_ = {@JsonProperty("priority")}) private RecommendationPriorityCoding priority; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("study")}) + @Setter(onMethod_ = {@JsonProperty("study")}) private List study; + @Getter(onMethod_ = {@JsonProperty("supportingVariants")}) + @Setter(onMethod_ = {@JsonProperty("supportingVariants")}) private List supportingVariants; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("levelOfEvidence") - public LevelOfEvidence getLevelOfEvidence() { return levelOfEvidence; } - @JsonProperty("levelOfEvidence") - public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; } - - @JsonProperty("medication") - public List getMedication() { return medication; } - @JsonProperty("medication") - public void setMedication(List value) { this.medication = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("priority") - public RecommendationPriorityCoding getPriority() { return priority; } - @JsonProperty("priority") - public void setPriority(RecommendationPriorityCoding value) { this.priority = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("study") - public List getStudy() { return study; } - @JsonProperty("study") - public void setStudy(List value) { this.study = value; } - - @JsonProperty("supportingVariants") - public List getSupportingVariants() { return supportingVariants; } - @JsonProperty("supportingVariants") - public void setSupportingVariants(List value) { this.supportingVariants = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapy.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapy.java index a542e7a..6adc457 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapy.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapy.java @@ -1,100 +1,60 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbSystemicTherapy { + @Getter(onMethod_ = {@JsonProperty("basedOn")}) + @Setter(onMethod_ = {@JsonProperty("basedOn")}) private Reference basedOn; + @Getter(onMethod_ = {@JsonProperty("category")}) + @Setter(onMethod_ = {@JsonProperty("category")}) private MtbSystemicTherapyCategoryCoding category; + @Getter(onMethod_ = {@JsonProperty("dosage")}) + @Setter(onMethod_ = {@JsonProperty("dosage")}) private MtbSystemicTherapyDosageDensityCoding dosage; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("intent")}) + @Setter(onMethod_ = {@JsonProperty("intent")}) private MtbTherapyIntentCoding intent; + @Getter(onMethod_ = {@JsonProperty("medication")}) + @Setter(onMethod_ = {@JsonProperty("medication")}) private List medication; + @Getter(onMethod_ = {@JsonProperty("notes")}) + @Setter(onMethod_ = {@JsonProperty("notes")}) private List notes; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("period")}) + @Setter(onMethod_ = {@JsonProperty("period")}) private PeriodDate period; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("recommendationFulfillmentStatus")}) + @Setter(onMethod_ = {@JsonProperty("recommendationFulfillmentStatus")}) private MtbSystemicTherapyRecommendationFulfillmentStatusCoding recommendationFulfillmentStatus; + @Getter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date recordedOn; + @Getter(onMethod_ = {@JsonProperty("status")}) + @Setter(onMethod_ = {@JsonProperty("status")}) private TherapyStatusCoding status; + @Getter(onMethod_ = {@JsonProperty("statusReason")}) + @Setter(onMethod_ = {@JsonProperty("statusReason")}) private MtbTherapyStatusReasonCoding statusReason; + @Getter(onMethod_ = {@JsonProperty("therapyLine")}) + @Setter(onMethod_ = {@JsonProperty("therapyLine")}) private Long therapyLine; - - @JsonProperty("basedOn") - public Reference getBasedOn() { return basedOn; } - @JsonProperty("basedOn") - public void setBasedOn(Reference value) { this.basedOn = value; } - - @JsonProperty("category") - public MtbSystemicTherapyCategoryCoding getCategory() { return category; } - @JsonProperty("category") - public void setCategory(MtbSystemicTherapyCategoryCoding value) { this.category = value; } - - @JsonProperty("dosage") - public MtbSystemicTherapyDosageDensityCoding getDosage() { return dosage; } - @JsonProperty("dosage") - public void setDosage(MtbSystemicTherapyDosageDensityCoding value) { this.dosage = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("intent") - public MtbTherapyIntentCoding getIntent() { return intent; } - @JsonProperty("intent") - public void setIntent(MtbTherapyIntentCoding value) { this.intent = value; } - - @JsonProperty("medication") - public List getMedication() { return medication; } - @JsonProperty("medication") - public void setMedication(List value) { this.medication = value; } - - @JsonProperty("notes") - public List getNotes() { return notes; } - @JsonProperty("notes") - public void setNotes(List value) { this.notes = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("period") - public PeriodDate getPeriod() { return period; } - @JsonProperty("period") - public void setPeriod(PeriodDate value) { this.period = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("recommendationFulfillmentStatus") - public MtbSystemicTherapyRecommendationFulfillmentStatusCoding getRecommendationFulfillmentStatus() { return recommendationFulfillmentStatus; } - @JsonProperty("recommendationFulfillmentStatus") - public void setRecommendationFulfillmentStatus(MtbSystemicTherapyRecommendationFulfillmentStatusCoding value) { this.recommendationFulfillmentStatus = value; } - - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getRecordedOn() { return recordedOn; } - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setRecordedOn(Date value) { this.recordedOn = value; } - - @JsonProperty("status") - public TherapyStatusCoding getStatus() { return status; } - @JsonProperty("status") - public void setStatus(TherapyStatusCoding value) { this.status = value; } - - @JsonProperty("statusReason") - public MtbTherapyStatusReasonCoding getStatusReason() { return statusReason; } - @JsonProperty("statusReason") - public void setStatusReason(MtbTherapyStatusReasonCoding value) { this.statusReason = value; } - - @JsonProperty("therapyLine") - public Long getTherapyLine() { return therapyLine; } - @JsonProperty("therapyLine") - public void setTherapyLine(Long value) { this.therapyLine = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCoding.java index 2e4cdf9..c974792 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbSystemicTherapyCategoryCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbSystemicTherapyCategoryCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbSystemicTherapyCategoryCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbSystemicTherapyCategoryCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCodingCode.java index 83200bf..de96389 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbSystemicTherapyCategoryCodingCode { A, I, N, O, S; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCoding.java index 871d4e2..f3e3064 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbSystemicTherapyDosageDensityCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbSystemicTherapyDosageDensityCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbSystemicTherapyDosageDensityCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbSystemicTherapyDosageDensityCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCodingCode.java index 19f4642..325185a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbSystemicTherapyDosageDensityCodingCode { OVER_50, UNDER_50; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCoding.java index fbc1c64..7acde49 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbSystemicTherapyRecommendationFulfillmentStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.java index 48b3024..e9f36cd 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode { COMPLETE, PARTIAL; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCoding.java index 5bae22f..ddc49fa 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbTherapyIntentCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbTherapyIntentCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbTherapyIntentCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbTherapyIntentCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCodingCode.java index 5239a43..f8e6cc9 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbTherapyIntentCodingCode { K, P, S, X; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCoding.java index a16c010..41b1a55 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MtbTherapyStatusReasonCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbTherapyStatusReasonCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public MtbTherapyStatusReasonCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbTherapyStatusReasonCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCodingCode.java index 12848b5..5973d29 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MtbTherapyStatusReasonCodingCode { BEST_SUPPORTIVE_CARE, CHRONIC_REMISSION, DETERIORATION, LOST_TO_FU, MEDICAL_REASONS, NO_INDICATION, OTHER, OTHER_THERAPY_CHOSEN, PATIENT_DEATH, PATIENT_REFUSAL, PATIENT_WISH, PAYMENT_ENDED, PAYMENT_PENDING, PAYMENT_REFUSED, PROGRESSION, REGULAR_COMPLETION, REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION, REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE, TOXICITY; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhMetadata.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhMetadata.java index 39e7b89..9f578ea 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhMetadata.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhMetadata.java @@ -1,32 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; import java.util.Map; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class MvhMetadata { + @Getter(onMethod_ = {@JsonProperty("modelProjectConsent")}) + @Setter(onMethod_ = {@JsonProperty("modelProjectConsent")}) private ModelProjectConsent modelProjectConsent; + @Getter(onMethod_ = {@JsonProperty("researchConsents")}) + @Setter(onMethod_ = {@JsonProperty("researchConsents")}) private List> researchConsents; + @Getter(onMethod_ = {@JsonProperty("transferTAN")}) + @Setter(onMethod_ = {@JsonProperty("transferTAN")}) private String transferTan; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private MvhSubmissionType type; - - @JsonProperty("modelProjectConsent") - public ModelProjectConsent getModelProjectConsent() { return modelProjectConsent; } - @JsonProperty("modelProjectConsent") - public void setModelProjectConsent(ModelProjectConsent value) { this.modelProjectConsent = value; } - - @JsonProperty("researchConsents") - public List> getResearchConsents() { return researchConsents; } - @JsonProperty("researchConsents") - public void setResearchConsents(List> value) { this.researchConsents = value; } - - @JsonProperty("transferTAN") - public String getTransferTan() { return transferTan; } - @JsonProperty("transferTAN") - public void setTransferTan(String value) { this.transferTan = value; } - - @JsonProperty("type") - public MvhSubmissionType getType() { return type; } - @JsonProperty("type") - public void setType(MvhSubmissionType value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhSubmissionType.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhSubmissionType.java index 47733de..99dae7a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhSubmissionType.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/MvhSubmissionType.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum MvhSubmissionType { ADDITION, CORRECTION, FOLLOWUP, INITIAL; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCoding.java index d083713..4832793 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class NgsReportCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private NgsReportCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public NgsReportCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(NgsReportCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCodingCode.java index a86968c..053a1d2 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum NgsReportCodingCode { ARRAY, EXOME, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, SINGLE; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportMetadata.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportMetadata.java index 036fcc4..9696865 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportMetadata.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportMetadata.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class NgsReportMetadata { + @Getter(onMethod_ = {@JsonProperty("kitManufacturer")}) + @Setter(onMethod_ = {@JsonProperty("kitManufacturer")}) private String kitManufacturer; + @Getter(onMethod_ = {@JsonProperty("kitType")}) + @Setter(onMethod_ = {@JsonProperty("kitType")}) private String kitType; + @Getter(onMethod_ = {@JsonProperty("pipeline")}) + @Setter(onMethod_ = {@JsonProperty("pipeline")}) private String pipeline; + @Getter(onMethod_ = {@JsonProperty("referenceGenome")}) + @Setter(onMethod_ = {@JsonProperty("referenceGenome")}) private String referenceGenome; + @Getter(onMethod_ = {@JsonProperty("sequencer")}) + @Setter(onMethod_ = {@JsonProperty("sequencer")}) private String sequencer; - - @JsonProperty("kitManufacturer") - public String getKitManufacturer() { return kitManufacturer; } - @JsonProperty("kitManufacturer") - public void setKitManufacturer(String value) { this.kitManufacturer = value; } - - @JsonProperty("kitType") - public String getKitType() { return kitType; } - @JsonProperty("kitType") - public void setKitType(String value) { this.kitType = value; } - - @JsonProperty("pipeline") - public String getPipeline() { return pipeline; } - @JsonProperty("pipeline") - public void setPipeline(String value) { this.pipeline = value; } - - @JsonProperty("referenceGenome") - public String getReferenceGenome() { return referenceGenome; } - @JsonProperty("referenceGenome") - public void setReferenceGenome(String value) { this.referenceGenome = value; } - - @JsonProperty("sequencer") - public String getSequencer() { return sequencer; } - @JsonProperty("sequencer") - public void setSequencer(String value) { this.sequencer = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportResults.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportResults.java index e5d8c4a..03b42c3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportResults.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportResults.java @@ -1,61 +1,40 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class NgsReportResults { + @Getter(onMethod_ = {@JsonProperty("brcaness")}) + @Setter(onMethod_ = {@JsonProperty("brcaness")}) private Brcaness brcaness; + @Getter(onMethod_ = {@JsonProperty("copyNumberVariants")}) + @Setter(onMethod_ = {@JsonProperty("copyNumberVariants")}) private List copyNumberVariants; + @Getter(onMethod_ = {@JsonProperty("dnaFusions")}) + @Setter(onMethod_ = {@JsonProperty("dnaFusions")}) private List dnaFusions; + @Getter(onMethod_ = {@JsonProperty("hrdScore")}) + @Setter(onMethod_ = {@JsonProperty("hrdScore")}) private HrdScore hrdScore; + @Getter(onMethod_ = {@JsonProperty("rnaFusions")}) + @Setter(onMethod_ = {@JsonProperty("rnaFusions")}) private List rnaFusions; + @Getter(onMethod_ = {@JsonProperty("rnaSeqs")}) + @Setter(onMethod_ = {@JsonProperty("rnaSeqs")}) private List rnaSeqs; + @Getter(onMethod_ = {@JsonProperty("simpleVariants")}) + @Setter(onMethod_ = {@JsonProperty("simpleVariants")}) private List simpleVariants; + @Getter(onMethod_ = {@JsonProperty("tmb")}) + @Setter(onMethod_ = {@JsonProperty("tmb")}) private Tmb tmb; + @Getter(onMethod_ = {@JsonProperty("tumorCellContent")}) + @Setter(onMethod_ = {@JsonProperty("tumorCellContent")}) private TumorCellContent tumorCellContent; - - @JsonProperty("brcaness") - public Brcaness getBrcaness() { return brcaness; } - @JsonProperty("brcaness") - public void setBrcaness(Brcaness value) { this.brcaness = value; } - - @JsonProperty("copyNumberVariants") - public List getCopyNumberVariants() { return copyNumberVariants; } - @JsonProperty("copyNumberVariants") - public void setCopyNumberVariants(List value) { this.copyNumberVariants = value; } - - @JsonProperty("dnaFusions") - public List getDnaFusions() { return dnaFusions; } - @JsonProperty("dnaFusions") - public void setDnaFusions(List value) { this.dnaFusions = value; } - - @JsonProperty("hrdScore") - public HrdScore getHrdScore() { return hrdScore; } - @JsonProperty("hrdScore") - public void setHrdScore(HrdScore value) { this.hrdScore = value; } - - @JsonProperty("rnaFusions") - public List getRnaFusions() { return rnaFusions; } - @JsonProperty("rnaFusions") - public void setRnaFusions(List value) { this.rnaFusions = value; } - - @JsonProperty("rnaSeqs") - public List getRnaSeqs() { return rnaSeqs; } - @JsonProperty("rnaSeqs") - public void setRnaSeqs(List value) { this.rnaSeqs = value; } - - @JsonProperty("simpleVariants") - public List getSimpleVariants() { return simpleVariants; } - @JsonProperty("simpleVariants") - public void setSimpleVariants(List value) { this.simpleVariants = value; } - - @JsonProperty("tmb") - public Tmb getTmb() { return tmb; } - @JsonProperty("tmb") - public void setTmb(Tmb value) { this.tmb = value; } - - @JsonProperty("tumorCellContent") - public TumorCellContent getTumorCellContent() { return tumorCellContent; } - @JsonProperty("tumorCellContent") - public void setTumorCellContent(TumorCellContent value) { this.tumorCellContent = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/NoSequencingPerformedReasonCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/NoSequencingPerformedReasonCode.java index 15f3915..cedca05 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/NoSequencingPerformedReasonCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/NoSequencingPerformedReasonCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum NoSequencingPerformedReasonCode { NON_GENETIC_CAUSE, NOT_RARE_DISEASE, OTHER, PSYCHOSOMATIC, TARGETED_DIAGNOSTICS_RECOMMENDED; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedure.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedure.java index 1c0eeac..b4f4968 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedure.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedure.java @@ -1,82 +1,51 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class OncoProcedure { + @Getter(onMethod_ = {@JsonProperty("basedOn")}) + @Setter(onMethod_ = {@JsonProperty("basedOn")}) private Reference basedOn; + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private OncoProcedureCoding code; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("intent")}) + @Setter(onMethod_ = {@JsonProperty("intent")}) private MtbTherapyIntentCoding intent; + @Getter(onMethod_ = {@JsonProperty("notes")}) + @Setter(onMethod_ = {@JsonProperty("notes")}) private List notes; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("period")}) + @Setter(onMethod_ = {@JsonProperty("period")}) private PeriodDate period; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("recordedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date recordedOn; + @Getter(onMethod_ = {@JsonProperty("status")}) + @Setter(onMethod_ = {@JsonProperty("status")}) private TherapyStatusCoding status; + @Getter(onMethod_ = {@JsonProperty("statusReason")}) + @Setter(onMethod_ = {@JsonProperty("statusReason")}) private MtbTherapyStatusReasonCoding statusReason; + @Getter(onMethod_ = {@JsonProperty("therapyLine")}) + @Setter(onMethod_ = {@JsonProperty("therapyLine")}) private Long therapyLine; - - @JsonProperty("basedOn") - public Reference getBasedOn() { return basedOn; } - @JsonProperty("basedOn") - public void setBasedOn(Reference value) { this.basedOn = value; } - - @JsonProperty("code") - public OncoProcedureCoding getCode() { return code; } - @JsonProperty("code") - public void setCode(OncoProcedureCoding value) { this.code = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("intent") - public MtbTherapyIntentCoding getIntent() { return intent; } - @JsonProperty("intent") - public void setIntent(MtbTherapyIntentCoding value) { this.intent = value; } - - @JsonProperty("notes") - public List getNotes() { return notes; } - @JsonProperty("notes") - public void setNotes(List value) { this.notes = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("period") - public PeriodDate getPeriod() { return period; } - @JsonProperty("period") - public void setPeriod(PeriodDate value) { this.period = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getRecordedOn() { return recordedOn; } - @JsonProperty("recordedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setRecordedOn(Date value) { this.recordedOn = value; } - - @JsonProperty("status") - public TherapyStatusCoding getStatus() { return status; } - @JsonProperty("status") - public void setStatus(TherapyStatusCoding value) { this.status = value; } - - @JsonProperty("statusReason") - public MtbTherapyStatusReasonCoding getStatusReason() { return statusReason; } - @JsonProperty("statusReason") - public void setStatusReason(MtbTherapyStatusReasonCoding value) { this.statusReason = value; } - - @JsonProperty("therapyLine") - public Long getTherapyLine() { return therapyLine; } - @JsonProperty("therapyLine") - public void setTherapyLine(Long value) { this.therapyLine = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCoding.java index aca7471..097429c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class OncoProcedureCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private OncoProcedureCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public OncoProcedureCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(OncoProcedureCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCodingCode.java index 81d781f..1690bb7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/OncoProcedureCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum OncoProcedureCodingCode { NUCLEAR_MEDICINE, RADIO_THERAPY, SURGERY; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java index 8532ab8..d8e96e6 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Patient.java @@ -1,63 +1,41 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Patient { + @Getter(onMethod_ = {@JsonProperty("address")}) + @Setter(onMethod_ = {@JsonProperty("address")}) private Address address; + @Getter(onMethod_ = {@JsonProperty("age")}) + @Setter(onMethod_ = {@JsonProperty("age")}) private Age age; + @Getter(onMethod_ = {@JsonProperty("birthDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("birthDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date birthDate; + @Getter(onMethod_ = {@JsonProperty("dateOfDeath")}) + @Setter(onMethod_ = {@JsonProperty("dateOfDeath")}) private Date dateOfDeath; + @Getter(onMethod_ = {@JsonProperty("gender")}) + @Setter(onMethod_ = {@JsonProperty("gender")}) private GenderCoding gender; + @Getter(onMethod_ = {@JsonProperty("healthInsurance")}) + @Setter(onMethod_ = {@JsonProperty("healthInsurance")}) private HealthInsurance healthInsurance; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("managingSite")}) + @Setter(onMethod_ = {@JsonProperty("managingSite")}) private Coding managingSite; + @Getter(onMethod_ = {@JsonProperty("vitalStatus")}) + @Setter(onMethod_ = {@JsonProperty("vitalStatus")}) private VitalStatusCoding vitalStatus; - - @JsonProperty("address") - public Address getAddress() { return address; } - @JsonProperty("address") - public void setAddress(Address value) { this.address = value; } - - @JsonProperty("age") - public Age getAge() { return age; } - @JsonProperty("age") - public void setAge(Age value) { this.age = value; } - - @JsonProperty("birthDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getBirthDate() { return birthDate; } - @JsonProperty("birthDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setBirthDate(Date value) { this.birthDate = value; } - - @JsonProperty("dateOfDeath") - public Date getDateOfDeath() { return dateOfDeath; } - @JsonProperty("dateOfDeath") - public void setDateOfDeath(Date value) { this.dateOfDeath = value; } - - @JsonProperty("gender") - public GenderCoding getGender() { return gender; } - @JsonProperty("gender") - public void setGender(GenderCoding value) { this.gender = value; } - - @JsonProperty("healthInsurance") - public HealthInsurance getHealthInsurance() { return healthInsurance; } - @JsonProperty("healthInsurance") - public void setHealthInsurance(HealthInsurance value) { this.healthInsurance = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("managingSite") - public Coding getManagingSite() { return managingSite; } - @JsonProperty("managingSite") - public void setManagingSite(Coding value) { this.managingSite = value; } - - @JsonProperty("vitalStatus") - public VitalStatusCoding getVitalStatus() { return vitalStatus; } - @JsonProperty("vitalStatus") - public void setVitalStatus(VitalStatusCoding value) { this.vitalStatus = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PerformanceStatus.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PerformanceStatus.java index 921dc19..b958ee7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PerformanceStatus.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PerformanceStatus.java @@ -1,33 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PerformanceStatus { + @Getter(onMethod_ = {@JsonProperty("effectiveDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("effectiveDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date effectiveDate; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private EcogCoding value; - - @JsonProperty("effectiveDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getEffectiveDate() { return effectiveDate; } - @JsonProperty("effectiveDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setEffectiveDate(Date value) { this.effectiveDate = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("value") - public EcogCoding getValue() { return value; } - @JsonProperty("value") - public void setValue(EcogCoding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java index a1004d6..2940df5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PeriodDate.java @@ -1,21 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PeriodDate { + @Getter(onMethod_ = {@JsonProperty("end")}) + @Setter(onMethod_ = {@JsonProperty("end")}) private Date end; + @Getter(onMethod_ = {@JsonProperty("start"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("start"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date start; - - @JsonProperty("end") - public Date getEnd() { return end; } - @JsonProperty("end") - public void setEnd(Date value) { this.end = value; } - - @JsonProperty("start") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getStart() { return start; } - @JsonProperty("start") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setStart(Date value) { this.start = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Position.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Position.java index 471258a..223a45b 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Position.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Position.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Position { + @Getter(onMethod_ = {@JsonProperty("end")}) + @Setter(onMethod_ = {@JsonProperty("end")}) private Double end; + @Getter(onMethod_ = {@JsonProperty("start")}) + @Setter(onMethod_ = {@JsonProperty("start")}) private double start; - - @JsonProperty("end") - public Double getEnd() { return end; } - @JsonProperty("end") - public void setEnd(Double value) { this.end = value; } - - @JsonProperty("start") - public double getStart() { return start; } - @JsonProperty("start") - public void setStart(double value) { this.start = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PriorDiagnosticReport.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PriorDiagnosticReport.java index 88e34a1..e29a1a7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PriorDiagnosticReport.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PriorDiagnosticReport.java @@ -1,52 +1,36 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PriorDiagnosticReport { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("performer")}) + @Setter(onMethod_ = {@JsonProperty("performer")}) private Reference performer; + @Getter(onMethod_ = {@JsonProperty("results")}) + @Setter(onMethod_ = {@JsonProperty("results")}) private List results; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private MolecularDiagnosticReportCoding type; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("performer") - public Reference getPerformer() { return performer; } - @JsonProperty("performer") - public void setPerformer(Reference value) { this.performer = value; } - - @JsonProperty("results") - public List getResults() { return results; } - @JsonProperty("results") - public void setResults(List value) { this.results = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("type") - public MolecularDiagnosticReportCoding getType() { return type; } - @JsonProperty("type") - public void setType(MolecularDiagnosticReportCoding value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProcedureRecommendation.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProcedureRecommendation.java index 255648a..a6c941c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProcedureRecommendation.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProcedureRecommendation.java @@ -1,58 +1,39 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ProcedureRecommendation { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private MtbProcedureRecommendationCategoryCoding code; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("levelOfEvidence")}) + @Setter(onMethod_ = {@JsonProperty("levelOfEvidence")}) private LevelOfEvidence levelOfEvidence; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("priority")}) + @Setter(onMethod_ = {@JsonProperty("priority")}) private RecommendationPriorityCoding priority; + @Getter(onMethod_ = {@JsonProperty("reason")}) + @Setter(onMethod_ = {@JsonProperty("reason")}) private Reference reason; + @Getter(onMethod_ = {@JsonProperty("supportingVariants")}) + @Setter(onMethod_ = {@JsonProperty("supportingVariants")}) private List supportingVariants; - - @JsonProperty("code") - public MtbProcedureRecommendationCategoryCoding getCode() { return code; } - @JsonProperty("code") - public void setCode(MtbProcedureRecommendationCategoryCoding value) { this.code = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("levelOfEvidence") - public LevelOfEvidence getLevelOfEvidence() { return levelOfEvidence; } - @JsonProperty("levelOfEvidence") - public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("priority") - public RecommendationPriorityCoding getPriority() { return priority; } - @JsonProperty("priority") - public void setPriority(RecommendationPriorityCoding value) { this.priority = value; } - - @JsonProperty("reason") - public Reference getReason() { return reason; } - @JsonProperty("reason") - public void setReason(Reference value) { this.reason = value; } - - @JsonProperty("supportingVariants") - public List getSupportingVariants() { return supportingVariants; } - @JsonProperty("supportingVariants") - public void setSupportingVariants(List value) { this.supportingVariants = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpression.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpression.java index 092251c..4d77cf6 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpression.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpression.java @@ -1,48 +1,32 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ProteinExpression { + @Getter(onMethod_ = {@JsonProperty("icScore")}) + @Setter(onMethod_ = {@JsonProperty("icScore")}) private ProteinExpressionIcScoreCoding icScore; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("protein")}) + @Setter(onMethod_ = {@JsonProperty("protein")}) private Coding protein; + @Getter(onMethod_ = {@JsonProperty("tcScore")}) + @Setter(onMethod_ = {@JsonProperty("tcScore")}) private ProteinExpressionTcScoreCoding tcScore; + @Getter(onMethod_ = {@JsonProperty("tpsScore")}) + @Setter(onMethod_ = {@JsonProperty("tpsScore")}) private Long tpsScore; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private ProteinExpressionResultCoding value; - - @JsonProperty("icScore") - public ProteinExpressionIcScoreCoding getIcScore() { return icScore; } - @JsonProperty("icScore") - public void setIcScore(ProteinExpressionIcScoreCoding value) { this.icScore = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("protein") - public Coding getProtein() { return protein; } - @JsonProperty("protein") - public void setProtein(Coding value) { this.protein = value; } - - @JsonProperty("tcScore") - public ProteinExpressionTcScoreCoding getTcScore() { return tcScore; } - @JsonProperty("tcScore") - public void setTcScore(ProteinExpressionTcScoreCoding value) { this.tcScore = value; } - - @JsonProperty("tpsScore") - public Long getTpsScore() { return tpsScore; } - @JsonProperty("tpsScore") - public void setTpsScore(Long value) { this.tpsScore = value; } - - @JsonProperty("value") - public ProteinExpressionResultCoding getValue() { return value; } - @JsonProperty("value") - public void setValue(ProteinExpressionResultCoding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCoding.java index 7d01df1..ceac742 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ProteinExpressionIcScoreCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ProteinExpressionIcScoreCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ProteinExpressionIcScoreCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ProteinExpressionIcScoreCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCodingCode.java index 3a08d05..8d52a49 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionIcScoreCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ProteinExpressionIcScoreCodingCode { CODE_0, CODE_1, CODE_2, CODE_3; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCoding.java index 31fd787..d54ba7c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ProteinExpressionResultCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ProteinExpressionResultCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ProteinExpressionResultCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ProteinExpressionResultCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCodingCode.java index 06478dd..d899348 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionResultCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ProteinExpressionResultCodingCode { EXP, NOT_EXP, CODE_1PLUS, CODE_2PLUS, CODE_3PLUS, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCoding.java index 54c110c..f176ef2 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ProteinExpressionTcScoreCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ProteinExpressionTcScoreCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ProteinExpressionTcScoreCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ProteinExpressionTcScoreCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCodingCode.java index f0740f4..468e870 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ProteinExpressionTcScoreCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ProteinExpressionTcScoreCodingCode { CODE_0, CODE_1, CODE_2, CODE_3, CODE_4, CODE_5, CODE_6; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Provision.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Provision.java index f5c9c26..3c1b0e5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Provision.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Provision.java @@ -1,27 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Provision { + @Getter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("purpose")}) + @Setter(onMethod_ = {@JsonProperty("purpose")}) private ModelProjectConsentPurpose purpose; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private ConsentProvision type; - - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getDate() { return date; } - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("purpose") - public ModelProjectConsentPurpose getPurpose() { return purpose; } - @JsonProperty("purpose") - public void setPurpose(ModelProjectConsentPurpose value) { this.purpose = value; } - - @JsonProperty("type") - public ConsentProvision getType() { return type; } - @JsonProperty("type") - public void setType(ConsentProvision value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationReference.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationReference.java index 3a17d9e..f53ad83 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationReference.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationReference.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PublicationReference { + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private PublicationSystem system; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private String type; - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("system") - public PublicationSystem getSystem() { return system; } - @JsonProperty("system") - public void setSystem(PublicationSystem value) { this.system = value; } - - @JsonProperty("type") - public String getType() { return type; } - @JsonProperty("type") - public void setType(String value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationSystem.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationSystem.java index 34bb2aa..2993f3a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationSystem.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/PublicationSystem.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum PublicationSystem { PUBMED_NCBI_NLM_NIH_GOV, DOI_ORG; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RebiopsyRequest.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RebiopsyRequest.java index 0a6727a..ea95879 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RebiopsyRequest.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RebiopsyRequest.java @@ -1,33 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RebiopsyRequest { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("tumorEntity")}) + @Setter(onMethod_ = {@JsonProperty("tumorEntity")}) private Reference tumorEntity; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("tumorEntity") - public Reference getTumorEntity() { return tumorEntity; } - @JsonProperty("tumorEntity") - public void setTumorEntity(Reference value) { this.tumorEntity = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCoding.java index 7ba1a8a..f617bff 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RecistCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private RecistCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public RecistCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(RecistCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCodingCode.java index 9df7135..b74aae7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecistCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum RecistCodingCode { CR, MR, NA, PD, PR, SD; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCoding.java index 0df4de6..d40b803 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RecommendationPriorityCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private RecommendationPriorityCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public RecommendationPriorityCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(RecommendationPriorityCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCodingCode.java index dccf9ab..4ec59d0 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RecommendationPriorityCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum RecommendationPriorityCodingCode { CODE_1, CODE_2, CODE_3, CODE_4; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Reference.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Reference.java index ea2cf94..5f12aba 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Reference.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Reference.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Reference { + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private String type; - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("type") - public String getType() { return type; } - @JsonProperty("type") - public void setType(String value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RequestedMedicationSystem.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RequestedMedicationSystem.java index d62d678..e0f094d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RequestedMedicationSystem.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RequestedMedicationSystem.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum RequestedMedicationSystem { FHIR_DE_CODE_SYSTEM_BFARM_ATC, UNDEFINED; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Response.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Response.java index d03077a..5bc01b6 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Response.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Response.java @@ -1,45 +1,32 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Response { + @Getter(onMethod_ = {@JsonProperty("effectiveDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("effectiveDate"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date effectiveDate; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("method")}) + @Setter(onMethod_ = {@JsonProperty("method")}) private ResponseMethodCoding method; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("therapy")}) + @Setter(onMethod_ = {@JsonProperty("therapy")}) private Reference therapy; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private RecistCoding value; - - @JsonProperty("effectiveDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getEffectiveDate() { return effectiveDate; } - @JsonProperty("effectiveDate") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setEffectiveDate(Date value) { this.effectiveDate = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("method") - public ResponseMethodCoding getMethod() { return method; } - @JsonProperty("method") - public void setMethod(ResponseMethodCoding value) { this.method = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("therapy") - public Reference getTherapy() { return therapy; } - @JsonProperty("therapy") - public void setTherapy(Reference value) { this.therapy = value; } - - @JsonProperty("value") - public RecistCoding getValue() { return value; } - @JsonProperty("value") - public void setValue(RecistCoding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCoding.java index 04f7e98..ef52afb 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class ResponseMethodCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private ResponseMethodCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public ResponseMethodCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(ResponseMethodCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCodingCode.java index 08707b0..ea022a5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ResponseMethodCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ResponseMethodCodingCode { RANO, RECIST; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusion.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusion.java index f2f097f..f3e4faa 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusion.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusion.java @@ -1,55 +1,37 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RnaFusion { + @Getter(onMethod_ = {@JsonProperty("effect")}) + @Setter(onMethod_ = {@JsonProperty("effect")}) private String effect; + @Getter(onMethod_ = {@JsonProperty("externalIds")}) + @Setter(onMethod_ = {@JsonProperty("externalIds")}) private List externalIds; + @Getter(onMethod_ = {@JsonProperty("fusionPartner3prime")}) + @Setter(onMethod_ = {@JsonProperty("fusionPartner3prime")}) private RnaFusionFusionPartner3Prime fusionPartner3Prime; + @Getter(onMethod_ = {@JsonProperty("fusionPartner5prime")}) + @Setter(onMethod_ = {@JsonProperty("fusionPartner5prime")}) private RnaFusionFusionPartner5Prime fusionPartner5Prime; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private List localization; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("reportedNumReads")}) + @Setter(onMethod_ = {@JsonProperty("reportedNumReads")}) private long reportedNumReads; - - @JsonProperty("effect") - public String getEffect() { return effect; } - @JsonProperty("effect") - public void setEffect(String value) { this.effect = value; } - - @JsonProperty("externalIds") - public List getExternalIds() { return externalIds; } - @JsonProperty("externalIds") - public void setExternalIds(List value) { this.externalIds = value; } - - @JsonProperty("fusionPartner3prime") - public RnaFusionFusionPartner3Prime getFusionPartner3Prime() { return fusionPartner3Prime; } - @JsonProperty("fusionPartner3prime") - public void setFusionPartner3Prime(RnaFusionFusionPartner3Prime value) { this.fusionPartner3Prime = value; } - - @JsonProperty("fusionPartner5prime") - public RnaFusionFusionPartner5Prime getFusionPartner5Prime() { return fusionPartner5Prime; } - @JsonProperty("fusionPartner5prime") - public void setFusionPartner5Prime(RnaFusionFusionPartner5Prime value) { this.fusionPartner5Prime = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("localization") - public List getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(List value) { this.localization = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("reportedNumReads") - public long getReportedNumReads() { return reportedNumReads; } - @JsonProperty("reportedNumReads") - public void setReportedNumReads(long value) { this.reportedNumReads = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner3Prime.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner3Prime.java index 947b9f2..aa60daa 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner3Prime.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner3Prime.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RnaFusionFusionPartner3Prime { + @Getter(onMethod_ = {@JsonProperty("exonId")}) + @Setter(onMethod_ = {@JsonProperty("exonId")}) private String exonId; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("position")}) + @Setter(onMethod_ = {@JsonProperty("position")}) private double position; + @Getter(onMethod_ = {@JsonProperty("strand")}) + @Setter(onMethod_ = {@JsonProperty("strand")}) private RnaFusionStrand strand; + @Getter(onMethod_ = {@JsonProperty("transcriptId")}) + @Setter(onMethod_ = {@JsonProperty("transcriptId")}) private TranscriptId transcriptId; - - @JsonProperty("exonId") - public String getExonId() { return exonId; } - @JsonProperty("exonId") - public void setExonId(String value) { this.exonId = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("position") - public double getPosition() { return position; } - @JsonProperty("position") - public void setPosition(double value) { this.position = value; } - - @JsonProperty("strand") - public RnaFusionStrand getStrand() { return strand; } - @JsonProperty("strand") - public void setStrand(RnaFusionStrand value) { this.strand = value; } - - @JsonProperty("transcriptId") - public TranscriptId getTranscriptId() { return transcriptId; } - @JsonProperty("transcriptId") - public void setTranscriptId(TranscriptId value) { this.transcriptId = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner5Prime.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner5Prime.java index 7a76c87..36f8fc4 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner5Prime.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionFusionPartner5Prime.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RnaFusionFusionPartner5Prime { + @Getter(onMethod_ = {@JsonProperty("exonId")}) + @Setter(onMethod_ = {@JsonProperty("exonId")}) private String exonId; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("position")}) + @Setter(onMethod_ = {@JsonProperty("position")}) private double position; + @Getter(onMethod_ = {@JsonProperty("strand")}) + @Setter(onMethod_ = {@JsonProperty("strand")}) private RnaFusionStrand strand; + @Getter(onMethod_ = {@JsonProperty("transcriptId")}) + @Setter(onMethod_ = {@JsonProperty("transcriptId")}) private TranscriptId transcriptId; - - @JsonProperty("exonId") - public String getExonId() { return exonId; } - @JsonProperty("exonId") - public void setExonId(String value) { this.exonId = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("position") - public double getPosition() { return position; } - @JsonProperty("position") - public void setPosition(double value) { this.position = value; } - - @JsonProperty("strand") - public RnaFusionStrand getStrand() { return strand; } - @JsonProperty("strand") - public void setStrand(RnaFusionStrand value) { this.strand = value; } - - @JsonProperty("transcriptId") - public TranscriptId getTranscriptId() { return transcriptId; } - @JsonProperty("transcriptId") - public void setTranscriptId(TranscriptId value) { this.transcriptId = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionStrand.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionStrand.java index e749cd0..3cc71b3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionStrand.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaFusionStrand.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum RnaFusionStrand { EMPTY, RNA_FUSION_STRAND; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaSeq.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaSeq.java index ab7b6a8..5215627 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaSeq.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/RnaSeq.java @@ -1,79 +1,49 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class RnaSeq { + @Getter(onMethod_ = {@JsonProperty("cohortRanking")}) + @Setter(onMethod_ = {@JsonProperty("cohortRanking")}) private Long cohortRanking; + @Getter(onMethod_ = {@JsonProperty("externalIds")}) + @Setter(onMethod_ = {@JsonProperty("externalIds")}) private List externalIds; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("librarySize")}) + @Setter(onMethod_ = {@JsonProperty("librarySize")}) private Long librarySize; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private List localization; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("rawCounts")}) + @Setter(onMethod_ = {@JsonProperty("rawCounts")}) private long rawCounts; + @Getter(onMethod_ = {@JsonProperty("tissueCorrectedExpression")}) + @Setter(onMethod_ = {@JsonProperty("tissueCorrectedExpression")}) private Boolean tissueCorrectedExpression; + @Getter(onMethod_ = {@JsonProperty("transcriptId")}) + @Setter(onMethod_ = {@JsonProperty("transcriptId")}) private TranscriptId transcriptId; + @Getter(onMethod_ = {@JsonProperty("transcriptsPerMillion")}) + @Setter(onMethod_ = {@JsonProperty("transcriptsPerMillion")}) private double transcriptsPerMillion; + @Getter(onMethod_ = {@JsonProperty("variant")}) + @Setter(onMethod_ = {@JsonProperty("variant")}) private Reference variant; - - @JsonProperty("cohortRanking") - public Long getCohortRanking() { return cohortRanking; } - @JsonProperty("cohortRanking") - public void setCohortRanking(Long value) { this.cohortRanking = value; } - - @JsonProperty("externalIds") - public List getExternalIds() { return externalIds; } - @JsonProperty("externalIds") - public void setExternalIds(List value) { this.externalIds = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("librarySize") - public Long getLibrarySize() { return librarySize; } - @JsonProperty("librarySize") - public void setLibrarySize(Long value) { this.librarySize = value; } - - @JsonProperty("localization") - public List getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(List value) { this.localization = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("rawCounts") - public long getRawCounts() { return rawCounts; } - @JsonProperty("rawCounts") - public void setRawCounts(long value) { this.rawCounts = value; } - - @JsonProperty("tissueCorrectedExpression") - public Boolean getTissueCorrectedExpression() { return tissueCorrectedExpression; } - @JsonProperty("tissueCorrectedExpression") - public void setTissueCorrectedExpression(Boolean value) { this.tissueCorrectedExpression = value; } - - @JsonProperty("transcriptId") - public TranscriptId getTranscriptId() { return transcriptId; } - @JsonProperty("transcriptId") - public void setTranscriptId(TranscriptId value) { this.transcriptId = value; } - - @JsonProperty("transcriptsPerMillion") - public double getTranscriptsPerMillion() { return transcriptsPerMillion; } - @JsonProperty("transcriptsPerMillion") - public void setTranscriptsPerMillion(double value) { this.transcriptsPerMillion = value; } - - @JsonProperty("variant") - public Reference getVariant() { return variant; } - @JsonProperty("variant") - public void setVariant(Reference value) { this.variant = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Snv.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Snv.java index a0a7058..f025478 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Snv.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Snv.java @@ -1,103 +1,61 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Snv { + @Getter(onMethod_ = {@JsonProperty("allelicFrequency")}) + @Setter(onMethod_ = {@JsonProperty("allelicFrequency")}) private double allelicFrequency; + @Getter(onMethod_ = {@JsonProperty("altAllele")}) + @Setter(onMethod_ = {@JsonProperty("altAllele")}) private String altAllele; + @Getter(onMethod_ = {@JsonProperty("chromosome")}) + @Setter(onMethod_ = {@JsonProperty("chromosome")}) private Chromosome chromosome; + @Getter(onMethod_ = {@JsonProperty("dnaChange")}) + @Setter(onMethod_ = {@JsonProperty("dnaChange")}) private String dnaChange; + @Getter(onMethod_ = {@JsonProperty("exonId")}) + @Setter(onMethod_ = {@JsonProperty("exonId")}) private String exonId; + @Getter(onMethod_ = {@JsonProperty("externalIds")}) + @Setter(onMethod_ = {@JsonProperty("externalIds")}) private List externalIds; + @Getter(onMethod_ = {@JsonProperty("gene")}) + @Setter(onMethod_ = {@JsonProperty("gene")}) private Coding gene; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("interpretation")}) + @Setter(onMethod_ = {@JsonProperty("interpretation")}) private ClinVarCoding interpretation; + @Getter(onMethod_ = {@JsonProperty("localization")}) + @Setter(onMethod_ = {@JsonProperty("localization")}) private List localization; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("position")}) + @Setter(onMethod_ = {@JsonProperty("position")}) private Position position; + @Getter(onMethod_ = {@JsonProperty("proteinChange")}) + @Setter(onMethod_ = {@JsonProperty("proteinChange")}) private String proteinChange; + @Getter(onMethod_ = {@JsonProperty("readDepth")}) + @Setter(onMethod_ = {@JsonProperty("readDepth")}) private long readDepth; + @Getter(onMethod_ = {@JsonProperty("refAllele")}) + @Setter(onMethod_ = {@JsonProperty("refAllele")}) private String refAllele; + @Getter(onMethod_ = {@JsonProperty("transcriptId")}) + @Setter(onMethod_ = {@JsonProperty("transcriptId")}) private TranscriptId transcriptId; - - @JsonProperty("allelicFrequency") - public double getAllelicFrequency() { return allelicFrequency; } - @JsonProperty("allelicFrequency") - public void setAllelicFrequency(double value) { this.allelicFrequency = value; } - - @JsonProperty("altAllele") - public String getAltAllele() { return altAllele; } - @JsonProperty("altAllele") - public void setAltAllele(String value) { this.altAllele = value; } - - @JsonProperty("chromosome") - public Chromosome getChromosome() { return chromosome; } - @JsonProperty("chromosome") - public void setChromosome(Chromosome value) { this.chromosome = value; } - - @JsonProperty("dnaChange") - public String getDnaChange() { return dnaChange; } - @JsonProperty("dnaChange") - public void setDnaChange(String value) { this.dnaChange = value; } - - @JsonProperty("exonId") - public String getExonId() { return exonId; } - @JsonProperty("exonId") - public void setExonId(String value) { this.exonId = value; } - - @JsonProperty("externalIds") - public List getExternalIds() { return externalIds; } - @JsonProperty("externalIds") - public void setExternalIds(List value) { this.externalIds = value; } - - @JsonProperty("gene") - public Coding getGene() { return gene; } - @JsonProperty("gene") - public void setGene(Coding value) { this.gene = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("interpretation") - public ClinVarCoding getInterpretation() { return interpretation; } - @JsonProperty("interpretation") - public void setInterpretation(ClinVarCoding value) { this.interpretation = value; } - - @JsonProperty("localization") - public List getLocalization() { return localization; } - @JsonProperty("localization") - public void setLocalization(List value) { this.localization = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("position") - public Position getPosition() { return position; } - @JsonProperty("position") - public void setPosition(Position value) { this.position = value; } - - @JsonProperty("proteinChange") - public String getProteinChange() { return proteinChange; } - @JsonProperty("proteinChange") - public void setProteinChange(String value) { this.proteinChange = value; } - - @JsonProperty("readDepth") - public long getReadDepth() { return readDepth; } - @JsonProperty("readDepth") - public void setReadDepth(long value) { this.readDepth = value; } - - @JsonProperty("refAllele") - public String getRefAllele() { return refAllele; } - @JsonProperty("refAllele") - public void setRefAllele(String value) { this.refAllele = value; } - - @JsonProperty("transcriptId") - public TranscriptId getTranscriptId() { return transcriptId; } - @JsonProperty("transcriptId") - public void setTranscriptId(TranscriptId value) { this.transcriptId = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/SomaticNgsReport.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/SomaticNgsReport.java index 7c6156a..7667a1a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/SomaticNgsReport.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/SomaticNgsReport.java @@ -1,52 +1,36 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class SomaticNgsReport { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("issuedOn"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date issuedOn; + @Getter(onMethod_ = {@JsonProperty("metadata")}) + @Setter(onMethod_ = {@JsonProperty("metadata")}) private List metadata; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("results")}) + @Setter(onMethod_ = {@JsonProperty("results")}) private NgsReportResults results; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private NgsReportCoding type; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getIssuedOn() { return issuedOn; } - @JsonProperty("issuedOn") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setIssuedOn(Date value) { this.issuedOn = value; } - - @JsonProperty("metadata") - public List getMetadata() { return metadata; } - @JsonProperty("metadata") - public void setMetadata(List value) { this.metadata = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("results") - public NgsReportResults getResults() { return results; } - @JsonProperty("results") - public void setResults(NgsReportResults value) { this.results = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("type") - public NgsReportCoding getType() { return type; } - @JsonProperty("type") - public void setType(NgsReportCoding value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Staging.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Staging.java index 84be81b..aaec232 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Staging.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Staging.java @@ -1,13 +1,16 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Staging { + @Getter(onMethod_ = {@JsonProperty("history")}) + @Setter(onMethod_ = {@JsonProperty("history")}) private List history; - - @JsonProperty("history") - public List getHistory() { return history; } - @JsonProperty("history") - public void setHistory(List value) { this.history = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/StartRange.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/StartRange.java index 6c4efd9..d364fa5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/StartRange.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/StartRange.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class StartRange { + @Getter(onMethod_ = {@JsonProperty("end")}) + @Setter(onMethod_ = {@JsonProperty("end")}) private Double end; + @Getter(onMethod_ = {@JsonProperty("start")}) + @Setter(onMethod_ = {@JsonProperty("start")}) private double start; - - @JsonProperty("end") - public Double getEnd() { return end; } - @JsonProperty("end") - public void setEnd(Double value) { this.end = value; } - - @JsonProperty("start") - public double getStart() { return start; } - @JsonProperty("start") - public void setStart(double value) { this.start = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/StudyReference.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/StudyReference.java index f5114a9..7106238 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/StudyReference.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/StudyReference.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class StudyReference { + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private StudySystem system; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private String type; - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("system") - public StudySystem getSystem() { return system; } - @JsonProperty("system") - public void setSystem(StudySystem value) { this.system = value; } - - @JsonProperty("type") - public String getType() { return type; } - @JsonProperty("type") - public void setType(String value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/StudySystem.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/StudySystem.java index 6098479..9072f2c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/StudySystem.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/StudySystem.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum StudySystem { DRKS, EUDAMED, EUDRA_CT, NCT; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/SystemicTherapy.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/SystemicTherapy.java index 3abd517..8521f1a 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/SystemicTherapy.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/SystemicTherapy.java @@ -1,13 +1,16 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class SystemicTherapy { + @Getter(onMethod_ = {@JsonProperty("history")}) + @Setter(onMethod_ = {@JsonProperty("history")}) private List history; - - @JsonProperty("history") - public List getHistory() { return history; } - @JsonProperty("history") - public void setHistory(List value) { this.history = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCoding.java index 7c6fc48..d935d82 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TherapyStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TherapyStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TherapyStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TherapyStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCodingCode.java index 8d3c5ee..7635aa7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TherapyStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TherapyStatusCodingCode { COMPLETED, NOT_DONE, ON_GOING, STOPPED, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Tmb.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Tmb.java index 83bf7d8..35f3816 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Tmb.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Tmb.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Tmb { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("interpretation")}) + @Setter(onMethod_ = {@JsonProperty("interpretation")}) private TmbInterpretationCoding interpretation; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private TmbResult value; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("interpretation") - public TmbInterpretationCoding getInterpretation() { return interpretation; } - @JsonProperty("interpretation") - public void setInterpretation(TmbInterpretationCoding value) { this.interpretation = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("value") - public TmbResult getValue() { return value; } - @JsonProperty("value") - public void setValue(TmbResult value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbInterpretationCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbInterpretationCoding.java index a61f27f..bd50c86 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbInterpretationCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbInterpretationCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TmbInterpretationCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private InterpretationCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public InterpretationCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(InterpretationCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbResult.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbResult.java index f2b0a54..33d49f7 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbResult.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TmbResult.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TmbResult { + @Getter(onMethod_ = {@JsonProperty("unit")}) + @Setter(onMethod_ = {@JsonProperty("unit")}) private String unit; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private double value; - - @JsonProperty("unit") - public String getUnit() { return unit; } - @JsonProperty("unit") - public void setUnit(String value) { this.unit = value; } - - @JsonProperty("value") - public double getValue() { return value; } - @JsonProperty("value") - public void setValue(double value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TnmClassification.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TnmClassification.java index 9f80c34..17aa6b8 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TnmClassification.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TnmClassification.java @@ -1,24 +1,20 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TnmClassification { + @Getter(onMethod_ = {@JsonProperty("metastasis")}) + @Setter(onMethod_ = {@JsonProperty("metastasis")}) private Coding metastasis; + @Getter(onMethod_ = {@JsonProperty("nodes")}) + @Setter(onMethod_ = {@JsonProperty("nodes")}) private Coding nodes; + @Getter(onMethod_ = {@JsonProperty("tumor")}) + @Setter(onMethod_ = {@JsonProperty("tumor")}) private Coding tumor; - - @JsonProperty("metastasis") - public Coding getMetastasis() { return metastasis; } - @JsonProperty("metastasis") - public void setMetastasis(Coding value) { this.metastasis = value; } - - @JsonProperty("nodes") - public Coding getNodes() { return nodes; } - @JsonProperty("nodes") - public void setNodes(Coding value) { this.nodes = value; } - - @JsonProperty("tumor") - public Coding getTumor() { return tumor; } - @JsonProperty("tumor") - public void setTumor(Coding value) { this.tumor = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptId.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptId.java index f447b9a..2f81596 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptId.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptId.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TranscriptId { + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private TranscriptIdSystem system; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private String value; - - @JsonProperty("system") - public TranscriptIdSystem getSystem() { return system; } - @JsonProperty("system") - public void setSystem(TranscriptIdSystem value) { this.system = value; } - - @JsonProperty("value") - public String getValue() { return value; } - @JsonProperty("value") - public void setValue(String value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptIdSystem.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptIdSystem.java index 24ef392..d117fa3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptIdSystem.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TranscriptIdSystem.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TranscriptIdSystem { ENSEMBL_ORG, NCBI_NLM_NIH_GOV_REFSEQ; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContent.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContent.java index 9013408..d6d2535 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContent.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContent.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorCellContent { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("method")}) + @Setter(onMethod_ = {@JsonProperty("method")}) private TumorCellContentMethodCoding method; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private double value; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("method") - public TumorCellContentMethodCoding getMethod() { return method; } - @JsonProperty("method") - public void setMethod(TumorCellContentMethodCoding value) { this.method = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("value") - public double getValue() { return value; } - @JsonProperty("value") - public void setValue(double value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCoding.java index 18858ba..b0bb057 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorCellContentMethodCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TumorCellContentMethodCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TumorCellContentMethodCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TumorCellContentMethodCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCodingCode.java index 7d3e963..e919d39 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorCellContentMethodCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TumorCellContentMethodCodingCode { BIOINFORMATIC, HISTOLOGIC; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorGrading.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorGrading.java index a4418c4..2427cf4 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorGrading.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorGrading.java @@ -1,22 +1,21 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorGrading { + @Getter(onMethod_ = {@JsonProperty("codes")}) + @Setter(onMethod_ = {@JsonProperty("codes")}) private List codes; + @Getter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date date; - - @JsonProperty("codes") - public List getCodes() { return codes; } - @JsonProperty("codes") - public void setCodes(List value) { this.codes = value; } - - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getDate() { return date; } - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setDate(Date value) { this.date = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorMorphology.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorMorphology.java index 3e5ec8c..1cbd014 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorMorphology.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorMorphology.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorMorphology { + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("note")}) + @Setter(onMethod_ = {@JsonProperty("note")}) private String note; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("specimen")}) + @Setter(onMethod_ = {@JsonProperty("specimen")}) private Reference specimen; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private Coding value; - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("note") - public String getNote() { return note; } - @JsonProperty("note") - public void setNote(String value) { this.note = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("specimen") - public Reference getSpecimen() { return specimen; } - @JsonProperty("specimen") - public void setSpecimen(Reference value) { this.specimen = value; } - - @JsonProperty("value") - public Coding getValue() { return value; } - @JsonProperty("value") - public void setValue(Coding value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimen.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimen.java index 097c26e..5a783ab 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimen.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimen.java @@ -1,36 +1,26 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorSpecimen { + @Getter(onMethod_ = {@JsonProperty("collection")}) + @Setter(onMethod_ = {@JsonProperty("collection")}) private Collection collection; + @Getter(onMethod_ = {@JsonProperty("diagnosis")}) + @Setter(onMethod_ = {@JsonProperty("diagnosis")}) private Reference diagnosis; + @Getter(onMethod_ = {@JsonProperty("id")}) + @Setter(onMethod_ = {@JsonProperty("id")}) private String id; + @Getter(onMethod_ = {@JsonProperty("patient")}) + @Setter(onMethod_ = {@JsonProperty("patient")}) private Reference patient; + @Getter(onMethod_ = {@JsonProperty("type")}) + @Setter(onMethod_ = {@JsonProperty("type")}) private TumorSpecimenCoding type; - - @JsonProperty("collection") - public Collection getCollection() { return collection; } - @JsonProperty("collection") - public void setCollection(Collection value) { this.collection = value; } - - @JsonProperty("diagnosis") - public Reference getDiagnosis() { return diagnosis; } - @JsonProperty("diagnosis") - public void setDiagnosis(Reference value) { this.diagnosis = value; } - - @JsonProperty("id") - public String getId() { return id; } - @JsonProperty("id") - public void setId(String value) { this.id = value; } - - @JsonProperty("patient") - public Reference getPatient() { return patient; } - @JsonProperty("patient") - public void setPatient(Reference value) { this.patient = value; } - - @JsonProperty("type") - public TumorSpecimenCoding getType() { return type; } - @JsonProperty("type") - public void setType(TumorSpecimenCoding value) { this.type = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCoding.java index 40db539..3d3c7b5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorSpecimenCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TumorSpecimenCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TumorSpecimenCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TumorSpecimenCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCodingCode.java index f8ff478..0ca1e04 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TumorSpecimenCodingCode { CRYO_FROZEN, FFPE, FRESH_TISSUE, LIQUID_BIOPSY, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCoding.java index e7827f9..32f74e3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorSpecimenCollectionLocalizationCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TumorSpecimenCollectionLocalizationCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TumorSpecimenCollectionLocalizationCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TumorSpecimenCollectionLocalizationCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCodingCode.java index c35658f..e81a476 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionLocalizationCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TumorSpecimenCollectionLocalizationCodingCode { CELLFREE_DNA, LOCAL_RECURRENCE, METASTASIS, PRIMARY_TUMOR, REGIONAL_LYMPH_NODES, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCoding.java index 99c9515..f78b49c 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorSpecimenCollectionMethodCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TumorSpecimenCollectionMethodCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TumorSpecimenCollectionMethodCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TumorSpecimenCollectionMethodCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCodingCode.java index e514d62..95c8ee3 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorSpecimenCollectionMethodCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TumorSpecimenCollectionMethodCodingCode { BIOPSY, CYTOLOGY, LIQUID_BIOPSY, RESECTION, UNKNOWN; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStaging.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStaging.java index d22f7f8..3fafe94 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStaging.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStaging.java @@ -1,34 +1,27 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.Date; import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorStaging { + @Getter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) + @Setter(onMethod_ = {@JsonProperty("date"), @JsonFormat(pattern = "yyyy-MM-dd")}) private Date date; + @Getter(onMethod_ = {@JsonProperty("method")}) + @Setter(onMethod_ = {@JsonProperty("method")}) private TumorStagingMethodCoding method; + @Getter(onMethod_ = {@JsonProperty("otherClassifications")}) + @Setter(onMethod_ = {@JsonProperty("otherClassifications")}) private List otherClassifications; + @Getter(onMethod_ = {@JsonProperty("tnmClassification")}) + @Setter(onMethod_ = {@JsonProperty("tnmClassification")}) private TnmClassification tnmClassification; - - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public Date getDate() { return date; } - @JsonProperty("date") - @JsonFormat(pattern = "yyyy-MM-dd") - public void setDate(Date value) { this.date = value; } - - @JsonProperty("method") - public TumorStagingMethodCoding getMethod() { return method; } - @JsonProperty("method") - public void setMethod(TumorStagingMethodCoding value) { this.method = value; } - - @JsonProperty("otherClassifications") - public List getOtherClassifications() { return otherClassifications; } - @JsonProperty("otherClassifications") - public void setOtherClassifications(List value) { this.otherClassifications = value; } - - @JsonProperty("tnmClassification") - public TnmClassification getTnmClassification() { return tnmClassification; } - @JsonProperty("tnmClassification") - public void setTnmClassification(TnmClassification value) { this.tnmClassification = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCoding.java index 64507e0..e365078 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class TumorStagingMethodCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private TumorStagingMethodCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public TumorStagingMethodCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(TumorStagingMethodCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCodingCode.java index 0b01f8c..96f2ba1 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/TumorStagingMethodCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum TumorStagingMethodCodingCode { CLINICAL, PATHOLOGIC; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Type.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Type.java index 2319f2b..2c6cc2e 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Type.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Type.java @@ -1,13 +1,16 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + import java.util.List; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class Type { + @Getter(onMethod_ = {@JsonProperty("history")}) + @Setter(onMethod_ = {@JsonProperty("history")}) private List history; - - @JsonProperty("history") - public List getHistory() { return history; } - @JsonProperty("history") - public void setHistory(List value) { this.history = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/Unit.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/Unit.java index 32f1ce1..fe1f73d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/Unit.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/Unit.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum Unit { MONTHS, YEARS; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/ValueCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/ValueCode.java index 847bc49..39ccb01 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/ValueCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/ValueCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum ValueCode { MAIN, METACHRONOUS, SECONDARY; diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/VariantExternalId.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/VariantExternalId.java index 97a307e..ef5218d 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/VariantExternalId.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/VariantExternalId.java @@ -1,18 +1,17 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class VariantExternalId { + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private ExternalIdSystem system; + @Getter(onMethod_ = {@JsonProperty("value")}) + @Setter(onMethod_ = {@JsonProperty("value")}) private String value; - - @JsonProperty("system") - public ExternalIdSystem getSystem() { return system; } - @JsonProperty("system") - public void setSystem(ExternalIdSystem value) { this.system = value; } - - @JsonProperty("value") - public String getValue() { return value; } - @JsonProperty("value") - public void setValue(String value) { this.value = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCoding.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCoding.java index 1d9c95a..d0f6221 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCoding.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCoding.java @@ -1,30 +1,23 @@ package dev.pcvolkmer.mv64e.mtb; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class VitalStatusCoding { + @Getter(onMethod_ = {@JsonProperty("code")}) + @Setter(onMethod_ = {@JsonProperty("code")}) private VitalStatusCodingCode code; + @Getter(onMethod_ = {@JsonProperty("display")}) + @Setter(onMethod_ = {@JsonProperty("display")}) private String display; + @Getter(onMethod_ = {@JsonProperty("system")}) + @Setter(onMethod_ = {@JsonProperty("system")}) private String system; + @Getter(onMethod_ = {@JsonProperty("version")}) + @Setter(onMethod_ = {@JsonProperty("version")}) private String version; - - @JsonProperty("code") - public VitalStatusCodingCode getCode() { return code; } - @JsonProperty("code") - public void setCode(VitalStatusCodingCode value) { this.code = value; } - - @JsonProperty("display") - public String getDisplay() { return display; } - @JsonProperty("display") - public void setDisplay(String value) { this.display = value; } - - @JsonProperty("system") - public String getSystem() { return system; } - @JsonProperty("system") - public void setSystem(String value) { this.system = value; } - - @JsonProperty("version") - public String getVersion() { return version; } - @JsonProperty("version") - public void setVersion(String value) { this.version = value; } } diff --git a/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCodingCode.java b/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCodingCode.java index 24a25c1..10519a5 100644 --- a/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCodingCode.java +++ b/src/main/java/dev/pcvolkmer/mv64e/mtb/VitalStatusCodingCode.java @@ -1,7 +1,9 @@ package dev.pcvolkmer.mv64e.mtb; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + import java.io.IOException; -import com.fasterxml.jackson.annotation.*; public enum VitalStatusCodingCode { ALIVE, DECEASED;