changes default createSession to relayed session, fixes #40

Author: aoberoi

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

@@ -237,7 +237,7 @@ public Session createSession(SessionProperties properties) throws OpenTokExcepti
         if(properties != null) {
             params = properties.toMap();
         } else {
-            params = null;
+            params = new SessionProperties.Builder().build().toMap();
         }
 
         String xmlResponse = this.client.createSession(params);

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

@@ -33,7 +33,7 @@ private SessionProperties(Builder builder) {
      */
     public static class Builder {
         private String location = null;
-        private MediaMode mediaMode = MediaMode.ROUTED;
+        private MediaMode mediaMode = MediaMode.RELAYED;
 
 
         /**

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

@@ -71,17 +71,17 @@ public void testCreateDefaultSession() throws OpenTokException {
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertEquals(MediaMode.ROUTED, session.getProperties().mediaMode());
+        assertEquals(MediaMode.RELAYED, session.getProperties().mediaMode());
         assertNull(session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))
-                // TODO: add p2p.preference=disabled
+                .withRequestBody(matching(".*p2p.preference=enabled.*"))
                 .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))
                 .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
     }
 
     @Test
-    public void testCreateRelayedSession() throws OpenTokException {
+    public void testCreateRoutedSession() throws OpenTokException {
         String sessionId = "SESSIONID";
         stubFor(post(urlEqualTo("/session/create"))
                 .willReturn(aResponse()
@@ -92,19 +92,19 @@ public void testCreateRelayedSession() throws OpenTokException {
                                 "Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>")));
 
         SessionProperties properties = new SessionProperties.Builder()
-                .mediaMode(MediaMode.RELAYED)
+                .mediaMode(MediaMode.ROUTED)
                 .build();
         Session session = sdk.createSession(properties);
 
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertEquals(MediaMode.RELAYED, session.getProperties().mediaMode());
+        assertEquals(MediaMode.ROUTED, session.getProperties().mediaMode());
         assertNull(session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))
-                // TODO: this is a pretty bad way to verify, ideally we can decode the body and then query the object
-                .withRequestBody(matching(".*p2p.preference=enabled.*"))
+                // NOTE: this is a pretty bad way to verify, ideally we can decode the body and then query the object
+                .withRequestBody(matching(".*p2p.preference=disabled.*"))
                 .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))
                 .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
     }
@@ -129,7 +129,7 @@ public void testCreateLocationHintSession() throws OpenTokException {
         assertNotNull(session);
         assertEquals(this.apiKey, session.getApiKey());
         assertEquals(sessionId, session.getSessionId());
-        assertEquals(MediaMode.ROUTED, session.getProperties().mediaMode());
+        assertEquals(MediaMode.RELAYED, session.getProperties().mediaMode());
         assertEquals(locationHint, session.getProperties().getLocation());
 
         verify(postRequestedFor(urlMatching("/session/create"))