Skip to content

Commit

Permalink
HTTPCLIENT-2319 / Updated the parseDate method to solely catch DateTi…
Browse files Browse the repository at this point in the history
…meException, streamlining error handling for date parsing and conversion. This change ensures comprehensive management of parsing issues, including those due to absent time-zone information, aligning with our documentation that the method should return null when conversion to Instant is not feasible. (#551)
  • Loading branch information
arturobernalg authored Feb 23, 2024
1 parent 407b915 commit f2b9a37
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

package org.apache.hc.client5.http.utils;

import java.time.DateTimeException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
Expand Down Expand Up @@ -145,6 +145,8 @@ public static LocalDateTime toUTC(final Date date) {

/**
* Parses the date value using the given date/time formats.
* <p>This method can handle strings without time-zone information by failing gracefully, in which case
* it returns {@code null}.</p>
*
* @param dateValue the instant value to parse
* @param dateFormatters the date/time formats to use
Expand All @@ -165,7 +167,7 @@ public static Instant parseDate(final String dateValue, final DateTimeFormatter.
for (final DateTimeFormatter dateFormatter : dateFormatters) {
try {
return Instant.from(dateFormatter.parse(v));
} catch (final DateTimeParseException ignore) {
} catch (final DateTimeException ignore) {
}
}
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public void testDateParseMessage() throws Exception {
@Test
public void testMalformedDate() {
Assertions.assertNull(DateUtils.parseDate("Fri, 14 Oct 2005 00:00:00 GMT", new DateTimeFormatter[] {}));
Assertions.assertNull(DateUtils.parseDate("Thu Feb 22 17:20:18 2024", new DateTimeFormatter[] {}));
}

@Test
Expand Down

0 comments on commit f2b9a37

Please sign in to comment.