Merge pull request #9 from sendinblue/feature_mixed-spec-updtaes

Mixed spec updates

Author: ekta-slit

.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]