Initial IPS + Cql to Cr migration

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Spring Boot-Application<hapi-fhir-jpaserver-starter>",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "ca.uhn.fhir.jpa.starter.Application",
+            "projectName": "hapi-fhir-jpaserver-starter",
+            "args": "",
+            "envFile": "${workspaceFolder}/.env"
+        }
+    ]
+}

.vscode/settings.json

@@ -4,5 +4,6 @@
         "**/.project": true,
         "**/.settings": true,
         "**/.factorypath": true
-    }
+    },
+    "java.compile.nullAnalysis.mode": "disabled"
 }

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>6.3.6-SNAPSHOT</version>
+        <version>6.3.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
@@ -117,7 +117,7 @@
         <!-- This dependency includes the JPA CQL Server -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-jpaserver-cql</artifactId>
+            <artifactId>hapi-fhir-storage-cr</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- This dependency includes the JPA MDM Server -->
@@ -146,6 +146,12 @@
             <version>${project.version}</version>
             <classifier>classes</classifier>
         </dependency>
+        <!-- This dependency is used to include the IPS Base Implementation -->
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-jpaserver-ips</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a logging library. Logback
             is used here, but log4j would also be fine. -->

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu3.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.jpa.config.dstu3.JpaDstu3Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition;
-import ca.uhn.fhir.jpa.starter.cql.StarterCqlDstu3Config;
+import ca.uhn.fhir.jpa.starter.cr.StarterCrDstu3Config;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Import;
 @Import({
 	JpaDstu3Config.class,
 	StarterJpaConfig.class,
-	StarterCqlDstu3Config.class,
+	 StarterCrDstu3Config.class,
 	ElasticsearchConfig.class})
 public class FhirServerConfigDstu3 {
 }

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigR4.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.jpa.config.r4.JpaR4Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
-import ca.uhn.fhir.jpa.starter.cql.StarterCqlR4Config;
+import ca.uhn.fhir.jpa.starter.cr.StarterCrR4Config;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Import;
 @Import({
 	JpaR4Config.class,
 	StarterJpaConfig.class,
-	StarterCqlR4Config.class,
+	StarterCrR4Config.class,
 	ElasticsearchConfig.class
 })
 public class FhirServerConfigR4 {

src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java

@@ -30,6 +30,11 @@ import ca.uhn.fhir.jpa.delete.ThreadSafeResourceDeleterSvc;
 import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
 import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor;
 import ca.uhn.fhir.jpa.interceptor.validation.RepositoryValidatingInterceptor;
+import ca.uhn.fhir.jpa.ips.api.IIpsGenerationStrategy;
+import ca.uhn.fhir.jpa.ips.generator.DefaultIpsGenerationStrategy;
+import ca.uhn.fhir.jpa.ips.generator.IIpsGeneratorSvc;
+import ca.uhn.fhir.jpa.ips.generator.IpsGeneratorSvcImpl;
+import ca.uhn.fhir.jpa.ips.provider.IpsOperationProvider;
 import ca.uhn.fhir.jpa.packages.IPackageInstallerSvc;
 import ca.uhn.fhir.jpa.packages.PackageInstallationSpec;
 import ca.uhn.fhir.jpa.partition.PartitionManagementProvider;
@@ -238,7 +243,7 @@ public class StarterJpaConfig {
 	}
 
 	@Bean
-	public RestfulServer restfulServer(IFhirSystemDao<?, ?> fhirSystemDao, AppProperties appProperties, DaoRegistry daoRegistry, Optional<MdmProviderLoader> mdmProviderProvider, IJpaSystemProvider jpaSystemProvider, ResourceProviderFactory resourceProviderFactory, DaoConfig daoConfig, ISearchParamRegistry searchParamRegistry, IValidationSupport theValidationSupport, DatabaseBackedPagingProvider databaseBackedPagingProvider, LoggingInterceptor loggingInterceptor, Optional<TerminologyUploaderProvider> terminologyUploaderProvider, Optional<SubscriptionTriggeringProvider> subscriptionTriggeringProvider, Optional<CorsInterceptor> corsInterceptor, IInterceptorBroadcaster interceptorBroadcaster, Optional<BinaryAccessProvider> binaryAccessProvider, BinaryStorageInterceptor binaryStorageInterceptor, IValidatorModule validatorModule, Optional<GraphQLProvider> graphQLProvider, BulkDataExportProvider bulkDataExportProvider, BulkDataImportProvider bulkDataImportProvider, ValueSetOperationProvider theValueSetOperationProvider, ReindexProvider reindexProvider, PartitionManagementProvider partitionManagementProvider, Optional<RepositoryValidatingInterceptor> repositoryValidatingInterceptor, IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc, ApplicationContext appContext) {
+	public RestfulServer restfulServer(IFhirSystemDao<?, ?> fhirSystemDao, AppProperties appProperties, DaoRegistry daoRegistry, Optional<MdmProviderLoader> mdmProviderProvider, IJpaSystemProvider jpaSystemProvider, ResourceProviderFactory resourceProviderFactory, DaoConfig daoConfig, ISearchParamRegistry searchParamRegistry, IValidationSupport theValidationSupport, DatabaseBackedPagingProvider databaseBackedPagingProvider, LoggingInterceptor loggingInterceptor, Optional<TerminologyUploaderProvider> terminologyUploaderProvider, Optional<SubscriptionTriggeringProvider> subscriptionTriggeringProvider, Optional<CorsInterceptor> corsInterceptor, IInterceptorBroadcaster interceptorBroadcaster, Optional<BinaryAccessProvider> binaryAccessProvider, BinaryStorageInterceptor binaryStorageInterceptor, IValidatorModule validatorModule, Optional<GraphQLProvider> graphQLProvider, BulkDataExportProvider bulkDataExportProvider, BulkDataImportProvider bulkDataImportProvider, ValueSetOperationProvider theValueSetOperationProvider, ReindexProvider reindexProvider, PartitionManagementProvider partitionManagementProvider, Optional<RepositoryValidatingInterceptor> repositoryValidatingInterceptor, IPackageInstallerSvc packageInstallerSvc, ThreadSafeResourceDeleterSvc theThreadSafeResourceDeleterSvc, ApplicationContext appContext, IpsOperationProvider theIpsOperationProvider) {
 		RestfulServer fhirServer = new RestfulServer(fhirSystemDao.getContext());
 
 		List<String> supportedResourceTypes = appProperties.getSupported_resource_types();
@@ -408,9 +413,29 @@ public class StarterJpaConfig {
 		// register custom interceptors
 		registerCustomInterceptors(fhirServer, appContext, appProperties.getCustomInterceptorClasses());
 
+
+		//register the IPS Provider
+		fhirServer.registerProvider(theIpsOperationProvider);
 		return fhirServer;
 	}
 
+	@Bean
+	public IIpsGeneratorSvc IpsGeneratorSvcImpl(FhirContext theFhirContext, IIpsGenerationStrategy theGenerationStrategy, DaoRegistry theDaoRegistry)
+	{
+		return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy, theDaoRegistry);
+	}
+
+	@Bean
+	public IpsOperationProvider IpsOperationProvider(IIpsGeneratorSvc theIpsGeneratorSvc){
+		return new IpsOperationProvider(theIpsGeneratorSvc);
+	}
+
+	@Bean IIpsGenerationStrategy IpsGenerationStrategy()
+	{
+		return new DefaultIpsGenerationStrategy();
+	}
+
+
 	/**
 	 * check the properties for custom interceptor classes and registers them.
 	 */

src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java

@@ -1,11 +0,0 @@
-package ca.uhn.fhir.jpa.starter.cql;
-
-import ca.uhn.fhir.cql.config.CqlR4Config;
-import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Import;
-
-@Conditional({OnR4Condition.class, CqlConfigCondition.class})
-@Import({CqlR4Config.class})
-public class StarterCqlR4Config {
-}

src/main/java/ca/uhn/fhir/jpa/starter/cr/CrConfigCondition.java

@@ -1,14 +1,14 @@
-package ca.uhn.fhir.jpa.starter.cql;
+package ca.uhn.fhir.jpa.starter.cr;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-public class CqlConfigCondition implements Condition {
+public class CrConfigCondition implements Condition {
 
   @Override
   public boolean matches(ConditionContext theConditionContext, AnnotatedTypeMetadata theAnnotatedTypeMetadata) {
-    String property = theConditionContext.getEnvironment().getProperty("hapi.fhir.cql_enabled");
+    String property = theConditionContext.getEnvironment().getProperty("hapi.fhir.cr_enabled");
 	  return Boolean.parseBoolean(property);
   }
 }

src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java

@@ -1,13 +1,13 @@
-package ca.uhn.fhir.jpa.starter.cql;
+package ca.uhn.fhir.jpa.starter.cr;
 
-import ca.uhn.fhir.cql.config.CqlDstu3Config;
+import ca.uhn.fhir.cr.config.CrDstu3Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Conditional({OnDSTU3Condition.class, CqlConfigCondition.class})
+@Conditional({OnDSTU3Condition.class, CrConfigCondition.class})
-@Import({CqlDstu3Config.class})
+@Import({CrDstu3Config.class})
-public class StarterCqlDstu3Config {
+public class StarterCrDstu3Config {
 }

src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java

@@ -0,0 +1,11 @@
+package ca.uhn.fhir.jpa.starter.cr;
+
+import ca.uhn.fhir.cr.config.CrR4Config;
+import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Import;
+
+@Conditional({OnR4Condition.class, CrConfigCondition.class})
+@Import({CrR4Config.class})
+public class StarterCrR4Config {
+}

src/main/resources/application.yaml

@@ -93,7 +93,7 @@ hapi:
     #    allow_multiple_delete: true
     #    allow_override_default_search_params: true
     #    auto_create_placeholder_reference_targets: false
-    #    cql_enabled: true
+    #    cr_enabled: true
     #    default_encoding: JSON
     #    default_pretty_print: true
     #    default_page_size: 20
@@ -117,7 +117,7 @@ hapi:
     #    fhirpath_interceptor_enabled: false
     #    filter_search_enabled: true
     #    graphql_enabled: true
-    #    narrative_enabled: true
+    narrative_enabled: false
     #    mdm_enabled: true
     #    local_base_urls:
     #      - https://hapi.fhir.org/baseR4