From 91e2d227fb24418ea3046b3aafd10cf15bffbfdf Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Thu, 28 May 2020 21:07:18 -0400 Subject: [PATCH] Compile fixes --- .../org/hl7/fhir/utilities/cache/BasePackageCacheManager.java | 2 +- .../hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java | 2 +- .../org/hl7/fhir/utilities/tests/CachingPackageClientTests.java | 2 +- .../java/org/hl7/fhir/validation/packages/PackageValidator.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java index 850590ed7..105f11d9a 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/BasePackageCacheManager.java @@ -70,7 +70,7 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager { 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 public String getPackageUrl(String packageId) throws IOException { diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java index 3d0e528b9..9ea839180 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/FilesystemPackageCacheManager.java @@ -287,7 +287,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple * @throws IOException */ @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:")) { return loadPackageFromFile(id, version.substring(5)); } diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java index 126bfb6bc..21485daff 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java @@ -1,7 +1,7 @@ package org.hl7.fhir.utilities.tests; 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.Test; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/packages/PackageValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/packages/PackageValidator.java index 3f9e60412..c6d9890be 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/packages/PackageValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/packages/PackageValidator.java @@ -10,7 +10,7 @@ import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.cache.NpmPackage; import org.hl7.fhir.utilities.cache.FilesystemPackageCacheManager; 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; public class PackageValidator {