Add events; Bump version.

README.md

@@ -17,14 +17,14 @@ Add this dependency to your project's POM:
     <dependency>
       <groupId>com.stripe</groupId>
       <artifactId>stripe-java</artifactId>
-      <version>1.0.9</version>
+      <version>RELEASE</version>
     </dependency>
 
 ### Others
 
 You'll need to manually install the following JARs:
 
-* The Stripe JAR from https://code.stripe.com/stripe-java-1.0.9.jar
+* The Stripe JAR from https://code.stripe.com/stripe-java-latest.jar
 * [Google Gson](http://code.google.com/p/google-gson/) from <http://google-gson.googlecode.com/files/google-gson-1.7.1-release.zip>.
 
 Usage

VERSION

@@ -1 +1 @@
-1.0.9
+1.0.11

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.stripe</groupId>
     <artifactId>stripe-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.9</version>
+    <version>1.0.11</version>
     <name>stripe-java</name>
     <url>https://github.com/stripe/stripe-java</url>
     <dependencies>

src/main/java/com/stripe/Stripe.java

@@ -3,6 +3,6 @@
 public abstract class Stripe
 {
 	public static final String API_BASE = "https://api.stripe.com/v1";
-	public static final String VERSION = "1.0.9";
+	public static final String VERSION = "1.0.11";
 	public static String apiKey;
 }

src/main/java/com/stripe/model/Charge.java

@@ -10,7 +10,7 @@ public class Charge extends APIResource {
 	Long created;
 	String currency;
 	String id;
-	String livemode;
+	Boolean livemode;
 	Boolean paid;
 	Boolean refunded;
 	Integer fee;
@@ -50,11 +50,11 @@ public void setCurrency(String currency) {
 		this.currency = currency;
 	}
 
-	public String getLivemode() {
+	public Boolean getLivemode() {
 		return livemode;
 	}
 
-	public void setLivemode(String livemode) {
+	public void setLivemode(Boolean livemode) {
 		this.livemode = livemode;
 	}
 

src/main/java/com/stripe/model/Coupon.java

@@ -9,7 +9,7 @@ public class Coupon extends APIResource {
 	Integer percentOff;
 	String duration;
 	String id;
-	String livemode;
+	Boolean livemode;
 	Integer durationInMonths;
 	Integer maxRedemptions;
 	Integer redeemBy;
@@ -54,11 +54,11 @@ public void setId(String id) {
 		this.id = id;
 	}
 
-	public String getLivemode() {
+	public Boolean getLivemode() {
 		return livemode;
 	}
 
-	public void setLivemode(String livemode) {
+	public void setLivemode(Boolean livemode) {
 		this.livemode = livemode;
 	}
 

src/main/java/com/stripe/model/Customer.java

@@ -8,7 +8,7 @@
 public class Customer extends APIResource {
 	Long created;
 	String id;
-	String livemode;
+	Boolean livemode;
 	String description;
 	Card activeCard;
 	String email;
@@ -34,11 +34,11 @@ public void setId(String id) {
 		this.id = id;
 	}
 
-	public String getLivemode() {
+	public Boolean getLivemode() {
 		return livemode;
 	}
 
-	public void setLivemode(String livemode) {
+	public void setLivemode(Boolean livemode) {
 		this.livemode = livemode;
 	}
 

src/main/java/com/stripe/model/Event.java

@@ -0,0 +1,63 @@
+package com.stripe.model;
+
+import java.util.Map;
+
+import com.stripe.exception.StripeException;
+import com.stripe.net.APIResource;
+
+public class Event extends APIResource {
+	String id;
+	String type;
+	Boolean livemode;
+	Long created;
+	EventData data;
+
+	public static Event retrieve(String id) throws StripeException {
+		return request(RequestMethod.GET, instanceURL(Event.class, id), null, Event.class);
+	}
+
+	public static EventCollection all(Map<String, Object> params) throws StripeException {
+		return request(RequestMethod.GET, classURL(Event.class), params, EventCollection.class);
+	}
+
+	public EventData getData() {
+		return data;
+	}
+
+	public void setData(EventData data) {
+		this.data = data;
+	}
+
+	public Long getCreated() {
+		return created;
+	}
+
+	public void setCreated(Long created) {
+		this.created = created;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String name) {
+		this.type = name;
+	}
+
+	public Boolean getLivemode() {
+		return livemode;
+	}
+
+	public void setLivemode(Boolean livemode) {
+		this.livemode = livemode;
+	}
+
+}

src/main/java/com/stripe/model/NotificationCollection.java → src/main/java/com/stripe/model/EventCollection.java

@@ -2,14 +2,14 @@
 
 import java.util.List;
 
-public class NotificationCollection extends StripeObject {
-	List<Notification> data;
+public class EventCollection extends StripeObject {
+	List<Event> data;
 	Integer count;
 
-	public List<Notification> getData() {
+	public List<Event> getData() {
 		return data;
 	}
-	public void setData(List<Notification> data) {
+	public void setData(List<Event> data) {
 		this.data = data;
 	}
 	public Integer getCount() {

src/main/java/com/stripe/model/EventData.java

@@ -0,0 +1,24 @@
+package com.stripe.model;
+
+import java.util.Map;
+
+public class EventData extends StripeObject {
+	Map<String, Object> previousAttributes;
+	StripeObject object;
+
+	public Map<String, Object> getPreviousAttributes() {
+		return previousAttributes;
+	}
+
+	public void setPreviousAttributes(Map<String, Object> previousAttributes) {
+		this.previousAttributes = previousAttributes;
+	}
+
+	public StripeObject getObject() {
+		return object;
+	}
+
+	public void setObject(StripeObject object) {
+		this.object = object;
+	}
+}

src/main/java/com/stripe/model/EventDataDeserializer.java

@@ -0,0 +1,49 @@
+package com.stripe.model;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.stripe.net.APIResource;
+
+public class EventDataDeserializer implements JsonDeserializer<EventData> {
+
+	static Map<String, Class> objectMap = new HashMap<String, Class>();
+    static {
+        objectMap.put("charge", Charge.class);
+        objectMap.put("discount", Discount.class);
+        objectMap.put("customer", Customer.class);
+        objectMap.put("invoice", Invoice.class);
+        objectMap.put("invoiceitem", InvoiceItem.class);
+        objectMap.put("plan", Plan.class);
+        objectMap.put("subscription", Subscription.class);
+        objectMap.put("token", Token.class);
+    }
+
+	public EventData deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+			throws JsonParseException {
+		EventData eventData = new EventData();
+		JsonObject jsonObject = json.getAsJsonObject();
+		for(Map.Entry<String, JsonElement> entry: jsonObject.entrySet()) {
+			String key = entry.getKey();
+			JsonElement element = entry.getValue();
+			if("previous_attributes".equals(key)) {
+				Type typeOfPrevAttrs = new TypeToken<Map<String, Object>>(){}.getType();
+				eventData.setPreviousAttributes(
+					(Map<String, Object>) APIResource.gson.fromJson(element, typeOfPrevAttrs));
+			} else if ("object".equals(key)) {
+				String type = element.getAsJsonObject().get("object").getAsString();
+				Class<StripeObject> cl = objectMap.get(type);
+				StripeObject object = APIResource.gson.fromJson(entry.getValue(), cl);
+				eventData.setObject(object);
+			}
+		}
+		return eventData;
+	}
+}

src/main/java/com/stripe/model/InvoiceItem.java

@@ -11,7 +11,7 @@ public class InvoiceItem extends APIResource {
 	String currency;
 	String description;
 	Long date;
-	String livemode;
+	Boolean livemode;
 
 	public Integer getAmount() {
 		return amount;
@@ -53,11 +53,11 @@ public void setDate(Long date) {
 		this.date = date;
 	}
 
-	public String getLivemode() {
+	public Boolean getLivemode() {
 		return livemode;
 	}
 
-	public void setLivemode(String livemode) {
+	public void setLivemode(Boolean livemode) {
 		this.livemode = livemode;
 	}
 

src/main/java/com/stripe/model/NextRecurringCharge.java

@@ -7,12 +7,15 @@ public class NextRecurringCharge extends StripeObject {
 	public Integer getAmount() {
 		return amount;
 	}
+
 	public void setAmount(Integer amount) {
 		this.amount = amount;
 	}
+
 	public String getDate() {
 		return date;
 	}
+
 	public void setDate(String date) {
 		this.date = date;
 	}

src/main/java/com/stripe/model/Plan.java

@@ -11,7 +11,7 @@ public class Plan extends APIResource {
 	String id;
 	String interval;
 	String name;
-	String livemode;
+	Boolean livemode;
 	Integer trialPeriodDays;
 
 	public static Plan create(Map<String, Object> params) throws StripeException {
@@ -74,11 +74,11 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public String getLivemode() {
+	public Boolean getLivemode() {
 		return livemode;
 	}
 
-	public void setLivemode(String livemode) {
+	public void setLivemode(Boolean livemode) {
 		this.livemode = livemode;
 	}