/metadata parsing: video_info: 'duration' can be null.

richardtitze · cakoose · commit 86c64dc4d31b · 2015-04-15T12:08:14.000-07:00
Closes dropbox#23
diff --git a/src/com/dropbox/core/DbxEntry.java b/src/com/dropbox/core/DbxEntry.java
@@ -483,7 +483,7 @@ public VideoInfo read(JsonParser parser)
                     JsonReader.expectObjectStart(parser);
                     File.Location location = null;
                     Date time_taken = null;
-                    long duration = 0;
+                    Long duration = null;
                     while (parser.getCurrentToken() == JsonToken.FIELD_NAME) {
                         String fieldName = parser.getCurrentName();
                         JsonReader.nextToken(parser);
@@ -492,7 +492,7 @@ public VideoInfo read(JsonParser parser)
                         } else if (fieldName.equals("time_taken")) {
                             time_taken = JsonDateReader.Dropbox.readOptional(parser);
                         } else if (fieldName.equals("duration")) {
-                            duration = JsonReader.readUnsignedLong(parser);
+                            duration = JsonReader.UnsignedLongReader.readOptional(parser);
                         } else {
                             JsonReader.skipValue(parser);
                         }
diff --git a/src/com/dropbox/core/json/JsonReader.java b/src/com/dropbox/core/json/JsonReader.java
@@ -131,6 +131,15 @@ public static void skipValue(JsonParser parser)
     // ------------------------------------------------------------------
     // Helpers for various types.
 
+    public static final JsonReader<Long> UnsignedLongReader = new JsonReader<Long>() {
+        @Override
+        public Long read(JsonParser parser)
+            throws IOException, JsonReadException
+        {
+            return readUnsignedLong(parser);
+        }
+    };
+
     public static long readUnsignedLong(JsonParser parser)
         throws IOException, JsonReadException
     {
diff --git a/test/com/dropbox/core/DbxEntryTest.java b/test/com/dropbox/core/DbxEntryTest.java
@@ -72,6 +72,7 @@ public void parseFileWithVideoInfo() throws Exception
     public void parseFileWithVideoInfoNullFields() throws Exception
     {
         DbxEntry.File f = loadJsonResource(DbxEntry.Reader, "file-with-video-info-null-fields.json").asFile();
+        assertNull(f.videoInfo.duration);
         assertNull(f.videoInfo.location);
         assertNull(f.videoInfo.timeTaken);
     }
diff --git a/test/com/dropbox/core/file-with-video-info-null-fields.json b/test/com/dropbox/core/file-with-video-info-null-fields.json
@@ -10,7 +10,7 @@
   "bytes": 802996,
   "modified": "Fri, 20 Mar 2015 17:45:56 +0000",
   "video_info": {
-    "duration": 1000,
+    "duration": null,
     "lat_long": null,
     "time_taken": null
   },

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public void parseFileWithVideoInfo() throws Exception`
`72`	`72`	`public void parseFileWithVideoInfoNullFields() throws Exception`
`73`	`73`	`{`
`74`	`74`	`DbxEntry.File f = loadJsonResource(DbxEntry.Reader, "file-with-video-info-null-fields.json").asFile();`
	`75`	`+ assertNull(f.videoInfo.duration);`
`75`	`76`	`assertNull(f.videoInfo.location);`
`76`	`77`	`assertNull(f.videoInfo.timeTaken);`
`77`	`78`	`}`