diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/DateConverter.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/DateConverter.java
index 2f4004a8..f7857be0 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/DateConverter.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/DateConverter.java
@@ -13,11 +13,9 @@ import java.time.format.DateTimeParseException;
 import java.time.format.ResolverStyle;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Optional;
 
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.UtilityClass;
@@ -33,7 +31,7 @@ public class DateConverter {
 
     public Optional<Date> parseDate(String dateAsString) {
 
-        DateTimeFormatter formatter = getDateTimeFormatter("date_formats.txt");
+        DateTimeFormatter formatter = getDateTimeFormatter();
         String cleanDate = dateAsString.trim();
         cleanDate = removeTrailingDot(cleanDate);
         try {
@@ -55,20 +53,19 @@ public class DateConverter {
     }
 
 
-    private DateTimeFormatter getDateTimeFormatter(String resourcePath) {
+    private DateTimeFormatter getDateTimeFormatter() {
 
         if (DATE_TIME_FORMATTER == null) {
-            DATE_TIME_FORMATTER = createFormatterFromResource(resourcePath);
+            DATE_TIME_FORMATTER = createFormatterFromResource();
         }
         return DATE_TIME_FORMATTER;
     }
 
 
-    private DateTimeFormatter createFormatterFromResource(String resourcePath) {
+    private DateTimeFormatter createFormatterFromResource() {
 
         DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
-        Resource resource = new ClassPathResource(resourcePath);
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.getInputStream()))) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(DateConverter.class.getResourceAsStream("/date_formats.txt"))))) {
             String line;
             while ((line = reader.readLine()) != null) {
                 builder.appendOptional(DateTimeFormatter.ofPattern(line.trim(), Locale.ENGLISH));