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

Merge pull request #2795 from hapifhir/2794_res_links_not_resolved 

Fixed link resolution
This commit is contained in:
Nick Goupinets 2021-07-15 10:38:26 -04:00 committed by GitHub
parent 744a95ae58 ac31000377
commit ddf3df4209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_5_0/2794-res-links-not-resolved.yaml Normal file
View File

@ -0,0 +1,4 @@
---
type: fix
issue: 2794
title: "When providing links for placeholder creation, DaoResourceLinkResolver expects just a single 'identifier=value' param, but it can be additional data, s.a. tags, extra identifiers, etc."

31
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolver.java
View File

@ -40,6 +40,8 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
import ca.uhn.fhir.util.HapiExtensions;
import ca.uhn.fhir.util.TerserUtil;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.hl7.fhir.instance.model.api.IBase;
import org.hl7.fhir.instance.model.api.IBaseExtension;
import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
@ -54,6 +56,8 @@ import javax.annotation.Nullable;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Optional;
public class DaoResourceLinkResolver implements IResourceLinkResolver {
@ -160,7 +164,7 @@ public class DaoResourceLinkResolver implements IResourceLinkResolver {
if (referenceIdentifier == null && referenceMatchUrlIdentifier != null) {
addMatchUrlIdentifierToTargetResource(theTargetResourceDef, theTargetResource, referenceMatchUrlIdentifier);
} else if (referenceIdentifier!= null && referenceMatchUrlIdentifier == null) {
} else if (referenceIdentifier != null && referenceMatchUrlIdentifier == null) {
addSubjectIdentifierToTargetResource(theSourceReference, theTargetResourceDef, theTargetResource);
} else if (referenceIdentifier != null && referenceMatchUrlIdentifier != null) {
if (referenceIdentifier.equals(referenceMatchUrlIdentifier)) {
@ -222,16 +226,33 @@ public class DaoResourceLinkResolver implements IResourceLinkResolver {
}
}
private CanonicalIdentifier extractIdentifierFromUrl(String theValue) {
if (!theValue.contains("identifier=")) {
/**
* Extracts the first available identifier from the URL part
*
* @param theValue Part of the URL to extract identifiers from
* @return Returns the first available identifier in the canonical form or null if URL contains no identifier param
* @throws IllegalArgumentException IllegalArgumentException is thrown in case identifier parameter can not be split using <code>system|value</code> pattern.
*/
protected CanonicalIdentifier extractIdentifierFromUrl(String theValue) {
int identifierIndex = theValue.indexOf("identifier=");
if (identifierIndex == -1) {
return null;
}
CanonicalIdentifier identifier = new CanonicalIdentifier();
String identifierString = theValue.substring(theValue.indexOf("=") + 1);
List<NameValuePair> params = URLEncodedUtils.parse(theValue.substring(identifierIndex), StandardCharsets.UTF_8, '&', ';');
Optional<NameValuePair> idOptional = params.stream().filter(p -> p.getName().equals("identifier")).findFirst();
if (!idOptional.isPresent()) {
return null;
}
NameValuePair id = idOptional.get();
String identifierString = id.getValue();
String[] split = identifierString.split("\\|");
if (split.length != 2) {
throw new IllegalArgumentException("Can't create a placeholder reference with identifier " + theValue + ". It is not a valid identifier");
}
CanonicalIdentifier identifier = new CanonicalIdentifier();
identifier.setSystem(split[0]);
identifier.setValue(split[1]);
return identifier;

35
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/index/DaoResourceLinkResolverTest.java Normal file
View File

@ -0,0 +1,35 @@
package ca.uhn.fhir.jpa.dao.index;
import ca.uhn.fhir.mdm.util.CanonicalIdentifier;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
class DaoResourceLinkResolverTest {
@Test
public void testLinkResolution() {
DaoResourceLinkResolver resolver = new DaoResourceLinkResolver();
CanonicalIdentifier canonicalIdentifier = resolver.extractIdentifierFromUrl("Patient?_patient?" +
"identifier=http://hapifhir.io/fhir/namingsystem/my_id|123456");
assertEquals("http://hapifhir.io/fhir/namingsystem/my_id", canonicalIdentifier.getSystemElement().getValueAsString());
assertEquals("123456", canonicalIdentifier.getValueElement().getValueAsString());
canonicalIdentifier = resolver.extractIdentifierFromUrl("Patient?_patient?" +
"identifier=http://hapifhir.io/fhir/namingsystem/my_id|123456&identifier=https://www.id.org/identifiers/member|1101331");
assertEquals("http://hapifhir.io/fhir/namingsystem/my_id", canonicalIdentifier.getSystemElement().getValueAsString());
assertEquals("123456", canonicalIdentifier.getValueElement().getValueAsString());
canonicalIdentifier = resolver.extractIdentifierFromUrl("Patient?_tag:not=http://hapifhir.io/fhir/namingsystem/mdm-record-status|GOLDEn_rEcorD" +
"&identifier=https://www.my.org/identifiers/memBER|123456");
assertEquals("https://www.my.org/identifiers/memBER", canonicalIdentifier.getSystemElement().getValueAsString());
assertEquals("123456", canonicalIdentifier.getValueElement().getValueAsString());
canonicalIdentifier = resolver.extractIdentifierFromUrl("Patient?_tag:not=http://hapifhir.io/fhir/namingsystem/mdm-record-status|GOLDEn_rEcorD");
assertNull(canonicalIdentifier);
}
}