Ehp 2025.10.30 package registry poc

hapi-deployable-pom/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		 <groupId>ca.uhn.hapi.fhir</groupId>
 		 <artifactId>hapi-fhir</artifactId>
-		 <version>8.7.1-SNAPSHOT</version>
+		 <version>8.7.2-SNAPSHOT-LS</version>
 
 		 <relativePath>../pom.xml</relativePath>
 	 </parent>

hapi-fhir-android/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java

@@ -45,6 +45,7 @@
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.apache.commons.lang3.StringUtils.defaultString;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -192,6 +193,14 @@ default IBaseResource fetchCodeSystem(String theSystem) {
 		return null;
 	}
 
+	default <T extends IBaseResource> Stream<T> fetchResources(Class<T> theClazz, String theUrl) {
+		return Stream.empty();
+	}
+
+	default <T extends IBaseResource> Stream<T> fetchAllResourcesOfType(@Nonnull Class<T> theClazz) {
+		return Stream.empty();
+	}
+
 	/**
 	 * Loads a resource needed by the validation (a StructureDefinition, or a
 	 * ValueSet)

hapi-fhir-bom/pom.xml

@@ -4,15 +4,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir-bom</artifactId>
-	<version>8.7.1-SNAPSHOT</version>
+	<version>8.7.2-SNAPSHOT-LS</version>
 
 	<packaging>pom</packaging>
 	<name>HAPI FHIR BOM</name>
 
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-checkstyle/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../pom.xml</relativePath>
 	</parent>

hapi-fhir-cli/hapi-fhir-cli-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-cli/hapi-fhir-cli-app/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir-cli</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../pom.xml</relativePath>
 	</parent>

hapi-fhir-cli/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../pom.xml</relativePath>
 	</parent>

hapi-fhir-client-apache-http5/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-client-okhttp/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-converter/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-dist/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../pom.xml</relativePath>
 	</parent>

hapi-fhir-docs/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-jacoco/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-jaxrsserver-base/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-jpa-hibernate-services/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 

hapi-fhir-jpa/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

hapi-fhir-jpaserver-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaConfig.java

@@ -36,6 +36,7 @@
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDaoConceptMap;
 import ca.uhn.fhir.jpa.api.model.ExpungeOptions;
 import ca.uhn.fhir.jpa.api.svc.IIdHelperService;
+import ca.uhn.fhir.jpa.api.svc.IPackageInstallerSvc;
 import ca.uhn.fhir.jpa.api.svc.ISearchUrlJobMaintenanceSvc;
 import ca.uhn.fhir.jpa.binary.interceptor.BinaryStorageInterceptor;
 import ca.uhn.fhir.jpa.binary.provider.BinaryAccessProvider;
@@ -101,7 +102,6 @@
 import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import ca.uhn.fhir.jpa.model.sched.ISchedulerService;
 import ca.uhn.fhir.jpa.packages.IHapiPackageCacheManager;
-import ca.uhn.fhir.jpa.packages.IPackageInstallerSvc;
 import ca.uhn.fhir.jpa.packages.JpaPackageCache;
 import ca.uhn.fhir.jpa.packages.NpmJpaValidationSupport;
 import ca.uhn.fhir.jpa.packages.PackageInstallerSvcImpl;

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

@@ -41,6 +41,7 @@
 import ca.uhn.fhir.jpa.model.util.JpaConstants;
 import ca.uhn.fhir.jpa.packages.loader.NpmPackageData;
 import ca.uhn.fhir.jpa.packages.loader.PackageLoaderSvc;
+import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
@@ -345,6 +346,8 @@ private NpmPackage addPackageToCacheInternal(NpmPackageData thePackageData) {
 			} catch (IOException e) {
 				throw new InternalErrorException(Msg.code(2371) + e);
 			}
+			IParser jsonParser = packageContext.newJsonParser();
+			;
 			for (Map.Entry<String, List<String>> nextTypeToFiles : packageFolderTypes.entrySet()) {
 				String nextType = nextTypeToFiles.getKey();
 				for (String nextFile : nextTypeToFiles.getValue()) {
@@ -362,7 +365,7 @@ private NpmPackage addPackageToCacheInternal(NpmPackageData thePackageData) {
 					if (nextFile.toLowerCase().endsWith(".xml")) {
 						resource = packageContext.newXmlParser().parseResource(contentsString);
 					} else if (nextFile.toLowerCase().endsWith(".json")) {
-						resource = packageContext.newJsonParser().parseResource(contentsString);
+						resource = jsonParser.parseResource(contentsString);
 					} else {
 						getProcessingMessages(npmPackage).add("Not indexing file: " + nextFile);
 						continue;
@@ -375,10 +378,8 @@ private NpmPackage addPackageToCacheInternal(NpmPackageData thePackageData) {
 					 */
 					String contentType = Constants.CT_FHIR_JSON_NEW;
 					ResourceUtil.removeNarrative(packageContext, resource);
