From 6d1ca42d123be8631c95264631f17a41d7891632 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sat, 21 Jun 2025 10:07:18 +0200 Subject: [PATCH] refactor: create mapper package --- .../dev/pcvolkmer/onco/datamapper/{ => mapper}/DataMapper.java | 2 +- .../onco/datamapper/{ => mapper}/KpaDiagnosisDataMapper.java | 2 +- .../onco/datamapper/{ => mapper}/KpaPatientDataMapper.java | 2 +- .../pcvolkmer/onco/datamapper/{ => mapper}/MtbDataMapper.java | 2 +- .../onco/datamapper/{ => mapper}/PatientDataMapper.java | 2 +- .../datamapper/{ => mapper}/KpaDiagnosisDataMapperTest.java | 3 +-- .../onco/datamapper/{ => mapper}/KpaPatientDataMapperTest.java | 2 +- .../onco/datamapper/{ => mapper}/MtbDataMapperTest.java | 2 +- .../onco/datamapper/{ => mapper}/PatientDataMapperTest.java | 3 +-- 9 files changed, 9 insertions(+), 11 deletions(-) rename src/main/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/DataMapper.java (93%) rename src/main/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/KpaDiagnosisDataMapper.java (96%) rename src/main/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/KpaPatientDataMapper.java (98%) rename src/main/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/MtbDataMapper.java (98%) rename src/main/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/PatientDataMapper.java (98%) rename src/test/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/KpaDiagnosisDataMapperTest.java (96%) rename src/test/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/KpaPatientDataMapperTest.java (98%) rename src/test/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/MtbDataMapperTest.java (96%) rename src/test/java/dev/pcvolkmer/onco/datamapper/{ => mapper}/PatientDataMapperTest.java (98%) diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/DataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java similarity index 93% rename from src/main/java/dev/pcvolkmer/onco/datamapper/DataMapper.java rename to src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java index b4e418b..28f404a 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/DataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import java.util.Date; diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java similarity index 96% rename from src/main/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapper.java rename to src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java index 50c994e..9c23dfb 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.Coding; import dev.pcvolkmer.mv64e.mtb.MtbDiagnosis; diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java similarity index 98% rename from src/main/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapper.java rename to src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java index 47e018f..e818520 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.*; import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue; diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/MtbDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapper.java similarity index 98% rename from src/main/java/dev/pcvolkmer/onco/datamapper/MtbDataMapper.java rename to src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapper.java index f9aa978..56036b8 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/MtbDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapper.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.Mtb; import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue; diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/PatientDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java similarity index 98% rename from src/main/java/dev/pcvolkmer/onco/datamapper/PatientDataMapper.java rename to src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java index 241d2be..557e3c1 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/PatientDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.Address; import dev.pcvolkmer.mv64e.mtb.GenderCoding; diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java similarity index 96% rename from src/test/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapperTest.java rename to src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java index 9ec3c34..1cae4d5 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/KpaDiagnosisDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.MtbDiagnosis; import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue; @@ -9,7 +9,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; -import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapperTest.java similarity index 98% rename from src/test/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapperTest.java rename to src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapperTest.java index cb2979e..a18129f 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/KpaPatientDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapperTest.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.*; import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue; diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/MtbDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapperTest.java similarity index 96% rename from src/test/java/dev/pcvolkmer/onco/datamapper/MtbDataMapperTest.java rename to src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapperTest.java index fdbc2c5..b0c073e 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/MtbDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbDataMapperTest.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/PatientDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapperTest.java similarity index 98% rename from src/test/java/dev/pcvolkmer/onco/datamapper/PatientDataMapperTest.java rename to src/test/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapperTest.java index a40cd95..9792cd2 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/PatientDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapperTest.java @@ -1,4 +1,4 @@ -package dev.pcvolkmer.onco.datamapper; +package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.Address; import dev.pcvolkmer.mv64e.mtb.GenderCodingCode; @@ -13,7 +13,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import javax.sql.DataSource; import java.time.Instant; import java.util.Date; -import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat;