Added delete method to the base class and pagination for invoices

README.md

@@ -1,13 +1,13 @@
 Recurly Java Client
 ===================
 
-The Recurly Java Client library is an open source wrapper library to talk to Recurly's subscription management from your Java app/website. The library interacts with Recurly's [REST API](http://support.recurly.com/faqs/api).
+The Recurly Java Client library is an open source wrapper library to talk to Recurly's subscription management from your Java app/website. The library interacts with Recurly's [REST API](https://docs.recurly.com/api).
 
 
 Usage
 -----
 
-Please refer to the JUnit test cases in [RecurlyTest](https://github.com/thobach/recurly-client-java/blob/master/src/com/kwanzoo/recurly/test/RecurlyTest.java)
+Please refer to the JUnit test cases in [RecurlyTest](https://github.com/mambu-gmbh/recurly-client-java/blob/master/src/com/kwanzoo/recurly/test/RecurlyTest.java)
 
 
 Installation
@@ -19,11 +19,11 @@ Just add the latest jar(under [dist/](https://github.com/thobach/recurly-client-
 Dependencies
 ------------
 
-This wrapper relies on the excellent [Jersey REST client API](https://jersey.dev.java.net/)
+This wrapper relies on the excellent [Jersey 2 REST client API](https://jersey.dev.java.net/)
 
 Developed By
 -------------
 
 The initial code was developed by Manoj Mathai, GSLab, for Kwanzoo Inc.
 
-The Transparent Post API and further API integration was done by Thomas Bachmann, Mambu GmbH.
+The Transparent Post API, Recurly API v2, Recurly JS support, further API integration and migration to Jersey 2 was done by Thomas Bachmann, Mambu GmbH.

src/com/kwanzoo/recurly/Account.java

@@ -1,72 +1,80 @@
 package com.kwanzoo.recurly;
 
-import java.util.Date;
-
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.GenericType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.UniformInterfaceException;
+@XmlRootElement(name = "account")
+public class Account extends Base {
 
-@XmlRootElement(name="account")
-public class Account extends Base{
 	public static String pluralResourceName = "accounts";
 
-	//Required
-    @XmlElement(name="account_code")
-    public String accountCode;
-
-    @XmlElement(name="username")
-    public String username;
-
-    @XmlElement(name="first_name")
-    public String firstName;
-
-    @XmlElement(name="last_name")
-    public String lastName;
-
-    @XmlElement(name="email")
-    public String email;
-
-    @XmlElement(name="company_name")
-    public String companyName;
-
-    @XmlElement(name="balance_in_cents")
-    public Integer balanceInCents;
-
-    @XmlElement(name="created_at")
-    public Date createdAt;
-
-    @XmlElement(name="billing_info")
-    public BillingInfo billingInfo;
-
-    private static String getResourcePath(String accountCode){
+	// Required
+	@XmlElement(name = "account_code")
+	public String accountCode;
+
+	@XmlElement(name = "username")
+	public String username;
+
+	@XmlElement(name = "first_name")
+	public String firstName;
+
+	@XmlElement(name = "last_name")
+	public String lastName;
+
+	@XmlElement(name = "email")
+	public String email;
+
+	@XmlElement(name = "company_name")
+	public String companyName;
+
+	@XmlElement(name = "balance_in_cents")
+	public Integer balanceInCents;
+
+	@XmlElement(name = "billing_info")
+	public BillingInfo billingInfo;
+
+	private static String getResourcePath(String accountCode) {
 		return pluralResourceName + "/" + accountCode;
 	}
-
-    public static Account get(final String accountCode) throws Exception{
-    	try{
-    		return getWebResourceBuilder(getResourcePath(accountCode)).get(new GenericType<Account>(){});
-    	}
-    	catch(final UniformInterfaceException uie){
-    		throwStatusBasedException(uie.getResponse());
-    		return null;
-    	}
-    }
-
-    @Override
+
+	public static Account get(final String accountCode) throws Exception {
+		try {
+			return getWebResourceBuilder(getResourcePath(accountCode)).get(new GenericType<Account>() {});
+		} catch (final ResponseProcessingException rpe) {
+			throwStatusBasedException(rpe.getResponse());
+			return null;
+		}
+	}
+
+	@Override
 	protected String getResourcePath() {
 		return getResourcePath(accountCode);
 	}
 
 	@Override
 	protected String getResourceCreationPath() {
 		return pluralResourceName;
-	}  
-
-    public Account(){}
+	}
+
+	public Account() {
+	}
 
-    public Account(final String accountCode){
-    	this.accountCode = accountCode;
-    }
+	public Account(final String accountCode) {
+		this.accountCode = accountCode;
+	}
+
+	public void reopen() throws Exception {
+		try {
+			getWebResourceBuilder(getResourceReopenPath()).put(Entity.xml(this));
+		} catch (final ResponseProcessingException rpe) {
+			throwStatusBasedException(rpe.getResponse());
+		}
+	}
+
+	private String getResourceReopenPath() {
+		return pluralResourceName + "/" + accountCode + "/reopen";
+	}
 }

src/com/kwanzoo/recurly/AccountResponse.java

@@ -0,0 +1,87 @@
+package com.kwanzoo.recurly;
+
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.GenericType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Response class for {@link Account} objects. Required since request class {@link Account} may not contain
+ * hostedLoginToken parameter.
+ */
+@XmlRootElement(name = "account")
+public class AccountResponse extends Base {
+
+	public static String pluralResourceName = "accounts";
+
+	// Required
+	@XmlElement(name = "account_code")
+	public String accountCode;
+
+	@XmlElement(name = "username")
+	public String username;
+
+	@XmlElement(name = "first_name")
+	public String firstName;
+
+	@XmlElement(name = "last_name")
+	public String lastName;
+
+	@XmlElement(name = "email")
+	public String email;
+
+	@XmlElement(name = "company_name")
+	public String companyName;
+
+	@XmlElement(name = "balance_in_cents")
+	public Integer balanceInCents;
+
+	@XmlElement(name = "billing_info")
+	public BillingInfo billingInfo;
+
+	@XmlElement(name = "hosted_login_token")
+	public String hostedLoginToken;
+
+	private static String getResourcePath(String accountCode) {
+		return pluralResourceName + "/" + accountCode;
+	}
+
+	public static AccountResponse get(final String accountCode) throws Exception {
+		try {
+			return getWebResourceBuilder(getResourcePath(accountCode)).get(new GenericType<AccountResponse>() {});
+		} catch (final ResponseProcessingException rpe) {
+			throwStatusBasedException(rpe.getResponse());
+			return null;
+		}
+	}
+
+	@Override
+	protected String getResourcePath() {
+		return getResourcePath(accountCode);
+	}
+
+	@Override
+	protected String getResourceCreationPath() {
+		return pluralResourceName;
+	}
+
+	public AccountResponse() {
+	}
+
+	public AccountResponse(final String accountCode) {
+		this.accountCode = accountCode;
+	}
+
+	@Override
+	public void create() throws Exception {
+		throw new UnsupportedOperationException(
+				"AccountResponse class can only be used for retrieving and deleting data, use Account class for creating data.");
+	}
+
+	@Override
+	public void update() throws Exception {
+		throw new UnsupportedOperationException(
+				"AccountResponse class can only be used for retrieving and deleting data, use Account class for updating data.");
+	}
+
+}

src/com/kwanzoo/recurly/Addon.java

@@ -0,0 +1,17 @@
+package com.kwanzoo.recurly;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "subscription_add_on")
+public class Addon {
+
+	@XmlElement(name = "add_on_code")
+	public String addOnCode;
+
+	@XmlElement(name = "quantity")
+	public Integer quantity;
+
+	@XmlElement(name = "unit_amount_in_cents")
+	public Integer unitAmountInCents;
+}

src/com/kwanzoo/recurly/Adjustment.java

@@ -0,0 +1,76 @@
+package com.kwanzoo.recurly;
+
+import java.util.Date;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "adjustment")
+public class Adjustment extends Base {
+
+	private static String resourceName = "adjustments";
+
+	@XmlElement(name = "unit_amount_in_cents")
+	public Integer unitAmountInCents;
+
+	@XmlElement(name = "discount_in_cents")
+	public Integer discountInCents;
+
+	@XmlElement(name = "tax_in_cents")
+	public Integer taxInCents;
+
+	@XmlElement(name = "total_in_cents")
+	public Integer totalInCents;
+
+	@XmlElement(name = "description")
+	public String description;
+
+	@XmlElement(name = "currency")
+	public String currency;
+
+	@XmlElement(name = "uuid")
+	public String uuid;
+
+	@XmlElement(name = "accounting_code")
+	public String accountingCode;
+
+	@XmlElement(name = "tax_exempt")
+	public Boolean taxExempt;
+
+	@XmlElement(name = "product_code")
+	public String productCode;
+
+	@XmlElement(name = "origin")
+	public String origin;
+
+	@XmlElement(name = "quantity")
+	public String quantity;
+
+	@XmlElement(name = "start_date")
+	public Date startDate;
+
+	@XmlElement(name = "created_at")
+	public Date createdAt;
+
+	@XmlElement(name = "end_date")
+	public Date endDate;
+
+	private String accountCode;
+
+	@Override
+	protected String getResourcePath() {
+		return Account.pluralResourceName + "/" + accountCode + "/" + resourceName;
+	}
+
+	@Override
+	protected String getResourceCreationPath() {
+		return getResourcePath();
+	}
+
+	public Adjustment() {
+	}
+
+	public Adjustment(final String accountCode) {
+		this.accountCode = accountCode;
+	}
+}