adds hasVideo and hasAudio properties to Archive

introduces an overloaded signature for OpenTok.startArchive()
testing is just as incomplete as all other archive testing 😝

Author: aoberoi

src/main/java/com/opentok/Archive.java

@@ -7,10 +7,7 @@
  */
 package com.opentok;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -70,6 +67,8 @@ public enum Status {
     @JsonProperty private int size = 0;
     @JsonProperty private Status status;
     @JsonProperty private String url;
+    @JsonProperty private boolean hasVideo = true;
+    @JsonProperty private boolean hasAudio = true;
 
     protected Archive() {
     }
@@ -156,6 +155,20 @@ public String getUrl() {
         return url;
     }
 
+    /**
+     * Whether the archive has an video track (<code>true</code>) or not (<code>false</code>).
+     */
+    public boolean hasVideo() {
+        return hasVideo;
+    }
+
+    /**
+     * Whether the archive has an audio track (<code>true</code>) or not (<code>false</code>).
+     */
+    public boolean hasAudio() {
+        return hasAudio;
+    }
+
     @Override
     public String toString() {
         try {

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

@@ -368,7 +368,11 @@ public ArchiveList listArchives(int offset, int count) throws OpenTokException {
             throw new RequestException("Exception mapping json: " + e.getMessage());
         }
     }
-    
+
+    public Archive startArchive(String sessionId, String name) throws OpenTokException {
+        return startArchive(sessionId, name, true, true);
+    }
+
     /**
      * Starts archiving an OpenTok 2.0 session.
      *
@@ -386,12 +390,12 @@ public ArchiveList listArchives(int offset, int count) throws OpenTokException {
      *
      * @return The Archive object. This object includes properties defining the archive, including the archive ID.
      */
-    public Archive startArchive(String sessionId, String name) throws OpenTokException {
+    public Archive startArchive(String sessionId, String name, boolean hasVideo, boolean hasAudio) throws OpenTokException {
         if (sessionId == null || sessionId == "") {
             throw new InvalidArgumentException("Session not valid");
         }
         // TODO: do validation on sessionId and name
-        String archive = this.client.startArchive(sessionId, name);
+        String archive = this.client.startArchive(sessionId, name, hasVideo, hasAudio);
         try {
             return archiveReader.readValue(archive);
         } catch (Exception e) {

src/main/java/com/opentok/util/HttpClient.java

@@ -9,13 +9,14 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.ning.http.client.*;
 import com.ning.http.client.filter.FilterContext;
 import com.ning.http.client.filter.FilterException;
@@ -161,21 +162,25 @@ public String getArchives(int offset, int count) throws RequestException {
         return responseString;
     }
 
-    public String startArchive(String sessionId, String name) throws OpenTokException, RequestException {
+    public String startArchive(String sessionId, String name, boolean hasVideo, boolean hasAudio)
+            throws OpenTokException {
         String responseString = null;
         Future<Response> request = null;
         String requestBody = null;
         // TODO: maybe use a StringBuilder?
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive";
 
-        ObjectMapper mapper = new ObjectMapper();
-        HashMap<String, String> jsonBody = new HashMap<String, String>();
-        jsonBody.put("sessionId", sessionId);
+        JsonNodeFactory nodeFactory = JsonNodeFactory.instance;
+        ObjectNode requestJson = nodeFactory.objectNode();
+        requestJson.put("sessionId", sessionId);
+        requestJson.put("hasVideo", hasVideo);
+        requestJson.put("hasAudio", hasAudio);
+
         if (name != null) {
-            jsonBody.put("name", name);
+            requestJson.put("name", name);
         }
         try {
-            requestBody = mapper.writeValueAsString(jsonBody);
+            requestBody = new ObjectMapper().writeValueAsString(requestJson);
         } catch (JsonProcessingException e) {
             throw new OpenTokException("Could not start an OpenTok Archive. The JSON body encoding failed.", e);
         }

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

@@ -504,6 +504,41 @@ public void testStartArchive() throws OpenTokException {
                 .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
     }
 
+    @Test
+    public void testStartVoiceOnlyArchive() throws OpenTokException {
+        String sessionId = "SESSIONID";
+
+        stubFor(post(urlEqualTo("/v2/partner/"+this.apiKey+"/archive"))
+                .willReturn(aResponse()
+                        .withStatus(200)
+                        .withHeader("Content-Type", "application/json")
+                        .withBody("{\n" +
+                                "          \"createdAt\" : 1395183243556,\n" +
+                                "          \"duration\" : 0,\n" +
+                                "          \"id\" : \"30b3ebf1-ba36-4f5b-8def-6f70d9986fe9\",\n" +
+                                "          \"name\" : \"\",\n" +
+                                "          \"partnerId\" : 123456,\n" +
+                                "          \"reason\" : \"\",\n" +
+                                "          \"sessionId\" : \"SESSIONID\",\n" +
+                                "          \"size\" : 0,\n" +
+                                "          \"status\" : \"started\",\n" +
+                                "          \"url\" : null,\n" +
+                                "          \"hasVideo\" : false,\n" +
+                                "          \"hasAudio\" : true\n" +
+                                "        }")));
+
+        Archive archive = sdk.startArchive(sessionId, null, false, true);
+        assertNotNull(archive);
+        assertEquals(sessionId, archive.getSessionId());
+        assertNotNull(archive.getId());
+
+        verify(postRequestedFor(urlMatching("/v2/partner/"+this.apiKey+"/archive"))
+                // TODO: find a way to match JSON without caring about spacing
+                //.withRequestBody(matching(".*"+".*"))
+                .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))
+                .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
+    }
+
     // TODO: test start archive with name
 
     // TODO: test start archive failure scenarios