New Methods for Integration Tools

build.gradle

@@ -1,15 +1,18 @@
 buildscript {
+    ext.kotlin_version = '1.1.2-2'
     repositories {
         mavenCentral()
         jcenter()
     }
     dependencies {
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.9"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply from: 'wrapper.gradle'
+apply plugin: 'kotlin'
 apply from: 'compile.gradle'
 apply from: 'test.gradle'
 apply from: 'publish.gradle'
@@ -27,4 +30,5 @@ dependencies {
     compile 'joda-time:joda-time:2.9.4'
 
     testCompile 'org.testng:testng:6.8.21'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
 }

publish.gradle

@@ -64,6 +64,11 @@ if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePass
                             name 'Vasily Karyaev'
                             email '[email protected]'
                         }
+                        developer {
+                            id 'lararojasmr'
+                            name 'Manuel Lara'
+                            email '[email protected]'
+                        }
                     }
                 }
             }

src/main/java/com/ecwid/maleorang/MailchimpClient.kt

@@ -64,8 +64,9 @@ open class MailchimpClient protected constructor (
                 code = error.get("status").asInt
                 description = error.get("detail").asString
             }
+            throw MailchimpException(code, response.responseBody.toString())
+            //throw MailchimpException(code, description)
 
-            throw MailchimpException(code, description)
         }
 
         return MailchimpObject.fromJson(response.responseBody ?: "{}", method.resultType)

src/main/java/com/ecwid/maleorang/MailchimpMethodInfo.kt

@@ -1,14 +1,10 @@
 package com.ecwid.maleorang
 
 import com.ecwid.maleorang.annotation.*
-import com.ecwid.maleorang.annotation.Method
-import com.ecwid.maleorang.util.DateUtil.formatDate
 import com.ecwid.maleorang.util.ClassUtil.getAnnotatedFields
-
+import com.ecwid.maleorang.util.DateUtil.formatDate
 import java.net.URLEncoder
