#403 - Update spring boot to 3.4.0

- adapt to changes in elastic search client
medizininformatik-initiative · Nov 25, 2024 · 0b5929d · 0b5929d
1 parent f4d7aa4
commit 0b5929d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsService.java b/src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsService.java
@@ -1,12 +1,10 @@
 package de.numcodex.feasibility_gui_backend.terminology.es;
 
 import co.elastic.clients.elasticsearch._types.FieldValue;
-import co.elastic.clients.elasticsearch._types.InlineScript;
 import co.elastic.clients.elasticsearch._types.Script;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
 import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket;
 import co.elastic.clients.elasticsearch._types.query_dsl.*;
-import co.elastic.clients.json.JsonData;
 import de.numcodex.feasibility_gui_backend.terminology.api.EsSearchResult;
 import de.numcodex.feasibility_gui_backend.terminology.api.EsSearchResultEntry;
 import de.numcodex.feasibility_gui_backend.terminology.es.model.*;
@@ -121,10 +119,12 @@ private SearchHits<OntologyListItemDocument> findByNameOrTermcode(String keyword
     List<Query> filterTerms = new ArrayList<>();
 
     if (availability) {
-      var availabilityFilter = new RangeQuery.Builder()
-          .field("availability")
-          .gt(JsonData.of("0"))
-          .build();
+      var availabilityFilter = RangeQuery.of(r -> r
+          .number(n -> n
+              .field("availability")
+              .gt(0.0)
+          )
+      );
       filterTerms.add(availabilityFilter._toQuery());
     }
 
@@ -164,12 +164,8 @@ private SearchHits<OntologyListItemDocument> findByNameOrTermcode(String keyword
         .withPageable(pageRequest)
         .build();
 
-    var inlineScript = new InlineScript.Builder()
-        .source("doc['availability'].value == 0 ? _score : _score + 100")
-        .build();
-
     var availabilityScoreScript = new Script.Builder()
-        .inline(inlineScript)
+        .source("doc['availability'].value == 0 ? _score : _score + 100")
         .build();
 
     var function = FunctionScoreBuilders.scriptScore()

diff --git a/...t/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptServiceTest.java b/...t/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptServiceTest.java
@@ -143,7 +143,7 @@ private SearchHits<CodeableConceptDocument> createDummySearchHitsPage(int totalH
           )
       );
     }
-    return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, searchHitsList, null, null, null);
+    return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, null, searchHitsList, null, null, null);
   }
 
   private CodeableConceptDocument createDummyCodeableConceptDocument(String id) {

diff --git a/...est/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java b/...est/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java
@@ -303,6 +303,6 @@ private SearchHits<OntologyListItemDocument> createDummySearchHitsPage(int total
           )
       );
     }
-    return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, searchHitsList, null, null, null);
+    return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, null, searchHitsList, null, null, null);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
               )
           );
         }
-        return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, searchHitsList, null, null, null);
+        return new SearchHitsImpl<>(totalHits, TotalHitsRelation.OFF, 10.0F, null, null, null, searchHitsList, null, null, null);
       }
       private CodeableConceptDocument createDummyCodeableConceptDocument(String id) {
@@ Expand Down @@