From e4ad7c3fbcb878de4ea51f9f0c991bf9d5962d3b Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 20 Jul 2020 16:33:59 +0300 Subject: [PATCH 1/5] add body to complete call --- src/main/java/cc/protea/spreedly/Spreedly.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/protea/spreedly/Spreedly.java b/src/main/java/cc/protea/spreedly/Spreedly.java index 8c7536b..2829a8f 100644 --- a/src/main/java/cc/protea/spreedly/Spreedly.java +++ b/src/main/java/cc/protea/spreedly/Spreedly.java @@ -396,8 +396,8 @@ public SpreedlyPaymentMethod update(final SpreedlyPaymentMethod paymentMethod) { * For more details see https://docs.spreedly.com/guides/3dsecure2/ * @param token transaction_token to complete */ - public SpreedlyTransactionResponse complete(String token) { - return util.post("https://core.spreedly.com/v1/transactions/" + token + "/complete.xml", null, SpreedlyTransactionResponse.class); + public SpreedlyTransactionResponse complete(String token, String body) { + return util.post("https://core.spreedly.com/v1/transactions/" + token + "/complete.xml", body, SpreedlyTransactionResponse.class); } } From ad31eded7b27be08b6acf3523cfb24050589bece Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 22 Jul 2020 14:43:54 +0300 Subject: [PATCH 2/5] add SpreedlyCompleteRequest --- src/main/java/cc/protea/spreedly/Spreedly.java | 4 ++-- .../spreedly/model/SpreedlyCompleteRequest.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java diff --git a/src/main/java/cc/protea/spreedly/Spreedly.java b/src/main/java/cc/protea/spreedly/Spreedly.java index 2829a8f..b560cc8 100644 --- a/src/main/java/cc/protea/spreedly/Spreedly.java +++ b/src/main/java/cc/protea/spreedly/Spreedly.java @@ -396,8 +396,8 @@ public SpreedlyPaymentMethod update(final SpreedlyPaymentMethod paymentMethod) { * For more details see https://docs.spreedly.com/guides/3dsecure2/ * @param token transaction_token to complete */ - public SpreedlyTransactionResponse complete(String token, String body) { - return util.post("https://core.spreedly.com/v1/transactions/" + token + "/complete.xml", body, SpreedlyTransactionResponse.class); + public SpreedlyTransactionResponse complete(String token, SpreedlyCompleteRequest request) { + return util.post("https://core.spreedly.com/v1/transactions/" + token + "/complete.xml", request, SpreedlyTransactionResponse.class); } } diff --git a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java new file mode 100644 index 0000000..0922712 --- /dev/null +++ b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java @@ -0,0 +1,16 @@ + +package cc.protea.spreedly.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.Map; + + +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class SpreedlyCompleteRequest +{ + public Map context; +} From 83a75a022dfdca5a960db592a0b326e35e367d87 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 22 Jul 2020 15:06:29 +0300 Subject: [PATCH 3/5] add complete request object --- .../protea/spreedly/model/SpreedlyCompleteRequest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java index 0922712..23b19d3 100644 --- a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java +++ b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java @@ -8,9 +8,17 @@ import java.util.Map; -@XmlRootElement +@XmlRootElement(name = "transaction") @XmlAccessorType(XmlAccessType.FIELD) public class SpreedlyCompleteRequest { public Map context; + + public Map getContext() { + return context; + } + + public void setContext(Map context) { + this.context = context; + } } From 413eecc0e1e4f42210e91888d08f68ca4ef02907 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 24 Jul 2020 15:36:20 +0300 Subject: [PATCH 4/5] change complete request to map --- .../spreedly/model/SpreedlyCompleteRequest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java index 23b19d3..70b81b1 100644 --- a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java +++ b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java @@ -5,20 +5,13 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.util.HashMap; import java.util.Map; -@XmlRootElement(name = "transaction") +@XmlRootElement(name = "context") @XmlAccessorType(XmlAccessType.FIELD) -public class SpreedlyCompleteRequest +public class SpreedlyCompleteRequest extends HashMap { - public Map context; - public Map getContext() { - return context; - } - - public void setContext(Map context) { - this.context = context; - } } From 3a192774e23462d6dd1035785a80d83d51761930 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 24 Jul 2020 16:46:17 +0300 Subject: [PATCH 5/5] change to entry --- .../model/SpreedlyCompleteRequest.java | 58 +++++++++++++++++-- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java index 70b81b1..8657e35 100644 --- a/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java +++ b/src/main/java/cc/protea/spreedly/model/SpreedlyCompleteRequest.java @@ -1,17 +1,63 @@ package cc.protea.spreedly.model; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import java.util.HashMap; -import java.util.Map; +import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "context") @XmlAccessorType(XmlAccessType.FIELD) -public class SpreedlyCompleteRequest extends HashMap -{ +@XmlType(name = "", propOrder = { + "entry" +}) +@XmlRootElement(name = "context") +public class SpreedlyCompleteRequest { + + protected List entry; + + + public List getEntry() { + if (entry == null) { + entry = new ArrayList(); + } + return this.entry; + } + + public void setEntry(List entry) { + this.entry = entry; + } + + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "key", + "value" + }) + public static class Entry { + + @XmlElement(required = true) + protected String key; + @XmlElement(required = true) + protected Object value; + + public String getKey() { + return key; + } + + public void setKey(String value) { + this.key = value; + } + + public Object getValue() { + return value; + } + + public void setValue(Object value) { + this.value = value; + } + + } }