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

fixes for #483: Quantity subclasses copy() functions not all transferring values

This commit is contained in:
Grahame Grieve 2021-05-04 12:43:07 +10:00
parent 53ea22cae7
commit 898665f356
6 changed files with 681 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Money.java
View File

@ -115,6 +115,12 @@ public class Money extends Quantity implements ICompositeType {
public Money copy() { public Money copy() {
Money dst = new Money(); Money dst = new Money();
copyValues(dst); copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
return dst; return dst;
} }

5
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/MoneyQuantity.java
View File

@ -54,11 +54,6 @@ public class MoneyQuantity extends Quantity {
public void copyValues(MoneyQuantity dst) { public void copyValues(MoneyQuantity dst) {
super.copyValues(dst); super.copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
} }
protected MoneyQuantity typedCopy() { protected MoneyQuantity typedCopy() {

5
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/SimpleQuantity.java
View File

@ -54,11 +54,6 @@ public class SimpleQuantity extends Quantity {
public void copyValues(SimpleQuantity dst) { public void copyValues(SimpleQuantity dst) {
super.copyValues(dst); super.copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
} }
protected SimpleQuantity typedCopy() { protected SimpleQuantity typedCopy() {

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MoneyQuantity.java
View File

@ -53,11 +53,6 @@ public class MoneyQuantity extends Quantity {
public void copyValues(MoneyQuantity dst) { public void copyValues(MoneyQuantity dst) {
super.copyValues(dst); super.copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
} }
protected MoneyQuantity typedCopy() { protected MoneyQuantity typedCopy() {

26
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java
View File

@ -684,5 +684,31 @@ public class ResourceFactory extends Factory {
} }
} }
public static DataType createPrimitive(String type, String value) {
switch (type) {
case "boolean": return new BooleanType(value);
case "integer": return new IntegerType(value);
case "integer64": return new Integer64Type(value);
case "string": return new StringType(value);
case "decimal": return new DecimalType(value);
case "uri": return new UriType(value);
case "url": return new UrlType(value);
case "canonical": return new CanonicalType(value);
case "base64Binary": return new Base64BinaryType(value);
case "instant": return new InstantType(value);
case "date": return new DateType(value);
case "dateTime": return new DateTimeType(value);
case "time": return new TimeType(value);
case "code": return new CodeType(value);
case "oid": return new OidType(value);
case "id": return new IdType(value);
case "markdown": return new MarkdownType(value);
case "unsignedInt": return new UnsignedIntType(value);
case "positiveInt": return new PositiveIntType(value);
case "uuid": return new UuidType(value);
default:
throw new FHIRException("Unknown Primitive Type '"+type+"'");
}
}
} }

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SimpleQuantity.java
View File

@ -53,11 +53,6 @@ public class SimpleQuantity extends Quantity {
public void copyValues(SimpleQuantity dst) { public void copyValues(SimpleQuantity dst) {
super.copyValues(dst); super.copyValues(dst);
dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy();
} }
protected SimpleQuantity typedCopy() { protected SimpleQuantity typedCopy() {