From 8e764c10fc2616d0b471bba53941542abf384dd6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Thu, 27 May 2021 17:28:34 +0200 Subject: [PATCH] added more date formats --- .../java/eu/dnetlib/dhp/schema/common/ModelSupport.java | 9 ++------- src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java | 6 ++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java index 03e80d6..990d719 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java @@ -7,21 +7,14 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.ParseException; -import java.time.Instant; -import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import java.time.temporal.ChronoField; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalField; import java.util.*; import java.util.function.Function; -import java.util.stream.Collectors; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import eu.dnetlib.dhp.schema.oaf.*; @@ -314,6 +307,8 @@ public class ModelSupport { public static final String[] DATE_TIME_FORMATS = { "yyyy-MM-dd'T'hh:mm:ss.SSS'Z'", + "yyyy-MM-dd'T'hh:mm:ss'Z'", + "yyyy-MM-dd hh:mm:ss'Z'", "yyyy-MM-dd hh:mm:ss" }; diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java index ca57fab..ac3e76e 100644 --- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java +++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java @@ -97,6 +97,12 @@ public class MergeTest { a.mergeFrom(b); assertEquals("2020-09-10 11:08:52", a.getValidationDate()); + a = createRel(true, "2021-03-16T10:32:42Z"); + b = createRel(true, "2020-03-16T10:32:42Z"); + a.mergeFrom(b); + assertEquals("2020-03-16T10:32:42Z", a.getValidationDate()); + + } @Test