Mixed specification updates

README.md

@@ -22,7 +22,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.sendinblue</groupId>
     <artifactId>sib-api-v3-sdk</artifactId>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -32,7 +32,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "com.sendinblue:sib-api-v3-sdk:1.0.1"
+compile "com.sendinblue:sib-api-v3-sdk:2.0.0"
 ```
 
 ### Others
@@ -45,7 +45,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/sib-api-v3-sdk-1.0.1.jar
+* target/sib-api-v3-sdk-2.0.0.jar
 * target/lib/*.jar
 
 ## Getting Started
@@ -116,7 +116,7 @@ Class | Method | HTTP request | Description
 *ContactsApi* | [**getList**](docs/ContactsApi.md#getList) | **GET** /contacts/lists/{listId} | Get the details of a list
 *ContactsApi* | [**getLists**](docs/ContactsApi.md#getLists) | **GET** /contacts/lists | Get all the lists
 *ContactsApi* | [**importContacts**](docs/ContactsApi.md#importContacts) | **POST** /contacts/import | Import contacts
-*ContactsApi* | [**removeContactToList**](docs/ContactsApi.md#removeContactToList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
+*ContactsApi* | [**removeContactFromList**](docs/ContactsApi.md#removeContactFromList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
 *ContactsApi* | [**requestContactExport**](docs/ContactsApi.md#requestContactExport) | **POST** /contacts/export | Export contacts
 *ContactsApi* | [**updateAttribute**](docs/ContactsApi.md#updateAttribute) | **PUT** /contacts/attributes/{attributeCategory}/{attributeName} | Updates contact attribute
 *ContactsApi* | [**updateContact**](docs/ContactsApi.md#updateContact) | **PUT** /contacts/{email} | Updates a contact
@@ -145,7 +145,7 @@ Class | Method | HTTP request | Description
 *ListsApi* | [**getFolderLists**](docs/ListsApi.md#getFolderLists) | **GET** /contacts/folders/{folderId}/lists | Get the lists in a folder
 *ListsApi* | [**getList**](docs/ListsApi.md#getList) | **GET** /contacts/lists/{listId} | Get the details of a list
 *ListsApi* | [**getLists**](docs/ListsApi.md#getLists) | **GET** /contacts/lists | Get all the lists
-*ListsApi* | [**removeContactToList**](docs/ListsApi.md#removeContactToList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
+*ListsApi* | [**removeContactFromList**](docs/ListsApi.md#removeContactFromList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
 *ListsApi* | [**updateList**](docs/ListsApi.md#updateList) | **PUT** /contacts/lists/{listId} | Update a list
 *ProcessApi* | [**getProcess**](docs/ProcessApi.md#getProcess) | **GET** /processes/{processId} | Return the informations for a process
 *ProcessApi* | [**getProcesses**](docs/ProcessApi.md#getProcesses) | **GET** /processes | Return all the processes for your account
@@ -199,8 +199,8 @@ Class | Method | HTTP request | Description
 
 ## Documentation for Models
 
+ - [AddContactToList](docs/AddContactToList.md)
  - [AddCredits](docs/AddCredits.md)
- - [AddRemoveContactToList](docs/AddRemoveContactToList.md)
  - [CreateAttribute](docs/CreateAttribute.md)
  - [CreateAttributeEnumeration](docs/CreateAttributeEnumeration.md)
  - [CreateChild](docs/CreateChild.md)
@@ -304,6 +304,7 @@ Class | Method | HTTP request | Description
  - [RemainingCreditModel](docs/RemainingCreditModel.md)
  - [RemainingCreditModelChild](docs/RemainingCreditModelChild.md)
  - [RemainingCreditModelReseller](docs/RemainingCreditModelReseller.md)
+ - [RemoveContactFromList](docs/RemoveContactFromList.md)
  - [RemoveCredits](docs/RemoveCredits.md)
  - [RequestContactExport](docs/RequestContactExport.md)
  - [RequestContactImport](docs/RequestContactImport.md)
@@ -369,4 +370,4 @@ Be sure to visit the SendinBlue official [documentation website](https://sendinb
 
 If you find a bug, please post the issue on [Github](https://github.com/sendinblue/APIv3-java-library/issues).
 
-As always, if you need additional assistance, drop us a note [here](https://account.sendinblue.com/support).
+As always, if you need additional assistance, drop us a note [here](https://account.sendinblue.com/support).

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.sendinblue'
-version = '1.0.0'
+version = '2.0.0'
 
 buildscript {
     repositories {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.sendinblue",
     name := "sib-api-v3-sdk",
-    version := "1.0.0",
+    version := "2.0.0",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

docs/AddRemoveContactToList.md → docs/AddContactToList.md

@@ -1,10 +1,10 @@
 
-# AddRemoveContactToList
+# AddContactToList
 
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**emails** | **List<String>** | Emails to add or remove from a list |  [optional]
+**emails** | **List<String>** | Emails to add to a list |  [optional]
 
 
 

docs/AddCredits.md

@@ -4,8 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**sms** | **Long** | SMS credits to be added to the child account |  [optional]
-**email** | **Long** | Email credits to be added to the child account |  [optional]
+**sms** | **Long** | Required if email credits are empty. SMS credits to be added to the child account |  [optional]
+**email** | **Long** | Required if sms credits are empty. Email credits to be added to the child account |  [optional]
 
 
 

docs/ContactsApi.md

@@ -23,7 +23,7 @@ Method | HTTP request | Description
 [**getList**](ContactsApi.md#getList) | **GET** /contacts/lists/{listId} | Get the details of a list
 [**getLists**](ContactsApi.md#getLists) | **GET** /contacts/lists | Get all the lists
 [**importContacts**](ContactsApi.md#importContacts) | **POST** /contacts/import | Import contacts
-[**removeContactToList**](ContactsApi.md#removeContactToList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
+[**removeContactFromList**](ContactsApi.md#removeContactFromList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
 [**requestContactExport**](ContactsApi.md#requestContactExport) | **POST** /contacts/export | Export contacts
 [**updateAttribute**](ContactsApi.md#updateAttribute) | **PUT** /contacts/attributes/{attributeCategory}/{attributeName} | Updates contact attribute
 [**updateContact**](ContactsApi.md#updateContact) | **PUT** /contacts/{email} | Updates a contact
@@ -56,7 +56,7 @@ apiKey.setApiKey("YOUR API KEY");
 
 ContactsApi apiInstance = new ContactsApi();
 Long listId = 789L; // Long | Id of the list
-AddRemoveContactToList contactEmails = new AddRemoveContactToList(); // AddRemoveContactToList | Emails addresses of the contacts
+AddContactToList contactEmails = new AddContactToList(); // AddContactToList | Emails addresses of the contacts
 try {
     PostContactInfo result = apiInstance.addContactToList(listId, contactEmails);
     System.out.println(result);
@@ -71,7 +71,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **listId** | **Long**| Id of the list |
- **contactEmails** | [**AddRemoveContactToList**](AddRemoveContactToList.md)| Emails addresses of the contacts |
+ **contactEmails** | [**AddContactToList**](AddContactToList.md)| Emails addresses of the contacts |
 
 ### Return type
 
@@ -1058,9 +1058,9 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
-<a name="removeContactToList"></a>
-# **removeContactToList**
-> PostContactInfo removeContactToList(listId, contactEmails)
+<a name="removeContactFromList"></a>
+# **removeContactFromList**
+> PostContactInfo removeContactFromList(listId, contactEmails)
 
 Remove existing contacts from a list
 
@@ -1083,12 +1083,12 @@ apiKey.setApiKey("YOUR API KEY");
 
 ContactsApi apiInstance = new ContactsApi();
 Long listId = 789L; // Long | Id of the list
-AddRemoveContactToList contactEmails = new AddRemoveContactToList(); // AddRemoveContactToList | Emails adresses of the contact
+RemoveContactFromList contactEmails = new RemoveContactFromList(); // RemoveContactFromList | Emails adresses of the contact
 try {
-    PostContactInfo result = apiInstance.removeContactToList(listId, contactEmails);
+    PostContactInfo result = apiInstance.removeContactFromList(listId, contactEmails);
     System.out.println(result);
 } catch (ApiException e) {
-    System.err.println("Exception when calling ContactsApi#removeContactToList");
+    System.err.println("Exception when calling ContactsApi#removeContactFromList");
     e.printStackTrace();
 }
 ```
