Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
This commit is contained in:
commit
d43e3c037d
|
@ -379,7 +379,7 @@ public class CliContext {
|
||||||
return txCache;
|
return txCache;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonProperty("txLog")
|
@JsonProperty("txCache")
|
||||||
public CliContext setTxCache(String txCache) {
|
public CliContext setTxCache(String txCache) {
|
||||||
this.txCache = txCache;
|
this.txCache = txCache;
|
||||||
return this;
|
return this;
|
||||||
|
@ -588,6 +588,7 @@ public class CliContext {
|
||||||
Objects.equals(txServer, that.txServer) &&
|
Objects.equals(txServer, that.txServer) &&
|
||||||
Objects.equals(sv, that.sv) &&
|
Objects.equals(sv, that.sv) &&
|
||||||
Objects.equals(txLog, that.txLog) &&
|
Objects.equals(txLog, that.txLog) &&
|
||||||
|
Objects.equals(txCache, that.txCache) &&
|
||||||
Objects.equals(mapLog, that.mapLog) &&
|
Objects.equals(mapLog, that.mapLog) &&
|
||||||
Objects.equals(lang, that.lang) &&
|
Objects.equals(lang, that.lang) &&
|
||||||
Objects.equals(fhirpath, that.fhirpath) &&
|
Objects.equals(fhirpath, that.fhirpath) &&
|
||||||
|
@ -610,7 +611,7 @@ public class CliContext {
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash(doNative, anyExtensionsAllowed, hintAboutNonMustSupport, recursive, doDebug, assumeValidRestReferences, canDoNative, noInternalCaching,
|
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);
|
targetVer, igs, questionnaireMode, level, profiles, sources, mode, locale, locations, crumbTrails, showTimes, allowExampleUrls, outputStyle, noUnicodeBiDiControlChars);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -635,6 +636,7 @@ public class CliContext {
|
||||||
", txServer='" + txServer + '\'' +
|
", txServer='" + txServer + '\'' +
|
||||||
", sv='" + sv + '\'' +
|
", sv='" + sv + '\'' +
|
||||||
", txLog='" + txLog + '\'' +
|
", txLog='" + txLog + '\'' +
|
||||||
|
", txCache='" + txCache + '\'' +
|
||||||
", mapLog='" + mapLog + '\'' +
|
", mapLog='" + mapLog + '\'' +
|
||||||
", lang='" + lang + '\'' +
|
", lang='" + lang + '\'' +
|
||||||
", fhirpath='" + fhirpath + '\'' +
|
", fhirpath='" + fhirpath + '\'' +
|
||||||
|
|
Loading…
Reference in New Issue