From 76d3245df0be88723397fab7d0393cad1b7da009 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <code@pcvolkmer.de>
Date: Sat, 21 Jun 2025 16:32:55 +0200
Subject: [PATCH] refactor: return java.util.Date

---
 .../pcvolkmer/onco/datamapper/ResultSet.java  |  2 +-
 .../onco/datamapper/mapper/DataMapper.java    | 19 +++----------------
 .../mapper/KpaPatientDataMapper.java          |  4 ++--
 .../datamapper/mapper/PatientDataMapper.java  |  4 ++--
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
index a9ede6b..5033be6 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
@@ -2,7 +2,7 @@ package dev.pcvolkmer.onco.datamapper;
 
 import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException;
 
-import java.sql.Date;
+import java.util.Date;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java
index 28f404a..d37dee0 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/DataMapper.java
@@ -1,33 +1,20 @@
 package dev.pcvolkmer.onco.datamapper.mapper;
 
-import java.util.Date;
-
 /**
  * General interface for all data mappers
  *
- * @since 0.1
- * @author Paul-Christian Volkmer
  * @param <T> The destination type
+ * @author Paul-Christian Volkmer
+ * @since 0.1
  */
 public interface DataMapper<T> {
 
     /**
      * Loads a data set from database and maps it into destination data type
+     *
      * @param id The database id of the root procedure data set
      * @return The data set to be loaded
      */
     T getById(int id);
 
-    /**
-     * Maps java.sql.Date to java.util.Date
-     * @param date
-     * @return
-     */
-    default Date mapDate(java.sql.Date date) {
-        if (date == null) {
-            return null;
-        }
-        return new Date(date.getTime());
-    }
-
 }
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java
index f3373a6..7fec0d4 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaPatientDataMapper.java
@@ -32,8 +32,8 @@ public class KpaPatientDataMapper implements DataMapper<Patient> {
         builder
                 .id(kpaData.getString("patient_id"))
                 .gender(getGenderCoding(kpaData))
-                .birthDate(mapDate(kpaData.getDate("geburtsdatum")))
-                .dateOfDeath(mapDate(kpaData.getDate("todesdatum")))
+                .birthDate(kpaData.getDate("geburtsdatum"))
+                .dateOfDeath(kpaData.getDate("todesdatum"))
                 .healthInsurance(getHealthInsurance(kpaData))
         ;
         return builder.build();
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java
index a7e01b3..555a54c 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/PatientDataMapper.java
@@ -36,8 +36,8 @@ public class PatientDataMapper implements DataMapper<Patient> {
         builder
                 .id(patientData.getString("id"))
                 .gender(getGenderCoding(patientData))
-                .birthDate(mapDate(patientData.getDate("geburtsdatum")))
-                .dateOfDeath(mapDate(patientData.getDate("sterbedatum")))
+                .birthDate(patientData.getDate("geburtsdatum"))
+                .dateOfDeath(patientData.getDate("sterbedatum"))
                 .address(Address.builder().municipalityCode(getMunicipalityCode(patientData)).build())
         ;
         return builder.build();