Skip to content

Avoid Resource.meta.source string matching an illegal fragment #7069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid Resource.meta.source string matching an illegal fragment #7069

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9668324
auto-commit
MartinBernstorff Jun 19, 2025
0ff26a5
auto-commit
MartinBernstorff Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/util/MetaUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.stream.Collectors;

import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

public class MetaUtil {
Expand Down Expand Up @@ -101,9 +102,13 @@ private static String getSourceR4Plus(FhirContext theFhirContext, IBaseMetaType

public static <R extends IBaseResource> void populateResourceSource(
FhirContext theFhirContext, String theProvenanceSourceUri, String theProvenanceRequestId, R theRetVal) {
String sourceString = cleanProvenanceSourceUriOrEmpty(theProvenanceSourceUri);
if (isNotBlank(theProvenanceRequestId)) {
sourceString = sourceString + "#" + theProvenanceRequestId;
String cleanedProvenanceSourceUri = cleanProvenanceSourceUriOrEmpty(theProvenanceSourceUri);
String sourceString = "";

if (isBlank(cleanedProvenanceSourceUri)) {
sourceString = theProvenanceRequestId;
} else {
sourceString = cleanedProvenanceSourceUri + "#" + theProvenanceRequestId;
}

if (isNotBlank(sourceString)) {
Expand Down