Skip to content

Update 8.11 tracking branch for HAPI FHIR 8.11.18-SNAPSHOT #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gM4n-sys wants to merge 8 commits into
base: hapi-8_11-tracking
Choose a base branch
from
+26 −5
Open

Update 8.11 tracking branch for HAPI FHIR 8.11.18-SNAPSHOT #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12430fa
Bump org.postgresql:postgresql from 42.7.9 to 42.7.12
dependabot[bot] Jul 23, 2026
4a22496
Merge pull request #983 from hapifhir/dependabot/maven/org.postgresql…
KevinDougan Jul 23, 2026
4622752
Merge remote-tracking branch 'upstream/master' into hapi-8_11-trackin…
Jul 24, 2026
aa4fd50
Update starter for HAPI FHIR 8.11.17-SNAPSHOT
gM4n-sys Jul 24, 2026
449fbfe
Register DaoRegistry services in starter configuration
gM4n-sys Jul 24, 2026
f0bea7d
Import search configuration for HAPI 8.11
gM4n-sys Jul 24, 2026
8932b22
Initialize resource DAOs before REST providers
gM4n-sys Jul 24, 2026
c6e1c11
Update HAPI FHIR parent to 8.11.18-SNAPSHOT
gM4n-sys Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<micrometer.version>1.16.2</micrometer.version>
<commons.logging.version>1.3.5</commons.logging.version>
<spring_boot_version>3.5.9</spring_boot_version>
<postgresql.version>42.7.9</postgresql.version>
<postgresql.version>42.7.12</postgresql.version>
<logback_version>1.5.25</logback_version>
</properties>

Expand All @@ -35,7 +35,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>8.11.16-SNAPSHOT</version>
<version>8.11.18-SNAPSHOT</version>

@vishwasrao vishwasrao Sep 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to update version to 8.12.0?

</parent>

<artifactId>hapi-fhir-jpaserver-starter</artifactId>
Expand Down
27 changes: 24 additions & 3 deletions src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
import ca.uhn.fhir.jpa.api.IDaoRegistry;
import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
import ca.uhn.fhir.jpa.api.config.ThreadPoolFactoryConfig;
import ca.uhn.fhir.jpa.api.dao.DaoRegistrationService;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
import ca.uhn.fhir.jpa.binary.provider.BinaryAccessProvider;
import ca.uhn.fhir.jpa.config.SearchConfig;
import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil;
import ca.uhn.fhir.jpa.config.util.ResourceCountCacheUtil;
import ca.uhn.fhir.jpa.dao.FulltextSearchSvcImpl;
Expand Down Expand Up @@ -110,7 +113,7 @@
@Configuration
// allow users to configure custom packages to scan for additional beans
@ComponentScan(basePackages = {"${hapi.fhir.custom-bean-packages:}"})
@Import(ThreadPoolFactoryConfig.class)
@Import({ThreadPoolFactoryConfig.class, SearchConfig.class})
public class StarterJpaConfig {

private static final Logger ourLog = LoggerFactory.getLogger(StarterJpaConfig.class);
Expand Down Expand Up @@ -167,14 +170,24 @@ public ApplicationRunner restfulClientFactoryConfigurer(FhirContext fhirContext,
};
}

@Bean
public DaoRegistry daoRegistry(FhirContext theFhirContext) {
return new DaoRegistry(theFhirContext);
}

@Bean
public DaoRegistrationService daoRegistrationService(DaoRegistry theDaoRegistry) {
return new DaoRegistrationService(theDaoRegistry);
}

@Bean
public IResourceSupportedSvc resourceSupportedSvc(IDaoRegistry theDaoRegistry) {
return new DaoRegistryResourceSupportedSvc(theDaoRegistry);
}

@Bean(name = "myResourceCountsCache")
public ResourceCountCache resourceCountsCache(IFhirSystemDao<?, ?> theSystemDao) {
return ResourceCountCacheUtil.newResourceCountCache(theSystemDao);
public ResourceCountCache resourceCountsCache(DaoRegistry theDaoRegistry) {
return ResourceCountCacheUtil.newResourceCountCache(theDaoRegistry);
}

@Primary
Expand Down Expand Up @@ -334,6 +347,7 @@ public RestfulServer restfulServer(
IFhirSystemDao<?, ?> fhirSystemDao,
AppProperties appProperties,
DaoRegistry daoRegistry,
List<IFhirResourceDao<?>> resourceDaos,
Optional<MdmProviderLoader> mdmProviderProvider,
IJpaSystemProvider jpaSystemProvider,
ResourceProviderFactory resourceProviderFactory,
Expand Down Expand Up @@ -363,6 +377,13 @@ public RestfulServer restfulServer(
DiffProvider diffProvider) {
RestfulServer fhirServer = new RestfulServer(fhirSystemDao.getContext());

/*
* Resource providers are selected from the DaoRegistry below.
* Force the generated resource DAOs to initialize and self-register
* before the provider suppliers are evaluated.
*/
ourLog.info("Initialized {} JPA resource DAO(s)", resourceDaos.size());

List<String> supportedResourceTypes = appProperties.getSupported_resource_types();

if (!supportedResourceTypes.isEmpty()) {
Expand Down