HTTPCORE-754: Correct formatting of infinite deadline

apache · Sep 15, 2023 · 4695f25 · 4695f25
1 parent a56b383
commit 4695f25
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/util/Deadline.java b/httpcore5/src/main/java/org/apache/hc/core5/util/Deadline.java
@@ -181,7 +181,11 @@ public int hashCode() {
      * @return a formatted string.
      */
     public String format(final TimeUnit overdueTimeUnit) {
-        return String.format("Deadline: %s, %s overdue", formatTarget(), TimeValue.of(remaining(), overdueTimeUnit));
+        if (value == MAX_VALUE.value) {
+            return "No deadline (infinite)";
+        } else {
+            return String.format("Deadline: %s, %s overdue", formatTarget(), TimeValue.of(remaining(), overdueTimeUnit));
+        }
     }
 
     /**
@@ -190,7 +194,11 @@ public String format(final TimeUnit overdueTimeUnit) {
      * @return a formatted string in the format {@value #DATE_FORMAT}.
      */
     public String formatTarget() {
-        return DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(value).atOffset(ZoneOffset.UTC));
+        if (value == MAX_VALUE.value) {
+            return "(infinite)";
+        } else {
+            return DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(value).atOffset(ZoneOffset.UTC));
+        }
     }
 
     public Deadline freeze() {

diff --git a/httpcore5/src/test/java/org/apache/hc/core5/util/TestDeadlineTimeoutException.java b/httpcore5/src/test/java/org/apache/hc/core5/util/TestDeadlineTimeoutException.java
@@ -42,4 +42,11 @@ public void testMessage() {
                 DeadlineTimeoutException.from(deadline).getMessage());
     }
 
+    @Test
+    public void testInfiniteDeadlineMessage() {
+        final Deadline deadline = Deadline.calculate(Timeout.ZERO_MILLISECONDS);
+        Assertions.assertEquals("No deadline (infinite)",
+                DeadlineTimeoutException.from(deadline).getMessage());
+    }
+
 }