support for -forPublication parameter to validator

This commit is contained in:
Grahame Grieve 2022-09-20 11:42:07 -04:00
parent af4ec00697
commit 7846ae5169
5 changed files with 27 additions and 3 deletions

View File

@ -1,7 +1,12 @@
## Validator Changes
* no changes
* Validator support for -forPublication parameter
## Other code changes
* no changes
* Improved ConceptMap rendering
* Internal reorganization of extensions
* Fix NPE rendering terminology resources
* Fix bad HTML rendering SearchParameter
* Allow rendering additional information in a comparison
* bug fixes from loading all published packages ever

View File

@ -156,6 +156,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
@Getter @Setter private boolean noUnicodeBiDiControlChars;
@Getter @Setter private boolean securityChecks;
@Getter @Setter private boolean crumbTrails;
@Getter @Setter private boolean forPublication;
@Getter @Setter private boolean allowExampleUrls;
@Getter @Setter private boolean showMessagesFromReferences;
@Getter @Setter private boolean doImplicitFHIRPathStringConversion;
@ -614,6 +615,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
validator.setNoExtensibleWarnings(noExtensibleBindingMessages);
validator.setSecurityChecks(securityChecks);
validator.setCrumbTrails(crumbTrails);
validator.setForPublication(forPublication);
validator.setAllowExamples(allowExampleUrls);
validator.setShowMessagesFromReferences(showMessagesFromReferences);
validator.getContext().setLocale(locale);

View File

@ -97,6 +97,9 @@ public class CliContext {
@JsonProperty("crumbTrails")
private boolean crumbTrails = false;
@JsonProperty("forPublication")
private boolean forPublication = false;
@JsonProperty("allowExampleUrls")
private boolean allowExampleUrls = false;
@ -548,6 +551,14 @@ public class CliContext {
this.crumbTrails = crumbTrails;
}
public boolean isForPublication() {
return forPublication;
}
public void setForPublication(boolean forPublication) {
this.forPublication = forPublication;
}
public boolean isAllowExampleUrls() {
return allowExampleUrls;
}
@ -623,6 +634,7 @@ public class CliContext {
Objects.equals(profiles, that.profiles) &&
Objects.equals(sources, that.sources) &&
Objects.equals(crumbTrails, that.crumbTrails) &&
Objects.equals(forPublication, that.forPublication) &&
Objects.equals(allowExampleUrls, that.allowExampleUrls) &&
Objects.equals(showTimes, that.showTimes) &&
mode == that.mode &&
@ -636,7 +648,7 @@ public class CliContext {
public int hashCode() {
return Objects.hash(doNative, extensions, hintAboutNonMustSupport, recursive, doDebug, assumeValidRestReferences, canDoNative, noInternalCaching,
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, jurisdiction, noUnicodeBiDiControlChars);
targetVer, igs, questionnaireMode, level, profiles, sources, mode, locale, locations, crumbTrails, forPublication, showTimes, allowExampleUrls, outputStyle, jurisdiction, noUnicodeBiDiControlChars);
}
@Override
@ -674,6 +686,7 @@ public class CliContext {
", mode=" + mode +
", securityChecks=" + securityChecks +
", crumbTrails=" + crumbTrails +
", forPublication=" + forPublication +
", outputStyle=" + outputStyle +
", jurisdiction=" + jurisdiction +
", allowExampleUrls=" + allowExampleUrls +

View File

@ -378,6 +378,7 @@ public class ValidationService {
validator.setWantInvariantInMessage(cliContext.isWantInvariantsInMessages());
validator.setSecurityChecks(cliContext.isSecurityChecks());
validator.setCrumbTrails(cliContext.isCrumbTrails());
validator.setForPublication(cliContext.isForPublication());
validator.setShowTimes(cliContext.isShowTimes());
validator.setAllowExampleUrls(cliContext.isAllowExampleUrls());
StandAloneValidatorFetcher fetcher = new StandAloneValidatorFetcher(validator.getPcm(), validator.getContext(), validator);

View File

@ -63,6 +63,7 @@ public class Params {
public static final String WANT_INVARIANTS_IN_MESSAGES = "-want-invariants-in-messages";
public static final String SECURITY_CHECKS = "-security-checks";
public static final String CRUMB_TRAIL = "-crumb-trails";
public static final String FOR_PUBLICATION = "-forPublication";
public static final String VERBOSE = "-verbose";
public static final String SHOW_TIMES = "-show-times";
public static final String ALLOW_EXAMPLE_URLS = "-allow-example-urls";
@ -221,6 +222,8 @@ public class Params {
cliContext.setSecurityChecks(true);
} else if (args[i].equals(CRUMB_TRAIL)) {
cliContext.setCrumbTrails(true);
} else if (args[i].equals(FOR_PUBLICATION)) {
cliContext.setForPublication(true);
} else if (args[i].equals(VERBOSE)) {
cliContext.setCrumbTrails(true);
} else if (args[i].equals(ALLOW_EXAMPLE_URLS)) {