Merge branch 'main' of https://github.com/Bandwidth/java-sdk into SWI-8856

Author: ckoegel

.github/workflows/deploy.yml

@@ -35,10 +35,10 @@ jobs:
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Apache Maven Central
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
           java-version: 21

.github/workflows/test-pr.yml

@@ -58,5 +58,5 @@ jobs:
         run: |
           mvn -B package --file pom.xml -DskipTests
           npm install -g @stoplight/prism-cli
-          prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests)
+          prism mock ./bandwidth.yml & (sleep 4; mvn test -Punit-tests)
         shell: bash

.github/workflows/test-smoke.yml

@@ -38,10 +38,10 @@ jobs:
       MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 21
@@ -70,10 +70,10 @@ jobs:
       MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_UP_APPLICATION_ID }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 21

.gitignore

@@ -24,4 +24,4 @@ build
 
 .DS_Store
 .idea
-.settings
+.settings/

.settings/org.eclipse.jdt.core.prefs

@@ -146,7 +146,7 @@ public class Example {
 
 ### Authorization
 
-[Basic](../README.md#Basic), [OAuth2](../README.md#OAuth2)
+[Basic](../README.md#Basic)
 
 ### HTTP request headers
 
@@ -187,10 +187,6 @@ public class Example {
     Basic.setUsername("YOUR USERNAME");
     Basic.setPassword("YOUR PASSWORD");
 
-    // Configure OAuth2 access token for authorization: OAuth2
-    OAuth OAuth2 = (OAuth) defaultClient.getAuthentication("OAuth2");
-    OAuth2.setAccessToken("YOUR ACCESS TOKEN");
-
     PhoneNumberLookupApi apiInstance = new PhoneNumberLookupApi(defaultClient);
     String accountId = "9900000"; // String | 
     UUID requestId = UUID.fromString("004223a0-8b17-41b1-bf81-20732adf5590"); // UUID | 

.settings/org.eclipse.m2e.core.prefs

@@ -14,4 +14,5 @@ modelPackage: com.bandwidth.sdk.model
 library: okhttp-gson
 licenseName: MIT
 useEnumCaseInsensitive: true
+useOneOfDiscriminatorLookup: true
 templateDir: custom_templates

custom_templates/libraries/okhttp-gson/anyof_model.mustache

@@ -66,6 +66,7 @@
  */
 public class ApiClient {
 
+    protected String basePath = "http://localhost";
     protected String basePath = "http://localhost";
     protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
     new ServerConfiguration(
@@ -80,21 +81,36 @@ public class ApiClient {
     protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
     protected String tempFolderPath = null;
+    protected boolean debugging = false;
+    protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
+    protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
+    protected String tempFolderPath = null;
 
+    protected Map<String, Authentication> authentications;
     protected Map<String, Authentication> authentications;
 
+    protected DateFormat dateFormat;
+    protected DateFormat datetimeFormat;
+    protected boolean lenientDatetimeFormat;
+    protected int dateLength;
     protected DateFormat dateFormat;
     protected DateFormat datetimeFormat;
     protected boolean lenientDatetimeFormat;
     protected int dateLength;
 
+    protected InputStream sslCaCert;
+    protected boolean verifyingSsl;
+    protected KeyManager[] keyManagers;
     protected InputStream sslCaCert;
     protected boolean verifyingSsl;
     protected KeyManager[] keyManagers;
 
+    protected OkHttpClient httpClient;
+    protected JSON json;
     protected OkHttpClient httpClient;
     protected JSON json;
 
+    protected HttpLoggingInterceptor loggingInterceptor;
     protected HttpLoggingInterceptor loggingInterceptor;
 
     /**
@@ -199,6 +215,7 @@ protected void initHttpClient() {
         initHttpClient(Collections.<Interceptor>emptyList());
     }
 
+    protected void initHttpClient(List<Interceptor> interceptors) {
     protected void initHttpClient(List<Interceptor> interceptors) {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
         builder.addNetworkInterceptor(getProgressInterceptor());
@@ -209,6 +226,7 @@ protected void initHttpClient(List<Interceptor> interceptors) {
         httpClient = builder.build();
     }
 
+    protected void init() {
     protected void init() {
         verifyingSsl = true;
 
@@ -234,6 +252,8 @@ public String getBasePath() {
      *
      * @param basePath Base path of the URL (e.g http://localhost)
      * @return An instance of ApiClient
+     * @param basePath Base path of the URL (e.g http://localhost)
+     * @return An instance of ApiClient
      */
     public ApiClient setBasePath(String basePath) {
         this.basePath = basePath;
@@ -282,6 +302,7 @@ public OkHttpClient getHttpClient() {
      *
      * @param newHttpClient An instance of OkHttpClient
      * @return ApiClient
+     * @return ApiClient
      * @throws java.lang.NullPointerException when newHttpClient is null
      */
     public ApiClient setHttpClient(OkHttpClient newHttpClient) {
@@ -789,6 +810,7 @@ public List<Pair> parameterToPair(String name, Object value) {
      * @param value The value of the parameter.
      * @return A list of {@code Pair} objects.
      */
+    public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
     public List<Pair> parameterToPairs(String collectionFormat, String name, Collection<?> value) {
         List<Pair> params = new ArrayList<Pair>();
 
@@ -897,6 +919,7 @@ public String collectionPathParameterToString(String collectionFormat, Collectio
      */
     public String sanitizeFilename(String filename) {
         return filename.replaceFirst("^.*[/\\\\]", "");
+        return filename.replaceFirst("^.*[/\\\\]", "");
     }
 
     /**
@@ -1006,6 +1029,8 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
             return (T) downloadFileFromResponse(response);
         }
 
+        ResponseBody respBody = response.body();
+        if (respBody == null) {
         ResponseBody respBody = response.body();
         if (respBody == null) {
             return null;
@@ -1016,6 +1041,18 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
             // ensuring a default content type
             contentType = "application/json";
         }
+        try {
+            if (isJsonMime(contentType)) {
+                return JSON.deserialize(respBody.byteStream(), returnType);
+            } else if (returnType.equals(String.class)) {
+                String respBodyString = respBody.string();
+                if (respBodyString.isEmpty()) {
+                    return null;
+                }
+                // Expecting string, return the raw response body.
+                return (T) respBodyString;
+            } else {
+                throw new ApiException(
         try {
             if (isJsonMime(contentType)) {
                 return JSON.deserialize(respBody.byteStream(), returnType);
@@ -1033,6 +1070,10 @@ public <T> T deserialize(Response response, Type returnType) throws ApiException
                     response.headers().toMultimap(),
                     response.body().string());
             }
+        } catch (IOException e) {
+            throw new ApiException(e);
+                    response.body().string());
+            }
         } catch (IOException e) {
             throw new ApiException(e);
         }
@@ -1363,6 +1404,8 @@ public String buildUrl(String baseUrl, String path, List<Pair> queryParams, List
                     throw new ArrayIndexOutOfBoundsException(String.format(
                         Locale.ROOT,
                         "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
+                        Locale.ROOT,
+                        "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
                     ));
                 }
                 baseURL = servers.get(serverIndex).URL(serverVariables);
@@ -1435,10 +1478,12 @@ public void processHeaderParams(Map<String, String> headerParams, Request.Builde
     public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) {
         for (Entry<String, String> param : cookieParams.entrySet()) {
             reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
+            reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
         }
         for (Entry<String, String> param : defaultCookieMap.entrySet()) {
             if (!cookieParams.containsKey(param.getKey())) {
                 reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
+                reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
             }
         }
     }
@@ -1531,6 +1576,7 @@ public String guessContentTypeFromFile(File file) {
      * @param key The key of the Header element
      * @param file The file to add to the Header
      */ 
+    protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
     protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, File file) {
         Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + key + "\"; filename=\"" + file.getName() + "\"");
         MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
@@ -1544,6 +1590,7 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
      * @param key The key of the Header element
      * @param obj The complex object to add to the Header
      */
+    protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
     protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String key, Object obj) {
         RequestBody requestBody;
         if (obj instanceof String) {
@@ -1566,6 +1613,7 @@ protected void addPartToMultiPartBuilder(MultipartBody.Builder mpBuilder, String
      * Get network interceptor to add it to the httpClient to track download progress for
      * async requests.
      */
+    protected Interceptor getProgressInterceptor() {
     protected Interceptor getProgressInterceptor() {
         return new Interceptor() {
             @Override
@@ -1587,6 +1635,7 @@ public Response intercept(Interceptor.Chain chain) throws IOException {
      * Apply SSL related settings to httpClient according to the current values of
      * verifyingSsl and sslCaCert.
      */
+    protected void applySslSettings() {
     protected void applySslSettings() {
         try {
             TrustManager[] trustManagers;
@@ -1649,6 +1698,7 @@ public boolean verify(String hostname, SSLSession session) {
         }
     }
 
+    protected KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
     protected KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
         try {
             KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -1666,6 +1716,7 @@ protected KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityExcep
      * @return The string representation of the HTTP request body
      * @throws com.bandwidth.sdk.ApiException If fail to serialize the request body object into a string
      */
+    protected String requestBodyToString(RequestBody requestBody) throws ApiException {
     protected String requestBodyToString(RequestBody requestBody) throws ApiException {
         if (requestBody != null) {
             try {