Skip to content

Commit

Permalink
Pull request OsiriX-Foundation#222: TELIMA-293
Browse files Browse the repository at this point in the history
Merge in TELIMA/karnak from TELIMA-293 to master

* commit '7d509b904377ec287d560edd149575ef3c8e9427':
  fix: in order to launch context
  feat: change lib native loading from docker volume to embedded docker image build
  fix: ut
  • Loading branch information
jdcshug committed Oct 21, 2024
2 parents e9f28df + 7d509b9 commit b2d15d8
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 38 deletions.
6 changes: 1 addition & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<env>
<BPE_DELIM_LD_LIBRARY_PATH>:</BPE_DELIM_LD_LIBRARY_PATH>
<BPE_APPEND_LD_LIBRARY_PATH>/var/lib/native_lib:/var/lib/native_lib/native_lib
</BPE_APPEND_LD_LIBRARY_PATH>
</env>
<runImage>${docker-registry}/vna-docker-base-image:1.0.0</runImage>
</image>
</configuration>
</plugin>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/karnak/KarnakApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
17 changes: 9 additions & 8 deletions src/test/java/org/karnak/frontend/extid/ExternalIDGridTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/karnak/profilepipe/ProfileTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down

0 comments on commit b2d15d8

Please sign in to comment.