Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-8650' into 'master'

Browse Source 
RED-8650 - Support more date formats

Closes RED-8650

See merge request redactmanager/redaction-service!379
This commit is contained in:
Andrei Isvoran 2024-04-18 09:45:01 +02:00
commit 0e73512d9a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/DateConverter.java
View File

@ -48,7 +48,7 @@ public class DateConverter {
public String convertDate(Date date, String resultFormat) { 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); 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"))))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(DateConverter.class.getResourceAsStream("/date_formats.txt"))))) {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
builder.appendOptional(DateTimeFormatter.ofPattern(line.trim(), Locale.ENGLISH)); builder.appendOptional(DateTimeFormatter.ofPattern(line.trim(), Locale.UK));
} }
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Error reading date format file: " + e.getMessage()); 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);
} }

2
redaction-service-v1/redaction-service-server-v1/src/main/resources/date_formats.txt
View File

@ -1,9 +1,9 @@
dd-MMM-yyyy
dd MMM yyyy dd MMM yyyy
dd MMM yy dd MMM yy
dd MM yyyy dd MM yyyy
dd MMMM yyyy dd MMMM yyyy
MMMM dd, yyyy MMMM dd, yyyy
dd-MMM-yyyy
dd.MM.yyyy dd.MM.yyyy
yyyy/MM/dd yyyy/MM/dd
yyyy-MM-dd yyyy-MM-dd

2
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java
View File

@ -157,7 +157,7 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest {
String[] dateArray = dates.split(", "); String[] dateArray = dates.split(", ");
boolean allEqual = true; boolean allEqual = true;
for (String date : dateArray) { for (String date : dateArray) {
if (!"10/01/2022".equals(date)) { if (!"10/01/2022".equals(date) && !"08/09/2024".equals(date)) {
allEqual = false; allEqual = false;
break; break;
} }

BIN
redaction-service-v1/redaction-service-server-v1/src/test/resources/files/dates/date_formats.pdf
View File

Binary file not shown.