Version 3.10.1 release (#172)

* Version 3.10.1-v2.1-20.3.01 release

* Update pom.xml

Co-authored-by: DevCenter-DocuSign <dcdev@docusign.com>

Author: mmallis87

CHANGELOG.md

@@ -1,11 +1,18 @@
 # DocuSign Java Client Changelog
 See [DocuSign Support Center](https://support.docusign.com/en/releasenotes/) for Product Release Notes.
 
-## [v3.10.0-RC1] - eSignature API v2.1-20.3.01 - 2020-10-15
+## [v3.10.1] - eSignature API v2.1-20.3.01 - 2020-10-29
 ### Changed
 - Added support for version v2.1-20.3.01 of the DocuSign eSignature API.
 - Updated the SDK release version.
 - Updated ApiClient to use an empty JSON object if the body is null. (DCM-4359)
+### Fixed
+- AccountBrands::updateBrandResourcesByContentType is missing brand file option. (DCM-3868)
+
+## [v3.10.0-RC1] - eSignature API v2.1-20.3.01 - 2020-10-15
+### Changed
+- Added support for version v2.1-20.3.01 of the DocuSign eSignature API.
+- Updated the SDK release version.
 
 ## [v3.9.0] - eSignature API v2.1-20.3.00 - 2020-09-24
 ### Changed

README.md

@@ -34,7 +34,7 @@ Note: DocuSign uses **Eclipse** with **Maven** for testing purposes.
 <dependency>
   <groupId>com.docusign</groupId>
   <artifactId>docusign-esign-java</artifactId>
-  <version>3.10.0-RC1</version>
+  <version>3.10.1</version>
 </dependency>
 ```
 

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.docusign'
-version = '3.10.0-RC1'
+version = '3.10.1'
 
 buildscript {
     repositories {

pom.xml

@@ -4,7 +4,7 @@
   <artifactId>docusign-esign-java</artifactId>
   <packaging>jar</packaging>
   <name>docusign-esign-java</name>
-  <version>3.10.0-RC1</version>
+  <version>3.10.1</version>
   <description>The official DocuSign eSignature JAVA client is based on version 2 of the DocuSign REST API and provides libraries for JAVA application integration. It is recommended that you use this version of the library for new development.</description>
   <url>https://developers.docusign.com</url>
 

src/main/java/com/docusign/esign/api/AccountsApi.java

@@ -184,7 +184,7 @@ public AccountSignaturesInformation createAccountSignatures(String accountId, Ac
   /**
    * Creates one or more brand profile files for the account.
    * Creates one or more brand profile files for the account. The Account Branding feature (accountSettings properties `canSelfBrandSend` and `canSelfBrandSig`) must be set to **true** for the account to use this call.  An error is returned if `brandId` property for a brand profile is already set for the account. To upload a new version of an existing brand profile, you must delete the profile and then upload the newer version.  When brand profile files are being uploaded, they must be combined into one zip file and the `Content-Type` must be `application/zip`.
-   * @param accountId The external account number (int) or account ID Guid. (required)
+   * @param accountId The external account number (int) or account ID GUID. (required)
    * @param brand  (optional)
    * @return BrandsResponse
    * @throws ApiException if fails to make API call
@@ -3817,13 +3817,14 @@ public void updateBrandLogoByType(String accountId, String brandId, String logoT
   /**
    * Uploads a branding resource file.
    * 
-   * @param accountId The external account number (int) or account ID Guid. (required)
-   * @param brandId The unique identifier of a brand. (required)
-   * @param resourceContentType  (required)
+   * @param accountId The external account number (int) or account ID GUID. (required)
+   * @param brandId The id of the brand. (required)
+   * @param resourceContentType The type of brand resource file that you are updating. Valid values are:  - `sending` - `signing` - `email` - `signing_captive` (required)
+   * @param fileXml Brand resource XML file. (required)
    * @return BrandResources
    * @throws ApiException if fails to make API call
    */
-  public BrandResources updateBrandResourcesByContentType(String accountId, String brandId, String resourceContentType) throws ApiException {
+  public BrandResources updateBrandResourcesByContentType(String accountId, String brandId, String resourceContentType, byte[] fileXml) throws ApiException {
     Object localVarPostBody = "{}";
 
     // verify the required parameter 'accountId' is set
@@ -3841,6 +3842,11 @@ public BrandResources updateBrandResourcesByContentType(String accountId, String
       throw new ApiException(400, "Missing the required parameter 'resourceContentType' when calling updateBrandResourcesByContentType");
     }
 
+    // verify the required parameter 'fileXml' is set
+    if (fileXml == null) {
+      throw new ApiException(400, "Missing the required parameter 'fileXml' when calling updateBrandResourcesByContentType");
+    }
+    
     // create path and map variables
     String localVarPath = "/v2.1/accounts/{accountId}/brands/{brandId}/resources/{resourceContentType}"
       .replaceAll("\\{" + "accountId" + "\\}", apiClient.escapeString(accountId.toString()))
@@ -3857,15 +3863,17 @@ public BrandResources updateBrandResourcesByContentType(String accountId, String
 
 
 
-    
+    if (fileXml != null) {
+      localVarFormParams.put("file.xml", fileXml);
+    }
 
     final String[] localVarAccepts = {
       "application/json"
     };
     final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
 
     final String[] localVarContentTypes = {
-      
+      "multipart/form-data"
     };
     final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
 

src/main/java/com/docusign/esign/client/ApiClient.java

@@ -20,10 +20,7 @@
 import org.glassfish.jersey.client.spi.ConnectorProvider;
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.MultiPart;
-import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.media.multipart.*;
 
 import javax.net.ssl.*;
 import javax.ws.rs.client.*;
@@ -87,7 +84,7 @@ public ApiClient() {
     this.dateFormat = new RFC3339DateFormat();
 
     // Set default User-Agent.
-    setUserAgent("Swagger-Codegen/3.10.0-RC1/java");
+    setUserAgent("Swagger-Codegen/3.10.1/java");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();
@@ -1176,7 +1173,13 @@ public Entity<?> serialize(Object obj, Map<String, Object> formParams, String co
     if (contentType.startsWith("multipart/form-data")) {
       MultiPart multiPart = new MultiPart();
       for (Entry<String, Object> param: formParams.entrySet()) {
-        if (param.getValue() instanceof File) {
+        if (param.getValue() instanceof byte[]) {
+          byte[] bytes = (byte[]) param.getValue();	
+          FormDataContentDisposition contentDisp = FormDataContentDisposition.name(param.getKey())
+              .fileName(param.getKey()).size(bytes.length).build();	
+
+          multiPart.bodyPart(new FormDataBodyPart(contentDisp, bytes, MediaType.APPLICATION_OCTET_STREAM_TYPE));	
+        } else if (param.getValue() instanceof File) {
           File file = (File) param.getValue();
           FormDataContentDisposition contentDisp = FormDataContentDisposition.name(param.getKey())
               .fileName(file.getName()).size(file.length()).build();
@@ -1345,7 +1348,25 @@ public <T> T invokeAPI(String path, String method, List<Pair> queryParams, List<
       }
     }
 
-    Entity<?> entity = (body == null) ? Entity.json("{}") : serialize(body, formParams, contentType);
+    Entity<?> entity = (body == null && formParams.isEmpty()) ? Entity.json("{}") : serialize(body, formParams, contentType);
+
+    // Generate and add Content-Disposition header as per RFC 6266	
+    if (contentType.startsWith("multipart/form-data")) {	
+      for (Entry<String, Object> param : formParams.entrySet()) {	
+        if (param.getValue() instanceof byte[]) {	
+          MultiPart mp = ((MultiPart) entity.getEntity());	
+          List<BodyPart> bodyParts = mp.getBodyParts();	
+          if (!bodyParts.isEmpty()) {	
+            BodyPart bodyPart = bodyParts.get(0);	
+            if (bodyPart.getContentDisposition() != null) {	
+              String contentDispositionValue = bodyPart.getContentDisposition().toString();	
+              invocationBuilder = invocationBuilder.header("Content-Disposition", contentDispositionValue);	
+              entity = Entity.entity(param.getValue(), "application/octet-stream");	
+            }	
+          }	
+        }	
+      }	
+    }
 
     Response response = null;
     String message = "error";