-					byte[] minimizedContents = packageContext
-							.newJsonParser()
-							.encodeResourceToString(resource)
-							.getBytes(StandardCharsets.UTF_8);
+					byte[] minimizedContents =
+							jsonParser.encodeResourceToString(resource).getBytes(StandardCharsets.UTF_8);
 
 					IBaseBinary resourceBinary = createPackageResourceBinary(minimizedContents, contentType);
 					ResourceTable persistedResource = createResourceBinary(resourceBinary);
@@ -428,7 +429,11 @@ private NpmPackage addPackageToCacheInternal(NpmPackageData thePackageData) {
 			}
 
 			getProcessingMessages(npmPackage)
-					.add("Successfully added package " + npmPackage.id() + "#" + npmPackage.version() + " to registry");
+					.add(String.format(
+							NpmPackageUtils.SUCCESSFULLY_INSTALLED_MSG_TEMPLATE,
+							npmPackage.id(),
+							npmPackage.version()));
+			//					.add("Successfully added package " + npmPackage.id() + "#" + npmPackage.version() + " to registry");
 
 			return npmPackage;
 		});

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/NpmJpaValidationSupport.java

@@ -22,11 +22,18 @@
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.support.IValidationSupport;
+import ca.uhn.fhir.model.api.PagingIterator;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 public class NpmJpaValidationSupport implements IValidationSupport {
 
@@ -56,6 +63,55 @@ public IBaseResource fetchStructureDefinition(String theUri) {
 		return fetchResource("StructureDefinition", theUri);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T extends IBaseResource> T fetchResource(@Nullable Class<T> theClass, String theUri) {
+		if (theClass != null) {
+			String resourceType = myFhirContext.getResourceType(theClass);
+			// we can cast safely because the resource type must match what we're passing in.
+			// we aren't loading different versions of FHIR after all (since what we
+			// load is dependent on the fhir context too)
+			return (T) fetchResource(resourceType, theUri);
+		}
+
+		// no class
+		return null;
+	}
+
+	public static int batchSize() {
+		return 100;
+	}
+
+	@Override
+	public <T extends IBaseResource> Stream<T> fetchResources(Class<T> theClazz, String theUrl) {
+		FhirVersionEnum fhirVersion = myFhirContext.getVersion().getVersion();
+		PagingIterator<T> pagingIterator = new PagingIterator<>(
+				batchSize(),
+				(pageSize, batchSize, theConsumer) ->
+						myHapiPackageCacheManager
+								.loadPackageAssetsByUrl(fhirVersion, theUrl, PageRequest.of(pageSize, batchSize))
+								.stream()
+								.filter(r -> {
+									if (theClazz != null) {
+										return r.getClass().isAssignableFrom(theClazz);
+									}
+									return true;
+								})
+								.forEach(r -> theConsumer.accept((T) r)));
+
+		return StreamSupport.stream(
+				Spliterators.spliteratorUnknownSize(pagingIterator, Spliterator.ORDERED), false); // sequential
+	}
+
+	@Override
+	public <T extends IBaseResource> Stream<T> fetchAllResourcesOfType(@Nonnull Class<T> theClazz) {
+		FhirVersionEnum fhirVersion = myFhirContext.getVersion().getVersion();
+		return myHapiPackageCacheManager.loadPackageAssetsByType(fhirVersion, theClazz.getSimpleName()).stream()
+				.map(r -> (T) r)
+				.toList()
+				.stream();
+	}
+
 	@Nullable
 	public IBaseResource fetchResource(String theResourceType, String theUri) {
 		FhirVersionEnum fhirVersion = myFhirContext.getVersion().getVersion();

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java

@@ -32,6 +32,7 @@
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.api.model.DaoMethodOutcome;
+import ca.uhn.fhir.jpa.api.svc.IPackageInstallerSvc;
 import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionDao;
 import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
 import ca.uhn.fhir.jpa.dao.validation.SearchParameterDaoValidator;
@@ -199,6 +200,8 @@ public PackageInstallOutcomeJson install(PackageInstallationSpec theInstallation
 							"Package {}#{} is already installed",
 							theInstallationSpec.getName(),
 							theInstallationSpec.getVersion());
+					// add a property to specify whether we keep going or not.
+					// use quartz to schedule a batch job on one instance to install the packages
 				}
 
 				NpmPackage npmPackage = myPackageCacheManager.installPackage(theInstallationSpec);

hapi-fhir-jpaserver-elastic-test-utilities/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 

hapi-fhir-jpaserver-hfql/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 

hapi-fhir-jpaserver-ips/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-jpaserver-mdm/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.7.1-SNAPSHOT</version>
+		<version>8.7.2-SNAPSHOT-LS</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>