REVAI-4573: Update SDKs to support new model

.github/workflows/build_and_test.yml

@@ -19,23 +19,24 @@ jobs:
     strategy:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11.0.x, 13 ]
+        java: [8, 11, 17 ]
 
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Cache the maven artifacts
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
 
     - name: Configure java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: temurin
         java-version: ${{ matrix.java }}
 
     - name: Build and run tests
@@ -53,9 +54,9 @@ jobs:
       run: mkdir staging && cp target/*.jar staging
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: Package
+        name: Package-java-${{ matrix.java }}
         path: staging
 
     - name: Notify slack fail

examples/AsyncTranscribeMediaUrl.java

@@ -53,7 +53,7 @@ public static void main(String[] args) {
     revAiJobOptions.setSpeakerChannelsCount(null);
     revAiJobOptions.setDeleteAfterSeconds(2592000); // 30 days in seconds
     revAiJobOptions.setLanguage("en");
-    revAiJobOptions.setTranscriber("machine_v2");
+    revAiJobOptions.setTranscriber("machine_v3");
 
     RevAiJob submittedJob;
 

pom.xml

@@ -5,7 +5,7 @@
     <!-- groupId, artifactId, these namespaces should not be changed -->
     <groupId>ai.rev</groupId>
     <artifactId>revai-java-sdk</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <name>Rev AI SDK for Java</name>
     <description>Java SDK for Rev AI API</description>
     <url>https://docs.rev.ai/</url>

src/main/java/ai/rev/speechtotext/ApiClient.java

@@ -284,7 +284,12 @@ public RevAiJob submitJobUrl(String mediaUrl, RevAiJobOptions options) throws IO
     if (options == null) {
       options = new RevAiJobOptions();
     }
-    options.setMediaUrl(mediaUrl);
+    if (options.getSourceConfig() != null) {
+      throw new IllegalArgumentException(
+          "source_config is not compatible with submitJobUrl. "
+          + "Remove source_config from options or use submitJobUrl(RevAiJobOptions) instead.");
+    }
+    options.setSourceConfig(mediaUrl);
     return apiInterface.submitJobUrl(options).execute().body();
   }
 

src/test/java/ai/rev/speechtotext/integration/SubmitJobTest.java

@@ -172,6 +172,18 @@ public void SubmitJobUrl_OnlyUrlIsSpecified_ReturnsRevAiJobInProgress() throws I
 
     assertRevAiJob(revAiJob);
   }
+
+  @Test
+  public void SubmitJobUrl_WithMachineV3_ReturnsRevAiJobInProgress() throws IOException {
+    RevAiJobOptions revAiJobOptions = new RevAiJobOptions();
+    revAiJobOptions.setMetadata(testName.getMethodName());
+    revAiJobOptions.setTranscriber("machine_v3");
+
+    RevAiJob revAiJob = apiClient.submitJobUrl(SOURCE_URL, revAiJobOptions);
+
+    assertRevAiJob(revAiJob);
+  }
+
   @Test
   public void SubmitJobLocalFile_SummarizationOptionsSpecified_ReturnsRevAiJobInProgress()
           throws IOException, InterruptedException {

src/test/java/ai/rev/speechtotext/unit/RevAiJobTest.java

@@ -226,24 +226,37 @@ public void SubmitJobUrl_UrlAndOptionsAreSpecified_WithAuthHeaders_ReturnsARevAi
     assertRevAiJob(revAiJob, mockInProgressJob);
   }
 
+
   @Test
-  public void SubmitJobUrl_NullOptions_ReturnsIllegalArgumentException() {
+  public void SubmitJobUrl_DeprecatedWithSourceConfigUrl_ThrowsIllegalArgumentException() {
+    RevAiJobOptions options = new RevAiJobOptions();
+    options.setSourceConfig("existing-url.com");
     assertThatExceptionOfType(IllegalArgumentException.class)
-            .isThrownBy(() -> sut.submitJobUrl((RevAiJobOptions) null));
+            .isThrownBy(() -> sut.submitJobUrl("another-url.com", options));
   }
 
   @Test
-  public void SubmitJobUrl_NullSourceConfig_ReturnsIllegalArgumentException() {
+  public void SubmitJobUrl_DeprecatedWithSourceConfigAuthHeaders_ThrowsIllegalArgumentException() {
+    RevAiJobOptions options = new RevAiJobOptions();
+    options.setSourceConfig(null, SOURCE_AUTH);
     assertThatExceptionOfType(IllegalArgumentException.class)
-            .isThrownBy(() -> sut.submitJobUrl(new RevAiJobOptions()));
+            .isThrownBy(() -> sut.submitJobUrl(SOURCE_URL, options));
   }
 
   @Test
-  public void SubmitJobUrl_NullSourceConfigUrl_ReturnsIllegalArgumentException() {
+  public void SubmitJobUrl_DeprecatedUrlAndOptions_SendsSourceConfig() throws IOException {
+    mockInterceptor.setSampleResponse(gson.toJson(mockInProgressJob));
     RevAiJobOptions options = new RevAiJobOptions();
-    options.setSourceConfig(null, null);
-    assertThatExceptionOfType(IllegalArgumentException.class)
-            .isThrownBy(() -> sut.submitJobUrl(options));
+    options.setMetadata(METADATA);
+
+    RevAiJob revAiJob = sut.submitJobUrl(SOURCE_URL, options);
+
+    RevAiJobOptions expectedOptions = new RevAiJobOptions();
+    expectedOptions.setSourceConfig(SOURCE_URL);
+    expectedOptions.setMetadata(METADATA);
+    AssertHelper.assertRequestBody(mockInterceptor, expectedOptions, RevAiJobOptions.class);
+    AssertHelper.assertRequestMethodAndUrl(mockInterceptor, "POST", JOBS_URL);
+    assertRevAiJob(revAiJob, mockInProgressJob);
   }
 
   @Test