Bundle.entry.resource.id should not be stripped on POST from client #…

…2297 (#2303)
hapifhir · Jan 19, 2021 · 874b162 · 874b162
1 parent 240decc
commit 874b162
Show file tree

Hide file tree

Showing 5 changed files with 209 additions and 161 deletions.
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java
@@ -991,7 +991,7 @@ protected boolean shouldAddSubsettedTag(EncodeContext theEncodeContext) {
 
 	protected boolean shouldEncodeResourceId(IBaseResource theResource, EncodeContext theEncodeContext) {
 		boolean retVal = true;
-		if (isOmitResourceId()) {
+		if (isOmitResourceId() && theEncodeContext.getPath().size() == 1) {
 			retVal = false;
 		} else {
 			if (myDontEncodeElements != null) {