Fix StreamingBuffer to allow oldestEntryTime to be null (#1141)

mziccard · web-flow · commit 0637c80cc239 · 2016-08-09T14:42:52.000+02:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
@@ -53,9 +53,9 @@ public static class StreamingBuffer implements Serializable {
     private static final long serialVersionUID = 822027055549277843L;
     private final long estimatedRows;
     private final long estimatedBytes;
-    private final long oldestEntryTime;
+    private final Long oldestEntryTime;
 
-    StreamingBuffer(long estimatedRows, long estimatedBytes, long oldestEntryTime) {
+    StreamingBuffer(long estimatedRows, long estimatedBytes, Long oldestEntryTime) {
       this.estimatedRows = estimatedRows;
       this.estimatedBytes = estimatedBytes;
       this.oldestEntryTime = oldestEntryTime;
@@ -77,9 +77,9 @@ public long estimatedBytes() {
 
     /**
      * Returns the timestamp of the oldest entry in the streaming buffer, in milliseconds since
-     * epoch.
+     * epoch. Returns {@code null} if the streaming buffer is empty.
      */
-    public long oldestEntryTime() {
+    public Long oldestEntryTime() {
       return oldestEntryTime;
     }
 
@@ -111,9 +111,13 @@ Streamingbuffer toPb() {
     }
 
     static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
+      Long oldestEntryTime = null;
+      if (streamingBufferPb.getOldestEntryTime() != null) {
+        oldestEntryTime = streamingBufferPb.getOldestEntryTime().longValue();
+      }
       return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
           streamingBufferPb.getEstimatedBytes().longValue(),
-          streamingBufferPb.getOldestEntryTime().longValue());
+          oldestEntryTime);
     }
   }
 
