From 0cf2cafb628bff6ea14485ef8521c64be6ff795b Mon Sep 17 00:00:00 2001 From: James Agnew Date: Sun, 13 Oct 2019 19:39:19 -0400 Subject: [PATCH] Improve efficiency of isEmpty() methods --- .../java/org/hl7/fhir/dstu3/model/Base64BinaryType.java | 7 +++++++ .../main/java/org/hl7/fhir/r4/model/Base64BinaryType.java | 6 ++++++ .../main/java/org/hl7/fhir/r5/model/Base64BinaryType.java | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java index 4b382ff2a..7e62a955b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java @@ -147,4 +147,11 @@ public class Base64BinaryType extends PrimitiveType implements IPrimitiv return myValue != null && myValue.length > 0; } + @Override + public boolean isEmpty() { + // Custom isEmpty() in order to avoid generating the text representation unneccessarily + return ca.uhn.fhir.util.ElementUtil.isEmpty(id, extension) && !hasValue(); + } + + } diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java index 19086534a..6721f1649 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Base64BinaryType.java @@ -148,4 +148,10 @@ public class Base64BinaryType extends PrimitiveType implements IPrimitiv return myValue != null && myValue.length > 0; } + @Override + public boolean isEmpty() { + // Custom isEmpty() in order to avoid generating the text representation unneccessarily + return ca.uhn.fhir.util.ElementUtil.isEmpty(id, extension) && !hasValue(); + } + } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java index c4325300b..ae40d1bbf 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base64BinaryType.java @@ -148,4 +148,11 @@ public class Base64BinaryType extends PrimitiveType implements IPrimitiv return myValue != null && myValue.length > 0; } + @Override + public boolean isEmpty() { + // Custom isEmpty() in order to avoid generating the text representation unneccessarily + return ca.uhn.fhir.util.ElementUtil.isEmpty(id, extension) && !hasValue(); + } + + }