From b0f8d025b779ff49c86be786b287b7e24f4f46f4 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Thu, 18 Apr 2024 09:51:35 +0300 Subject: [PATCH] RED-8650 - Support more date formats --- .../v1/server/utils/DateConverter.java | 6 +++--- .../src/main/resources/date_formats.txt | 2 +- .../v1/server/DocumineFloraTest.java | 2 +- .../resources/files/dates/date_formats.pdf | Bin 3481 -> 2200 bytes 4 files changed, 5 insertions(+), 5 deletions(-) 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 f7857be0..d9d70147 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 @@ -48,7 +48,7 @@ public class DateConverter { public String convertDate(Date date, String resultFormat) { - DateFormat resultDateFormat = new SimpleDateFormat(resultFormat, Locale.ENGLISH); + DateFormat resultDateFormat = new SimpleDateFormat(resultFormat, Locale.UK); return resultDateFormat.format(date); } @@ -68,12 +68,12 @@ public class DateConverter { 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)); + builder.appendOptional(DateTimeFormatter.ofPattern(line.trim(), Locale.UK)); } } catch (IOException e) { throw new RuntimeException("Error reading date format file: " + e.getMessage()); } - return builder.toFormatter().withResolverStyle(ResolverStyle.SMART).withLocale(Locale.ENGLISH); + return builder.toFormatter().withResolverStyle(ResolverStyle.SMART).withLocale(Locale.UK); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt index b4fb4351..c8725365 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt @@ -1,9 +1,9 @@ +dd-MMM-yyyy dd MMM yyyy dd MMM yy dd MM yyyy dd MMMM yyyy MMMM dd, yyyy -dd-MMM-yyyy dd.MM.yyyy yyyy/MM/dd yyyy-MM-dd diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java index c452b809..36ee258a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java @@ -128,7 +128,7 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { String[] dateArray = dates.split(", "); boolean allEqual = true; for (String date : dateArray) { - if (!"10/01/2022".equals(date)) { + if (!"10/01/2022".equals(date) && !"08/09/2024".equals(date)) { allEqual = false; break; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf index 553b18be292b739ad8cdb5bed272fe0f55d5d38c..90dff62cd79ceee3812c53ccf0838e96dec4bc92 100644 GIT binary patch delta 1465 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 WVo^y&5ztS@hDN}in5wJ48y5f*F%