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

Merge remote-tracking branch 'origin/master' into ng_20201218_survivorship_poc

This commit is contained in:
Nick 2021-01-15 14:18:27 -05:00
parent f10785ed43 4791c81aec
commit 1d7ec3cc13
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/JpaPackageCache.java
View File

@ -191,6 +191,8 @@ public class JpaPackageCache extends BasePackageCacheManager implements IHapiPac
byte[] bytes = IOUtils.toByteArray(thePackageTgzInputStream);
ourLog.info("Parsing package .tar.gz ({} bytes) from {}", bytes.length, theSourceDesc);
NpmPackage npmPackage = NpmPackage.fromPackage(new ByteArrayInputStream(bytes));
if (!npmPackage.id().equals(thePackageId)) {
throw new InvalidRequestException("Package ID " + npmPackage.id() + " doesn't match expected: " + thePackageId);
@ -409,13 +411,15 @@ public class JpaPackageCache extends BasePackageCacheManager implements IHapiPac
Validate.notBlank(theInstallationSpec.getName(), "thePackageId must not be blank");
Validate.notBlank(theInstallationSpec.getVersion(), "thePackageVersion must not be blank");
String sourceDescription = "Embedded content";
if (isNotBlank(theInstallationSpec.getPackageUrl())) {
byte[] contents = loadPackageUrlContents(theInstallationSpec.getPackageUrl());
theInstallationSpec.setPackageContents(contents);
sourceDescription = theInstallationSpec.getPackageUrl();
}
if (theInstallationSpec.getPackageContents() != null) {
return addPackageToCache(theInstallationSpec.getName(), theInstallationSpec.getVersion(), new ByteArrayInputStream(theInstallationSpec.getPackageContents()), "Manually added");
return addPackageToCache(theInstallationSpec.getName(), theInstallationSpec.getVersion(), new ByteArrayInputStream(theInstallationSpec.getPackageContents()), sourceDescription);
}
return loadPackage(theInstallationSpec.getName(), theInstallationSpec.getVersion());