Mixed spec updates

.travis.yml

@@ -2,12 +2,14 @@
 # Generated by: https://github.com/swagger-api/swagger-codegen.git
 #
 language: java
-jdk:
-  - oraclejdk8
-  - oraclejdk7
+
 before_install:
   # ensure gradlew has proper permission
   - chmod a+x ./gradlew
+
+jdk:
+  - oraclejdk8
+
 script:
   # test using maven
   - mvn test

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>2.0.1</version>
+    <version>3.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:2.0.1"
+compile "com.sendinblue:sib-api-v3-sdk:3.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-2.0.1.jar
+* target/sib-api-v3-sdk-3.0.0.jar
 * target/lib/*.jar
 
 ## Getting Started
@@ -256,7 +256,6 @@ Class | Method | HTTP request | Description
  - [GetEmailEventReportEvents](docs/GetEmailEventReportEvents.md)
  - [GetExtendedCampaignOverviewSender](docs/GetExtendedCampaignOverviewSender.md)
  - [GetExtendedCampaignStats](docs/GetExtendedCampaignStats.md)
- - [GetExtendedCampaignStatsLinksStats](docs/GetExtendedCampaignStatsLinksStats.md)
  - [GetExtendedClientAddress](docs/GetExtendedClientAddress.md)
  - [GetExtendedContactDetailsStatistics](docs/GetExtendedContactDetailsStatistics.md)
  - [GetExtendedContactDetailsStatisticsClicked](docs/GetExtendedContactDetailsStatisticsClicked.md)

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.sendinblue'
-version = '2.0.1'
+version = '3.0.0'
 
 buildscript {
     repositories {
@@ -32,8 +32,8 @@ if(hasProperty('target') && target == 'android') {
             targetSdkVersion 25
         }
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
         }
 
         // Rename the aar correctly
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
 
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 
     install {
         repositories.mavenInstaller {
@@ -100,5 +100,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.1'
     compile 'io.gsonfire:gson-fire:1.8.0'
     compile 'org.threeten:threetenbp:1.3.5'
+    compile 'org.apache.commons:commons-lang3:3.0'
     testCompile 'junit:junit:4.12'
 }

build.sbt

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

docs/CreateAttribute.md

@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**value** | **String** | Value of the attribute. Use only if the attribute's category is calculated or global |  [optional]
-**enumeration** | [**List<CreateAttributeEnumeration>**](CreateAttributeEnumeration.md) | Values that the attribute can take. Use only if the attribute's category is category |  [optional]
-**type** | [**TypeEnum**](#TypeEnum) | Type of the attribute. Use only if the attribute's category is normal, category or transactional ( type 'id' only available if the category is 'transactional' attribute & type 'category' only available if the category is 'category' attribute ) |  [optional]
+**value** | **String** | Value of the attribute. Use only if the attribute's category is 'calculated' or 'global' |  [optional]
+**enumeration** | [**List<CreateAttributeEnumeration>**](CreateAttributeEnumeration.md) | List of values and labels that the attribute can take. Use only if the attribute's category is \"category\". For example, [{'value':1, 'label':'male'}, {'value':2, 'label':'female'}] |  [optional]
+**type** | [**TypeEnum**](#TypeEnum) | Type of the attribute. Use only if the attribute's category is 'normal', 'category' or 'transactional' ( type 'id' is only available if the category is 'transactional' attribute & type 'category' is only available if the category is 'category' attribute ) |  [optional]
 
 
 <a name="TypeEnum"></a>

docs/CreateContact.md

@@ -4,12 +4,12 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**email** | **String** | Email address of the user. Mandatory if `attributes.sms` is not passed |  [optional]
-**attributes** | **Object** | Values of the attributes to fill. The attributes must exist in you contact database |  [optional]
-**emailBlacklisted** | **Boolean** | Blacklist the contact for emails (emailBlacklisted = true) |  [optional]
-**smsBlacklisted** | **Boolean** | Blacklist the contact for SMS (smsBlacklisted = true) |  [optional]
+**email** | **String** | Email address of the user. Mandatory if \"sms\" field is not passed in \"attributes\" parameter' |  [optional]
+**attributes** | **Object** | Pass the set of attributes and their values. These attributes must be present in your SendinBlue account. For eg. {'FNAME':'Elly', 'LNAME':'Roger'} |  [optional]
+**emailBlacklisted** | **Boolean** | Set this field to blacklist the contact for emails (emailBlacklisted = true) |  [optional]
+**smsBlacklisted** | **Boolean** | Set this field to blacklist the contact for SMS (smsBlacklisted = true) |  [optional]
 **listIds** | **List<Long>** | Ids of the lists to add the contact to |  [optional]
-**updateEnabled** | **Boolean** | Facilitate to update existing contact in same request (updateEnabled = true) |  [optional]
+**updateEnabled** | **Boolean** | Facilitate to update the existing contact in the same request (updateEnabled = true) |  [optional]
 **smtpBlacklistSender** | **List<String>** | SMTP forbidden sender for contact. Use only for email Contact ( only available if updateEnabled = true ) |  [optional]
 
 

docs/CreateEmailCampaign.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **name** | **String** | Name of the campaign | 
 **htmlContent** | **String** | Mandatory if htmlUrl is empty. Body of the message (HTML) |  [optional]
 **htmlUrl** | **String** | Mandatory if htmlContent is empty. Url to the message (HTML) |  [optional]
-**scheduledAt** | [**OffsetDateTime**](OffsetDateTime.md) | Sending UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ). Prefer to pass your timezone in date-time format for accurate result. |  [optional]
+**scheduledAt** | [**OffsetDateTime**] | Sending UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ). Prefer to pass your timezone in date-time format for accurate result. |  [optional]
 **subject** | **String** | Subject of the campaign | 
 **replyTo** | **String** | Email on which the campaign recipients will be able to reply to |  [optional]
 **toField** | **String** | To personalize the «To» Field, e.g. if you want to include the first name and last name of your recipient, use {FNAME} {LNAME}. These attributes must already exist in your contact database |  [optional]

docs/CreateList.md

@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **String** | Name of the list | 
-**folderId** | **Long** | Id of the folder in which to create the list | 
+**folderId** | **Long** | Id of the parent folder in which this list is to be created | 
 
 
 

docs/CreateSmsCampaign.md

@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **sender** | **String** | Name of the sender. The number of characters is limited to 11 | 
 **content** | **String** | Content of the message. The maximum characters used per SMS is 160, if used more than that, it will be counted as more than one SMS |  [optional]
 **recipients** | [**CreateSmsCampaignRecipients**](CreateSmsCampaignRecipients.md) |  |  [optional]
-**scheduledAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time on which the campaign has to run (YYYY-MM-DDTHH:mm:ss.SSSZ). Prefer to pass your timezone in date-time format for accurate result. |  [optional]
+**scheduledAt** | [**OffsetDateTime**] | UTC date-time on which the campaign has to run (YYYY-MM-DDTHH:mm:ss.SSSZ). Prefer to pass your timezone in date-time format for accurate result. |  [optional]
 
 
 

docs/DeleteHardbounces.md

@@ -4,8 +4,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**startDate** | **LocalDate** | Starting date (YYYY-MM-DD) of the period from which the hardbounces will be deleted. Must be lower than equal to endDate |  [optional]
-**endDate** | **LocalDate** | Ending date (YYYY-MM-DD) of the period from which the hardbounces will be deleted. Must be greater than equal to startDate |  [optional]
+**startDate** | **LocalDate** | Starting date (YYYY-MM-DD) of the time period for deletion. The hardbounces occurred after this date will be deleted. Must be less than or equal to the endDate |  [optional]
+**endDate** | **LocalDate** | Ending date (YYYY-MM-DD) of the time period for deletion. The hardbounces until this date will be deleted. Must be greater than or equal to the startDate |  [optional]
 **contactEmail** | **String** | Target a specific email address |  [optional]
 
 

docs/GetAccountPlan.md

@@ -7,8 +7,8 @@ Name | Type | Description | Notes
 **type** | [**TypeEnum**](#TypeEnum) | Displays the plan type of the user | 
 **creditsType** | [**CreditsTypeEnum**](#CreditsTypeEnum) | This is the type of the credit, \"Send Limit\" is one of the possible types of credit of a user. \"Send Limit\" implies the total number of emails you can send to the subscribers in your account. | 
 **credits** | **Float** | Remaining credits of the user | 
-**startDate** | **LocalDate** | Date of the period from which the plan will start (only available for \"subscription\", \"unlimited\" and \"reseller\" plan type) |  [optional]
-**endDate** | **LocalDate** | Date of the period from which the plan will end (only available for \"subscription\", \"unlimited\" and \"reseller\" plan type) |  [optional]
+**startDate** | **LocalDate** | Date of the period from which the plan will start (only available for \"subscription\" and \"reseller\" plan type) |  [optional]
+**endDate** | **LocalDate** | Date of the period from which the plan will end (only available for \"subscription\" and \"reseller\" plan type) |  [optional]
 **userLimit** | **Integer** | Only in case of reseller account. It implies the total number of child accounts you can add to your account. |  [optional]
 
 
@@ -17,7 +17,6 @@ Name | Type | Description | Notes
 Name | Value
 ---- | -----
 PAYASYOUGO | "payAsYouGo"
-UNLIMITED | "unlimited"
 FREE | "free"
 SUBSCRIPTION | "subscription"
 SMS | "sms"

docs/GetCampaignOverview.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **subject** | **String** | Subject of the campaign | 
 **type** | [**TypeEnum**](#TypeEnum) | Type of campaign | 
 **status** | [**StatusEnum**](#StatusEnum) | Status of the campaign | 
-**scheduledAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
+**scheduledAt** | [**OffsetDateTime**] | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
 
 
 <a name="TypeEnum"></a>

docs/GetCampaignStats.md

@@ -4,9 +4,9 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**listId** | **Long** | List Id of email campaign (only in case of get email campaign(s)) |  [optional]
+**listId** | **Long** | List Id of email campaign (only in case of get email campaign(s)(not for global stats)) |  [optional]
 **uniqueClicks** | **Long** | Number of unique clicks for the campaign | 
-**clickers** | **Long** | Number of clicks for the campaign | 
+**clickers** | **Long** | Number of total clicks for the campaign | 
 **complaints** | **Long** | Number of complaints (Spam reports) for the campaign | 
 **delivered** | **Long** | Number of delivered emails for the campaign | 
 **sent** | **Long** | Number of sent emails for the campaign | 
@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **uniqueViews** | **Long** | Number of unique openings for the campaign | 
 **unsubscriptions** | **Long** | Number of unsubscription for the campaign | 
 **viewed** | **Long** | Number of openings for the campaign | 
-**deferred** | **Long** | Number of deferred emails for the campaign | 
+**deferred** | **Long** | Number of deferred emails for the campaign |  [optional]
 
 
 

docs/GetContactCampaignStatsOpened.md

@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **campaignId** | **Long** | ID of the campaign which generated the event | 
 **count** | **Long** | Number of openings of the campaign | 
-**eventTime** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time of the event | 
+**eventTime** | [**OffsetDateTime**] | UTC date-time of the event | 
 **ip** | **String** | IP from which the user has opened the campaign | 
 
 

docs/GetContactDetails.md

@@ -8,10 +8,10 @@ Name | Type | Description | Notes
 **id** | **Long** | ID of the contact for which you requested the details | 
 **emailBlacklisted** | **Boolean** | Blacklist status for email campaigns (true=blacklisted, false=not blacklisted) | 
 **smsBlacklisted** | **Boolean** | Blacklist status for SMS campaigns (true=blacklisted, false=not blacklisted) | 
-**modifiedAt** | [**OffsetDateTime**](OffsetDateTime.md) | Last modification UTC date-time of the contact (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**modifiedAt** | [**OffsetDateTime**] | Last modification UTC date-time of the contact (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
 **listIds** | **List<Long>** |  | 
 **listUnsubscribed** | **List<Long>** |  |  [optional]
-**attributes** | **Map<String, String>** |  | 
+**attributes** | **Object** | Set of attributes of the contact | 
 
 
 

docs/GetEmailCampaign.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **subject** | **String** | Subject of the campaign | 
 **type** | [**TypeEnum**](#TypeEnum) | Type of campaign | 
 **status** | [**StatusEnum**](#StatusEnum) | Status of the campaign | 
-**scheduledAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
+**scheduledAt** | [**OffsetDateTime**] | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
 **testSent** | **Boolean** | Retrieved the status of test email sending. (true=Test email has been sent  false=Test email has not been sent) | 
 **header** | **String** | Header of the campaign | 
 **footer** | **String** | Footer of the campaign | 
@@ -19,8 +19,8 @@ Name | Type | Description | Notes
 **htmlContent** | **String** | HTML content of the campaign | 
 **shareLink** | **String** | Link to share the campaign on social medias |  [optional]
 **tag** | **String** | Tag of the campaign | 
-**createdAt** | [**OffsetDateTime**](OffsetDateTime.md) | Creation UTC date-time of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
-**modifiedAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time of last modification of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**createdAt** | [**OffsetDateTime**] | Creation UTC date-time of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**modifiedAt** | [**OffsetDateTime**] | UTC date-time of last modification of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
 **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]

docs/GetEmailEventReportEvents.md

@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email** | **String** | Email address which generates the event | 
-**date** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time on which the event has been generated | 
+**date** | [**OffsetDateTime**] | UTC date-time on which the event has been generated | 
 **subject** | **String** | Subject of the event |  [optional]
 **messageId** | **String** | Message ID which generated the event | 
 **event** | [**EventEnum**](#EventEnum) | Event which occurred | 

docs/GetExtendedCampaignOverview.md

@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **subject** | **String** | Subject of the campaign | 
 **type** | [**TypeEnum**](#TypeEnum) | Type of campaign | 
 **status** | [**StatusEnum**](#StatusEnum) | Status of the campaign | 
-**scheduledAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
+**scheduledAt** | [**OffsetDateTime**] | UTC date-time on which campaign is scheduled (YYYY-MM-DDTHH:mm:ss.SSSZ) |  [optional]
 **testSent** | **Boolean** | Retrieved the status of test email sending. (true=Test email has been sent  false=Test email has not been sent) | 
 **header** | **String** | Header of the campaign | 
 **footer** | **String** | Footer of the campaign | 
@@ -19,8 +19,8 @@ Name | Type | Description | Notes
 **htmlContent** | **String** | HTML content of the campaign | 
 **shareLink** | **String** | Link to share the campaign on social medias |  [optional]
 **tag** | **String** | Tag of the campaign | 
-**createdAt** | [**OffsetDateTime**](OffsetDateTime.md) | Creation UTC date-time of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
-**modifiedAt** | [**OffsetDateTime**](OffsetDateTime.md) | UTC date-time of last modification of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**createdAt** | [**OffsetDateTime**] | Creation UTC date-time of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
+**modifiedAt** | [**OffsetDateTime**] | UTC date-time of last modification of the campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
 **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]

docs/GetExtendedCampaignStats.md

@@ -4,10 +4,11 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**campaignStats** | **List<Object>** |  | 
+**globalStats** | **Object** | Overall statistics of the campaign | 
+**campaignStats** | **List<Object>** | List-wise statistics of the campaign. | 
 **mirrorClick** | **Long** | Number of clicks on mirror link | 
 **remaining** | **Long** | Number of remaning emails to send | 
-**linksStats** | [**Map<String, GetExtendedCampaignStatsLinksStats>**](GetExtendedCampaignStatsLinksStats.md) |  | 
+**linksStats** | **Object** | Statistics about the number of clicks for the links | 
 **statsByDomain** | [**GetStatsByDomain**](GetStatsByDomain.md) |  |