Skip to content

Package registry poc #847

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
TipzCM wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Package registry poc #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6dde1bb
updating some poms
Nov 21, 2025
eca9429
Merge remote-tracking branch 'origin/master' into packageRegistryPOC
Nov 21, 2025
e045b0f
commenting out pom
Nov 24, 2025
2cb08cd
Merge remote-tracking branch 'origin/master' into packageRegistryPOC
Nov 24, 2025
1c00130
changing poms
Nov 25, 2025
0c182b3
update
Nov 26, 2025
8fdb708
updating npm loading
Dec 2, 2025
014a576
spotless
Dec 2, 2025
7088fcb
cleanup
Dec 2, 2025
3ccd2f6
updating for merging
Dec 3, 2025
c8c4b91
Merge remote-tracking branch 'origin/master' into packageRegistryPOC
Dec 3, 2025
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
8 changes: 4 additions & 4 deletions cqf-fhir-benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-benchmark</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>FHIR Clinical Reasoning (Benchmarks)</name>
<description>Tests validating performance of FHIR Clinical Reasoning operations</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-test</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand Down
18 changes: 9 additions & 9 deletions cqf-fhir-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,53 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-bom</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>FHIR Clinical Reasoning (Bill Of Materials)</name>
<description>This bom can be used to simplify dependency management when using this project</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-test</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-utility</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cql</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr-cli</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr-hapi</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr-spring</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions cqf-fhir-cql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cql</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>FHIR Clinical Reasoning (CQL)</name>
<description>Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-utility</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cqframework</groupId>
Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-test</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 8 additions & 2 deletions cqf-fhir-cql/src/main/java/org/opencds/cqf/fhir/cql/LibraryEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.opencds.cqf.fhir.cql.engine.parameters.CqlParameterDefinition;
import org.opencds.cqf.fhir.utility.CqfExpression;
import org.opencds.cqf.fhir.utility.adapter.IAdapterFactory;
import org.opencds.cqf.fhir.utility.repository.INpmRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -40,15 +41,21 @@ public class LibraryEngine {
private static final Logger logger = LoggerFactory.getLogger(LibraryEngine.class);

protected final IRepository repository;
protected final INpmRepository npmRepository;
protected final FhirContext fhirContext;
protected final EvaluationSettings settings;
protected final IAdapterFactory adapterFactory;

public LibraryEngine(IRepository repository, EvaluationSettings evaluationSettings) {
public LibraryEngine(IRepository repository, EvaluationSettings settings) {
this(repository, null, settings);
}

public LibraryEngine(IRepository repository, INpmRepository npmRepository, EvaluationSettings evaluationSettings) {
this.repository = requireNonNull(repository, "repository can not be null");
this.settings = requireNonNull(evaluationSettings, "evaluationSettings can not be null");
fhirContext = repository.fhirContext();
adapterFactory = IAdapterFactory.forFhirContext(fhirContext);
this.npmRepository = npmRepository;
}

public IRepository getRepository() {
Expand Down Expand Up @@ -320,7 +327,6 @@ public EvaluationResultsForMultiLib getEvaluationResult(
var versionlessIdentifiers = ids.stream()
.map(id -> new VersionedIdentifier().withId(id.getId()))
.toList();

return engineToUse.evaluate(
versionlessIdentifiers,
expressions,
Expand Down
12 changes: 6 additions & 6 deletions cqf-fhir-cr-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr-cli</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>FHIR Clinical Reasoning (CLI)</name>
<description>CLI for running FHIR Clincial Reasoning operations</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-utility</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cql</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
Expand Down Expand Up @@ -58,13 +58,13 @@
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-test</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion cqf-fhir-cr-hapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<artifactId>cqf-fhir-cr-hapi</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/common/NpmRepositoryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.opencds.cqf.fhir.cr.hapi.common;

import org.opencds.cqf.fhir.utility.repository.INpmRepository;

public class NpmRepositoryFactory {

private INpmRepository npmRepository;

/**
* Fetch the INpmRepository
*/
public INpmRepository getNpmRepository() {
return npmRepository;
}

/**
* Register the INpmRepository
*/
public void register(INpmRepository npmRepository) {
this.npmRepository = npmRepository;
}
}
12 changes: 11 additions & 1 deletion cqf-fhir-cr-hapi/src/main/java/org/opencds/cqf/fhir/cr/hapi/config/CrProcessorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.opencds.cqf.fhir.cr.hapi.common.IQuestionnaireProcessorFactory;
import org.opencds.cqf.fhir.cr.hapi.common.IQuestionnaireResponseProcessorFactory;
import org.opencds.cqf.fhir.cr.hapi.common.IValueSetProcessorFactory;
import org.opencds.cqf.fhir.cr.hapi.common.NpmRepositoryFactory;
import org.opencds.cqf.fhir.cr.implementationguide.ImplementationGuideProcessor;
import org.opencds.cqf.fhir.cr.library.LibraryProcessor;
import org.opencds.cqf.fhir.cr.plandefinition.PlanDefinitionProcessor;
Expand All @@ -35,6 +36,11 @@ IActivityDefinitionProcessorFactory activityDefinitionProcessorFactory(
return rd -> new ActivityDefinitionProcessor(repositoryFactory.create(rd), crSettings);
}

@Bean
NpmRepositoryFactory npmRepositoryFactory() {
return new NpmRepositoryFactory();
}

@Bean
IImplementationGuideProcessorFactory implementationGuideProcessorFactory(IRepositoryFactory repositoryFactory) {
return rd -> new ImplementationGuideProcessor(repositoryFactory.create(rd));
Expand All @@ -49,7 +55,11 @@ IPlanDefinitionProcessorFactory planDefinitionProcessorFactory(
@Bean
IQuestionnaireProcessorFactory questionnaireProcessorFactory(
IRepositoryFactory repositoryFactory, CrSettings crSettings) {
return rd -> new QuestionnaireProcessor(repositoryFactory.create(rd), crSettings);

return rd -> QuestionnaireProcessor.builder(repositoryFactory.create(rd))
.setCrSettings(crSettings)
.setINpmRepository(npmRepositoryFactory().getNpmRepository())
.build();
}

@Bean
Expand Down
6 changes: 3 additions & 3 deletions cqf-fhir-cr-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr-spring</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>FHIR Clinical Reasoning (Spring)</name>
<description>Spring configurations for FHIR Clinical Reasoning</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
10 changes: 5 additions & 5 deletions cqf-fhir-cr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@

<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cr</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>FHIR Clinical Reasoning (Operations)</name>
<description>Implementations of clinical reasoning operations</description>

<parent>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-cql</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-utility</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
</dependency>

<!-- test dependencies-->
<dependency>
<groupId>org.opencds.cqf.fhir</groupId>
<artifactId>cqf-fhir-test</artifactId>
<version>4.1.0-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/common/ResourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

public class ResourceResolver {
final String invalidResourceType = "The resource passed in was not a valid instance of %s.class";
final String resourceType;
final IRepository repository;
final Class<? extends IBaseResource> clazz;
final Class<? extends IBaseBundle> bundleClazz;
protected final String resourceType;
protected final IRepository repository;
protected final Class<? extends IBaseResource> clazz;
protected final Class<? extends IBaseBundle> bundleClazz;

@SuppressWarnings("unchecked")
public ResourceResolver(String resourceType, IRepository repository) {
Expand Down
Loading
Loading