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 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 7133bb1e..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,9 +9,6 @@ */ package org.karnak.backend.model.editor; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Tag; import org.dcm4che3.data.VR; @@ -29,6 +26,9 @@ 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; + @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..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,15 +9,6 @@ */ 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 org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; @@ -42,6 +33,16 @@ 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; + @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..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,6 @@ */ 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 org.junit.jupiter.api.Test; import org.karnak.backend.cache.ExternalIDCache; import org.karnak.backend.cache.MainzellisteCache; @@ -26,6 +18,15 @@ 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; + @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..c5ed034a 100644 --- a/src/test/java/org/karnak/profilepipe/ProfileTest.java +++ b/src/test/java/org/karnak/profilepipe/ProfileTest.java @@ -9,8 +9,6 @@ */ package org.karnak.profilepipe; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.dcm4che3.data.Attributes; import org.dcm4che3.data.Sequence; import org.dcm4che3.data.Tag; @@ -31,6 +29,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; +import static org.junit.jupiter.api.Assertions.assertTrue; + @SpringBootTest class ProfileTest {