Merge pull request #660 from hapifhir/rel_7_1_tracking

HAPI 7.2.0 Release Tracking
hapifhir · May 21, 2024 · 8f497dd · 8f497dd
2 parents 66f1af3 + 695c704
commit 8f497dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.0.2</version>
+ <version>7.2.0</version>
  </parent>
 
  <artifactId>hapi-fhir-jpaserver-starter</artifactId>

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
@@ -2,7 +2,7 @@
 
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc;
-import ca.uhn.fhir.jpa.binstore.DatabaseBlobBinaryStorageSvcImpl;
+import ca.uhn.fhir.jpa.binstore.DatabaseBinaryContentStorageSvcImpl;
 import ca.uhn.fhir.jpa.config.HibernatePropertiesProvider;
 import ca.uhn.fhir.jpa.model.config.PartitionSettings;
 import ca.uhn.fhir.jpa.model.config.PartitionSettings.CrossPartitionReferenceMode;
@@ -88,7 +88,7 @@ public FhirServerConfigCommon(AppProperties appProperties) {
  }
 
  /**
- * Configure FHIR properties around the the JPA server via this bean
+ * Configure FHIR properties around the JPA server via this bean
  */
  @Bean
  public JpaStorageSettings jpaStorageSettings(AppProperties appProperties) {
@@ -264,7 +264,7 @@ protected StorageSettings storageSettings(AppProperties appProperties, JpaStorag
  @Lazy
  @Bean
  public IBinaryStorageSvc binaryStorageSvc(AppProperties appProperties) {
- DatabaseBlobBinaryStorageSvcImpl binaryStorageSvc = new DatabaseBlobBinaryStorageSvcImpl();
+ DatabaseBinaryContentStorageSvcImpl binaryStorageSvc = new DatabaseBinaryContentStorageSvcImpl();
 
  if (appProperties.getMax_binary_size() != null) {
  binaryStorageSvc.setMaximumBinarySize(appProperties.getMax_binary_size());

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
@@ -68,7 +68,6 @@ public ExecutorService cqlExecutor() {
  @Bean
  CareGapsProperties careGapsProperties(CrProperties theCrProperties) {
  var careGapsProperties = new CareGapsProperties();
- careGapsProperties.setThreadedCareGapsEnabled(false);
  careGapsProperties.setCareGapsReporter(theCrProperties.getCareGapsReporter());
  careGapsProperties.setCareGapsCompositionSectionAuthor(theCrProperties.getCareGapsSectionAuthor());
  return careGapsProperties;

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java
@@ -1,20 +1,20 @@
 package ca.uhn.fhir.jpa.starter.ips;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.ips.api.IIpsGenerationStrategy;
 import ca.uhn.fhir.jpa.ips.generator.IIpsGeneratorSvc;
 import ca.uhn.fhir.jpa.ips.generator.IpsGeneratorSvcImpl;
+import ca.uhn.fhir.jpa.ips.jpa.DefaultJpaIpsGenerationStrategy;
 import ca.uhn.fhir.jpa.ips.provider.IpsOperationProvider;
-import ca.uhn.fhir.jpa.ips.strategy.DefaultIpsGenerationStrategy;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 
 @Conditional(IpsConfigCondition.class)
 public class StarterIpsConfig {
  @Bean
  IIpsGenerationStrategy ipsGenerationStrategy() {
- return new DefaultIpsGenerationStrategy();
+ return new DefaultJpaIpsGenerationStrategy();
  }
 
  @Bean
@@ -24,7 +24,7 @@ public IpsOperationProvider ipsOperationProvider(IIpsGeneratorSvc theIpsGenerato
 
  @Bean
  public IIpsGeneratorSvc ipsGeneratorSvcImpl(
- FhirContext theFhirContext, IIpsGenerationStrategy theGenerationStrategy, DaoRegistry theDaoRegistry) {
- return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy, theDaoRegistry);
+ FhirContext theFhirContext, IIpsGenerationStrategy theGenerationStrategy) {
+ return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy);
  }
 }