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

#426 - fix serialization of NULL enumerations

This commit is contained in:
Grahame Grieve 2021-02-08 09:33:36 +11:00
parent c95b07f0f1
commit 8fac290ebe
8 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/NarrativeGenerator.java
View File

@ -2436,7 +2436,8 @@ public class NarrativeGenerator implements INarrativeGenerator {
case INEXACT : return "><";
case UNMATCHED : return "-";
case DISJOINT : return "!=";
default: return "?";
case NULL: return null;
default: return "?";
}
}

3
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/NarrativeGenerator.java
View File

@ -2497,7 +2497,8 @@ public class NarrativeGenerator implements INarrativeGenerator {
case INEXACT : return "><";
case UNMATCHED : return "-";
case DISJOINT : return "!=";
default: return "?";
case NULL: return null;
default: return "?";
}
}

3
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/NarrativeGenerator.java
View File

@ -3235,7 +3235,8 @@ public class NarrativeGenerator implements INarrativeGenerator {
case INEXACT : return "><";
case UNMATCHED : return "-";
case DISJOINT : return "!=";
default: return "?";
case NULL: return null;
default: return "?";
}
}

3
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/NarrativeGenerator.java
View File

@ -3515,7 +3515,8 @@ public class NarrativeGenerator implements INarrativeGenerator {
case INEXACT : return "><";
case UNMATCHED : return "-";
case DISJOINT : return "!=";
default: return "?";
case NULL: return null;
default: return "?";
}
}

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/patterns/Event.java
View File

@ -130,6 +130,7 @@ public interface Event extends PatternBase {
case COMPLETED: return "completed";
case ENTEREDINERROR: return "entered-in-error";
case UNKNOWN: return "unknown";
case NULL: return null;
default: return "?";
}
}
@ -143,6 +144,7 @@ public interface Event extends PatternBase {
case COMPLETED: return "http://hl7.org/fhir/event-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/event-status";
case UNKNOWN: return "http://hl7.org/fhir/event-status";
case NULL: return null;
default: return "?";
}
}
@ -156,6 +158,7 @@ public interface Event extends PatternBase {
case COMPLETED: return "The event has now concluded.";
case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".).";
case UNKNOWN: return "The authoring/source system does not know which of the status values currently applies for this event. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which.";
case NULL: return null;
default: return "?";
}
}
@ -169,6 +172,7 @@ public interface Event extends PatternBase {
case COMPLETED: return "Completed";
case ENTEREDINERROR: return "Entered in Error";
case UNKNOWN: return "Unknown";
case NULL: return null;
default: return "?";
}
}

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/patterns/Fivews.java
View File

@ -289,6 +289,7 @@ public interface Fivews extends PatternBase {
case NOTREADY: return "not-ready";
case TRANSDUCDISCON: return "transduc-discon";
case HWDISCON: return "hw-discon";
case NULL: return null;
default: return "?";
}
}
@ -325,6 +326,7 @@ public interface Fivews extends PatternBase {
case NOTREADY: return "http://hl7.org/fhir/resource-status";
case TRANSDUCDISCON: return "http://hl7.org/fhir/resource-status";
case HWDISCON: return "http://hl7.org/fhir/resource-status";
case NULL: return null;
default: return "?";
}
}
@ -361,6 +363,7 @@ public interface Fivews extends PatternBase {
case NOTREADY: return "Behind the planned timelines";
case TRANSDUCDISCON: return "The device transducer is disconnected";
case HWDISCON: return "The hardware is disconnected";
case NULL: return null;
default: return "?";
}
}
@ -397,6 +400,7 @@ public interface Fivews extends PatternBase {
case NOTREADY: return "not-ready";
case TRANSDUCDISCON: return "transduc-discon";
case HWDISCON: return "hw-discon";
case NULL: return null;
default: return "?";
}
}

12
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/patterns/Request.java
View File

