From 2a2053a864b9e9a7fd4fe7c9d077fcb789f67cb0 Mon Sep 17 00:00:00 2001 From: JDCS Date: Fri, 18 Oct 2024 16:25:16 +0200 Subject: [PATCH 1/3] fix: ut --- .../model/editor/DeIdentifyEditorTest.java | 9 +++++--- .../gateway/GatewaySetUpServiceTest.java | 22 +++++++++++-------- .../service/profilepipe/ProfileTest.java | 19 ++++++++-------- .../frontend/extid/ExternalIDGridTest.java | 20 ++++++++++------- .../org/karnak/profilepipe/ProfileTest.java | 7 ++++-- 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java b/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java index 7133bb1e..879c05de 100644 --- a/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java +++ b/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java @@ -9,9 +9,7 @@ */ package org.karnak.backend.model.editor; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - +import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Tag; import org.dcm4che3.data.VR; @@ -24,11 +22,16 @@ import org.karnak.backend.data.entity.ProjectEntity; import org.karnak.backend.data.entity.SecretEntity; import org.karnak.backend.enums.PseudonymType; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.weasis.dicom.param.AttributeEditorContext; import org.weasis.dicom.param.DicomNode; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class DeIdentifyEditorTest { diff --git a/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java b/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java index c3f8cc9b..5f88afd1 100644 --- a/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java +++ b/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java @@ -9,15 +9,7 @@ */ package org.karnak.backend.service.gateway; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; @@ -38,10 +30,22 @@ import org.karnak.backend.enums.NodeEventType; import org.karnak.backend.model.event.NodeEvent; import org.mockito.Mockito; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.weasis.dicom.param.DicomNode; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class GatewaySetUpServiceTest { diff --git a/src/test/java/org/karnak/backend/service/profilepipe/ProfileTest.java b/src/test/java/org/karnak/backend/service/profilepipe/ProfileTest.java index 3d1b2da6..83b9cf51 100644 --- a/src/test/java/org/karnak/backend/service/profilepipe/ProfileTest.java +++ b/src/test/java/org/karnak/backend/service/profilepipe/ProfileTest.java @@ -9,15 +9,6 @@ */ package org.karnak.backend.service.profilepipe; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.awt.Rectangle; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Tag; import org.dcm4che3.data.VR; @@ -32,6 +23,16 @@ import org.karnak.backend.enums.PseudonymType; import org.weasis.dicom.param.AttributeEditorContext; +import java.awt.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + class ProfileTest { @Test diff --git a/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java b/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java index 317fe1c1..7e498652 100644 --- a/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java +++ b/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java @@ -9,23 +9,27 @@ */ package org.karnak.frontend.extid; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - -import java.util.List; +import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; import org.karnak.backend.cache.MainzellisteCache; import org.karnak.backend.cache.Patient; import org.karnak.backend.config.RedisConfiguration; import org.karnak.backend.data.entity.ProjectEntity; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class ExternalIDGridTest { diff --git a/src/test/java/org/karnak/profilepipe/ProfileTest.java b/src/test/java/org/karnak/profilepipe/ProfileTest.java index 13b73eb1..87c83862 100644 --- a/src/test/java/org/karnak/profilepipe/ProfileTest.java +++ b/src/test/java/org/karnak/profilepipe/ProfileTest.java @@ -9,8 +9,7 @@ */ package org.karnak.profilepipe; -import static org.junit.jupiter.api.Assertions.assertTrue; - +import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Sequence; import org.dcm4che3.data.Tag; @@ -28,9 +27,13 @@ import org.karnak.backend.model.profilepipe.HashContext; import org.karnak.backend.service.profilepipe.Profile; import org.karnak.backend.util.DicomObjectTools; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class ProfileTest { From 27bec58c68682f949e1d44449238125257989659 Mon Sep 17 00:00:00 2001 From: JDCS Date: Fri, 18 Oct 2024 16:29:56 +0200 Subject: [PATCH 2/3] feat: change lib native loading from docker volume to embedded docker image build --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 80ac23b5..b4fbdb32 100644 --- a/pom.xml +++ b/pom.xml @@ -107,11 +107,7 @@ spring-boot-maven-plugin - - : - /var/lib/native_lib:/var/lib/native_lib/native_lib - - + ${docker-registry}/vna-docker-base-image:1.0.0 From 7d509b904377ec287d560edd149575ef3c8e9427 Mon Sep 17 00:00:00 2001 From: JDCS Date: Mon, 21 Oct 2024 10:14:39 +0200 Subject: [PATCH 3/3] fix: in order to launch context --- src/main/java/org/karnak/KarnakApplication.java | 6 ++++-- .../karnak/backend/model/editor/DeIdentifyEditorTest.java | 3 --- .../backend/service/gateway/GatewaySetUpServiceTest.java | 3 --- .../java/org/karnak/frontend/extid/ExternalIDGridTest.java | 3 --- src/test/java/org/karnak/profilepipe/ProfileTest.java | 3 --- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/karnak/KarnakApplication.java b/src/main/java/org/karnak/KarnakApplication.java index be3eb2c9..1622ce8e 100644 --- a/src/main/java/org/karnak/KarnakApplication.java +++ b/src/main/java/org/karnak/KarnakApplication.java @@ -9,8 +9,8 @@ */ package org.karnak; +import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import com.vaadin.flow.spring.annotation.EnableVaadin; -import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.karnak.backend.config.AppConfig; import org.karnak.backend.enums.ApplicationProfile; @@ -26,7 +26,9 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; -@SpringBootApplication(exclude = ErrorMvcAutoConfiguration.class) +import java.util.Objects; + +@SpringBootApplication(exclude = { ErrorMvcAutoConfiguration.class, Oauth2UserInfoAutoConfiguration.class }) @EntityScan("org.karnak.backend.data.entity") @EnableJpaRepositories("org.karnak.backend.data.repo") @EnableVaadin(value = "org.karnak") diff --git a/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java b/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java index 879c05de..b7aa1d02 100644 --- a/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java +++ b/src/test/java/org/karnak/backend/model/editor/DeIdentifyEditorTest.java @@ -9,7 +9,6 @@ */ package org.karnak.backend.model.editor; -import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Tag; import org.dcm4che3.data.VR; @@ -22,7 +21,6 @@ import org.karnak.backend.data.entity.ProjectEntity; import org.karnak.backend.data.entity.SecretEntity; import org.karnak.backend.enums.PseudonymType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.weasis.dicom.param.AttributeEditorContext; @@ -31,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class DeIdentifyEditorTest { diff --git a/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java b/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java index 5f88afd1..951351f7 100644 --- a/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java +++ b/src/test/java/org/karnak/backend/service/gateway/GatewaySetUpServiceTest.java @@ -9,7 +9,6 @@ */ package org.karnak.backend.service.gateway; -import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; @@ -30,7 +29,6 @@ import org.karnak.backend.enums.NodeEventType; import org.karnak.backend.model.event.NodeEvent; import org.mockito.Mockito; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.weasis.dicom.param.DicomNode; @@ -45,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class GatewaySetUpServiceTest { diff --git a/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java b/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java index 7e498652..a80e50c9 100644 --- a/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java +++ b/src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java @@ -9,14 +9,12 @@ */ package org.karnak.frontend.extid; -import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; import org.karnak.backend.cache.MainzellisteCache; import org.karnak.backend.cache.Patient; import org.karnak.backend.config.RedisConfiguration; import org.karnak.backend.data.entity.ProjectEntity; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -29,7 +27,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class ExternalIDGridTest { diff --git a/src/test/java/org/karnak/profilepipe/ProfileTest.java b/src/test/java/org/karnak/profilepipe/ProfileTest.java index 87c83862..c5ed034a 100644 --- a/src/test/java/org/karnak/profilepipe/ProfileTest.java +++ b/src/test/java/org/karnak/profilepipe/ProfileTest.java @@ -9,7 +9,6 @@ */ package org.karnak.profilepipe; -import ch.hcuge.springcloud.security.oauth2.userinfo.Oauth2UserInfoAutoConfiguration; import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Sequence; import org.dcm4che3.data.Tag; @@ -27,13 +26,11 @@ import org.karnak.backend.model.profilepipe.HashContext; import org.karnak.backend.service.profilepipe.Profile; import org.karnak.backend.util.DicomObjectTools; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableAutoConfiguration(exclude = Oauth2UserInfoAutoConfiguration.class) @SpringBootTest class ProfileTest {