Fixing up elastic for Spring Boot

Author: jkiddo

pom.xml

@@ -5,7 +5,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <hapi.fhir.jpa.server.starter.revision>2</hapi.fhir.jpa.server.starter.revision>
+        <hapi.fhir.jpa.server.starter.revision>3</hapi.fhir.jpa.server.starter.revision>
         <clinical-reasoning.version>3.26.0</clinical-reasoning.version>
     </properties>
 
@@ -60,6 +60,16 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <version>${spring_boot_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -265,12 +275,7 @@
             <artifactId>moment</artifactId>
         </dependency>
 
-        <!-- The following dependencies are only needed for automated unit tests, you do not neccesarily need them to run the example. -->
-        <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-            <scope>test</scope>
-        </dependency>
+
 
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>

src/main/java/ca/uhn/fhir/jpa/starter/Application.java

@@ -26,8 +26,9 @@
 import org.springframework.context.annotation.Import;
 
 @ServletComponentScan(basePackageClasses = {RestfulServer.class})
-@SpringBootApplication(exclude = {ElasticsearchRestClientAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = {ThymeleafAutoConfiguration.class})
 @Import({
+	ElasticsearchRestClientAutoConfiguration.class,
 	StarterCrR4Config.class,
 	StarterCrDstu3Config.class,
 	StarterCdsHooksConfig.class,

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

@@ -19,10 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.env.YamlPropertySourceLoader;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.*;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -36,6 +33,7 @@
  */
 @Configuration
 @EnableTransactionManagement
+@Import(ElasticsearchBootSvcImpl.class)
 public class FhirServerConfigCommon {
 
 	private static final Logger ourLog = LoggerFactory.getLogger(FhirServerConfigCommon.class);

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

@@ -16,8 +16,7 @@
 @Import({JpaDstu2Config.class, StarterJpaConfig.class})
 public class FhirServerConfigDstu2 {
 	@Bean
-	public ITermLoaderSvc termLoaderService(
-			ITermDeferredStorageSvc theDeferredStorageSvc, ITermCodeSystemStorageSvc theCodeSystemStorageSvc) {
+	public ITermLoaderSvc termLoaderService(ITermDeferredStorageSvc theDeferredStorageSvc, ITermCodeSystemStorageSvc theCodeSystemStorageSvc) {
 		return new TermLoaderSvcImpl(theDeferredStorageSvc, theCodeSystemStorageSvc);
 	}
 }

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

@@ -9,5 +9,5 @@
 
 @Configuration
 @Conditional(OnDSTU3Condition.class)
-@Import({JpaDstu3Config.class, StarterJpaConfig.class, StarterCrDstu3Config.class, ElasticsearchConfig.class})
+@Import({JpaDstu3Config.class, StarterJpaConfig.class, StarterCrDstu3Config.class})
 public class FhirServerConfigDstu3 {}

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

@@ -14,7 +14,8 @@
 	JpaR4Config.class,
 	StarterJpaConfig.class,
 	StarterCrR4Config.class,
-	ElasticsearchConfig.class,
+
 	StarterIpsConfig.class
 })
-public class FhirServerConfigR4 {}
+public class FhirServerConfigR4 {
+}

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

@@ -9,5 +9,5 @@
 
 @Configuration
 @Conditional(OnR4BCondition.class)
-@Import({JpaR4BConfig.class, SubscriptionTopicConfig.class, StarterJpaConfig.class, ElasticsearchConfig.class})
+@Import({JpaR4BConfig.class, SubscriptionTopicConfig.class, StarterJpaConfig.class})
 public class FhirServerConfigR4B {}

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

@@ -9,5 +9,5 @@
 
 @Configuration
 @Conditional(OnR5Condition.class)
-@Import({StarterJpaConfig.class, JpaR5Config.class, SubscriptionTopicConfig.class, ElasticsearchConfig.class})
+@Import({StarterJpaConfig.class, JpaR5Config.class, SubscriptionTopicConfig.class})
 public class FhirServerConfigR5 {}

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

@@ -0,0 +1,4 @@
+package ca.uhn.fhir.jpa.starter.elastic;
+
+public class ElasticConfigCondition {
+}