Use Project Lombok

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'
 }

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; }
 }

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; }
 }

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; }
 }

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; }
 }

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;

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; }
 }

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; }
 }

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;

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<AtcUnregisteredMedicationCoding> 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<AtcUnregisteredMedicationCoding> getRequestedMedication() { return requestedMedication; }
-    @JsonProperty("requestedMedication")
-    public void setRequestedMedication(List<AtcUnregisteredMedicationCoding> value) { this.requestedMedication = value; }
-
-    @JsonProperty("stage")
-    public ClaimStageCoding getStage() { return stage; }
-    @JsonProperty("stage")
-    public void setStage(ClaimStageCoding value) { this.stage = value; }
 }

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; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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<Coding> copyNumberNeutralLoH;
+    @Getter(onMethod_ = {@JsonProperty("endRange")})
+    @Setter(onMethod_ = {@JsonProperty("endRange")})
     private EndRange endRange;
+    @Getter(onMethod_ = {@JsonProperty("externalIds")})
+    @Setter(onMethod_ = {@JsonProperty("externalIds")})
     private List<VariantExternalId> externalIds;
+    @Getter(onMethod_ = {@JsonProperty("id")})
+    @Setter(onMethod_ = {@JsonProperty("id")})
     private String id;
+    @Getter(onMethod_ = {@JsonProperty("localization")})
+    @Setter(onMethod_ = {@JsonProperty("localization")})
     private List<BaseVariantLocalizationCoding> 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<Coding> 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<Coding> getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; }
-    @JsonProperty("copyNumberNeutralLoH")
-    public void setCopyNumberNeutralLoH(List<Coding> 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<VariantExternalId> getExternalIds() { return externalIds; }
-    @JsonProperty("externalIds")
-    public void setExternalIds(List<VariantExternalId> 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<BaseVariantLocalizationCoding> getLocalization() { return localization; }
-    @JsonProperty("localization")
-    public void setLocalization(List<BaseVariantLocalizationCoding> 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<Coding> getReportedAffectedGenes() { return reportedAffectedGenes; }
-    @JsonProperty("reportedAffectedGenes")
-    public void setReportedAffectedGenes(List<Coding> 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; }
 }

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; }
 }

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;

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; }
 }

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; }
 }

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; }
 }

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; }
 }

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;

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<VariantExternalId> 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<BaseVariantLocalizationCoding> 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<VariantExternalId> getExternalIds() { return externalIds; }
-    @JsonProperty("externalIds")
-    public void setExternalIds(List<VariantExternalId> 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<BaseVariantLocalizationCoding> getLocalization() { return localization; }
-    @JsonProperty("localization")
-    public void setLocalization(List<BaseVariantLocalizationCoding> 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; }
 }

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; }
 }

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; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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; }
 }

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; }
 }

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;

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<TumorGrading> history;
-
-    @JsonProperty("history")
-    public List<TumorGrading> getHistory() { return history; }
-    @JsonProperty("history")
-    public void setHistory(List<TumorGrading> value) { this.history = value; }
 }

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; }
 }

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; }
 }

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;

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; }
 }

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; }
 }

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; }
 }

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; }
 }

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; }
 }

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; }
 }

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<String> 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<String> getBlockIds() { return blockIds; }
-    @JsonProperty("blockIds")
-    public void setBlockIds(List<String> 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; }
 }

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> msiMmr;
+    @Getter(onMethod_ = {@JsonProperty("proteinExpression")})
+    @Setter(onMethod_ = {@JsonProperty("proteinExpression")})
     private List<ProteinExpression> proteinExpression;
-
-    @JsonProperty("msiMmr")
-    public List<MSIMmr> getMsiMmr() { return msiMmr; }
-    @JsonProperty("msiMmr")
-    public void setMsiMmr(List<MSIMmr> value) { this.msiMmr = value; }
-
-    @JsonProperty("proteinExpression")
-    public List<ProteinExpression> getProteinExpression() { return proteinExpression; }
-    @JsonProperty("proteinExpression")
-    public void setProteinExpression(List<ProteinExpression> value) { this.proteinExpression = value; }
 }

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;

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<LevelOfEvidenceAddendumCoding> addendums;
+    @Getter(onMethod_ = {@JsonProperty("grading")})
+    @Setter(onMethod_ = {@JsonProperty("grading")})
     private LevelOfEvidenceGradingCoding grading;
