Implement changes on AssemblyListener

transloadit · Nov 25, 2024 · 3f0cda4 · 3f0cda4
1 parent 6849072
commit 3f0cda4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 39 deletions.
diff --git a/src/test/java/com/transloadit/sdk/AssemblyMultiThreadingTest.java b/src/test/java/com/transloadit/sdk/AssemblyMultiThreadingTest.java
@@ -3,6 +3,7 @@
 import com.transloadit.sdk.exceptions.LocalOperationException;
 import com.transloadit.sdk.exceptions.RequestException;
 import com.transloadit.sdk.response.AssemblyResponse;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -71,55 +72,55 @@ public void saveMultiThreadedUpload() throws IOException, LocalOperationExceptio
         MockTusAssemblyMultiThreading assembly = new MockTusAssemblyMultiThreading(transloadit);
         assembly.wipeAssemblyID();
         assembly.setRunnableAssemblyListener(new AssemblyListener() {
-                    @Override
-                    public void onAssemblyFinished(AssemblyResponse response) {
+            @Override
+            public void onAssemblyFinished(AssemblyResponse response) {
 
-                    }
+            }
 
-                    @Override
-                    public void onError(Exception error) {
+            @Override
+            public void onError(Exception error) {
 
-                    }
+            }
 
-                    @Override
-                    public void onMetadataExtracted() {
+            @Override
+            public void onMetadataExtracted() {
 
-                    }
+            }
 
-                    @Override
-                    public void onAssemblyUploadFinished() {
+            @Override
+            public void onAssemblyUploadFinished() {
 
-                    }
+            }
 
-                    @Override
-                    public void onFileUploadFinished(String fileName, JSONObject uploadInformation) {
+            @Override
+            public void onFileUploadFinished(JSONObject uploadInformation) {
 
-                    }
+            }
 
-                    @Override
-                    public void onFileUploadPaused(String name) {
+            @Override
+            public void onFileUploadPaused(String name) {
 
-                    }
+            }
 
-                    @Override
-                    public void onFileUploadResumed(String name) {
+            @Override
+            public void onFileUploadResumed(String name) {
 
-                    }
+            }
 
-                    @Override
-                    public void onFileUploadProgress(long uploadedBytes, long totalBytes) {
+            @Override
+            public void onFileUploadProgress(long uploadedBytes, long totalBytes) {
 
-                    }
+            }
 
             @Override
-            public void onAssemblyProgress(double combinedProgress, JSONObject progressPerOriginalFile) {
+            public void onAssemblyProgress(JSONObject progress) {
 
             }
 
             @Override
-                    public void onAssemblyResultFinished(String stepName, JSONObject result) {
+            public void onAssemblyResultFinished(JSONArray result) {
 
-                    }
+            }
         });
 
         assembly.addFile(new File("LICENSE"), "file_name1");
@@ -223,7 +224,7 @@ public void onAssemblyUploadFinished() {
             }
 
             @Override
-            public void onFileUploadFinished(String fileName, JSONObject uploadInformation) {
+            public void onFileUploadFinished(JSONObject uploadInformation) {
 
             }
 
@@ -243,22 +244,23 @@ public void onFileUploadProgress(long uploadedBytes, long totalBytes) {
             }
 
             @Override
-            public void onAssemblyProgress(double combinedProgress, JSONObject progressPerOriginalFile) {
+            public void onAssemblyProgress(JSONObject progress) {
 
             }
 
             @Override
-            public void onAssemblyResultFinished(String stepName, JSONObject result) {
+            public void onAssemblyResultFinished(JSONArray result) {
 
             }
+
         };
         assembly.setRunnableAssemblyListener(listener);
         Assertions.assertEquals(listener, assembly.getRunnableAssemblyListener());
     }
 
     /**
      * Verifies, that {@link Assembly#abortUploads()} gets called in case of an upload error.
-     * And if the {@link UploadProgressListener} gets notified.
+     * And if the {@link AssemblyListener} gets notified.
      * @throws LocalOperationException
      * @throws RequestException
      * @throws IOException
@@ -399,7 +401,7 @@ public void onAssemblyUploadFinished() {
             }
 
             @Override
-            public void onFileUploadFinished(String fileName, JSONObject uploadInformation) {
+            public void onFileUploadFinished(JSONObject uploadInformation) {
 
             }
 
@@ -419,12 +421,12 @@ public void onFileUploadProgress(long uploadedBytes, long totalBytes) {
             }
 
             @Override
-            public void onAssemblyProgress(double combinedProgress, JSONObject progressPerOriginalFile) {
+            public void onAssemblyProgress(JSONObject progress) {
 
             }
 
             @Override
-            public void onAssemblyResultFinished(String stepName, JSONObject result) {
+            public void onAssemblyResultFinished(JSONArray result) {
 
             }
         };

diff --git a/src/test/java/com/transloadit/sdk/MockProtocolExceptionAssembly.java b/src/test/java/com/transloadit/sdk/MockProtocolExceptionAssembly.java
@@ -13,6 +13,7 @@
 //CHECKSTYLE:OFF
 import com.transloadit.sdk.exceptions.LocalOperationException;  // needed for doc
 import com.transloadit.sdk.exceptions.RequestException;
+import org.json.JSONArray;
 import org.json.JSONObject;
 //CHECKSTYLE:ON
 
@@ -60,7 +61,7 @@ public void onAssemblyUploadFinished() {
                 }
 
                 @Override
-                public void onFileUploadFinished(String fileName, JSONObject uploadInformation) {
+                public void onFileUploadFinished(JSONObject uploadInformation) {
 
                 }
 
@@ -80,12 +81,12 @@ public void onFileUploadProgress(long uploadedBytes, long totalBytes) {
                 }
 
                 @Override
-                public void onAssemblyProgress(double combinedProgress, JSONObject progressPerOriginalFile) {
+                public void onAssemblyProgress(JSONObject progressPerOriginalFile) {
 
                 }
 
                 @Override
-                public void onAssemblyResultFinished(String stepName, JSONObject result) {
+                public void onAssemblyResultFinished(JSONArray result) {
 
                 }
             };

diff --git a/src/test/java/com/transloadit/sdk/MockTusAssembly.java b/src/test/java/com/transloadit/sdk/MockTusAssembly.java
@@ -6,8 +6,7 @@
 import java.util.Map;
 
 /**
- * This class serves as a Mock to {@link Assembly}, which can be used to test
- * Assemblies with resumability enabled and provides a suitable {@link MockSocket}.
+ * This class serves as a Mock to {@link Assembly}, which can be used to test.
  */
 public class MockTusAssembly extends Assembly {
     /**