@ -123,6 +123,7 @@ public interface Request extends PatternBase {
case COMPLETED: return "completed";
case ENTEREDINERROR: return "entered-in-error";
case UNKNOWN: return "unknown";
case NULL: return null;
default: return "?";
}
}
@ -135,6 +136,7 @@ public interface Request extends PatternBase {
case COMPLETED: return "http://hl7.org/fhir/request-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/request-status";
case UNKNOWN: return "http://hl7.org/fhir/request-status";
case NULL: return null;
default: return "?";
}
}
@ -147,6 +149,7 @@ public interface Request extends PatternBase {
case COMPLETED: return "The activity described by the request has been fully performed. No further activity will occur.";
case ENTEREDINERROR: return "This request should never have existed and should be considered 'void'. (It is possible that real-world decisions were based on it. If real-world activity has occurred, the status should be \"cancelled\" rather than \"entered-in-error\".).";
case UNKNOWN: return "The authoring/source system does not know which of the status values currently applies for this request. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which.";
case NULL: return null;
default: return "?";
}
}
@ -159,6 +162,7 @@ public interface Request extends PatternBase {
case COMPLETED: return "Completed";
case ENTEREDINERROR: return "Entered in Error";
case UNKNOWN: return "Unknown";
case NULL: return null;
default: return "?";
}
}
@ -309,6 +313,7 @@ public interface Request extends PatternBase {
case FILLERORDER: return "filler-order";
case INSTANCEORDER: return "instance-order";
case OPTION: return "option";
case NULL: return null;
default: return "?";
}
}
@ -323,6 +328,7 @@ public interface Request extends PatternBase {
case FILLERORDER: return "http://hl7.org/fhir/request-intent";
case INSTANCEORDER: return "http://hl7.org/fhir/request-intent";
case OPTION: return "http://hl7.org/fhir/request-intent";
case NULL: return null;
default: return "?";
}
}
@ -337,6 +343,7 @@ public interface Request extends PatternBase {
case FILLERORDER: return "The request represents the view of an authorization instantiated by a fulfilling system representing the details of the fulfiller's intention to act upon a submitted order.";
case INSTANCEORDER: return "An order created in fulfillment of a broader order that represents the authorization for a single activity occurrence. E.g. The administration of a single dose of a drug.";
case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests. Refer to [[[RequestGroup]]] for additional information on how this status is used.";
case NULL: return null;
default: return "?";
}
}
@ -351,6 +358,7 @@ public interface Request extends PatternBase {
case FILLERORDER: return "Filler Order";
case INSTANCEORDER: return "Instance Order";
case OPTION: return "Option";
case NULL: return null;
default: return "?";
}
}
@ -478,6 +486,7 @@ public interface Request extends PatternBase {
case URGENT: return "urgent";
case ASAP: return "asap";
case STAT: return "stat";
case NULL: return null;
default: return "?";
}
}
@ -487,6 +496,7 @@ public interface Request extends PatternBase {
case URGENT: return "http://hl7.org/fhir/request-priority";
case ASAP: return "http://hl7.org/fhir/request-priority";
case STAT: return "http://hl7.org/fhir/request-priority";
case NULL: return null;
default: return "?";
}
}
@ -496,6 +506,7 @@ public interface Request extends PatternBase {
case URGENT: return "The request should be actioned promptly - higher priority than routine.";
case ASAP: return "The request should be actioned as soon as possible - higher priority than urgent.";
case STAT: return "The request should be actioned immediately - highest possible priority. E.g. an emergency.";
case NULL: return null;
default: return "?";
}
}
@ -505,6 +516,7 @@ public interface Request extends PatternBase {
case URGENT: return "Urgent";
case ASAP: return "ASAP";
case STAT: return "STAT";
case NULL: return null;
default: return "?";
}
}

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GuideParameterCode.java
View File

@ -92,6 +92,7 @@ public enum GuideParameterCode {
case GENERATEJSON: return "generate-json";
case GENERATETURTLE: return "generate-turtle";
case HTMLTEMPLATE: return "html-template";
case NULL: return null;
default: return "?";
}
}
@ -107,6 +108,7 @@ public enum GuideParameterCode {
case GENERATEJSON: return "http://hl7.org/fhir/guide-parameter-code";
case GENERATETURTLE: return "http://hl7.org/fhir/guide-parameter-code";
case HTMLTEMPLATE: return "http://hl7.org/fhir/guide-parameter-code";
case NULL: return null;
default: return "?";
}
}
@ -122,6 +124,7 @@ public enum GuideParameterCode {
case GENERATEJSON: return "The value of this boolean 0..1 parameter specifies whether the IG publisher creates examples in JSON format. If not present, the Publication Tool decides whether to generate JSON.";
case GENERATETURTLE: return "The value of this boolean 0..1 parameter specifies whether the IG publisher creates examples in Turtle format. If not present, the Publication Tool decides whether to generate Turtle.";
case HTMLTEMPLATE: return "The value of this string singleton parameter is the name of the file to use as the builder template for each generated page (see templating).";
case NULL: return null;
default: return "?";
}
}
@ -137,6 +140,7 @@ public enum GuideParameterCode {
case GENERATEJSON: return "Generate JSON";
case GENERATETURTLE: return "Generate Turtle";
case HTMLTEMPLATE: return "HTML Template";
case NULL: return null;
default: return "?";
}
}