-import java.util.Collections
-import java.util.Date
-import java.util.TreeMap
+import java.util.*
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -34,7 +30,8 @@ internal class MailchimpMethodInfo(private val method: MailchimpMethod<*>) {
 
     val requestBody: String? = when (httpMethod) {
         HttpMethod.POST, HttpMethod.PATCH, HttpMethod.PUT -> method.toJson()
-        else -> null.apply { require(method.mapping.isEmpty(), { "$httpMethod method is not supposed to have request body: $method" }) }
+        else -> null.apply { require(method.mapping.isEmpty(), { "$httpMethod method is not supposed to have request " +
+                "body: $method mapping: "+ method.mapping }) }
     }
 
     fun buildUrl(apiKey: String): String {

src/main/java/com/ecwid/maleorang/MailchimpObjectGsonFactory.kt

@@ -4,9 +4,8 @@ import com.ecwid.maleorang.util.DateUtil.formatDate
 import com.ecwid.maleorang.util.DateUtil.parseDate
 import com.google.gson.*
 import com.google.gson.reflect.TypeToken
-
 import java.lang.reflect.Type
-import java.util.Date
+import java.util.*
 
 /**
  * Factory creating [Gson] objects to be used for MailChimp API calls wrapping.

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/CampaignInfo.kt

@@ -0,0 +1,55 @@
+package com.ecwid.maleorang.method.v3_0.campaign
+
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.Field
+import com.ecwid.maleorang.method.v3_0.reports.email.TypeCampaign
+import java.util.*
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+class CampaignInfo : MailchimpObject() {
+    @JvmField
+    @Field
+    var id: String? = null
+
+    @JvmField
+    @Field
+    var type: TypeCampaign? = null
+
+    @JvmField
+    @Field
+    var create_time: Date? = null
+
+    @JvmField
+    @Field
+    var archive_url: String? = null
+
+    @JvmField
+    @Field
+    var long_archive_url: String? = null
+
+    @JvmField
+    @Field
+    var status: String? = null
+
+    @JvmField
+    @Field
+    var emails_sent: Int? = null
+
+    @JvmField
+    @Field
+    var content_type: String? = null
+
+    @JvmField
+    @Field
+    var recipients: RecipientsCampaignInfo? = null
+
+    @JvmField
+    @Field
+    var settings: CampaignSettingsInfo? = null
+
+
+
+}

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/CampaignSettingsInfo.kt

@@ -0,0 +1,66 @@
+package com.ecwid.maleorang.method.v3_0.campaign
+
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.Field
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+class CampaignSettingsInfo : MailchimpObject() {
+    @JvmField
+    @Field
+    var subject_line: String? = null
+
+    @JvmField
+    @Field
+    var title: String? = null
+
+    @JvmField
+    @Field
+    var from_name: String? = null
+
+    @JvmField
+    @Field
+    var reply_to: String? = null
+
+    @JvmField
+    @Field
+    var use_conversation: String? = null
+
+    @JvmField
+    @Field
+    var to_name: String? = null
+
+    @JvmField
+    @Field
+    var folder_id: String? = null
+
+    @JvmField
+    @Field
+    var authenticate: Boolean? = null
+
+    @JvmField
+    @Field
+    var auto_footer: Boolean? = null
+
+    @JvmField
+    @Field
+    var inline_css: Boolean? = null
+
+    @JvmField
+    @Field
+    var auto_tweet: Boolean? = null
+
+    @JvmField
+    @Field
+    var fb_comments: Boolean? = null
+
+    @JvmField
+    @Field
+    var timewrap: Boolean? = null
+
+    @JvmField
+    @Field
+    var drag_and_drop: Boolean? = null
+}

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/GetCampaignMethod.kt

@@ -0,0 +1,26 @@
+package com.ecwid.maleorang.method.v3_0.campaign
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.annotation.*
+import org.apache.commons.codec.digest.DigestUtils
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/campaigns/{campaign_id}")
+class GetCampaignMethod(
+        @JvmField
+        @PathParam
+        val campaign_id: String
+) : MailchimpMethod<CampaignInfo>() {
+
+    @JvmField
+    @QueryStringParam
+    var fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var exclude_fields: String? = null
+}

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/GetCampaignsMethod.kt

@@ -0,0 +1,73 @@
+package com.ecwid.maleorang.method.v3_0.campaign
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import java.util.*
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/campaigns")
+class GetCampaignsMethod : MailchimpMethod<GetCampaignsMethod.Response>() {
+
+    @JvmField
+    @QueryStringParam
+    var fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var exclude_fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var count: Int? = null
+
+    @JvmField
+    @QueryStringParam
+    var offset: Int? = null
+
+    @JvmField
+    @QueryStringParam
+    var type: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var status: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var before_send_time: Date? = null
+
+    @JvmField
+    @QueryStringParam
+    var since_send_opt: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var before_create_time: Date? = null
+
+    @JvmField
+    @QueryStringParam
+    var since_create_time: Date? = null
+
+    @JvmField
+    @QueryStringParam
+    var list_id: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var folder_id: String? = null
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var campaigns: List<CampaignInfo>? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/RecipientsCampaignInfo.kt

@@ -0,0 +1,19 @@
+package com.ecwid.maleorang.method.v3_0.campaign
+
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.Field
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+class RecipientsCampaignInfo : MailchimpObject() {
+    @JvmField
+    @Field
+    var list_id: String? = null
+
+    @JvmField
+    @Field
+    var segment_opts: MailchimpObject? = null //TODO create SegmentOpts Object
+
+}

src/main/java/com/ecwid/maleorang/method/v3_0/campaign/TypeCampaign.kt

@@ -0,0 +1,13 @@
+package com.ecwid.maleorang.method.v3_0.reports.email
+
+/**
+ * Created by larar on 15/10/2016.
+ */
+
+enum class TypeCampaign(val type: String) {
+    REGULAR("regular"),
+    PLAINTEXT("plaintext"),
+    ABSPLIT("absplit"),
+    RSS("rss"),
+    VARIATE("variate")
+}

src/main/java/com/ecwid/maleorang/method/v3_0/lists/segments/DeleteSegmentMethod.kt

@@ -0,0 +1,22 @@
+package com.ecwid.maleorang.method.v3_0.lists.segments
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.APIVersion
+import com.ecwid.maleorang.annotation.HttpMethod
+import com.ecwid.maleorang.annotation.Method
+import com.ecwid.maleorang.annotation.PathParam
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+@Method(httpMethod = HttpMethod.DELETE, version = APIVersion.v3_0, path = "/lists/{list_id}/segments/{segment_id}")
+class DeleteSegmentMethod(
+        @JvmField
+        @PathParam
+        val list_id: String,
+
+        @JvmField
+        @PathParam
+        val segment_id: String
+) : MailchimpMethod<MailchimpObject>()