honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix resource type enum handling

This commit is contained in:
Grahame Grieve 2019-12-30 21:15:24 +11:00
parent 5340926ead
commit 96da8f3e16
22 changed files with 477 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java
View File

@ -1682,9 +1682,17 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
throw new Error("??");
}
boolean isReferenceRefField = (analysis.getName().equals("Reference") && e.getName().equals("reference"));
String simpleType = getSimpleType(tn);
if (e.unbounded() || (inh != null && inh.unbounded())) {
if (!e.unbounded()) {
jdoc(indent, "only one on this implementation");
write(indent+"@Override\r\n");
write(indent+"public int get"+getTitle(getElementName(e.getName(), false))+"Max() { \r\n");
write(indent+" return 1;\r\n");
write(indent+"}\r\n");
}
/*
* getXXX()for repeatable type
*/
@ -2032,6 +2040,11 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
throw new Error("??");
}
boolean isReferenceRefField = (ti.getDefn().getName().equals("Reference") && e.getName().equals("reference"));
jdoc(indent, "How many allowed for this property by the implementation");
write(indent+"public int get"+getTitle(getElementName(e.getName(), false))+"Max() { \r\n");
write(indent+" return "+(e.getMax().equals("*") ? "Integer.MAX_VALUE" : "1")+";\r\n");
write(indent+"}\r\n");
String simpleType = getSimpleType(tn);
if (e.unbounded()) {
@ -2189,6 +2202,7 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
}
private void generateUnimplementedAccessors(Analysis analysis, TypeInfo ti, ElementDefinition e, String indent) throws Exception {
System.out.println(" .. unimplemented: "+e.getPath());
String tn = e.getUserString("java.type");
String className = ti.getName();
@ -2200,8 +2214,15 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
}
boolean isReferenceRefField = (analysis.getName().equals("Reference") && e.getName().equals("reference"));
jdoc(indent, "not supported on this implementation");
write(indent+"@Override\r\n");
write(indent+"public int get"+getTitle(getElementName(e.getName(), false))+"Max() { \r\n");
write(indent+" return 0;\r\n");
write(indent+"}\r\n");
String simpleType = getSimpleType(tn);
if (e.unbounded()) {
/*
* getXXX()for repeatable type
*/
@ -2213,7 +2234,7 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
listGenericType = tn;
}
write(indent+"public List<"+listGenericType+"> get"+getTitle(getElementName(e.getName(), false))+"() { \r\n");
write(indent+" throw new Error(\"The resource type \\\""+analysis.getName()+"\\\" does not implement the property \\\""+e.getName()+"\\\"\");\r\n");
write(indent+" return new ArrayList<>();\r\n");
write(indent+"}\r\n");
/*
* setXXX(List<foo>) for repeating type

36
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -493,6 +493,9 @@ public class ProfileUtilities extends TranslatingUtilities {
}
baseSnapshot = cloneSnapshot(baseSnapshot, base.getType(), derivedType);
}
if (derived.getUrl().equals("http://sharedhealth.exchange/fhir/StructureDefinition/profile-operationoutcome")) {
debug = true;
}
processPaths("", derived.getSnapshot(), baseSnapshot, diff, baseCursor, diffCursor, baseSnapshot.getElement().size()-1,
derived.getDifferential().hasElement() ? derived.getDifferential().getElement().size()-1 : -1, url, webUrl, derived.present(), null, null, false, base.getUrl(), null, false, null, new ArrayList<ElementRedirection>(), base);
if (derived.getDerivation().equals(TypeDerivationRule.SPECIALIZATION)) {
@ -520,6 +523,7 @@ public class ProfileUtilities extends TranslatingUtilities {
setIds(derived, false);
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
//Check that all differential elements have a corresponding snapshot element
int ce = 0;
for (ElementDefinition e : diff.getElement()) {
if (!e.hasUserData("diff-source"))
throw new Error("Unxpected internal condition - no source on diff element");
@ -532,14 +536,23 @@ public class ProfileUtilities extends TranslatingUtilities {
if (!e.hasUserData(GENERATED_IN_SNAPSHOT)) {
b.append(e.hasId() ? "id: "+e.getId() : "path: "+e.getPath());
if (e.hasId()) {
ce++;
String msg = "No match found in the generated snapshot: check that the path and definitions are legal in the differential (including order)";
messages.add(new ValidationMessage(Source.ProfileValidator, ValidationMessage.IssueType.VALUE, url+"#"+e.getId(), msg, ValidationMessage.IssueSeverity.ERROR));
}
}
}
if (!Utilities.noString(b.toString())) {
String msg = "The profile "+derived.getUrl()+" has several elements in the differential ("+b.toString()+") that don't have a matching element in the snapshot: check that the path and definitions are legal in the differential (including order)";
String msg = "The profile "+derived.getUrl()+" has "+ce+" "+Utilities.pluralize("element", ce)+" in the differential ("+b.toString()+") that don't have a matching element in the snapshot: check that the path and definitions are legal in the differential (including order)";
System.out.println("Error in snapshot generation: "+msg);
if (!debug) {
System.out.println("Differential: ");
for (ElementDefinition ed : derived.getDifferential().getElement())
System.out.println(" "+ed.getId()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed));
System.out.println("Snapshot: ");
for (ElementDefinition ed : derived.getSnapshot().getElement())
System.out.println(" "+ed.getId()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed));
}
if (exception)
throw new DefinitionException(msg);
else
@ -1983,13 +1996,14 @@ public class ProfileUtilities extends TranslatingUtilities {
String[] sp = statedPath.split("\\.");
boolean ok = sp.length == p.length;
for (int j = 0; j < p.length; j++) {
ok = ok && sp.length > j && (p[j].equals(sp[j]) || (p[j].endsWith("[x]") && sp[j].startsWith(p[j].substring(0, p[j].length()-3))));
}
if (ok != (statedPath.equals(path) || (path.endsWith("[x]") && statedPath.length() > path.length() - 2 &&
statedPath.substring(0, path.length()-3).equals(path.substring(0, path.length()-3)) &&
(statedPath.length() < path.length() || !statedPath.substring(path.length()).contains("."))))) {
System.out.println("mismatch in paths: "+statedPath +" vs " +path);
ok = ok && sp.length > j && (p[j].equals(sp[j]) || isSameBase(p[j], sp[j]));
}
// don't need this debug check - everything is ok
// if (ok != (statedPath.equals(path) || (path.endsWith("[x]") && statedPath.length() > path.length() - 2 &&
// statedPath.substring(0, path.length()-3).equals(path.substring(0, path.length()-3)) &&
// (statedPath.length() < path.length() || !statedPath.substring(path.length()).contains("."))))) {
// System.out.println("mismatch in paths: "+statedPath +" vs " +path);
// }
if (ok) {
/*
* Commenting this out because it raises warnings when profiling inherited elements. For example,
@ -2006,6 +2020,11 @@ public class ProfileUtilities extends TranslatingUtilities {
return result;
}
public boolean isSameBase(String p, String sp) {
return (p.endsWith("[x]") && sp.startsWith(p.substring(0, p.length()-3))) || (sp.endsWith("[x]") && p.startsWith(sp.substring(0, sp.length()-3))) ;
}
private int findEndOfElement(StructureDefinitionDifferentialComponent context, int cursor) {
int result = cursor;
if (cursor >= context.getElement().size())
@ -4173,6 +4192,9 @@ public class ProfileUtilities extends TranslatingUtilities {
if (p.endsWith("[x]") && actual.startsWith(p.substring(0, p.length()-3)) && !(actual.endsWith("[x]")) && !actual.substring(p.length()-3).contains(".")) {
return i;
}
if (actual.endsWith("[x]") && p.startsWith(actual.substring(0, actual.length()-3)) && !p.substring(actual.length()-3).contains(".")) {
return i;
}
if (path.startsWith(p+".") && snapshot.get(i).hasContentReference()) {
String ref = snapshot.get(i).getContentReference();
if (ref.substring(1, 2).toUpperCase().equals(ref.substring(1,2))) {

90
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
View File

@ -89,6 +89,12 @@ public abstract class CanonicalResource extends DomainResource {
this.setStatus(status);
}
/**
* How many allowed for this property by the implementation
*/
public int getUrlMax() {
return 1;
}
/**
* @return {@link #url} (An absolute URI that is used to identify this canonical resource when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this canonical resource is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the canonical resource is stored on different servers.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
*/
@ -109,6 +115,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value An absolute URI that is used to identify this canonical resource when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this canonical resource is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the canonical resource is stored on different servers.
*/
public abstract CanonicalResource setUrl(String value);
/**
* How many allowed for this property by the implementation
*/
public int getIdentifierMax() {
return Integer.MAX_VALUE;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this canonical resource when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
@ -125,6 +137,12 @@ public abstract class CanonicalResource extends DomainResource {
* @return The first repetition of repeating field {@link #identifier}, creating it if it does not already exist {1}
*/
public abstract Identifier getIdentifierFirstRep();
/**
* How many allowed for this property by the implementation
*/
public int getVersionMax() {
return 1;
}
/**
* @return {@link #version} (The identifier that is used to identify this version of the canonical resource when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the canonical resource author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
*/
@ -145,6 +163,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value The identifier that is used to identify this version of the canonical resource when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the canonical resource author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.
*/
public abstract CanonicalResource setVersion(String value);
/**
* How many allowed for this property by the implementation
*/
public int getNameMax() {
return 1;
}
/**
* @return {@link #name} (A natural language name identifying the canonical resource. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
*/
@ -165,6 +189,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value A natural language name identifying the canonical resource. This name should be usable as an identifier for the module by machine processing applications such as code generation.
*/
public abstract CanonicalResource setName(String value);
/**
* How many allowed for this property by the implementation
*/
public int getTitleMax() {
return 1;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the canonical resource.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -185,6 +215,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value A short, descriptive, user-friendly title for the canonical resource.
*/
public abstract CanonicalResource setTitle(String value);
/**
* How many allowed for this property by the implementation
*/
public int getStatusMax() {
return 1;
}
/**
* @return {@link #status} (The status of this canonical resource. Enables tracking the life-cycle of the content.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
@ -205,6 +241,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value The status of this canonical resource. Enables tracking the life-cycle of the content.
*/
public abstract CanonicalResource setStatus(PublicationStatus value);
/**
* How many allowed for this property by the implementation
*/
public int getExperimentalMax() {
return 1;
}
/**
* @return {@link #experimental} (A Boolean value to indicate that this canonical resource is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value
*/
@ -225,6 +267,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value A Boolean value to indicate that this canonical resource is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.
*/
public abstract CanonicalResource setExperimental(boolean value);
/**
* How many allowed for this property by the implementation
*/
public int getDateMax() {
return 1;
}
/**
* @return {@link #date} (The date (and optionally time) when the canonical resource was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the canonical resource changes.). This is the underlying object with id, value and extensions. The accessor "getDate" gives direct access to the value
*/
@ -245,6 +293,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value The date (and optionally time) when the canonical resource was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the canonical resource changes.
*/
public abstract CanonicalResource setDate(Date value);
/**
* How many allowed for this property by the implementation
*/
public int getPublisherMax() {
return 1;
}
/**
* @return {@link #publisher} (The name of the organization or individual that published the canonical resource.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value
*/
@ -265,6 +319,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value The name of the organization or individual that published the canonical resource.
*/
public abstract CanonicalResource setPublisher(String value);
/**
* How many allowed for this property by the implementation
*/
public int getContactMax() {
return Integer.MAX_VALUE;
}
/**
* @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.)
*/
@ -281,6 +341,12 @@ public abstract class CanonicalResource extends DomainResource {
* @return The first repetition of repeating field {@link #contact}, creating it if it does not already exist {1}
*/
public abstract ContactDetail getContactFirstRep();
/**
* How many allowed for this property by the implementation
*/
public int getDescriptionMax() {
return 1;
}
/**
* @return {@link #description} (A free text natural language description of the canonical resource from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
@ -301,6 +367,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value A free text natural language description of the canonical resource from a consumer's perspective.
*/
public abstract CanonicalResource setDescription(String value);
/**
* How many allowed for this property by the implementation
*/
public int getUseContextMax() {
return Integer.MAX_VALUE;
}
/**
* @return {@link #useContext} (The content was developed with a focus and intent of supporting the contexts that are listed. These contexts may be general categories (gender, age, ...) or may be references to specific programs (insurance plans, studies, ...) and may be used to assist with indexing and searching for appropriate canonical resource instances.)
*/
@ -317,6 +389,12 @@ public abstract class CanonicalResource extends DomainResource {
* @return The first repetition of repeating field {@link #useContext}, creating it if it does not already exist {1}
*/
public abstract UsageContext getUseContextFirstRep();
/**
* How many allowed for this property by the implementation
*/
public int getJurisdictionMax() {
return Integer.MAX_VALUE;
}
/**
* @return {@link #jurisdiction} (A legal or geographic region in which the canonical resource is intended to be used.)
*/
@ -333,6 +411,12 @@ public abstract class CanonicalResource extends DomainResource {
* @return The first repetition of repeating field {@link #jurisdiction}, creating it if it does not already exist {1}
*/
public abstract CodeableConcept getJurisdictionFirstRep();
/**
* How many allowed for this property by the implementation
*/
public int getPurposeMax() {
return 1;
}
/**
* @return {@link #purpose} (Explanation of why this canonical resource is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/
@ -353,6 +437,12 @@ public abstract class CanonicalResource extends DomainResource {
* @param value Explanation of why this canonical resource is needed and why it has been designed as it has.
*/
public abstract CanonicalResource setPurpose(String value);
/**
* How many allowed for this property by the implementation
*/
public int getCopyrightMax() {
return 1;
}
/**
* @return {@link #copyright} (A copyright statement relating to the canonical resource and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the canonical resource.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
View File

@ -8070,11 +8070,18 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
return getDocument().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this capability statement when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"CapabilityStatement\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
View File

@ -4942,11 +4942,18 @@ public class CapabilityStatement2 extends CanonicalResource {
return getRest().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this capability statement2 when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"CapabilityStatement2\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining

14
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
View File

@ -2342,6 +2342,13 @@ public class ChargeItemDefinition extends MetadataResource {
return getPropertyGroup().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getNameMax() {
return 0;
}
/**
* @return {@link #name} (A natural language name identifying the charge item definition. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
*/
@ -2371,6 +2378,13 @@ public class ChargeItemDefinition extends MetadataResource {
public ChargeItemDefinition setName(String value) {
throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"name\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this charge item definition is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/

32
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java
View File

@ -1211,11 +1211,18 @@ public class CompartmentDefinition extends CanonicalResource {
return getResource().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this compartment definition when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"CompartmentDefinition\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -1239,6 +1246,13 @@ public class CompartmentDefinition extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"CompartmentDefinition\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getTitleMax() {
return 0;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the compartment definition.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -1268,11 +1282,18 @@ public class CompartmentDefinition extends CanonicalResource {
public CompartmentDefinition setTitle(String value) {
throw new Error("The resource type \"CompartmentDefinition\" does not implement the property \"title\"");
}
/**
* not supported on this implementation
*/
@Override
public int getJurisdictionMax() {
return 0;
}
/**
* @return {@link #jurisdiction} (A legal or geographic region in which the compartment definition is intended to be used.)
*/
public List<CodeableConcept> getJurisdiction() {
throw new Error("The resource type \"CompartmentDefinition\" does not implement the property \"jurisdiction\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -1296,6 +1317,13 @@ public class CompartmentDefinition extends CanonicalResource {
public CodeableConcept getJurisdictionFirstRep() {
throw new Error("The resource type \"CompartmentDefinition\" does not implement the property \"jurisdiction\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the compartment definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the compartment definition.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java
View File

@ -2644,6 +2644,13 @@ public class ConceptMap extends CanonicalResource {
return this;
}
/**
* only one on this implementation
*/
@Override
public int getIdentifierMax() {
return 1;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this concept map when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/

35
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java
View File

@ -2961,6 +2961,13 @@ public class ConditionDefinition extends MetadataResource {
return getPlan().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this condition definition is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/
@ -2990,6 +2997,13 @@ public class ConditionDefinition extends MetadataResource {
public ConditionDefinition setPurpose(String value) {
throw new Error("The resource type \"ConditionDefinition\" does not implement the property \"purpose\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the condition definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the condition definition.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/
@ -3019,6 +3033,13 @@ public class ConditionDefinition extends MetadataResource {
public ConditionDefinition setCopyright(String value) {
throw new Error("The resource type \"ConditionDefinition\" does not implement the property \"copyright\"");
}
/**
* not supported on this implementation
*/
@Override
public int getApprovalDateMax() {
return 0;
}
/**
* @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value
*/
@ -3048,6 +3069,13 @@ public class ConditionDefinition extends MetadataResource {
public ConditionDefinition setApprovalDate(Date value) {
throw new Error("The resource type \"ConditionDefinition\" does not implement the property \"approvalDate\"");
}
/**
* not supported on this implementation
*/
@Override
public int getLastReviewDateMax() {
return 0;
}
/**
* @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value
*/
@ -3077,6 +3105,13 @@ public class ConditionDefinition extends MetadataResource {
public ConditionDefinition setLastReviewDate(Date value) {
throw new Error("The resource type \"ConditionDefinition\" does not implement the property \"lastReviewDate\"");
}
/**
* not supported on this implementation
*/
@Override
public int getEffectivePeriodMax() {
return 0;
}
/**
* @return {@link #effectivePeriod} (The period during which the condition definition content was or is planned to be in active use.)
*/

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java
View File

@ -6271,7 +6271,7 @@ The primary difference between a medicationusage and a medicationadministration
*/
_3_0_1,
/**
* FHIR Release 3 (STU) with 1 technical errata.
* FHIR Release 3 (STU) with 2 technical errata.
*/
_3_0_2,
/**
@ -6287,7 +6287,7 @@ The primary difference between a medicationusage and a medicationadministration
*/
_4_0_0,
/**
* FHIR Release 4 (Normative + STU).
* FHIR Release 4 (Normative + STU) - Technical Correction #1
*/
_4_0_1,
/**
@ -6433,7 +6433,7 @@ The primary difference between a medicationusage and a medicationadministration
case _3_3_0: return "R4 Ballot #1.";
case _3_5_0: return "R4 Ballot #2.";
case _4_0_0: return "FHIR Release 4 (Normative + STU).";
case _4_0_1: return "FHIR Release 4 (Technical Correction).";
case _4_0_1: return "FHIR Release 4 (Normative + STU) - Technical Correction #1";
case _4_1_0: return "Current build after R4.";
default: return "?";
}

60
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java
View File

@ -2841,6 +2841,13 @@ public class Evidence extends MetadataResource {
return getCertainty().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getNameMax() {
return 0;
}
/**
* @return {@link #name} (A natural language name identifying the evidence. This name should be usable as an identifier for the module by machine processing applications such as code generation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
*/
@ -2870,6 +2877,13 @@ public class Evidence extends MetadataResource {
public Evidence setName(String value) {
throw new Error("The resource type \"Evidence\" does not implement the property \"name\"");
}
/**
* not supported on this implementation
*/
@Override
public int getExperimentalMax() {
return 0;
}
/**
* @return {@link #experimental} (A Boolean value to indicate that this evidence is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value
*/
@ -2899,6 +2913,13 @@ public class Evidence extends MetadataResource {
public Evidence setExperimental(boolean value) {
throw new Error("The resource type \"Evidence\" does not implement the property \"experimental\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPublisherMax() {
return 0;
}
/**
* @return {@link #publisher} (The name of the organization or individual that published the evidence.). This is the underlying object with id, value and extensions. The accessor "getPublisher" gives direct access to the value
*/
@ -2928,11 +2949,18 @@ public class Evidence extends MetadataResource {
public Evidence setPublisher(String value) {
throw new Error("The resource type \"Evidence\" does not implement the property \"publisher\"");
}
/**
* not supported on this implementation
*/
@Override
public int getContactMax() {
return 0;
}
/**
* @return {@link #contact} (Contact details to assist a user in finding and communicating with the publisher.)
*/
public List<ContactDetail> getContact() {
throw new Error("The resource type \"Evidence\" does not implement the property \"contact\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -2956,11 +2984,18 @@ public class Evidence extends MetadataResource {
public ContactDetail getContactFirstRep() {
throw new Error("The resource type \"Evidence\" does not implement the property \"contact\"");
}
/**
* not supported on this implementation
*/
@Override
public int getJurisdictionMax() {
return 0;
}
/**
* @return {@link #jurisdiction} (A legal or geographic region in which the evidence is intended to be used.)
*/
public List<CodeableConcept> getJurisdiction() {
throw new Error("The resource type \"Evidence\" does not implement the property \"jurisdiction\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -2984,6 +3019,13 @@ public class Evidence extends MetadataResource {
public CodeableConcept getJurisdictionFirstRep() {
throw new Error("The resource type \"Evidence\" does not implement the property \"jurisdiction\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this evidence is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/
@ -3013,6 +3055,13 @@ public class Evidence extends MetadataResource {
public Evidence setPurpose(String value) {
throw new Error("The resource type \"Evidence\" does not implement the property \"purpose\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the evidence and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the evidence.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/
@ -3042,6 +3091,13 @@ public class Evidence extends MetadataResource {
public Evidence setCopyright(String value) {
throw new Error("The resource type \"Evidence\" does not implement the property \"copyright\"");
}
/**
* not supported on this implementation
*/
@Override
public int getEffectivePeriodMax() {
return 0;
}
/**
* @return {@link #effectivePeriod} (The period during which the evidence content was or is planned to be in active use.)
*/

14
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java
View File

@ -2781,6 +2781,13 @@ public class EvidenceVariable extends MetadataResource {
return getCharacteristic().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getExperimentalMax() {
return 0;
}
/**
* @return {@link #experimental} (A Boolean value to indicate that this evidence variable is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value
*/
@ -2810,6 +2817,13 @@ public class EvidenceVariable extends MetadataResource {
public EvidenceVariable setExperimental(boolean value) {
throw new Error("The resource type \"EvidenceVariable\" does not implement the property \"experimental\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this evidence variable is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/

14
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java
View File

@ -4572,6 +4572,13 @@ public class ExampleScenario extends CanonicalResource {
return false;
}
/**
* not supported on this implementation
*/
@Override
public int getTitleMax() {
return 0;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the example scenario.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -4601,6 +4608,13 @@ public class ExampleScenario extends CanonicalResource {
public ExampleScenario setTitle(String value) {
throw new Error("The resource type \"ExampleScenario\" does not implement the property \"title\"");
}
/**
* not supported on this implementation
*/
@Override
public int getDescriptionMax() {
return 0;
}
/**
* @return {@link #description} (A free text natural language description of the example scenario from a consumer's perspective.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/

23
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java
View File

@ -2642,11 +2642,18 @@ public class GraphDefinition extends CanonicalResource {
return getLink().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this graph definition when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"GraphDefinition\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -2670,6 +2677,13 @@ public class GraphDefinition extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"GraphDefinition\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getTitleMax() {
return 0;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the graph definition.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -2699,6 +2713,13 @@ public class GraphDefinition extends CanonicalResource {
public GraphDefinition setTitle(String value) {
throw new Error("The resource type \"GraphDefinition\" does not implement the property \"title\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the graph definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the graph definition.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

16
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java
View File

@ -10925,11 +10925,18 @@ public class ImplementationGuide extends CanonicalResource {
return this;
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this implementation guide when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"ImplementationGuide\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -10953,6 +10960,13 @@ public class ImplementationGuide extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"ImplementationGuide\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this implementation guide is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/

18
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java
View File

@ -80,6 +80,12 @@ public abstract class MetadataResource extends CanonicalResource {
super();
}
/**
* How many allowed for this property by the implementation
*/
public int getApprovalDateMax() {
return 1;
}
/**
* @return {@link #approvalDate} (The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.). This is the underlying object with id, value and extensions. The accessor "getApprovalDate" gives direct access to the value
*/
@ -100,6 +106,12 @@ public abstract class MetadataResource extends CanonicalResource {
* @param value The date on which the resource content was approved by the publisher. Approval happens once when the content is officially approved for usage.
*/
public abstract MetadataResource setApprovalDate(Date value);
/**
* How many allowed for this property by the implementation
*/
public int getLastReviewDateMax() {
return 1;
}
/**
* @return {@link #lastReviewDate} (The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.). This is the underlying object with id, value and extensions. The accessor "getLastReviewDate" gives direct access to the value
*/
@ -120,6 +132,12 @@ public abstract class MetadataResource extends CanonicalResource {
* @param value The date on which the resource content was last reviewed. Review happens periodically after approval but does not change the original approval date.
*/
public abstract MetadataResource setLastReviewDate(Date value);
/**
* How many allowed for this property by the implementation
*/
public int getEffectivePeriodMax() {
return 1;
}
/**
* @return {@link #effectivePeriod} (The period during which the metadata resource content was or is planned to be in active use.)
*/

37
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java
View File

@ -1583,11 +1583,18 @@ public class NamingSystem extends CanonicalResource {
return getUniqueId().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this naming system when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"NamingSystem\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -1611,6 +1618,13 @@ public class NamingSystem extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"NamingSystem\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getTitleMax() {
return 0;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the naming system.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -1640,6 +1654,13 @@ public class NamingSystem extends CanonicalResource {
public NamingSystem setTitle(String value) {
throw new Error("The resource type \"NamingSystem\" does not implement the property \"title\"");
}
/**
* not supported on this implementation
*/
@Override
public int getExperimentalMax() {
return 0;
}
/**
* @return {@link #experimental} (A Boolean value to indicate that this naming system is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.). This is the underlying object with id, value and extensions. The accessor "getExperimental" gives direct access to the value
*/
@ -1669,6 +1690,13 @@ public class NamingSystem extends CanonicalResource {
public NamingSystem setExperimental(boolean value) {
throw new Error("The resource type \"NamingSystem\" does not implement the property \"experimental\"");
}
/**
* not supported on this implementation
*/
@Override
public int getPurposeMax() {
return 0;
}
/**
* @return {@link #purpose} (Explanation of why this naming system is needed and why it has been designed as it has.). This is the underlying object with id, value and extensions. The accessor "getPurpose" gives direct access to the value
*/
@ -1698,6 +1726,13 @@ public class NamingSystem extends CanonicalResource {
public NamingSystem setPurpose(String value) {
throw new Error("The resource type \"NamingSystem\" does not implement the property \"purpose\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the naming system and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the naming system.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

16
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java
View File

@ -3316,11 +3316,18 @@ public class OperationDefinition extends CanonicalResource {
return getOverload().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this operation definition when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"OperationDefinition\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -3344,6 +3351,13 @@ public class OperationDefinition extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"OperationDefinition\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the operation definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the operation definition.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

23
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java
View File

@ -2448,11 +2448,18 @@ public class SearchParameter extends CanonicalResource {
return getComponent().get(0);
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this search parameter when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"SearchParameter\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining
@ -2476,6 +2483,13 @@ public class SearchParameter extends CanonicalResource {
public Identifier getIdentifierFirstRep() {
throw new Error("The resource type \"SearchParameter\" does not implement the property \"identifier\"");
}
/**
* not supported on this implementation
*/
@Override
public int getTitleMax() {
return 0;
}
/**
* @return {@link #title} (A short, descriptive, user-friendly title for the search parameter.). This is the underlying object with id, value and extensions. The accessor "getTitle" gives direct access to the value
*/
@ -2505,6 +2519,13 @@ public class SearchParameter extends CanonicalResource {
public SearchParameter setTitle(String value) {
throw new Error("The resource type \"SearchParameter\" does not implement the property \"title\"");
}
/**
* not supported on this implementation
*/
@Override
public int getCopyrightMax() {
return 0;
}
/**
* @return {@link #copyright} (A copyright statement relating to the search parameter and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the search parameter.). This is the underlying object with id, value and extensions. The accessor "getCopyright" gives direct access to the value
*/

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java
View File

@ -4296,11 +4296,18 @@ public class TerminologyCapabilities extends CanonicalResource {
return this;
}
/**
* not supported on this implementation
*/
@Override
public int getIdentifierMax() {
return 0;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this terminology capabilities when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/
public List<Identifier> getIdentifier() {
throw new Error("The resource type \"TerminologyCapabilities\" does not implement the property \"identifier\"");
return new ArrayList<>();
}
/**
* @return Returns a reference to <code>this</code> for easy method chaining

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java
View File

@ -11684,6 +11684,13 @@ public class TestScript extends CanonicalResource {
return this;
}
/**
* only one on this implementation
*/
@Override
public int getIdentifierMax() {
return 1;
}
/**
* @return {@link #identifier} (A formal identifier that is used to identify this test script when it is represented in other formats, or referenced in a specification, model, design or an instance.)
*/

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
View File

@ -4263,7 +4263,7 @@ public class NarrativeGenerator implements INarrativeGenerator {
tr.td().addText(path+p.getName());
tr.td().addText(Integer.toString(p.getMin())+".."+p.getMax());
XhtmlNode td = tr.td();
StructureDefinition sd = context.fetchTypeDefinition(p.getType().toCode());
StructureDefinition sd = p.getType() != null ? context.fetchTypeDefinition(p.getType().toCode()) : null;
if (sd == null)
td.tx(p.hasType() ? p.getType().toCode() : "");
else if (sd.getAbstract() && p.hasExtension(ToolingExtensions.EXT_ALLOWED_TYPE)) {