+    @Getter(onMethod_ = {@JsonProperty("publications")})
+    @Setter(onMethod_ = {@JsonProperty("publications")})
     private List<PublicationReference> publications;
-
-    @JsonProperty("addendums")
-    public List<LevelOfEvidenceAddendumCoding> getAddendums() { return addendums; }
-    @JsonProperty("addendums")
-    public void setAddendums(List<LevelOfEvidenceAddendumCoding> 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<PublicationReference> getPublications() { return publications; }
-    @JsonProperty("publications")
-    public void setPublications(List<PublicationReference> value) { this.publications = value; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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<Provision> 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<Provision> getProvisions() { return provisions; }
-    @JsonProperty("provisions")
-    public void setProvisions(List<Provision> value) { this.provisions = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
 }

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;

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; }
 }

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;

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<MtbCarePlan> carePlans;
+    @Getter(onMethod_ = {@JsonProperty("claimResponses")})
+    @Setter(onMethod_ = {@JsonProperty("claimResponses")})
     private List<ClaimResponse> claimResponses;
+    @Getter(onMethod_ = {@JsonProperty("claims")})
+    @Setter(onMethod_ = {@JsonProperty("claims")})
     private List<Claim> claims;
+    @Getter(onMethod_ = {@JsonProperty("diagnoses")})
+    @Setter(onMethod_ = {@JsonProperty("diagnoses")})
     private List<MtbDiagnosis> diagnoses;
+    @Getter(onMethod_ = {@JsonProperty("episodesOfCare")})
+    @Setter(onMethod_ = {@JsonProperty("episodesOfCare")})
     private List<MtbEpisodeOfCare> episodesOfCare;
+    @Getter(onMethod_ = {@JsonProperty("followUps")})
+    @Setter(onMethod_ = {@JsonProperty("followUps")})
     private List<FollowUp> followUps;
+    @Getter(onMethod_ = {@JsonProperty("guidelineProcedures")})
+    @Setter(onMethod_ = {@JsonProperty("guidelineProcedures")})
     private List<OncoProcedure> guidelineProcedures;
+    @Getter(onMethod_ = {@JsonProperty("guidelineTherapies")})
+    @Setter(onMethod_ = {@JsonProperty("guidelineTherapies")})
     private List<MtbSystemicTherapy> guidelineTherapies;
+    @Getter(onMethod_ = {@JsonProperty("histologyReports")})
+    @Setter(onMethod_ = {@JsonProperty("histologyReports")})
     private List<HistologyReport> histologyReports;
+    @Getter(onMethod_ = {@JsonProperty("ihcReports")})
+    @Setter(onMethod_ = {@JsonProperty("ihcReports")})
     private List<IhcReport> ihcReports;
+    @Getter(onMethod_ = {@JsonProperty("metadata")})
+    @Setter(onMethod_ = {@JsonProperty("metadata")})
     private MvhMetadata metadata;
+    @Getter(onMethod_ = {@JsonProperty("ngsReports")})
+    @Setter(onMethod_ = {@JsonProperty("ngsReports")})
     private List<SomaticNgsReport> ngsReports;
+    @Getter(onMethod_ = {@JsonProperty("patient")})
+    @Setter(onMethod_ = {@JsonProperty("patient")})
     private Patient patient;
+    @Getter(onMethod_ = {@JsonProperty("performanceStatus")})
+    @Setter(onMethod_ = {@JsonProperty("performanceStatus")})
     private List<PerformanceStatus> performanceStatus;
+    @Getter(onMethod_ = {@JsonProperty("priorDiagnosticReports")})
+    @Setter(onMethod_ = {@JsonProperty("priorDiagnosticReports")})
     private List<PriorDiagnosticReport> priorDiagnosticReports;
+    @Getter(onMethod_ = {@JsonProperty("responses")})
+    @Setter(onMethod_ = {@JsonProperty("responses")})
     private List<Response> responses;
+    @Getter(onMethod_ = {@JsonProperty("specimens")})
+    @Setter(onMethod_ = {@JsonProperty("specimens")})
     private List<TumorSpecimen> specimens;
+    @Getter(onMethod_ = {@JsonProperty("systemicTherapies")})
+    @Setter(onMethod_ = {@JsonProperty("systemicTherapies")})
     private List<SystemicTherapy> systemicTherapies;
