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 105f11d9a..a6b475243 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 @@ -60,7 +60,7 @@ public abstract class BasePackageCacheManager implements IPackageCacheManager { } InputStream stream = packageClient.fetch(id, version); String url = packageClient.url(id, version); - return new InputStreamWithSrc(stream, packageClient.url(id, version), version); + return new InputStreamWithSrc(stream, url, version); } catch (IOException e) { ourLog.info("Failed to resolve package {}#{} from server: {}", id, version, nextPackageServer); } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java index a49d83494..200b86c41 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java @@ -195,6 +195,7 @@ public class NpmPackage { private JsonObject npm; private Map folders = new HashMap<>(); private boolean changedByLoader; // internal qa only! + private Map userData = new HashMap<>(); /** * Constructor @@ -210,6 +211,10 @@ public class NpmPackage { return res; } + public Map getUserData() { + return userData; + } + public static void loadFiles(NpmPackage res, String path, File source, String... exemptions) throws FileNotFoundException, IOException { res.npm = (JsonObject) new com.google.gson.JsonParser().parse(TextFile.fileToString(Utilities.path(path, "package", "package.json"))); res.path = path;