Merge pull request #6274 from effective-webwork/default-date-format

Move default date format to constant
kitodo · Oct 28, 2024 · b68c5d5 · b68c5d5
2 parents 2b12938 + 137a9d1
commit b68c5d5
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 11 deletions.
diff --git a/...org/kitodo/constants/StringConstants.java → ...org/kitodo/constants/StringConstants.java b/...org/kitodo/constants/StringConstants.java → ...org/kitodo/constants/StringConstants.java
@@ -17,4 +17,7 @@ public class StringConstants {
     public static final String SEMICOLON_DELIMITER = "; ";
     public static final String EDIT_FORM_SAVE = "editForm:save";
 
+    // patterns
+    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
 }
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/BaseType.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/BaseType.java
@@ -11,6 +11,8 @@
 
 package org.kitodo.data.elasticsearch.index.type;
 
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -138,7 +140,7 @@ private void getAdditionalProperties(Map<String, Object> jsonObject, BaseBean pr
      */
     String getFormattedDate(Date date) {
         if (Objects.nonNull(date)) {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
             return dateFormat.format(date);
         }
         return "";

diff --git a/...ataManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/ProcessTypeTest.java b/...ataManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/ProcessTypeTest.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -260,7 +261,7 @@ public void shouldCreateDocuments() {
     }
 
     private String formatDate(Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
         return dateFormat.format(date);
     }
 }
diff --git a/...ataManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/ProjectTypeTest.java b/...ataManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/ProjectTypeTest.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -338,7 +339,7 @@ public void shouldCreateSecondDocument() throws Exception {
     @Test
     public void shouldCreateThirdDocument() throws Exception {
         ProjectType processType = new ProjectType();
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
 
         Project project = prepareData().get(2);
         Map<String, Object> actual = processType.createDocument(project);

diff --git a/...taManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/TemplateTypeTest.java b/...taManagement/src/test/java/org/kitodo/data/elasticsearch/index/type/TemplateTypeTest.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -195,7 +196,7 @@ public void shouldCreateDocuments() {
     }
 
     private String formatDate(Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
         return dateFormat.format(date);
     }
 }
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java
@@ -11,6 +11,8 @@
 
 package org.kitodo.production.forms;
 
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
+
 import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.MessageFormat;
@@ -364,7 +366,7 @@ public void saveSelectedColumns() {
      */
     public String getFormattedDate(Date date) {
         if (Objects.nonNull(date)) {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
             return dateFormat.format(date);
         }
         return "";

diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/Helper.java b/Kitodo/src/main/java/org/kitodo/production/helper/Helper.java
@@ -11,6 +11,8 @@
 
 package org.kitodo.production.helper;
 
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.security.SecureRandom;
@@ -398,7 +400,7 @@ public static String getDateAsFormattedString(Date date) {
         if (Objects.isNull(date)) {
             return "-";
         } else {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
             return dateFormat.format(date);
         }
     }
@@ -416,12 +418,12 @@ public static Date parseDateFromFormattedString(String date) {
             return null;
         }
         try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT);
             LocalDateTime localDate = LocalDateTime.parse(date, formatter);
             Instant instant = localDate.toInstant(ZoneOffset.UTC);
             return Date.from(instant);
         } catch (DateTimeParseException e) {
-            logger.info("invalid date format (yyyy-MM-dd HH:mm:ss) for date string: '" + date + "'");
+            logger.info("invalid date format '{}' for date string: '{}'", DEFAULT_DATE_FORMAT, date);
             return null;
         }
     }

diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/WikiFieldHelper.java b/Kitodo/src/main/java/org/kitodo/production/helper/WikiFieldHelper.java
@@ -11,6 +11,8 @@
 
 package org.kitodo.production.helper;
 
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -131,7 +133,7 @@ private static Task getCurrentTask(Property property) throws DAOException {
     }
 
     private static Date getCreationDate(Property property) throws ParseException {
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(property.getValue().substring(1, 20));
+        return new SimpleDateFormat(DEFAULT_DATE_FORMAT).parse(property.getValue().substring(1, 20));
     }
 
     private static String getWikiFieldMessage(String message) {

diff --git a/Kitodo/src/main/java/org/kitodo/production/security/SecuritySession.java b/Kitodo/src/main/java/org/kitodo/production/security/SecuritySession.java
@@ -11,6 +11,8 @@
 
 package org.kitodo.production.security;
 
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -73,7 +75,7 @@ public LocalDateTime getLastRequest() {
      * @return The lastRequest.
      */
     public String getLastRequestAsString() {
-        return lastRequest.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        return lastRequest.format(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT));
     }
 
     /**

diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ProcessService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ProcessService.java
@@ -14,6 +14,7 @@
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.nestedQuery;
+import static org.kitodo.constants.StringConstants.DEFAULT_DATE_FORMAT;
 import static org.kitodo.data.database.enums.CorrectionComments.NO_CORRECTION_COMMENTS;
 import static org.kitodo.data.database.enums.CorrectionComments.NO_OPEN_CORRECTION_COMMENTS;
 import static org.kitodo.data.database.enums.CorrectionComments.OPEN_CORRECTION_COMMENTS;
@@ -2223,7 +2224,7 @@ public static String getPropertyValue(ProcessDTO process, String propertyName) {
      */
     public static String getProcessDuration(ProcessDTO process) {
         String creationDateTimeString = process.getCreationDate();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT);
         LocalDateTime createLocalDate = LocalDateTime.parse(creationDateTimeString, formatter);
         Duration duration = Duration.between(createLocalDate, LocalDateTime.now());
         return String.format("%sd; %sh", duration.toDays(),