-
-    @JsonProperty("carePlans")
-    public List<MtbCarePlan> getCarePlans() { return carePlans; }
-    @JsonProperty("carePlans")
-    public void setCarePlans(List<MtbCarePlan> value) { this.carePlans = value; }
-
-    @JsonProperty("claimResponses")
-    public List<ClaimResponse> getClaimResponses() { return claimResponses; }
-    @JsonProperty("claimResponses")
-    public void setClaimResponses(List<ClaimResponse> value) { this.claimResponses = value; }
-
-    @JsonProperty("claims")
-    public List<Claim> getClaims() { return claims; }
-    @JsonProperty("claims")
-    public void setClaims(List<Claim> value) { this.claims = value; }
-
-    @JsonProperty("diagnoses")
-    public List<MtbDiagnosis> getDiagnoses() { return diagnoses; }
-    @JsonProperty("diagnoses")
-    public void setDiagnoses(List<MtbDiagnosis> value) { this.diagnoses = value; }
-
-    @JsonProperty("episodesOfCare")
-    public List<MtbEpisodeOfCare> getEpisodesOfCare() { return episodesOfCare; }
-    @JsonProperty("episodesOfCare")
-    public void setEpisodesOfCare(List<MtbEpisodeOfCare> value) { this.episodesOfCare = value; }
-
-    @JsonProperty("followUps")
-    public List<FollowUp> getFollowUps() { return followUps; }
-    @JsonProperty("followUps")
-    public void setFollowUps(List<FollowUp> value) { this.followUps = value; }
-
-    @JsonProperty("guidelineProcedures")
-    public List<OncoProcedure> getGuidelineProcedures() { return guidelineProcedures; }
-    @JsonProperty("guidelineProcedures")
-    public void setGuidelineProcedures(List<OncoProcedure> value) { this.guidelineProcedures = value; }
-
-    @JsonProperty("guidelineTherapies")
-    public List<MtbSystemicTherapy> getGuidelineTherapies() { return guidelineTherapies; }
-    @JsonProperty("guidelineTherapies")
-    public void setGuidelineTherapies(List<MtbSystemicTherapy> value) { this.guidelineTherapies = value; }
-
-    @JsonProperty("histologyReports")
-    public List<HistologyReport> getHistologyReports() { return histologyReports; }
-    @JsonProperty("histologyReports")
-    public void setHistologyReports(List<HistologyReport> value) { this.histologyReports = value; }
-
-    @JsonProperty("ihcReports")
-    public List<IhcReport> getIhcReports() { return ihcReports; }
-    @JsonProperty("ihcReports")
-    public void setIhcReports(List<IhcReport> 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<SomaticNgsReport> getNgsReports() { return ngsReports; }
-    @JsonProperty("ngsReports")
-    public void setNgsReports(List<SomaticNgsReport> 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<PerformanceStatus> getPerformanceStatus() { return performanceStatus; }
-    @JsonProperty("performanceStatus")
-    public void setPerformanceStatus(List<PerformanceStatus> value) { this.performanceStatus = value; }
-
-    @JsonProperty("priorDiagnosticReports")
-    public List<PriorDiagnosticReport> getPriorDiagnosticReports() { return priorDiagnosticReports; }
-    @JsonProperty("priorDiagnosticReports")
-    public void setPriorDiagnosticReports(List<PriorDiagnosticReport> value) { this.priorDiagnosticReports = value; }
-
-    @JsonProperty("responses")
-    public List<Response> getResponses() { return responses; }
-    @JsonProperty("responses")
-    public void setResponses(List<Response> value) { this.responses = value; }
-
-    @JsonProperty("specimens")
-    public List<TumorSpecimen> getSpecimens() { return specimens; }
-    @JsonProperty("specimens")
-    public void setSpecimens(List<TumorSpecimen> value) { this.specimens = value; }
-
-    @JsonProperty("systemicTherapies")
-    public List<SystemicTherapy> getSystemicTherapies() { return systemicTherapies; }
-    @JsonProperty("systemicTherapies")
-    public void setSystemicTherapies(List<SystemicTherapy> value) { this.systemicTherapies = value; }
 }

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<HistologyReevaluationRequest> 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<MtbMedicationRecommendation> medicationRecommendations;
+    @Getter(onMethod_ = {@JsonProperty("noSequencingPerformedReason")})
+    @Setter(onMethod_ = {@JsonProperty("noSequencingPerformedReason")})
     private CarePlanNoSequencingPerformedReasonCoding noSequencingPerformedReason;
+    @Getter(onMethod_ = {@JsonProperty("notes")})
+    @Setter(onMethod_ = {@JsonProperty("notes")})
     private List<String> notes;
+    @Getter(onMethod_ = {@JsonProperty("patient")})
+    @Setter(onMethod_ = {@JsonProperty("patient")})
     private Reference patient;
+    @Getter(onMethod_ = {@JsonProperty("procedureRecommendations")})
+    @Setter(onMethod_ = {@JsonProperty("procedureRecommendations")})
     private List<ProcedureRecommendation> procedureRecommendations;
+    @Getter(onMethod_ = {@JsonProperty("reason")})
+    @Setter(onMethod_ = {@JsonProperty("reason")})
     private Reference reason;
+    @Getter(onMethod_ = {@JsonProperty("rebiopsyRequests")})
+    @Setter(onMethod_ = {@JsonProperty("rebiopsyRequests")})
     private List<RebiopsyRequest> rebiopsyRequests;
+    @Getter(onMethod_ = {@JsonProperty("recommendationsMissingReason")})
+    @Setter(onMethod_ = {@JsonProperty("recommendationsMissingReason")})
     private MtbCarePlanRecommendationsMissingReasonCoding recommendationsMissingReason;
+    @Getter(onMethod_ = {@JsonProperty("studyEnrollmentRecommendations")})
+    @Setter(onMethod_ = {@JsonProperty("studyEnrollmentRecommendations")})
     private List<MtbStudyEnrollmentRecommendation> studyEnrollmentRecommendations;
-
-    @JsonProperty("geneticCounselingRecommendation")
-    public GeneticCounselingRecommendation getGeneticCounselingRecommendation() { return geneticCounselingRecommendation; }
-    @JsonProperty("geneticCounselingRecommendation")
-    public void setGeneticCounselingRecommendation(GeneticCounselingRecommendation value) { this.geneticCounselingRecommendation = value; }
-
-    @JsonProperty("histologyReevaluationRequests")
-    public List<HistologyReevaluationRequest> getHistologyReevaluationRequests() { return histologyReevaluationRequests; }
-    @JsonProperty("histologyReevaluationRequests")
-    public void setHistologyReevaluationRequests(List<HistologyReevaluationRequest> 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<MtbMedicationRecommendation> getMedicationRecommendations() { return medicationRecommendations; }
-    @JsonProperty("medicationRecommendations")
-    public void setMedicationRecommendations(List<MtbMedicationRecommendation> 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<String> getNotes() { return notes; }
-    @JsonProperty("notes")
-    public void setNotes(List<String> 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<ProcedureRecommendation> getProcedureRecommendations() { return procedureRecommendations; }
-    @JsonProperty("procedureRecommendations")
-    public void setProcedureRecommendations(List<ProcedureRecommendation> 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<RebiopsyRequest> getRebiopsyRequests() { return rebiopsyRequests; }
-    @JsonProperty("rebiopsyRequests")
-    public void setRebiopsyRequests(List<RebiopsyRequest> 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<MtbStudyEnrollmentRecommendation> getStudyEnrollmentRecommendations() { return studyEnrollmentRecommendations; }
-    @JsonProperty("studyEnrollmentRecommendations")
-    public void setStudyEnrollmentRecommendations(List<MtbStudyEnrollmentRecommendation> value) { this.studyEnrollmentRecommendations = value; }
 }

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; }
 }

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;

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<Coding> 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<Reference> histology;
+    @Getter(onMethod_ = {@JsonProperty("id")})
+    @Setter(onMethod_ = {@JsonProperty("id")})
     private String id;
+    @Getter(onMethod_ = {@JsonProperty("notes")})
+    @Setter(onMethod_ = {@JsonProperty("notes")})
     private List<String> 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<Coding> getGermlineCodes() { return germlineCodes; }
-    @JsonProperty("germlineCodes")
-    public void setGermlineCodes(List<Coding> 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<Reference> getHistology() { return histology; }
-    @JsonProperty("histology")
-    public void setHistology(List<Reference> 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<String> getNotes() { return notes; }
-    @JsonProperty("notes")
-    public void setNotes(List<String> 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; }
 }

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; }
 }

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; }
 }

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;

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<Reference> 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<Reference> getDiagnoses() { return diagnoses; }
-    @JsonProperty("diagnoses")
-    public void setDiagnoses(List<Reference> 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; }
 }

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<AtcUnregisteredMedicationCoding> 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<GeneAlterationReference> 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<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
-    @JsonProperty("medication")
-    public void setMedication(List<AtcUnregisteredMedicationCoding> 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<GeneAlterationReference> getSupportingVariants() { return supportingVariants; }
-    @JsonProperty("supportingVariants")
-    public void setSupportingVariants(List<GeneAlterationReference> value) { this.supportingVariants = value; }
-
-    @JsonProperty("useType")
-    public MtbMedicationRecommendationUseTypeCoding getUseType() { return useType; }
-    @JsonProperty("useType")
-    public void setUseType(MtbMedicationRecommendationUseTypeCoding value) { this.useType = value; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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<AtcUnregisteredMedicationCoding> 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<StudyReference> study;
+    @Getter(onMethod_ = {@JsonProperty("supportingVariants")})
+    @Setter(onMethod_ = {@JsonProperty("supportingVariants")})
     private List<GeneAlterationReference> 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<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
-    @JsonProperty("medication")
-    public void setMedication(List<AtcUnregisteredMedicationCoding> 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<StudyReference> getStudy() { return study; }
-    @JsonProperty("study")
-    public void setStudy(List<StudyReference> value) { this.study = value; }
-
-    @JsonProperty("supportingVariants")
-    public List<GeneAlterationReference> getSupportingVariants() { return supportingVariants; }
-    @JsonProperty("supportingVariants")
-    public void setSupportingVariants(List<GeneAlterationReference> value) { this.supportingVariants = value; }
 }

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<AtcUnregisteredMedicationCoding> medication;
+    @Getter(onMethod_ = {@JsonProperty("notes")})
+    @Setter(onMethod_ = {@JsonProperty("notes")})
     private List<String> 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<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
-    @JsonProperty("medication")
-    public void setMedication(List<AtcUnregisteredMedicationCoding> value) { this.medication = value; }
-
-    @JsonProperty("notes")
-    public List<String> getNotes() { return notes; }
-    @JsonProperty("notes")
-    public void setNotes(List<String> 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; }
 }

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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; }
 }

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;

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<Map<String, Object>> 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<Map<String, Object>> getResearchConsents() { return researchConsents; }
-    @JsonProperty("researchConsents")
-    public void setResearchConsents(List<Map<String, Object>> 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; }
 }

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;

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; }
 }

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;

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; }
 }

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<Cnv> copyNumberVariants;
+    @Getter(onMethod_ = {@JsonProperty("dnaFusions")})
+    @Setter(onMethod_ = {@JsonProperty("dnaFusions")})
     private List<DnaFusion> dnaFusions;
