change p2p to media mode

Author: aoberoi

src/main/java/com/opentok/MediaMode.java

@@ -0,0 +1,17 @@
+package com.opentok;
+
+public enum MediaMode {
+    ROUTED ("disabled"),
+    RELAYED ("enabled");
+
+    private String serialized;
+
+    private MediaMode(String s) {
+        serialized = s;
+    }
+
+    @Override
+    public String toString() {
+        return serialized;
+    }
+}

src/main/java/com/opentok/SessionProperties.java

@@ -19,11 +19,11 @@ public class SessionProperties {
 
 
     private String location = null;
-    private boolean p2p = false;
+    private MediaMode mediaMode;
 
     private SessionProperties(Builder builder) {
         this.location = builder.location;
-        this.p2p = builder.p2p;
+        this.mediaMode = builder.mediaMode;
     }
 
     /**
@@ -33,7 +33,7 @@ private SessionProperties(Builder builder) {
      */
     public static class Builder {
         private String location = null;
-        private boolean p2p = false;
+        private MediaMode mediaMode = MediaMode.ROUTED;
 
 
         /**
@@ -78,8 +78,8 @@ public Builder location(String location) throws InvalidArgumentException {
        *
        * @return The SessionProperties.Builder object with the peer-to-peer setting.
        */
-        public Builder p2p(boolean p2p) {
-            this.p2p = p2p;
+        public Builder mediaMode(MediaMode mediaMode) {
+            this.mediaMode = mediaMode;
             return this;
         }
 
@@ -103,12 +103,12 @@ public String getLocation() {
      * Defines whether the session's streams will be transmitted directly between peers or using the
      * OpenTok media server. See {@link SessionProperties.Builder#p2p(boolean p2p)}.
      */
-    public boolean isP2p() {
-        return p2p;
+    public MediaMode mediaMode() {
+        return mediaMode;
     }
 
     /**
-     * Returns the session properites as a Map.
+     * Returns the session properties as a Map.
      */
     public Map<String, Collection<String>> toMap() {
         Map<String, Collection<String>> params = new HashMap<String, Collection<String>>();
@@ -117,11 +117,10 @@ public Map<String, Collection<String>> toMap() {
             valueList.add(location);
             params.put("location", valueList);
         }
-        if (p2p) {
-            ArrayList<String> valueList = new ArrayList<String>();
-            valueList.add("enabled");
-            params.put("p2p.preference", valueList);
-        }
+        ArrayList<String> valueList = new ArrayList<String>();
+        valueList.add(mediaMode.toString());
+        params.put("p2p.preference", valueList);
+
         return params;
     }
 

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

@@ -71,7 +71,7 @@ public void testCreateDefaultSession() throws OpenTokException {
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertFalse(session.getProperties().isP2p());
+        assertEquals(MediaMode.ROUTED, session.getProperties().mediaMode());
         assertNull(session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))
@@ -81,7 +81,7 @@ public void testCreateDefaultSession() throws OpenTokException {
     }
 
     @Test
-    public void testCreateP2pSession() throws OpenTokException {
+    public void testCreateRelayedSession() throws OpenTokException {
         String sessionId = "SESSIONID";
         stubFor(post(urlEqualTo("/session/create"))
                 .willReturn(aResponse()
@@ -92,14 +92,14 @@ public void testCreateP2pSession() throws OpenTokException {
                                 "Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>")));
 
         SessionProperties properties = new SessionProperties.Builder()
-                .p2p(true)
+                .mediaMode(MediaMode.RELAYED)
                 .build();
         Session session = sdk.createSession(properties);
 
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertTrue(session.getProperties().isP2p());
+        assertEquals(MediaMode.RELAYED, session.getProperties().mediaMode());
         assertNull(session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))
@@ -129,7 +129,7 @@ public void testCreateLocationHintSession() throws OpenTokException {
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertFalse(session.getProperties().isP2p());
+        assertEquals(MediaMode.ROUTED, session.getProperties().mediaMode());
         assertEquals(locationHint, session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))