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"
 }

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/MailchimpObject.kt

@@ -1,6 +1,5 @@
 package com.ecwid.maleorang
 
-import com.ecwid.maleorang.annotation.Field
 import com.google.gson.JsonParseException
 
 
@@ -20,10 +19,6 @@ open class MailchimpObject {
     @JvmField
     val mapping: MutableMap<String, Any?> = MailchimpObjectMapping(this)
 
-    @JvmField
-    @Field
-    var _links: List<String>? = null
-
     /**
      * Serializes this object to JSON.
      */

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/lists/segments/DeleteSegmentMethod.kt

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 import com.ecwid.maleorang.MailchimpMethod
 import com.ecwid.maleorang.MailchimpObject

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

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 import com.ecwid.maleorang.MailchimpMethod
 import com.ecwid.maleorang.MailchimpObject

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

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 
 import com.ecwid.maleorang.MailchimpMethod

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

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 
 import com.ecwid.maleorang.MailchimpMethod
@@ -38,7 +38,7 @@ class GetSegmentsMethod(
 
     @JvmField
     @QueryStringParam
-    var since_create_at: Date? = null
+    var since_created_at: Date? = null
 
     @JvmField
     @QueryStringParam

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

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 import com.ecwid.maleorang.MailchimpObject
 import com.ecwid.maleorang.annotation.Field

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

@@ -1,4 +1,4 @@
-package com.ecwid.maleorang.method.v3_0.list.segments
+package com.ecwid.maleorang.method.v3_0.lists.segments
 
 /**
  * Created by: Manuel Lara <[email protected]>

src/main/java/com/ecwid/maleorang/method/v3_0/reports/CampaignLocationInfo.kt

@@ -0,0 +1,22 @@
+package com.ecwid.maleorang.method.v3_0.reports
+
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.Field
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+class CampaignLocationInfo : MailchimpObject() {
+    @JvmField
+    @Field
+    var country_code: String? = null
+
+    @JvmField
+    @Field
+    var region: String? = null
+
+    @JvmField
+    @Field
+    var opens: Int? = null
+}

src/main/java/com/ecwid/maleorang/method/v3_0/reports/GetCampaignsLocationMethod.kt

@@ -0,0 +1,49 @@
+package com.ecwid.maleorang.method.v3_0.reports
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/reports/{campaign_id}/locations")
+class GetCampaignLocationMethod(
+        @JvmField
+        @PathParam
+        val campaign_id: String
+) : MailchimpMethod<GetCampaignLocationMethod.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
+
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var locations: List<CampaignLocationInfo>? = null
+
+        @JvmField
+        @Field
+        var campaign_id: String? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/CampaignEmailAbuseInfo.kt

@@ -0,0 +1,44 @@
+package com.ecwid.maleorang.method.v3_0.reports.email
+
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.Field
+import java.util.*
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+class CampaignEmailAbuseInfo : MailchimpObject() {
+    @JvmField
+    @Field
+    var id: Int? = null
+
+    @JvmField
+    @Field
+    var campaign_id: String? = null
+
+    @JvmField
+    @Field
+    var list_id: String? = null
+
+    @JvmField
+    @Field
+    var email_id: String? = null
+
+    @JvmField
+    @Field
+    var email_address: String? = null
+
+    @JvmField
+    @Field
+    var merge_fields: MailchimpObject? = null
+
+    @JvmField
+    @Field
+    var vip: Boolean? = null
+
+    @JvmField
+    @Field
+    var date: Date? = null
+
+}

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/EmailReportActivityDetails.kt

@@ -11,11 +11,11 @@ import java.util.*
 class EmailReportActivityDetails : MailchimpObject() {
     @JvmField
     @Field
-    var action: String? = null
+    var action: TypeEmailActivity? = null
 
     @JvmField
     @Field
-    var type: TypeEmailActivity? = null
+    var type: TypeBounceActivity? = null
 
     @JvmField
     @Field
@@ -28,5 +28,14 @@ class EmailReportActivityDetails : MailchimpObject() {
     @JvmField
     @Field
     var ip: String? = null
-
+
+
+    fun setAction(action: String) {
+        this.action = TypeEmailActivity.valueOf(action)
+    }
+
+    fun setType(type: String) {
+        this.type = TypeBounceActivity.valueOf(type)
+    }
+
 }

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/GetCampaignsAbuseEmailActivityMethod.kt

@@ -0,0 +1,40 @@
+package com.ecwid.maleorang.method.v3_0.reports.email
+
+
+import com.ecwid.maleorang.MailchimpMethod
+import com.ecwid.maleorang.MailchimpObject
+import com.ecwid.maleorang.annotation.*
+
+/**
+ * Created by: Manuel Lara <[email protected]>
+ */
+
+@Method(httpMethod = HttpMethod.GET, version = APIVersion.v3_0, path = "/reports/{campaign_id}/abuse-reports")
+class GetCampaignsAbuseEmailActivityMethod(
+        @JvmField
+        @PathParam
+        val campaign_id: String
+) : MailchimpMethod<GetCampaignsAbuseEmailActivityMethod.Response>() {
+
+    @JvmField
+    @QueryStringParam
+    var fields: String? = null
+
+    @JvmField
+    @QueryStringParam
+    var exclude_fields: String? = null
+
+    class Response : MailchimpObject() {
+        @JvmField
+        @Field
+        var abuse_report: List<CampaignEmailAbuseInfo>? = null
+
+	    @JvmField
+        @Field
+        var campaign_id: String? = null
+
+        @JvmField
+        @Field
+        var total_items: Int? = null
+    }
+}

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/GetCampaignsEmailActivityMethod.kt

@@ -27,7 +27,7 @@ class GetCampaignsEmailActivityMethod(
 
     @JvmField
     @QueryStringParam
-    var count: Int? = null
+    var count: Int? = 0
 
     @JvmField
     @QueryStringParam

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/TypeBounceActivity.kt

@@ -0,0 +1,16 @@
+package com.ecwid.maleorang.method.v3_0.reports.email
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Created by larar on 15/10/2016.
+ */
+
+enum class TypeBounceActivity(val type: String) {
+    @SerializedName("hard")
+    HARD("hard"),
+    @SerializedName("soft")
+    SOFT("soft"),
+    @SerializedName("null")
+    NONE("null")
+}

src/main/java/com/ecwid/maleorang/method/v3_0/reports/email/TypeEmailActivity.kt

@@ -1,11 +1,16 @@
 package com.ecwid.maleorang.method.v3_0.reports.email
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * Created by larar on 15/10/2016.
  */
 
 enum class TypeEmailActivity(val type: String) {
+    @SerializedName("bounce")
     BOUNCE("bounce"),
+    @SerializedName("click")
     CLICK("click"),
+    @SerializedName("open")
     OPEN("open")
 }