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

Merge branch 'ja_20200524_npm_rework' of github.com:hapifhir/org.hl7.fhir.core into ja_20200524_npm_rework

This commit is contained in:
jamesagnew 2020-05-30 11:08:42 -04:00
parent 9fe0688ee5 91e2d227fb
commit 223ac04238
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java vendored
View File

@ -70,7 +70,7 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager {
return null; return null;
} }
protected abstract NpmPackage loadPackageFromCacheOnly(String id, @Nullable String version) throws IOException; public abstract NpmPackage loadPackageFromCacheOnly(String id, @Nullable String version) throws IOException;
@Override @Override
public String getPackageUrl(String packageId) throws IOException { public String getPackageUrl(String packageId) throws IOException {

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java vendored
View File

@ -287,7 +287,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
* @throws IOException * @throws IOException
*/ */
@Override @Override
protected NpmPackage loadPackageFromCacheOnly(String id, String version) throws IOException { public NpmPackage loadPackageFromCacheOnly(String id, String version) throws IOException {
if (!Utilities.noString(version) && version.startsWith("file:")) { if (!Utilities.noString(version) && version.startsWith("file:")) {
return loadPackageFromFile(id, version.substring(5)); return loadPackageFromFile(id, version.substring(5));
} }

2
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java
View File

@ -1,7 +1,7 @@
package org.hl7.fhir.utilities.tests; package org.hl7.fhir.utilities.tests;
import org.hl7.fhir.utilities.cache.CachingPackageClient; import org.hl7.fhir.utilities.cache.CachingPackageClient;
import org.hl7.fhir.utilities.cache.CachingPackageClient.PackageInfo; import org.hl7.fhir.utilities.cache.BasePackageClient.PackageInfo;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/packages/PackageValidator.java
View File

@ -10,7 +10,7 @@ import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.cache.NpmPackage; import org.hl7.fhir.utilities.cache.NpmPackage;
import org.hl7.fhir.utilities.cache.FilesystemPackageCacheManager; import org.hl7.fhir.utilities.cache.FilesystemPackageCacheManager;
import org.hl7.fhir.utilities.cache.CachingPackageClient; import org.hl7.fhir.utilities.cache.CachingPackageClient;
import org.hl7.fhir.utilities.cache.CachingPackageClient.PackageInfo; import org.hl7.fhir.utilities.cache.BasePackageClient.PackageInfo;
import org.hl7.fhir.utilities.cache.ToolsVersion; import org.hl7.fhir.utilities.cache.ToolsVersion;
public class PackageValidator { public class PackageValidator {