New Methods for Integration Tools

README.md

@@ -15,7 +15,7 @@ However, it is easy to extend the API and add support for any method you need (s
 ### Code samples
 
 * [Using an existing method implementation (Java)](src/test/java/com/ecwid/maleorang/examples/ExistingMethodExample.java)
-* [Using an existing method implementation (Kotlin)](src/test/java/com/ecwid/maleorang/method/v3_0/members/MembersTest.kt)
+* [Using an existing method implementation (Kotlin)](src/test/java/com/ecwid/maleorang/method/v3_0/lists/members/MembersTest.kt)
 * [Using a custom method implementation (Java)](src/test/java/com/ecwid/maleorang/examples/CustomMethodExample.java)
 
 ### Build tools integration

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

@@ -3,7 +3,7 @@ apply plugin: 'signing'
 
 group = 'com.ecwid'
 archivesBaseName = "maleorang"
-version = '3.0-0.9.4'
+version = '3.0-0.9.6'
 
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
@@ -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

@@ -60,12 +60,15 @@ open class MailchimpClient protected constructor (
             var description = response.reasonPhrase
 
             if (response.responseBody != null) {
-                val error = JsonParser().parse(response.responseBody).asJsonObject
-                code = error.get("status").asInt
-                description = error.get("detail").asString
+                try {
+                    val error = JsonParser().parse(response.responseBody).asJsonObject
+                    code = error.get("status").asInt
+                    description = error.get("detail").asString
+                } catch (e: Exception){}
             }
+            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/automation/GetAutomationEmailMethod.kt

@@ -0,0 +1,31 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowEmailInfo
+
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/emails/#read-get_automations_workflow_id_emails_workflow_email_id)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations/{workflow_id}/emails/{workflow_email_id}")
+class GetAutomationEmailMethod(
+
+        @JvmField
+        @PathParam
+        val workflow_id: String,
+
+        @JvmField
+        @PathParam
+        val workflow_email_id: String
+
+) : MailchimpMethod<GetAutomationEmailMethod.Response>() {
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var email: WorkflowEmailInfo? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/automation/GetAutomationEmailsMethod.kt

@@ -0,0 +1,34 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowEmailInfo
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/emails/#read-get_automations_workflow_id)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations/{workflow_id}/emails")
+class GetAutomationEmailsMethod(
+
+        @JvmField
+        @PathParam
+        val workflow_id: String
+
+) : MailchimpMethod<GetAutomationEmailsMethod.Response>() {
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var emails: List<WorkflowEmailInfo>? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+
+        @JvmField
+        @Field
+        var _links: MailchimpObject? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/automation/GetAutomationMethod.kt

@@ -0,0 +1,25 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowInfo
+
+/**
+ * [Get information about a specific automation workflow](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/#read-get_automations_workflow_id)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations/{workflow_id}")
+class GetAutomationMethod(
+        @JvmField
+        @PathParam
+        val workflow_id: String
+) : MailchimpMethod<WorkflowInfo>() {
+
+    @JvmField
+    @QueryStringParam
+    var fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var exclude_fields: String? = null
+}

src/main/java/com/ecwid/maleorang/method/v3_0/automation/GetAutomationsMethod.kt

@@ -0,0 +1,56 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowInfo
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/#read-get_automations)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations")
+class GetAutomationsMethod : MailchimpMethod<GetAutomationsMethod.Response>() {
+
+    @JvmField
+    @QueryStringParam
+    var fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var exclude_fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var before_create_time: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var since_create_time: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var before_send_time: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var since_send_time: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var status: String? = null
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var automations: List<WorkflowInfo>? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+
+        @JvmField
+        @Field
+        var _links: MailchimpObject? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/automation/GetQueueAutomationMethod.kt

@@ -0,0 +1,45 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowEmailQueue
+
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/emails/#read-get_automations_workflow_id_emails_workflow_email_id)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations/{workflow_id}/emails/{workflow_email_id}/queue")
+class GetQueueAutomationMethod(
+
+        @JvmField
+        @PathParam
+        val workflow_id: String,
+
+        @JvmField
+        @PathParam
+        val workflow_email_id: String
+
+) : MailchimpMethod<GetQueueAutomationMethod.Response>(){
+
+    class Response : MailchimpObject() {
+
+        @JvmField
+        @Field
+        var workflow_id: String? = null
+
+        @JvmField
+        @Field
+        var email_id: String? = null
+
+        @JvmField
+        @Field
+        var queue: List<WorkflowEmailQueue>? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/automation/GetQueueEmailAutomationMethod.kt

@@ -0,0 +1,28 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowEmailQueue
+
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/emails/#read-get_automations_workflow_id_emails_workflow_email_id)
+ */
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/automations/{workflow_id}/emails/{workflow_email_id}/queue/{subscriber_hash}")
+class GetQueueEmailAutomationMethod(
+
+        @JvmField
+        @PathParam
+        val workflow_id: String,
+
+        @JvmField
+        @PathParam
+        val workflow_email_id: String,
+
+        @JvmField
+        @PathParam
+        val subscriber_hash: String
+
+) : MailchimpMethod<WorkflowEmailQueue>()

src/main/java/com/ecwid/maleorang/method/v3_0/automation/QueueEmailAutomationMethod.kt

@@ -0,0 +1,28 @@
+package com.ecwid.maleorang.method.v3_0.automation
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.annotation.*
+import com.ecwid.maleorang.method.v3_0.automation.info.WorkflowEmailQueue
+
+
+/**
+ * [Get information about automations](http://developer.mailchimp.com/documentation/mailchimp/reference/automations/emails/#read-get_automations_workflow_id_emails_workflow_email_id)
+ */
+@Method(httpMethod = HttpMethod.POST, version = APIVersion.v3_0, path = "/automations/{workflow_id}/emails/{workflow_email_id}/queue")
+class QueueEmailAutomationMethod(
+
+        @JvmField
+        @PathParam
+        val workflow_id: String,
+
+        @JvmField
+        @PathParam
+        val workflow_email_id: String
+
+) : MailchimpMethod<WorkflowEmailQueue>(){
+
+    @JvmField
+    @PathParam
+    val email_address: String? = null
+}