#287 - Elastic search connection

- add a switch to turn elastic search on or off

.github/integration-test/docker-compose.yml

@@ -16,6 +16,7 @@ services:
       API_BASE_URL: "http://localhost:8091/api/"
       ALLOWED_ORIGINS: "https://localhost"
       QUERYRESULT_EXPIRY_MINUTES: 5
+      ELASTIC_SEARCH_ENABLED: "false"
       # ---- db config
       FEASIBILITY_DATABASE_HOST: "feasibility-gui-backend-db"
       FEASIBILITY_DATABASE_PORT: 5432

src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/config/Config.java

@@ -1,9 +1,11 @@
 package de.numcodex.feasibility_gui_backend.terminology.es.config;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
 
 @Configuration
+@ConditionalOnExpression("${app.elasticSearchEnabled}")
 public class Config extends ElasticsearchConfiguration {
 
   @Override

src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/repository/OntologyItemEsRepository.java

@@ -1,6 +1,8 @@
 package de.numcodex.feasibility_gui_backend.terminology.es.repository;
 
 import de.numcodex.feasibility_gui_backend.terminology.es.model.OntologyItemDocument;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
+@ConditionalOnExpression("${app.elasticSearchEnabled}")
 public interface OntologyItemEsRepository extends ElasticsearchRepository<OntologyItemDocument, String> {}

src/main/java/de/numcodex/feasibility_gui_backend/terminology/v3/TerminologyEsController.java

@@ -3,6 +3,7 @@
 import de.numcodex.feasibility_gui_backend.terminology.es.model.OntologyItemDocument;
 import de.numcodex.feasibility_gui_backend.terminology.es.model.OntologyListItemDocument;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.data.elasticsearch.client.elc.NativeQuery;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
@@ -15,6 +16,7 @@
 
 @RestController
 @RequestMapping("api/v3/terminology/search")
+@ConditionalOnExpression("${app.elasticSearchEnabled}")
 public class TerminologyEsController {
 
   private ElasticsearchOperations operations;

src/main/resources/application.yml

@@ -36,6 +36,9 @@ management:
   endpoint:
     health:
       enabled: true
+  health:
+    elasticsearch:
+      enabled: ${ELASTIC_SEARCH_ENABLED:true}
 
 app:
   # AKTIN or DSF or MOCK or DIRECT
@@ -52,6 +55,7 @@ app:
   keycloakAdminRole: ${KEYCLOAK_ADMIN_ROLE:FeasibilityAdmin}
   queryResultExpiryMinutes: ${QUERYRESULT_EXPIRY_MINUTES:1}
   maxSavedQueriesPerUser: ${MAX_SAVED_QUERIES_PER_USER:10}
+  elasticSearchEnabled: ${ELASTIC_SEARCH_ENABLED:true}
   broker:
     mock:
       enabled: ${BROKER_CLIENT_MOCK_ENABLED:false}

src/test/resources/application.yml

@@ -5,12 +5,17 @@ security:
   config:
     use-keycloak: false
 
+management:
+  health:
+    elasticsearch:
+      enabled: false
 app:
   queryResultExpiryMinutes: 1
   keycloakAllowedRole: "FEASIBILITY_TEST_USER"
   keycloakPowerRole: "FEASIBILITY_TEST_POWER"
   keycloakAdminRole: "FEASIBILITY_TEST_ADMIN"
   maxSavedQueriesPerUser: 2
+  elasticSearchEnabled: false
   broker:
     aktin:
       enabled: false