Merge pull request #92 from apivideo/fix/android_upload_token_video_id

fix(java): fix upload with upload token and video id for file smaller…

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [1.3.1] - 2023-08-10
+- Fix upload with upload token and video id when video is smaller than chunk size
+
 ## [1.3.0] - 2023-06-28
 - Introducing new live streams restream feature
 - Introducing new analytics endpoints

README.md

@@ -56,7 +56,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>video.api</groupId>
   <artifactId>java-api-client</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -66,7 +66,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-implementation "video.api:java-api-client:1.3.0"
+implementation "video.api:java-api-client:1.3.1"
 ```
 
 ### Others
@@ -79,7 +79,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/java-api-client-1.3.0.jar`
+* `target/java-api-client-1.3.1.jar`
 * `target/lib/*.jar`
 
 ## Code sample

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.diffplug.spotless'
 apply plugin: 'maven-publish'
 
 group = 'video.api'
-version = '1.3.0'
+version = '1.3.1'
 
 buildscript {
     repositories {

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>java-api-client</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <url>https://github.com/apivideo/api.video-java-client</url>
     <description>api.video Java API client</description>
     <scm>

src/main/java/video/api/client/api/ApiClient.java

@@ -118,7 +118,7 @@ private OkHttpClient initHttpClient(List<Interceptor> interceptors) {
     private void init() {
         verifyingSsl = true;
         json = new JSON();
-        addDefaultHeader("AV-Origin-Client", "java:1.3.0");
+        addDefaultHeader("AV-Origin-Client", "java:1.3.1");
     }
 
     private boolean isValid(String regex, String field) {

src/main/java/video/api/client/api/clients/VideosApi.java

@@ -899,7 +899,7 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
      *                        </tr>
      *                        </table>
      */
-    private okhttp3.Call uploadWithUploadTokenCall(String token, File file, final ApiCallback _callback)
+    private okhttp3.Call uploadWithUploadTokenCall(String token, File file, String videoId, final ApiCallback _callback)
             throws ApiException {
         Object localVarPostBody = null;
 
@@ -920,6 +920,10 @@ private okhttp3.Call uploadWithUploadTokenCall(String token, File file, final Ap
             localVarQueryParams.addAll(localVarApiClient.parameterToPair("token", token));
         }
 
+        if (videoId != null) {
+            localVarFormParams.put("videoId", videoId);
+        }
+
         final String[] localVarAccepts = { "application/json" };
         final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts);
         if (localVarAccept != null) {
@@ -983,8 +987,8 @@ private okhttp3.Call uploadWithUploadTokenChunkCall(String token, File file, Str
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call uploadWithUploadTokenValidateBeforeCall(String token, File file, final ApiCallback _callback)
-            throws ApiException {
+    private okhttp3.Call uploadWithUploadTokenValidateBeforeCall(String token, File file, String videoId,
+            final ApiCallback _callback) throws ApiException {
 
         // verify the required parameter 'token' is set
         if (token == null) {
@@ -996,7 +1000,7 @@ private okhttp3.Call uploadWithUploadTokenValidateBeforeCall(String token, File
             throw new ApiException("Missing the required parameter 'file' when calling uploadWithUploadToken");
         }
 
-        okhttp3.Call localVarCall = uploadWithUploadTokenCall(token, file, _callback);
+        okhttp3.Call localVarCall = uploadWithUploadTokenCall(token, file, videoId, _callback);
         return localVarCall;
     }
 
@@ -1372,7 +1376,7 @@ public void onDownloadProgress(long bytesRead, long contentLength, boolean done)
                 }
             };
 
-            okhttp3.Call localVarCall = uploadWithUploadTokenValidateBeforeCall(token, file, apiCallback);
+            okhttp3.Call localVarCall = uploadWithUploadTokenValidateBeforeCall(token, file, videoId, apiCallback);
             Type localVarReturnType = new TypeToken<Video>() {
             }.getType();
             return localVarApiClient.execute(localVarCall, localVarReturnType);