#374 - Extend API to save and load cohort and dataselection

- remove some unused imports - fix some minor potential errors
medizininformatik-initiative · Feb 28, 2025 · acb10cc · acb10cc
1 parent 2428a6f
commit acb10cc
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 37 deletions.
diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandler.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandler.java
@@ -10,7 +10,6 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;

diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/terminology/api/CcSearchResult.java b/src/main/java/de/numcodex/feasibility_gui_backend/terminology/api/CcSearchResult.java
@@ -1,6 +1,5 @@
 package de.numcodex.feasibility_gui_backend.terminology.api;
 
-import de.numcodex.feasibility_gui_backend.common.api.TermCode;
 import lombok.Builder;
 import lombok.Data;
 

diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptService.java b/src/main/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptService.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -74,9 +75,7 @@ private SearchHits<CodeableConceptDocument> findByCodeOrDisplay(String keyword,
     if (!filterList.isEmpty()) {
       var fieldValues = new ArrayList<FieldValue>();
       filterList.forEach(f -> {
-        f.getSecond().forEach(s -> {
-          fieldValues.add(new FieldValue.Builder().stringValue(s).build());
-        });
+        f.getSecond().forEach(s -> fieldValues.add(new FieldValue.Builder().stringValue(s).build()));
         filterTerms.add(new TermsQuery.Builder()
             .field(f.getFirst())
             .terms(new TermsQueryField.Builder().value(fieldValues).build())
@@ -135,7 +134,7 @@ private SearchHits<CodeableConceptDocument> findByCodeOrDisplay(String keyword,
         .withPageable(pageRequest)
         .build();
 
-    log.info(query.getQuery().toString());
+    log.info(Objects.requireNonNull(query.getQuery()).toString());
 
     return operations.search(query, CodeableConceptDocument.class);
   }

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
@@ -147,9 +147,7 @@ private SearchHits<OntologyListItemDocument> findByNameOrTermcode(String keyword
     if (!filterList.isEmpty()) {
       var fieldValues = new ArrayList<FieldValue>();
       filterList.forEach(f -> {
-        f.getSecond().forEach(s -> {
-          fieldValues.add(new FieldValue.Builder().stringValue(s).build());
-        });
+        f.getSecond().forEach(s -> fieldValues.add(new FieldValue.Builder().stringValue(s).build()));
         filterTerms.add(new TermsQuery.Builder()
                 .field(f.getFirst())
                 .terms(new TermsQueryField.Builder().value(fieldValues).build())

diff --git a/...ava/de/numcodex/feasibility_gui_backend/terminology/es/model/CodeableConceptDocument.java b/...ava/de/numcodex/feasibility_gui_backend/terminology/es/model/CodeableConceptDocument.java
@@ -5,7 +5,6 @@
 import lombok.Builder;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.List;
 

diff --git a/...n/java/de/numcodex/feasibility_gui_backend/terminology/es/model/OntologyItemDocument.java b/...n/java/de/numcodex/feasibility_gui_backend/terminology/es/model/OntologyItemDocument.java
@@ -5,7 +5,6 @@
 import lombok.Builder;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.Collection;
 

diff --git a/.../numcodex/feasibility_gui_backend/terminology/es/model/OntologyItemRelationsDocument.java b/.../numcodex/feasibility_gui_backend/terminology/es/model/OntologyItemRelationsDocument.java
@@ -3,7 +3,6 @@
 import lombok.Builder;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.Collection;
 

diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/OAuthInterceptorIT.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/OAuthInterceptorIT.java
@@ -92,25 +92,19 @@ public void tokenIsDifferentAfterRefreshTimeout() throws InterruptedException {
 
     @Test
     public void errorWhenIssuerUrlIsNull() throws InterruptedException {
-        assertThatThrownBy(() -> {
-            new OAuthInterceptor(null, "foo", "bar");
-        }).isInstanceOf(NullPointerException.class)
+        assertThatThrownBy(() -> new OAuthInterceptor(null, "foo", "bar")).isInstanceOf(NullPointerException.class)
                 .hasMessageContaining("oauthIssuerUrl");
     }
 
     @Test
     public void errorWhenClientIdIsNull() throws InterruptedException {
-        assertThatThrownBy(() -> {
-            new OAuthInterceptor("http://foo.bar", null, "bar");
-        }).isInstanceOf(NullPointerException.class)
+        assertThatThrownBy(() -> new OAuthInterceptor("http://foo.bar", null, "bar")).isInstanceOf(NullPointerException.class)
                 .hasMessageContaining("oauthClientId");
     }
 
     @Test
     public void errorWhenClientSecretIsNull() throws InterruptedException {
-        assertThatThrownBy(() -> {
-            new OAuthInterceptor("http://foo.bar", "foo", null);
-        }).isInstanceOf(NullPointerException.class)
+        assertThatThrownBy(() -> new OAuthInterceptor("http://foo.bar", "foo", null)).isInstanceOf(NullPointerException.class)
                 .hasMessageContaining("oauthClientSecret");
     }
 
@@ -120,9 +114,7 @@ public void errorWhenIssuerUrlIsWrong() throws InterruptedException {
         String issuerUrl = "http://" + host + "/foo/bar";
         OAuthInterceptor interceptor = new OAuthInterceptor(issuerUrl, "foo", "bar");
 
-        assertThatThrownBy(() -> {
-            interceptor.getToken();
-        }).isInstanceOf(OAuthClientException.class)
+        assertThatThrownBy(interceptor::getToken).isInstanceOf(OAuthClientException.class)
                 .hasMessageContaining("Request for OAuth2 access token failed")
                 .has(new Condition<Throwable>(s -> s.getCause() != null && s.getCause().getMessage().contains(host),
                         "hostname in error message of cause"));
@@ -133,9 +125,7 @@ public void errorWhenClientIdIsUnknown() throws InterruptedException {
         String issuerUrl = "http://" + keycloak.getHost() + ":" + keycloak.getFirstMappedPort() + "/realms/test";
         OAuthInterceptor interceptor = new OAuthInterceptor(issuerUrl, "foo", "test");
 
-        assertThatThrownBy(() -> {
-            interceptor.getToken();
-        }).isInstanceOf(OAuthClientException.class)
+        assertThatThrownBy(interceptor::getToken).isInstanceOf(OAuthClientException.class)
                 .hasMessageContaining("invalid_client");
     }
 
@@ -144,9 +134,7 @@ public void errorWhenClientSecretIsWrong() throws InterruptedException {
         String issuerUrl = "http://" + keycloak.getHost() + ":" + keycloak.getFirstMappedPort() + "/realms/test";
         OAuthInterceptor interceptor = new OAuthInterceptor(issuerUrl, "account", "foo");
 
-        assertThatThrownBy(() -> {
-            interceptor.getToken();
-        }).isInstanceOf(OAuthClientException.class)
+        assertThatThrownBy(interceptor::getToken).isInstanceOf(OAuthClientException.class)
                 .hasMessageContaining("unauthorized_client");
     }
 }
diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandlerIT.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandlerIT.java
@@ -168,13 +168,12 @@ public void testGetDataquerySlotsJson() throws JsonProcessingException, Dataquer
   }
 
   private Dataquery createDataquery(boolean withResult) {
-    var testDataquery = Dataquery.builder()
+    return Dataquery.builder()
         .label("test")
         .comment("test")
         .content(createCrtdl())
         .resultSize(withResult ? 123L : null)
         .build();
-    return testDataquery;
   }
 
   private Crtdl createCrtdl() {

diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandlerTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/dataquery/DataqueryHandlerTest.java
@@ -26,7 +26,6 @@
 
 import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @Tag("query")
@@ -196,7 +195,7 @@ void updateDataquery_throwsOnNoFreeSlots(boolean withResultNew, boolean withResu
         var dataqueryEntity = createDataqueryEntity(withResultOld);
 
         lenient().doReturn(Optional.of(dataqueryEntity)).when(dataqueryRepository).findById(any(Long.class));
-        lenient().doReturn(Long.valueOf(MAX_QUERIES_PER_USER)).when(dataqueryRepository).countByCreatedByWhereResultIsNotNull(any(String.class));
+        lenient().doReturn((long) MAX_QUERIES_PER_USER).when(dataqueryRepository).countByCreatedByWhereResultIsNotNull(any(String.class));
         lenient().doReturn(createDataqueryEntity()).when(dataqueryRepository).save(any(de.numcodex.feasibility_gui_backend.query.persistence.Dataquery.class));
 
         // When the new dataquery has no result, this should never throw. It should only throw if the old had no result and the new has a result

diff --git a/...est/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptServiceIT.java b/...est/java/de/numcodex/feasibility_gui_backend/terminology/es/CodeableConceptServiceIT.java
@@ -1,7 +1,6 @@
 package de.numcodex.feasibility_gui_backend.terminology.es;
 
 import de.numcodex.feasibility_gui_backend.terminology.es.repository.CodeableConceptEsRepository;
-import de.numcodex.feasibility_gui_backend.terminology.es.repository.OntologyItemNotFoundException;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.elasticsearch.DataElasticsearchTest;
@@ -20,8 +19,6 @@
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;