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

Accounted for uninitialized fields

This commit is contained in:
Nick Goupinets 2021-05-21 11:54:04 -04:00
parent 995ac96f73
commit e243674f5d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java
View File

@ -329,7 +329,7 @@ public final class TerserUtil {
*/
public static void clearField(FhirContext theFhirContext, String theFieldName, IBaseResource theResource) {
BaseRuntimeChildDefinition childDefinition = getBaseRuntimeChildDefinition(theFhirContext, theFieldName, theResource);
childDefinition.getAccessor().getValues(theResource).clear();
clear(childDefinition.getAccessor().getValues(theResource));
}
/**
@ -343,7 +343,7 @@ public final class TerserUtil {
BaseRuntimeElementDefinition definition = theFhirContext.getElementDefinition(theBase.getClass());
BaseRuntimeChildDefinition childDefinition = definition.getChildByName(theFieldName);
Validate.notNull(childDefinition);
childDefinition.getAccessor().getValues(theBase).clear();
clear(childDefinition.getAccessor().getValues(theBase));
}
/**
@ -448,7 +448,7 @@ public final class TerserUtil {
private static void replaceField(FhirTerser theTerser, IBaseResource theFrom, IBaseResource theTo, BaseRuntimeChildDefinition childDefinition) {
List<IBase> fromValues = childDefinition.getAccessor().getValues(theFrom);
List<IBase> toValues = childDefinition.getAccessor().getValues(theTo);
toValues.clear();
clear(toValues);
mergeFields(theTerser, theTo, childDefinition, fromValues, toValues);
}
@ -631,4 +631,12 @@ public final class TerserUtil {
return (T) def.newInstance(theConstructorParam);
}
private static void clear(List<IBase> values) {
if (values == null) {
return;
}
values.clear();
}
}