removing caching package client - rests on invalid assumptions
This commit is contained in:
Grahame Grieve
parent
64cc3771a6
commit
8b7890bea2
|
|
@ -19,7 +19,7 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager {
|
|||
|
||||
private static final Logger ourLog = LoggerFactory.getLogger(BasePackageCacheManager.class);
|
||||
private List<String> myPackageServers = new ArrayList<>();
|
||||
private Function<String, PackageClient> myClientFactory = address -> new CachingPackageClient(address);
|
||||
private Function<String, PackageClient> myClientFactory = address -> new PackageClient(address);
|
||||
protected boolean silent;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
package org.hl7.fhir.utilities.npm;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.hl7.fhir.utilities.TextFile;
|
||||
import org.hl7.fhir.utilities.Utilities;
|
||||
|
||||
/**
|
||||
* Implementation of a package client that keeps a local disk cache of downloaded artifacts
|
||||
* in order to avoid re-downloading things
|
||||
*/
|
||||
public class CachingPackageClient extends PackageClient {
|
||||
|
||||
private String cacheFolder;
|
||||
|
||||
|
||||
public CachingPackageClient(String address) {
|
||||
super(address);
|
||||
try {
|
||||
cacheFolder = Utilities.path(System.getProperty("user.home"), ".fhir", "package-client");
|
||||
Utilities.createDirectory(cacheFolder);
|
||||
} catch (IOException e) {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean exists(String id, String ver) throws IOException {
|
||||
List<PackageInfo> vl = getVersions(id);
|
||||
for (PackageInfo pi : vl) {
|
||||
if (ver.equals(pi.getVersion())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public InputStream fetchCached(String url) throws IOException {
|
||||
File cacheFile = new File(Utilities.path(cacheFolder, fn(url)));
|
||||
if (cacheFile.exists()) {
|
||||
return new FileInputStream(cacheFile);
|
||||
}
|
||||
InputStream fetchedPackage = super.fetchCached(url);
|
||||
TextFile.bytesToFile(TextFile.streamToBytes(fetchedPackage), cacheFile);
|
||||
return new FileInputStream(cacheFile);
|
||||
}
|
||||
|
||||
|
||||
public Date getNewPackages(Date lastCalled, List<PackageInfo> updates) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -219,7 +219,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
|
|||
}
|
||||
|
||||
private void listSpecs(Map<String, String> specList, String server) throws IOException {
|
||||
CachingPackageClient pc = new CachingPackageClient(server);
|
||||
PackageClient pc = new PackageClient(server);
|
||||
List<PackageInfo> matches = pc.search(null, null, null, false);
|
||||
for (PackageInfo m : matches) {
|
||||
if (!specList.containsKey(m.getId())) {
|
||||
|
|
@ -247,7 +247,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
|
|||
for (String nextPackageServer : getPackageServers()) {
|
||||
// special case:
|
||||
if (!(Utilities.existsInList(id,CommonPackages.ID_PUBPACK, "hl7.terminology.r5") && PackageClient.PRIMARY_SERVER.equals(nextPackageServer))) {
|
||||
CachingPackageClient pc = new CachingPackageClient(nextPackageServer);
|
||||
PackageClient pc = new PackageClient(nextPackageServer);
|
||||
try {
|
||||
return pc.getLatestVersion(id);
|
||||
} catch (IOException e) {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public class PackageHacker {
|
|||
private static boolean useSecureReferences = false;
|
||||
|
||||
public static void main(String[] args) throws FileNotFoundException, IOException {
|
||||
new PackageHacker().edit("/Users/grahamegrieve/work/www.fhir.org/source/guides/chile/hl7.fhir.cl.corecl#1.0.0.tgz");
|
||||
new PackageHacker().edit("/Users/grahamegrieve/web/hl7.org/fhir/5.0.0-snapshot3/hl7.fhir.r5.expansions.tgz");
|
||||
}
|
||||
|
||||
private void edit(String name) throws FileNotFoundException, IOException {
|
||||
|
|
@ -49,7 +49,7 @@ public class PackageHacker {
|
|||
if (pck.getFolders().containsKey("xml")) {
|
||||
fixContent(pck.getFolders().get("xml").getContent());
|
||||
}
|
||||
fixExampleContent(pck.getFolders().get("example").getContent());
|
||||
// fixExampleContent(pck.getFolders().get("example").getContent());
|
||||
|
||||
System.out.println("Revised Package");
|
||||
System.out.println("=======================");
|
||||
|
|
@ -64,9 +64,9 @@ public class PackageHacker {
|
|||
}
|
||||
|
||||
private void fixExampleContent(Map<String, byte[]> content) {
|
||||
byte[] cnt = content.get("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json");
|
||||
content.put("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssist.json", cnt);
|
||||
content.remove("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json");
|
||||
// byte[] cnt = content.get("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json");
|
||||
// content.put("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssist.json", cnt);
|
||||
// content.remove("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json");
|
||||
}
|
||||
|
||||
private void fixContent(Map<String, byte[]> content) {
|
||||
|
|
@ -80,9 +80,9 @@ public class PackageHacker {
|
|||
|
||||
private void change(JsonObject npm) throws FileNotFoundException, IOException {
|
||||
// fixVersions(npm);
|
||||
// npm.remove("notForPublication");
|
||||
npm.remove("url");
|
||||
npm.add("url", "https://hl7chile.cl/fhir/ig/CoreCL/1.7.0");
|
||||
npm.remove("notForPublication");
|
||||
// npm.remove("url");
|
||||
// npm.add("url", "https://hl7chile.cl/fhir/ig/CoreCL/1.7.0");
|
||||
// npm.remove("name");
|
||||
// npm.addProperty("name", "hl7.fhir.uv.smart-app-launch");
|
||||
// npm.remove("canonical");
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
package org.hl7.fhir.utilities.tests;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import org.hl7.fhir.utilities.npm.CachingPackageClient;
|
||||
import org.hl7.fhir.utilities.npm.CommonPackages;
|
||||
import org.hl7.fhir.utilities.npm.PackageInfo;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class CachingPackageClientTests {
|
||||
|
||||
private static final String SERVER1 = "http://packages.fhir.org";
|
||||
private static final String SERVER2 = "https://packages2.fhir.org/packages";
|
||||
// private static final String SERVER2 = "http://local.fhir.org:8080/packages";
|
||||
|
||||
@Test
|
||||
public void testExists() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
Assertions.assertTrue(client.exists("hl7.fhir.r4.core", "4.0.1"));
|
||||
Assertions.assertTrue(!client.exists("hl7.fhir.r4.core", "1.0.2"));
|
||||
Assertions.assertTrue(client.exists("HL7.fhir.r4.core", "4.0.1"));
|
||||
Assertions.assertTrue(!client.exists("hl7.fhir.nothing", "1.0.1"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCase() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
Assertions.assertTrue(client.exists("kbv.basis", "1.1.3"));
|
||||
Assertions.assertTrue(client.exists("KBV.Basis", "1.1.3"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearch() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
List<PackageInfo> matches = client.search("core", null, null, false);
|
||||
// for (PackageInfo pi : matches) {
|
||||
// System.out.println(pi.toString());
|
||||
// }
|
||||
Assertions.assertTrue(matches.size() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchNoMatches() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
List<PackageInfo> matches = client.search("corezxxx", null, null, false);
|
||||
Assertions.assertTrue(matches.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVersions() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
List<PackageInfo> matches = client.getVersions("Simplifier.Core.STU3");
|
||||
// for (PackageInfo pi : matches) {
|
||||
// System.out.println(pi.toString());
|
||||
// }
|
||||
Assertions.assertTrue(matches.size() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVersionsNone() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER1);
|
||||
List<PackageInfo> matches = client.getVersions("Simplifier.Core.STU3X");
|
||||
Assertions.assertTrue(matches.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExists2() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
Assertions.assertTrue(client.exists("hl7.fhir.r4.core", "4.0.1"));
|
||||
Assertions.assertTrue(!client.exists("hl7.fhir.r4.core", "1.0.2"));
|
||||
Assertions.assertTrue(!client.exists("hl7.fhir.nothing", "1.0.1"));
|
||||
Assertions.assertTrue(client.exists(CommonPackages.ID_PUBPACK, CommonPackages.VER_PUBPACK));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearch2() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
List<PackageInfo> matches = client.search("core", null, null, false);
|
||||
// for (PackageInfo pi : matches) {
|
||||
// System.out.println(pi.toString());
|
||||
// }
|
||||
Assertions.assertTrue(matches.size() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchNoMatches2() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
List<PackageInfo> matches = client.search("corezxxx", null, null, false);
|
||||
Assertions.assertTrue(matches.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVersions2() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
List<PackageInfo> matches = client.getVersions("Simplifier.Core.STU3");
|
||||
for (PackageInfo pi : matches) {
|
||||
System.out.println(pi.toString());
|
||||
}
|
||||
Assertions.assertTrue(matches.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVersions2A() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
List<PackageInfo> matches = client.getVersions("hl7.fhir.us.core");
|
||||
// for (PackageInfo pi : matches) {
|
||||
// System.out.println(pi.toString());
|
||||
// }
|
||||
Assertions.assertTrue(matches.size() > 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVersionsNone2() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient(CachingPackageClientTests.SERVER2);
|
||||
List<PackageInfo> matches = client.getVersions("Simplifier.Core.STU3X");
|
||||
Assertions.assertTrue(matches.size() == 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRegistry() throws IOException {
|
||||
CachingPackageClient client = new CachingPackageClient("http://packages.fhir.org/packages");
|
||||
List<PackageInfo> matches1 = client.listFromRegistry(null, null, null);
|
||||
List<PackageInfo> matches2 = client.listFromRegistry(null, null, "4.0.1");
|
||||
Assertions.assertTrue(matches1.size() > matches2.size());
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@ import java.util.List;
|
|||
import org.hl7.fhir.exceptions.FHIRException;
|
||||
import org.hl7.fhir.exceptions.FHIRFormatError;
|
||||
import org.hl7.fhir.utilities.VersionUtilities;
|
||||
import org.hl7.fhir.utilities.npm.CachingPackageClient;
|
||||
import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
|
||||
import org.hl7.fhir.utilities.npm.NpmPackage;
|
||||
import org.hl7.fhir.utilities.npm.PackageClient;
|
||||
|
|
@ -23,7 +22,7 @@ public class PackageValidator {
|
|||
private void execute() throws IOException {
|
||||
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
|
||||
|
||||
CachingPackageClient pc = new CachingPackageClient(PackageClient.PRIMARY_SERVER);
|
||||
PackageClient pc = new PackageClient(PackageClient.PRIMARY_SERVER);
|
||||
for (PackageInfo t : pc.search(null, null, null, false)) {
|
||||
System.out.println("Check Package "+t.getId());
|
||||
List<PackageInfo> vl = pc.getVersions(t.getId());
|
||||
|
|
|
|||
|
|
@ -17,3 +17,8 @@ e: {
|
|||
"error" : "java.lang.NullPointerException"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-snapshot3"}####
|
||||
e: {
|
||||
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -17,3 +17,8 @@ e: {
|
|||
"error" : "java.lang.NullPointerException"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-snapshot3"}####
|
||||
e: {
|
||||
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -119,3 +119,13 @@ e: {
|
|||
"error" : "java.lang.NullPointerException"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-snapshot3"}####
|
||||
e: {
|
||||
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-snapshot3"}####
|
||||
e: {
|
||||
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -75,3 +75,70 @@ v: {
|
|||
"system" : "http://unitsofmeasure.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"code" : "fr-CA"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "French (Canada)",
|
||||
"code" : "fr-CA",
|
||||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "439401001",
|
||||
"display" : "Diagnosis"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/condition-category", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "Diagnosis (observable entity)",
|
||||
"code" : "439401001",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"code" : "d"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "天",
|
||||
"code" : "d",
|
||||
"system" : "http://unitsofmeasure.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"code" : "text/plain"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "text/plain",
|
||||
"code" : "text/plain",
|
||||
"system" : "urn:ietf:bcp:13"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "271649006",
|
||||
"display" : "Systolic blood pressure"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Systolic blood pressure",
|
||||
"code" : "271649006",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"code" : "nl-NL"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot3", "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Nederlands (Nederland)",
|
||||
"code" : "nl-NL",
|
||||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"code" : "en-AU"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot3", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "English (Australia)",
|
||||
"code" : "en-AU",
|
||||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -29,3 +29,23 @@ v: {
|
|||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "urn:ietf:bcp:47",
|
||||
"code" : "fr-CA"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/languages--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "French (Canada)",
|
||||
"code" : "fr-CA",
|
||||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "urn:ietf:bcp:47",
|
||||
"code" : "fr-CA"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "French (Region=Canada)",
|
||||
"code" : "fr-CA",
|
||||
"system" : "urn:ietf:bcp:47"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -394,3 +394,110 @@ v: {
|
|||
"error" : "The display \"Good, strong cry; normal rate and effort of breathing \" is not a valid display for the code {http://loinc.org}LA6727-7 - should be one of ['Good, strong cry; normal rate and effort of breathing'] (from http://tx.fhir.org/r4)"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "85354-9"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Blood pressure panel with all children optional",
|
||||
"code" : "85354-9",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "85354-9",
|
||||
"display" : "Blood pressure panel with all children optional"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Blood pressure panel with all children optional",
|
||||
"code" : "85354-9",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "8480-6"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Systolic blood pressure",
|
||||
"code" : "8480-6",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "8480-6",
|
||||
"display" : "Systolic blood pressure"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Systolic blood pressure",
|
||||
"code" : "8480-6",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "8462-4"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Diastolic blood pressure",
|
||||
"code" : "8462-4",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "8462-4",
|
||||
"display" : "Diastolic blood pressure"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Diastolic blood pressure",
|
||||
"code" : "8462-4",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "56445-0"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Medication summary Document",
|
||||
"code" : "56445-0",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"version" : "2.73",
|
||||
"code" : "56445-0",
|
||||
"display" : "Medication summary Doc"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Medication summary Document",
|
||||
"code" : "56445-0",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"code" : "56445-0"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "Medication summary Document",
|
||||
"code" : "56445-0",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://loinc.org",
|
||||
"version" : "current",
|
||||
"code" : "56445-0",
|
||||
"display" : "Medication summary Doc"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "Medication summary Document",
|
||||
"code" : "56445-0",
|
||||
"system" : "http://loinc.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -374,3 +374,63 @@ v: {
|
|||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "90655003"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/c80-practice-codes--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"severity" : "error",
|
||||
"error" : "The code provided (http://snomed.info/sct#90655003) is not valid (from http://tx.fhir.org/r4)"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "24484000"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/condition-severity--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "Severe",
|
||||
"code" : "24484000",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "24484000",
|
||||
"display" : "Severe"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/condition-severity", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}####
|
||||
v: {
|
||||
"display" : "Severe",
|
||||
"code" : "24484000",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "109006"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Anxiety disorder of childhood OR adolescence",
|
||||
"code" : "109006",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "109006",
|
||||
"display" : "Anxiety disorder of childhood OR adolescence"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "Anxiety disorder of childhood OR adolescence",
|
||||
"code" : "109006",
|
||||
"system" : "http://snomed.info/sct"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://snomed.info/sct",
|
||||
"code" : "106004"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"severity" : "error",
|
||||
"error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -69,3 +69,13 @@ v: {
|
|||
"system" : "http://unitsofmeasure.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
{"code" : {
|
||||
"system" : "http://unitsofmeasure.org",
|
||||
"code" : "mm[Hg]"
|
||||
}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "5.0.0-snapshot3", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}####
|
||||
v: {
|
||||
"display" : "millimeter of mercury",
|
||||
"code" : "mm[Hg]",
|
||||
"system" : "http://unitsofmeasure.org"
|
||||
}
|
||||
-------------------------------------------------------------------------------------
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<properties>
|
||||
<hapi_fhir_version>6.2.1</hapi_fhir_version>
|
||||
<validator_test_case_version>1.2.3</validator_test_case_version>
|
||||
<validator_test_case_version>1.2.4-SNAPSHOT</validator_test_case_version>
|
||||
<junit_jupiter_version>5.7.1</junit_jupiter_version>
|
||||
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
|
||||
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
|
||||
|
|
|
|||
Loading…
Reference in New Issue