From 8b22bb96fad845034b823acf16f20944c15f23f4 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 2 Feb 2022 17:58:19 -0500 Subject: [PATCH 1/2] Fix CliContext typo for txCache --- .../main/java/org/hl7/fhir/validation/cli/model/CliContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java index d07da0239..612c556e7 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java @@ -379,7 +379,7 @@ public class CliContext { return txCache; } - @JsonProperty("txLog") + @JsonProperty("txCache") public CliContext setTxCache(String txCache) { this.txCache = txCache; return this; From 72cd4bea0359513058b08375bec3ec8fc3d7139a Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 2 Feb 2022 18:05:55 -0500 Subject: [PATCH 2/2] Include CliContext txCache in pretty printing, equals, and hashCode --- .../java/org/hl7/fhir/validation/cli/model/CliContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java index 612c556e7..34762062b 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java @@ -588,6 +588,7 @@ public class CliContext { Objects.equals(txServer, that.txServer) && Objects.equals(sv, that.sv) && Objects.equals(txLog, that.txLog) && + Objects.equals(txCache, that.txCache) && Objects.equals(mapLog, that.mapLog) && Objects.equals(lang, that.lang) && Objects.equals(fhirpath, that.fhirpath) && @@ -610,7 +611,7 @@ public class CliContext { @Override public int hashCode() { return Objects.hash(doNative, anyExtensionsAllowed, hintAboutNonMustSupport, recursive, doDebug, assumeValidRestReferences, canDoNative, noInternalCaching, - noExtensibleBindingMessages, noInvariants, wantInvariantsInMessages, map, output, htmlOutput, txServer, sv, txLog, mapLog, lang, fhirpath, snomedCT, + noExtensibleBindingMessages, noInvariants, wantInvariantsInMessages, map, output, htmlOutput, txServer, sv, txLog, txCache, mapLog, lang, fhirpath, snomedCT, targetVer, igs, questionnaireMode, level, profiles, sources, mode, locale, locations, crumbTrails, showTimes, allowExampleUrls, outputStyle, noUnicodeBiDiControlChars); } @@ -635,6 +636,7 @@ public class CliContext { ", txServer='" + txServer + '\'' + ", sv='" + sv + '\'' + ", txLog='" + txLog + '\'' + + ", txCache='" + txCache + '\'' + ", mapLog='" + mapLog + '\'' + ", lang='" + lang + '\'' + ", fhirpath='" + fhirpath + '\'' +