expected int raw type for time-millis

Author: RustedBones

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/AvroGenericRecordToStorageApiProto.java

@@ -138,7 +138,7 @@ static Long convertTimestamp(Object value, boolean micros) {
     } else {
       Preconditions.checkArgument(
           value instanceof Long, "Expecting a value as Long type (timestamp).");
-      return ((Long) value) * (micros ? 1 : 1_000L);
+      return (micros ? 1 : 1_000L) * ((Long) value);
     }
   }
 
@@ -161,8 +161,15 @@ static Long convertTime(Object value, boolean micros) {
       return java.util.concurrent.TimeUnit.NANOSECONDS.toMicros(
           ((java.time.LocalTime) value).toNanoOfDay());
     } else {
-      Preconditions.checkArgument(value instanceof Long, "Expecting a value as Long type (time).");
-      return (Long) value * (micros ? 1 : 1_000L);
+      if (micros) {
+        Preconditions.checkArgument(
+            value instanceof Long, "Expecting a value as Long type (time).");
+        return (Long) value;
+      } else {
+        Preconditions.checkArgument(
+            value instanceof Integer, "Expecting a value as Integer type (time).");
+        return 1_000L * (Integer) value;
+      }
     }
   }
 
@@ -180,7 +187,7 @@ static Long convertDateTime(Object value, boolean micros) {
     } else {
       Preconditions.checkArgument(
           value instanceof Long, "Expecting a value as Long type (local-timestamp).");
-      return ((Long) value) * (micros ? 1 : 1_000L);
+      return (micros ? 1 : 1_000L) * ((Long) value);
     }
   }
 

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/AvroGenericRecordToStorageApiProtoTest.java

@@ -359,7 +359,7 @@ enum TestEnum {
                           LogicalTypes.decimal(2, 1)))
               .set("dateValue", 42)
               .set("timeMicrosValue", 42_000_000L)
-              .set("timeMillisValue", 42_000L)
+              .set("timeMillisValue", 42_000) // expects int
               .set("timestampMicrosValue", 42_000_000L)
               .set("timestampMillisValue", 42_000L)
               .set("localTimestampMicrosValue", 42_000_000L)