Validate Duration instances produced by the static factories.

kluever · copybara-github · commit 1ae6b6bb9c67 · 2025-08-07T08:11:28.000-07:00
PiperOrigin-RevId: 792163897
diff --git a/java/util/src/main/java/com/google/protobuf/util/Durations.java b/java/util/src/main/java/com/google/protobuf/util/Durations.java
@@ -301,28 +301,19 @@ public static Duration parseUnchecked(@CompileTimeConstant String value) {
   /** Create a Duration from the number of days. */
   @SuppressWarnings("GoodTime") // this is a legacy conversion API
   public static Duration fromDays(long days) {
-    return Duration.newBuilder()
-        .setSeconds(multiplyExact(days, SECONDS_PER_DAY))
-        .setNanos(0)
-        .build();
+    return Durations.fromSeconds(multiplyExact(days, SECONDS_PER_DAY));
   }
 
   /** Create a Duration from the number of hours. */
   @SuppressWarnings("GoodTime") // this is a legacy conversion API
   public static Duration fromHours(long hours) {
-    return Duration.newBuilder()
-        .setSeconds(multiplyExact(hours, SECONDS_PER_HOUR))
-        .setNanos(0)
-        .build();
+    return Durations.fromSeconds(multiplyExact(hours, SECONDS_PER_HOUR));
   }
 
   /** Create a Duration from the number of minutes. */
   @SuppressWarnings("GoodTime") // this is a legacy conversion API
   public static Duration fromMinutes(long minutes) {
-    return Duration.newBuilder()
-        .setSeconds(multiplyExact(minutes, SECONDS_PER_MINUTE))
-        .setNanos(0)
-        .build();
+    return Durations.fromSeconds(multiplyExact(minutes, SECONDS_PER_MINUTE));
   }
 
   /** Create a Duration from the number of seconds. */
diff --git a/java/util/src/test/java/com/google/protobuf/util/DurationsTest.java b/java/util/src/test/java/com/google/protobuf/util/DurationsTest.java
@@ -146,8 +146,18 @@ public void testStaticFactories() {
 
   @Test
   public void testLargeDuration() {
-    // TODO: kak - this should throw an exception
-    assertThat(Durations.isValid(Durations.fromHours(Integer.MAX_VALUE))).isFalse();
+    try {
+      Durations.fromHours(Integer.MAX_VALUE);
+      fail();
+    } catch (IllegalArgumentException expected) {
+      assertThat(expected)
+          .hasMessageThat()
+          .isEqualTo(
+              "Duration is not valid. See proto definition for valid values. Seconds"
+                  + " (7730941129200) must be in range [-315,576,000,000, +315,576,000,000]. Nanos"
+                  + " (0) must be in range [-999,999,999, +999,999,999]. Nanos must have the same"
+                  + " sign as seconds");
+    }
   }
 
   @Test
