Command updates for validate command
@@ -68,18 +68,18 @@ public class ValidateCommand extends BaseCommand {
addFhirVersionOption(retVal);
OptionGroup source = new OptionGroup();
- source.addOption(new Option("n", "file", true, "The name of the file to validate"));
- source.addOption(new Option("d", "data", true, "The text to validate"));
+ addOptionalOption(source, "n", "file", true, "filename", "The name of the file to validate");
+ addOptionalOption(source, "d", "data", true, "text", "The text to validate");
retVal.addOptionGroup(source);
- retVal.addOption("x", "xsd", false, "Validate using Schemas");
- retVal.addOption("s", "sch", false, "Validate using Schematrons");
retVal.addOption("p", "profile", false, "Validate using Profiles (StructureDefinition / ValueSet)");
retVal.addOption("r", "fetch-remote", false,
"Allow fetching remote resources (in other words, if a resource being validated refers to an external StructureDefinition, Questionnaire, etc. this flag allows the validator to access the internet to try and fetch this resource)");
- retVal.addOption(new Option("l", "fetch-local", true, "Fetch a profile locally and use it if referenced"));
- retVal.addOption("e", "encoding", false, "File encoding (default is UTF-8)");
+ addOptionalOption(retVal, "l", "fetch-local", true, "filename", "Fetch a profile locally and use it if referenced"));
addOptionalOption(retVal, null, "igpack", true, "If specified, provides the filename of an IGPack file to include in validation");
+ addOptionalOption(retVal, "x", "xsd", false, "Validate using Schemas");
+ addOptionalOption(retVal, "s", "sch", false, "Validate using Schematrons");
+ addOptionalOption(retVal, "e", "encoding", true, "encoding", "File encoding (default is UTF-8)");
return retVal;
}
