Fix the values for duration constants

Author: Sagar Agarwal

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Interval.java

@@ -29,7 +29,7 @@
  * broken into two components microseconds and nanoFractions, where nanoFractions can range from
  * [-999, 999]. Internally, Spanner supports Interval value with the following range of individual
  * fields: months: [-120000, 120000] days: [-3660000, 3660000] nanoseconds: [-316224000000000000000,
- * 316224000000000000000] Interval value created outside the specified domain will return error when
+ * 316224000000000000000]. Interval value created outside the specified domain will return error when
  * sent to Spanner backend.
  */
 @Immutable
@@ -43,21 +43,19 @@ public class Interval implements Serializable {
   public static final long SECONDS_PER_MINUTE = 60;
   public static final long SECONDS_PER_HOUR = MINUTES_PER_HOUR * SECONDS_PER_MINUTE;
   public static final long MILLIS_PER_SECOND = 1000;
-  public static final long MICROS_PER_MILLI = 1000;
-  public static final long NANOS_PER_MICRO = 1000;
-  public static final long MICROS_PER_SECOND = MICROS_PER_MILLI * MILLIS_PER_SECOND;
+  public static final long MICROS_PER_MILLISECOND = 1000;
+  public static final long MICROS_PER_SECOND = MICROS_PER_MILLISECOND * MILLIS_PER_SECOND;
   public static final long MICROS_PER_MINUTE = SECONDS_PER_MINUTE * MICROS_PER_SECOND;
   public static final long MICROS_PER_HOUR = SECONDS_PER_HOUR * MICROS_PER_SECOND;
-  public static final BigInteger NANOS_PER_MICROSECOND =
-      BigInteger.valueOf(MICROS_PER_SECOND * NANOS_PER_MICRO);
+  public static final long NANOS_PER_MICROSECOND = 1000;
   public static final BigInteger NANOS_PER_MILLISECOND =
-      BigInteger.valueOf(MILLIS_PER_SECOND * NANOS_PER_MICRO);
+      BigInteger.valueOf(MICROS_PER_MILLISECOND * NANOS_PER_MICROSECOND);
   public static final BigInteger NANOS_PER_SECOND =
-      BigInteger.valueOf(MICROS_PER_SECOND * NANOS_PER_MICRO);
+      BigInteger.valueOf(MICROS_PER_SECOND * NANOS_PER_MICROSECOND);
   public static final BigInteger NANOS_PER_MINUTE =
-      BigInteger.valueOf(MICROS_PER_MINUTE * NANOS_PER_MICRO);
+      BigInteger.valueOf(MICROS_PER_MINUTE * NANOS_PER_MICROSECOND);
   public static final BigInteger NANOS_PER_HOUR =
-      BigInteger.valueOf(MICROS_PER_HOUR * NANOS_PER_MICRO);
+      BigInteger.valueOf(MICROS_PER_HOUR * NANOS_PER_MICROSECOND);
   public static final Interval ZERO = Interval.builder().build();
 
   /** Regex to parse ISO8601 interval format- `P[n]Y[n]M[n]DT[n]H[n]M[n([.,][fraction])]S` */
@@ -115,7 +113,7 @@ public static Interval ofMilliseconds(long milliseconds) {
   /** Creates an interval with specified number of microseconds. */
   public static Interval ofMicroseconds(long micros) {
     return builder()
-        .setNanoseconds(BigInteger.valueOf(micros).multiply(NANOS_PER_MICROSECOND))
+        .setNanoseconds(BigInteger.valueOf(micros).multiply(BigInteger.valueOf(NANOS_PER_MICROSECOND)))
         .build();
   }
 

google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntervalTest.java

@@ -49,7 +49,7 @@ public void testOfSeconds() {
     assertEquals(0, interval.getMonths());
     assertEquals(0, interval.getDays());
     assertEquals(
-        BigInteger.valueOf(10).multiply(Interval.NANOS_PER_SECOND), interval.getNanoseconds());
+        BigInteger.valueOf(10000000000L), interval.getNanoseconds());
   }
 
   @Test
@@ -58,7 +58,7 @@ public void testOfMilliseconds() {
     assertEquals(0, interval.getMonths());
     assertEquals(0, interval.getDays());
     assertEquals(
-        BigInteger.valueOf(10).multiply(Interval.NANOS_PER_MILLISECOND), interval.getNanoseconds());
+        BigInteger.valueOf(10000000L), interval.getNanoseconds());
   }
 
   @Test
@@ -67,7 +67,7 @@ public void testOfMicroseconds() {
     assertEquals(0, interval.getMonths());
     assertEquals(0, interval.getDays());
     assertEquals(
-        BigInteger.valueOf(10).multiply(Interval.NANOS_PER_MICROSECOND), interval.getNanoseconds());
+        BigInteger.valueOf(10000), interval.getNanoseconds());
   }
 
   @Test
@@ -262,8 +262,8 @@ public void testToISO8601() {
   public void testGetNanoseconds() {
     Interval interval1 =
         Interval.fromMonthsDaysNanos(
-            10, 20, BigInteger.valueOf(30 * Interval.NANOS_PER_MICRO + 40));
-    assertEquals(30 * Interval.NANOS_PER_MICRO + 40, interval1.getNanoseconds().longValueExact());
+            10, 20, BigInteger.valueOf(30 * Interval.NANOS_PER_MICROSECOND + 40));
+    assertEquals(30040, interval1.getNanoseconds().longValueExact());
 
     Interval interval2 = Interval.fromMonthsDaysNanos(0, 0, BigInteger.valueOf(123456789));
     assertEquals(123456789, interval2.getNanoseconds().longValueExact());