Merge pull request #168 from opentok/dev

Manik Sachdeva · web-flow · commit 1125b3a9d8ff · 2019-01-22T19:34:13.000Z
v4.3.1
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'jacoco'
 
 group = 'com.tokbox'
 archivesBaseName = 'opentok-server-sdk'
-version = '4.3.0'
+version = '4.3.1-alpha.1'
 
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
diff --git a/src/main/java/com/opentok/Archive.java b/src/main/java/com/opentok/Archive.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
@@ -95,7 +95,7 @@ public enum OutputMode {
     @JsonProperty private int partnerId;
     @JsonProperty private String reason;
     @JsonProperty private String sessionId;
-    @JsonProperty private int size = 0;
+    @JsonProperty private long size = 0;
     @JsonProperty private Status status;
     @JsonProperty private String url;
     @JsonProperty private boolean hasVideo = true;
@@ -172,7 +172,7 @@ public String getSessionId() {
     /**
      * The size of the MP4 file. For archives that have not been generated, this value is set to 0.
      */
-    public int getSize() {
+    public long getSize() {
         return size;
     }
 
diff --git a/src/main/java/com/opentok/ArchiveLayout.java b/src/main/java/com/opentok/ArchiveLayout.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/ArchiveList.java b/src/main/java/com/opentok/ArchiveList.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/ArchiveMode.java b/src/main/java/com/opentok/ArchiveMode.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/ArchiveProperties.java b/src/main/java/com/opentok/ArchiveProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Broadcast.java b/src/main/java/com/opentok/Broadcast.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/BroadcastLayout.java b/src/main/java/com/opentok/BroadcastLayout.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/BroadcastProperties.java b/src/main/java/com/opentok/BroadcastProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/CreatedSession.java b/src/main/java/com/opentok/CreatedSession.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/MediaMode.java b/src/main/java/com/opentok/MediaMode.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/OpenTok.java b/src/main/java/com/opentok/OpenTok.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Role.java b/src/main/java/com/opentok/Role.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Rtmp.java b/src/main/java/com/opentok/Rtmp.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/RtmpProperties.java b/src/main/java/com/opentok/RtmpProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Session.java b/src/main/java/com/opentok/Session.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/SessionProperties.java b/src/main/java/com/opentok/SessionProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/SignalProperties.java b/src/main/java/com/opentok/SignalProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Sip.java b/src/main/java/com/opentok/Sip.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/SipProperties.java b/src/main/java/com/opentok/SipProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/Stream.java b/src/main/java/com/opentok/Stream.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/StreamList.java b/src/main/java/com/opentok/StreamList.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/StreamListProperties.java b/src/main/java/com/opentok/StreamListProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/StreamProperties.java b/src/main/java/com/opentok/StreamProperties.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/TokenOptions.java b/src/main/java/com/opentok/TokenOptions.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/constants/DefaultApiUrl.java b/src/main/java/com/opentok/constants/DefaultApiUrl.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/constants/Version.java b/src/main/java/com/opentok/constants/Version.java
@@ -1,12 +1,12 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
  */
 package com.opentok.constants;
 
 public class Version {
-    public static final String VERSION = "4.3.0";
+    public static final String VERSION = "4.3.1-alpha.1";
 }
diff --git a/src/main/java/com/opentok/constants/package-info.java b/src/main/java/com/opentok/constants/package-info.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/exception/InvalidArgumentException.java b/src/main/java/com/opentok/exception/InvalidArgumentException.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/exception/OpenTokException.java b/src/main/java/com/opentok/exception/OpenTokException.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/exception/RequestException.java b/src/main/java/com/opentok/exception/RequestException.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/exception/package-info.java b/src/main/java/com/opentok/exception/package-info.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/package-info.java b/src/main/java/com/opentok/package-info.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/util/Crypto.java b/src/main/java/com/opentok/util/Crypto.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/util/HttpClient.java b/src/main/java/com/opentok/util/HttpClient.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/main/java/com/opentok/util/TokenGenerator.java b/src/main/java/com/opentok/util/TokenGenerator.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/test/java/com/opentok/test/Helpers.java b/src/test/java/com/opentok/test/Helpers.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
diff --git a/src/test/java/com/opentok/test/OpenTokTest.java b/src/test/java/com/opentok/test/OpenTokTest.java
@@ -1,6 +1,6 @@
 /**
  * OpenTok Java SDK
- * Copyright (C) 2018 TokBox, Inc.
+ * Copyright (C) 2019 TokBox, Inc.
  * http://www.tokbox.com
  *
  * Licensed under The MIT License (MIT). See LICENSE file for more information.
@@ -617,7 +617,7 @@ public void testListArchives() throws OpenTokException {
                                 "            \"partnerId\" : 123456,\n" +
                                 "            \"reason\" : \"\",\n" +
                                 "            \"sessionId\" : \"SESSIONID\",\n" +
-                                "            \"size\" : 2909274,\n" +
+                                "            \"size\" : 247145329511,\n" +
                                 "            \"status\" : \"available\",\n" +
                                 "            \"url\" : \"http://tokbox.com.archive2.s3.amazonaws.com/123456%2Fef546c5" +
                                 "a-4fd7-4e59-ab3d-f1cfb4148d1d%2Farchive.mp4?Expires=1395188695&AWSAccessKeyId=AKIAI6" +

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`* OpenTok Java SDK`
`3`		`- * Copyright (C) 2018 TokBox, Inc.`
	`3`	`+ * Copyright (C) 2019 TokBox, Inc.`
`4`	`4`	`* http://www.tokbox.com`
`5`	`5`	`*`
`6`	`6`	`* Licensed under The MIT License (MIT). See LICENSE file for more information.`