adds ArchiveList class, backwards compatible, fixes #29

Author: aoberoi

src/main/java/com/opentok/ArchiveList.java

@@ -0,0 +1,37 @@
+/**
+ * OpenTok Java SDK
+ * Copyright (C) 2015 TokBox, Inc.
+ * http://www.tokbox.com
+ *
+ * Licensed under The MIT License (MIT). See LICENSE file for more information.
+ */
+package com.opentok;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents an list of archives of OpenTok session(s).
+ */
+@JsonFormat(shape= JsonFormat.Shape.OBJECT)
+public class ArchiveList extends ArrayList<Archive> {
+
+    private int totalCount;
+
+    /**
+     * The total number of Archives for the API Key.
+     */
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    private void setItems(List<Archive> archives) {
+        this.addAll(archives);
+    }
+
+    private void setCount(int count) {
+        this.totalCount = count;
+    }
+}

src/main/java/com/opentok/OpenTok.java

@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -20,10 +19,8 @@
 import javax.xml.xpath.XPathFactory;
 
 import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.opentok.exception.OpenTokException;
 import com.opentok.exception.InvalidArgumentException;
 import com.opentok.exception.RequestException;
@@ -51,6 +48,8 @@ public class OpenTok {
     protected HttpClient client;
     static protected ObjectReader archiveReader = new ObjectMapper()
             .reader(Archive.class);
+    static protected ObjectReader archiveListReader = new ObjectMapper()
+            .reader(ArchiveList.class);
 
     /**
      * Creates an OpenTok object.
@@ -338,7 +337,7 @@ public Archive getArchive(String archiveId) throws OpenTokException {
      *
      * @return A List of {@link Archive} objects.
      */
-    public List<Archive> listArchives() throws OpenTokException {
+    public ArchiveList listArchives() throws OpenTokException {
         return listArchives(0, 1000);
     }
 
@@ -353,13 +352,10 @@ public List<Archive> listArchives() throws OpenTokException {
      * is 1000.
      * @return A List of {@link Archive} objects.
      */
-    public List<Archive> listArchives(int offset, int count) throws OpenTokException {
-        ObjectMapper mapper = new ObjectMapper();
-        String archive = this.client.getArchives(offset, count);
+    public ArchiveList listArchives(int offset, int count) throws OpenTokException {
+        String archives = this.client.getArchives(offset, count);
         try {
-            JsonParser jp = mapper.getFactory().createParser(archive);
-            return mapper.readValue(mapper.treeAsTokens(mapper.readTree(jp).get("items")),
-                    TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Archive.class));
+            return archiveListReader.readValue(archives);
 
         // if we only wanted Java 7 and above, we could DRY this into one catch clause
         } catch (JsonMappingException e) {

src/test/java/com/opentok/test/OpenTokTest.java

@@ -12,7 +12,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import com.opentok.*;
@@ -27,6 +26,8 @@
 import org.junit.Test;
 import static org.junit.Assert.*;
 
+import static org.hamcrest.CoreMatchers.*;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
@@ -371,7 +372,7 @@ public void testListArchives() throws OpenTokException {
                         .withStatus(200)
                         .withHeader("Content-Type", "application/json")
                         .withBody("{\n" +
-                                "          \"count\" : 6,\n" +
+                                "          \"count\" : 60,\n" +
                                 "          \"items\" : [ {\n" +
                                 "            \"createdAt\" : 1395187930000,\n" +
                                 "            \"duration\" : 22,\n" +
@@ -453,11 +454,13 @@ public void testListArchives() throws OpenTokException {
                                 "          } ]\n" +
                                 "        }")));
 
-        List<Archive> archives = sdk.listArchives();
+        ArchiveList archives = sdk.listArchives();
 
-        // NOTE: what about archive totalCount (total number of archives for API Key)?
         assertNotNull(archives);
         assertEquals(6, archives.size());
+        assertEquals(60, archives.getTotalCount());
+        assertThat(archives.get(0), instanceOf(Archive.class));
+        assertEquals("ef546c5a-4fd7-4e59-ab3d-f1cfb4148d1d", archives.get(0).getId());
 
         verify(getRequestedFor(urlMatching("/v2/partner/"+this.apiKey+"/archive"))
                 .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))