overlod

Author: jennywong2129

src/main/java/ai/rev/helpers/ClientHelper.java

@@ -1,6 +1,5 @@
 package ai.rev.helpers;
 
-import ai.rev.helpers.RevAiApiDeploymentConfiguration;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -17,6 +16,24 @@ public static OkHttpClient createOkHttpClient(String accessToken) {
         .build();
   }
 
+  public static Retrofit createRetrofitInstance(
+    OkHttpClient client,
+    String apiName,
+    String apiVersion
+    ) {
+    return new Retrofit.Builder()
+        .baseUrl(String.format(
+          "%s/%s/%s/",
+          RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl(),
+          apiName,
+          apiVersion
+        ))
+        .addConverterFactory(ScalarsConverterFactory.create())
+        .addConverterFactory(GsonConverterFactory.create())
+        .client(client)
+        .build();
+  }
+
   public static Retrofit createRetrofitInstance(
     OkHttpClient client,
     String apiName,

src/main/java/ai/rev/languageid/LanguageIdClient.java

@@ -1,5 +1,13 @@
 package ai.rev.languageid;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import ai.rev.helpers.ClientHelper;
 import ai.rev.helpers.RevAiApiDeploymentConfiguration;
 import ai.rev.languageid.models.LanguageIdJob;
@@ -12,14 +20,6 @@
 import okhttp3.RequestBody;
 import retrofit2.Retrofit;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * The LanguageIdClient object provides methods to send and retrieve information from all the
  * Rev AI Language Identification API endpoints using the Retrofit HTTP client.
@@ -58,6 +58,27 @@ public LanguageIdClient(String accessToken, String baseUrl) {
     this.apiInterface = retrofit.create(LanguageIdInterface.class);
   }
 
+  /**
+   * Constructs the API client used to send HTTP requests to Rev AI. The user access token can be
+   * generated on the website at <a
+   * href="https://www.rev.ai/access_token">https://www.rev.ai/access_token</a>.
+   *
+   * @param accessToken Rev AI authorization token associate with the account.
+   * @throws IllegalArgumentException If the access token is null or empty.
+   */
+  public LanguageIdClient(String accessToken) {
+    if (accessToken == null || accessToken.isEmpty()) {
+      throw new IllegalArgumentException("Access token must be provided");
+    }
+    this.client = ClientHelper.createOkHttpClient(accessToken);
+    Retrofit retrofit = ClientHelper.createRetrofitInstance(
+      client,
+      "languageid",
+      "v1"
+    );
+    this.apiInterface = retrofit.create(LanguageIdInterface.class);
+  }
+
   /**
    * Manually closes the connection when the code is running in a JVM
    */

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

@@ -1,14 +1,5 @@
 package ai.rev.speechtotext;
 
-import ai.rev.helpers.ClientHelper;
-import ai.rev.helpers.RevAiApiDeploymentConfiguration;
-import ai.rev.speechtotext.models.asynchronous.*;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.OkHttpClient;
-import okhttp3.RequestBody;
-import retrofit2.Retrofit;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -17,6 +8,20 @@
 import java.util.List;
 import java.util.Map;
 
+import ai.rev.helpers.ClientHelper;
+import ai.rev.helpers.RevAiApiDeploymentConfiguration;
+import ai.rev.speechtotext.models.asynchronous.RevAiAccount;
+import ai.rev.speechtotext.models.asynchronous.RevAiCaptionType;
+import ai.rev.speechtotext.models.asynchronous.RevAiJob;
+import ai.rev.speechtotext.models.asynchronous.RevAiJobOptions;
+import ai.rev.speechtotext.models.asynchronous.RevAiTranscript;
+import ai.rev.speechtotext.models.asynchronous.Summary;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import retrofit2.Retrofit;
+
 /**
  * The ApiClient object provides methods to send and retrieve information from all the Rev AI API
  * endpoints using the Retrofit HTTP client.
@@ -53,6 +58,30 @@ public ApiClient(String accessToken, String baseUrl) {
     this.apiInterface = retrofit.create(ApiInterface.class);
   }
 
+  /**
+   * Constructs the API client used to send HTTP requests to Rev AI. The user access token can be
+   * generated on the website at <a
+   * href="https://www.rev.ai/access_token">https://www.rev.ai/access_token</a>.
+   *
+   * @param accessToken Rev AI authorization token associate with the account.
+   * @param baseUrl Optional url of the Rev AI API deployment to use, defaults to the US
+        deployement, i.e. 'https://api.rev.ai', which can be referenced as
+        RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl().
+   * @throws IllegalArgumentException If the access token is null or empty.
+   */
+  public ApiClient(String accessToken) {
+    if (accessToken == null || accessToken.isEmpty()) {
+      throw new IllegalArgumentException("Access token must be provided");
+    }
+    this.client = ClientHelper.createOkHttpClient(accessToken);
+    Retrofit retrofit = ClientHelper.createRetrofitInstance(
+      client,
+      "speechtotext",
+      "v1"
+    );
+    this.apiInterface = retrofit.create(ApiInterface.class);
+  }
+
   /** Manually closes the connection when the code is running in a JVM */
   public void closeConnection() {
     client.dispatcher().executorService().shutdown();