@@ -1098,7 +1098,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **listId** | **Long**| Id of the list |
- **contactEmails** | [**AddRemoveContactToList**](AddRemoveContactToList.md)| Emails adresses of the contact |
+ **contactEmails** | [**RemoveContactFromList**](RemoveContactFromList.md)| Emails adresses of the contact |
 
 ### Return type
 

docs/GetEmailCampaign.md

@@ -24,6 +24,8 @@ Name | Type | Description | Notes
 **inlineImageActivation** | **Boolean** | Status of inline image. inlineImageActivation = false means image can’t be embedded, & inlineImageActivation = true means image can be embedded, in the email. |  [optional]
 **mirrorActive** | **Boolean** | Status of mirror links in campaign. mirrorActive = false means mirror links are deactivated, & mirrorActive = true means mirror links are activated, in the campaign |  [optional]
 **recurring** | **Boolean** | FOR TRIGGER ONLY ! Type of trigger campaign.recurring = false means contact can receive the same Trigger campaign only once, & recurring = true means contact can receive the same Trigger campaign several times |  [optional]
+**recipients** | **Object** |  | 
+**statistics** | **Object** |  | 
 
 
 <a name="TypeEnum"></a>

docs/GetEmailEventReportEvents.md

@@ -10,10 +10,10 @@ Name | Type | Description | Notes
 **messageId** | **String** | Message ID which generated the event | 
 **event** | [**EventEnum**](#EventEnum) | Event which occurred | 
 **reason** | **String** | Reason of bounce (only available if the event is hardbounce or softbounce) |  [optional]
-**tag** | **String** | Tag of the email which generated the event | 
+**tag** | **String** | Tag of the email which generated the event |  [optional]
 **ip** | **String** | IP from which the user has opened the email or clicked on the link (only available if the event is opened or clicks) |  [optional]
 **link** | **String** | The link which is sent to the user (only available if the event is requests or opened or clicks) |  [optional]
-**from** | **String** | Sender email from which the emails are sent | 
+**from** | **String** | Sender email from which the emails are sent |  [optional]
 
 
 <a name="EventEnum"></a>

docs/GetSmsCampaign.md

@@ -13,6 +13,8 @@ Name | Type | Description | Notes
 **sender** | **String** | Sender of the SMS Campaign | 
 **createdAt** | [**OffsetDateTime**](OffsetDateTime.md) | Creation UTC date-time of the SMS campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
 **modifiedAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time of last modification of the SMS campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**recipients** | **Object** |  | 
+**statistics** | **Object** |  | 
 
 
 <a name="StatusEnum"></a>

docs/ListsApi.md

@@ -11,7 +11,7 @@ Method | HTTP request | Description
 [**getFolderLists**](ListsApi.md#getFolderLists) | **GET** /contacts/folders/{folderId}/lists | Get the lists in a folder
 [**getList**](ListsApi.md#getList) | **GET** /contacts/lists/{listId} | Get the details of a list
 [**getLists**](ListsApi.md#getLists) | **GET** /contacts/lists | Get all the lists
-[**removeContactToList**](ListsApi.md#removeContactToList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
+[**removeContactFromList**](ListsApi.md#removeContactFromList) | **POST** /contacts/lists/{listId}/contacts/remove | Remove existing contacts from a list
 [**updateList**](ListsApi.md#updateList) | **PUT** /contacts/lists/{listId} | Update a list
 
 
@@ -40,7 +40,7 @@ apiKey.setApiKey("YOUR API KEY");
 
 ListsApi apiInstance = new ListsApi();
 Long listId = 789L; // Long | Id of the list
-AddRemoveContactToList contactEmails = new AddRemoveContactToList(); // AddRemoveContactToList | Emails addresses of the contacts
+AddContactToList contactEmails = new AddContactToList(); // AddContactToList | Emails addresses of the contacts
 try {
     PostContactInfo result = apiInstance.addContactToList(listId, contactEmails);
     System.out.println(result);
@@ -55,7 +55,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **listId** | **Long**| Id of the list |
- **contactEmails** | [**AddRemoveContactToList**](AddRemoveContactToList.md)| Emails addresses of the contacts |
+ **contactEmails** | [**AddContactToList**](AddContactToList.md)| Emails addresses of the contacts |
 
 ### Return type
 
@@ -399,9 +399,9 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
-<a name="removeContactToList"></a>
-# **removeContactToList**
-> PostContactInfo removeContactToList(listId, contactEmails)
+<a name="removeContactFromList"></a>
+# **removeContactFromList**
+> PostContactInfo removeContactFromList(listId, contactEmails)
 
 Remove existing contacts from a list
 
@@ -424,12 +424,12 @@ apiKey.setApiKey("YOUR API KEY");
 
 ListsApi apiInstance = new ListsApi();
 Long listId = 789L; // Long | Id of the list
-AddRemoveContactToList contactEmails = new AddRemoveContactToList(); // AddRemoveContactToList | Emails adresses of the contact
+RemoveContactFromList contactEmails = new RemoveContactFromList(); // RemoveContactFromList | Emails adresses of the contact
 try {
-    PostContactInfo result = apiInstance.removeContactToList(listId, contactEmails);
+    PostContactInfo result = apiInstance.removeContactFromList(listId, contactEmails);
     System.out.println(result);
 } catch (ApiException e) {
-    System.err.println("Exception when calling ListsApi#removeContactToList");
+    System.err.println("Exception when calling ListsApi#removeContactFromList");
     e.printStackTrace();
 }
 ```
@@ -439,7 +439,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **listId** | **Long**| Id of the list |
- **contactEmails** | [**AddRemoveContactToList**](AddRemoveContactToList.md)| Emails adresses of the contact |
+ **contactEmails** | [**RemoveContactFromList**](RemoveContactFromList.md)| Emails adresses of the contact |
 
 ### Return type
 

docs/RemoveContactFromList.md

@@ -0,0 +1,11 @@
+
+# RemoveContactFromList
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**emails** | **List<String>** | Required if 'all' is false. Emails to remove from a list |  [optional]
+**all** | **Boolean** | Required if 'emails' is empty. Remove all existing contacts from a list |  [optional]
+
+
+

docs/RemoveCredits.md

@@ -4,8 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**sms** | **Long** | SMS credits to be removed from the child account |  [optional]
-**email** | **Long** | Email credits to be removed from the child account |  [optional]
+**sms** | **Long** | Required if email credits are empty. SMS credits to be removed from the child account |  [optional]
+**email** | **Long** | Required if sms credits are empty. Email credits to be removed from the child account |  [optional]
 
 
 

docs/SendEmailAttachment.md

@@ -5,4 +5,4 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **content** | **byte[]** | Byte array of the attachment generated on the fly ( Encoded to base64 chunk data at our end ) |  [optional]
-**name** | **String** | Required for content. Name of the attachment |  [optional]
+**name** | **String** | Required for content. Name of the attachment |  [optional]

docs/SendSmtpEmail.md

@@ -4,15 +4,15 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**sender** | [**SendSmtpEmailSender**](SendSmtpEmailSender.md) |  | 
+**sender** | [**SendSmtpEmailSender**](SendSmtpEmailSender.md) |  |  [optional]
 **to** | [**List<SendSmtpEmailTo>**](SendSmtpEmailTo.md) | Email addresses and names of the recipients | 
 **bcc** | [**List<SendSmtpEmailBcc>**](SendSmtpEmailBcc.md) | Email addresses and names of the recipients in bcc |  [optional]
 **cc** | [**List<SendSmtpEmailCc>**](SendSmtpEmailCc.md) | Email addresses and names of the recipients in cc |  [optional]
-**htmlContent** | **String** | HTML body of the message ( Ignored if templateId is passed ) | 
-**textContent** | **String** | Plain Text body of the message ( Ignored if templateId is passed ) |  [optional]
-**subject** | **String** | Subject of the message | 
+**htmlContent** | **String** | HTML body of the message ( Mandatory if 'templateId' is not passed, ignored if 'templateId' is passed ) |  [optional]
+**textContent** | **String** | Plain Text body of the message ( Ignored if 'templateId' is passed ) |  [optional]
+**subject** | **String** | Subject of the message. Mandatory if 'templateId' is not passed |  [optional]
 **replyTo** | [**SendSmtpEmailReplyTo**](SendSmtpEmailReplyTo.md) |  |  [optional]
-**attachment** | [**List<SendSmtpEmailAttachment>**](SendSmtpEmailAttachment.md) | Pass the absolute URL (no local file) or the byte array of the attachment. Name can be used in both cases to define the attachment name. It is mandatory in case of content. Extension allowed: xlsx, xls, ods, docx, docm, doc, csv, pdf, txt, gif, jpg, jpeg, png, tif, tiff, rtf, bmp, cgm, css, shtml, html, htm, zip, xml, ppt, pptx, tar, ez, ics, mobi, msg, pub and eps |  [optional]
+**attachment** | [**List<SendSmtpEmailAttachment>**](SendSmtpEmailAttachment.md) | Pass the absolute URL (no local file) or the or the byte array of the attachment. Name can be used in both cases to define the attachment name. It is mandatory in case of content. Extension allowed: xlsx, xls, ods, docx, docm, doc, csv, pdf, txt, gif, jpg, jpeg, png, tif, tiff, rtf, bmp, cgm, css, shtml, html, htm, zip, xml, ppt, pptx, tar, ez, ics, mobi, msg, pub and eps ( Ignored if 'templateId' is passed ) |  [optional]
 **headers** | **Map<String, String>** |  |  [optional]
 **templateId** | **Long** | Id of the template |  [optional]
 **params** | **Map<String, String>** |  |  [optional]

docs/SendSmtpEmailAttachment.md

@@ -6,4 +6,4 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **url** | **String** | Absolute url of the attachment (no local file). |  [optional]
 **content** | **byte[]** | Byte array of the attachment generated on the fly ( Encoded to base64 chunk data at our end ) |  [optional]
-**name** | **String** | Required for content. Name of the attachment |  [optional]
+**name** | **String** | Required for content. Name of the attachment |  [optional]

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>sib-api-v3-sdk</artifactId>
     <packaging>jar</packaging>
     <name>sib-api-v3-sdk</name>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <url>https://github.com/sendinblue/APIv3-java-library</url>
     <description>SendinBlue&#39;s API v3 Java Library</description>
     <scm>

src/main/java/sendinblue/ApiClient.java

@@ -85,7 +85,7 @@ public ApiClient() {
         json = new Json();
 
         // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/1.0.0/java");
+        setUserAgent("Swagger-Codegen/2.0.0/java");
 
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();