+    @Getter(onMethod_ = {@JsonProperty("hrdScore")})
+    @Setter(onMethod_ = {@JsonProperty("hrdScore")})
     private HrdScore hrdScore;
+    @Getter(onMethod_ = {@JsonProperty("rnaFusions")})
+    @Setter(onMethod_ = {@JsonProperty("rnaFusions")})
     private List<RnaFusion> rnaFusions;
+    @Getter(onMethod_ = {@JsonProperty("rnaSeqs")})
+    @Setter(onMethod_ = {@JsonProperty("rnaSeqs")})
     private List<RnaSeq> rnaSeqs;
+    @Getter(onMethod_ = {@JsonProperty("simpleVariants")})
+    @Setter(onMethod_ = {@JsonProperty("simpleVariants")})
     private List<Snv> 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<Cnv> getCopyNumberVariants() { return copyNumberVariants; }
-    @JsonProperty("copyNumberVariants")
-    public void setCopyNumberVariants(List<Cnv> value) { this.copyNumberVariants = value; }
-
-    @JsonProperty("dnaFusions")
-    public List<DnaFusion> getDnaFusions() { return dnaFusions; }
-    @JsonProperty("dnaFusions")
-    public void setDnaFusions(List<DnaFusion> 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<RnaFusion> getRnaFusions() { return rnaFusions; }
-    @JsonProperty("rnaFusions")
-    public void setRnaFusions(List<RnaFusion> value) { this.rnaFusions = value; }
-
-    @JsonProperty("rnaSeqs")
-    public List<RnaSeq> getRnaSeqs() { return rnaSeqs; }
-    @JsonProperty("rnaSeqs")
-    public void setRnaSeqs(List<RnaSeq> value) { this.rnaSeqs = value; }
-
-    @JsonProperty("simpleVariants")
-    public List<Snv> getSimpleVariants() { return simpleVariants; }
-    @JsonProperty("simpleVariants")
-    public void setSimpleVariants(List<Snv> 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; }
 }