Support for further amendments

Support for more notification handlers

Author: Ian Saunders

src/main/java/net/billforward/BillForwardClient.java

@@ -108,7 +108,11 @@ public String getApiUrl() {
 		RuntimeTypeAdapterFactory<Notification> notificationConfigAdapter = RuntimeTypeAdapterFactory.of(Notification.class, "domain");
 		mappings = Notification.getTypeMappings();
 		for(GatewayTypeMapping mapping : mappings) {
-			notificationConfigAdapter.registerSubtype((Class)mapping.getApiType(), mapping.getName());
+			if(mapping.getName() == null) {
+				notificationConfigAdapter.registerSubtype((Class)mapping.getApiType(), "default_value_mapping");				
+			} else {
+				notificationConfigAdapter.registerSubtype((Class)mapping.getApiType(), mapping.getName());				
+			}
 		}
 
 		//2014-09-12T03:00:17Z

src/main/java/net/billforward/gson/typeadapters/RuntimeTypeAdapterFactory.java

@@ -212,6 +212,9 @@ public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
         String label = labelJsonElement.getAsString();
         @SuppressWarnings("unchecked") // registration requires that subtype extends T
         TypeAdapter<R> delegate = (TypeAdapter<R>) labelToDelegate.get(label);
+        if(delegate == null) {
+        	delegate = (TypeAdapter<R>)labelToDelegate.get("default_value_mapping");
+        }
         if (delegate == null) {
           throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
               + label + "; did you forget to register a subtype?");

src/main/java/net/billforward/model/gateways/GatewayTypeMapping.java

@@ -3,12 +3,16 @@
 public class GatewayTypeMapping {
 	public Class<?> type;
 	public String name;
-	
+
 	public GatewayTypeMapping(Class<?> type, String name) {
 		super();
 		this.type = type;
 		this.name = name;
 	}
+	
+	public GatewayTypeMapping(Class<?> type) {
+		this(type, null);
+	}
 
 	public Class<?> getApiType() {
 		return type;

src/main/java/net/billforward/model/notifications/AccountNotification.java

@@ -0,0 +1,23 @@
+package net.billforward.model.notifications;
+
+import net.billforward.BillForwardClient;
+import net.billforward.model.Account;
+
+import com.google.gson.annotations.Expose;
+
+public class AccountNotification extends Notification {
+	@Expose protected Account account;
+	
+	public AccountNotification() {
+		super();
+	}
+	
+	public Account getAccount() {
+		return account;
+	}
+
+	@Override
+	protected void buildEntity() {
+		account = BillForwardClient.GSON.fromJson(this.entity, Account.class);
+	}
+}

src/main/java/net/billforward/model/notifications/AmendmentNotification.java

@@ -0,0 +1,23 @@
+package net.billforward.model.notifications;
+
+import net.billforward.BillForwardClient;
+import net.billforward.amendments.Amendment;
+
+import com.google.gson.annotations.Expose;
+
+public class AmendmentNotification extends Notification {
+	@Expose protected Amendment amendment;
+	
+	public AmendmentNotification() {
+		super();
+	}
+	
+	public Amendment getInvoice() {
+		return amendment;
+	}
+
+	@Override
+	protected void buildEntity() {
+		amendment = BillForwardClient.GSON.fromJson(this.entity, Amendment.class);
+	}
+}

src/main/java/net/billforward/model/notifications/InvoiceLineNotification.java

@@ -0,0 +1,23 @@
+package net.billforward.model.notifications;
+
+import net.billforward.BillForwardClient;
+import net.billforward.model.InvoiceLine;
+
+import com.google.gson.annotations.Expose;
+
+public class InvoiceLineNotification extends Notification {
+	@Expose protected InvoiceLine invoiceLine;
+	
+	public InvoiceLineNotification() {
+		super();
+	}
+	
+	public InvoiceLine getInvoiceLine() {
+		return invoiceLine;
+	}
+
+	@Override
+	protected void buildEntity() {
+		invoiceLine = BillForwardClient.GSON.fromJson(this.entity, InvoiceLine.class);
+	}
+}

src/main/java/net/billforward/model/notifications/Notification.java

@@ -10,7 +10,7 @@
 
 import com.google.gson.annotations.Expose;
 
-public abstract class Notification extends BillingEntity {
+public class Notification extends BillingEntity {
 
 	@Expose protected String id;
 	@Expose protected String type;
@@ -29,7 +29,9 @@ public Notification(BillForwardClient client_) {
 		super(client_);		
 	}
 
-	protected abstract void buildEntity();
+	protected void buildEntity() {
+		
+	}
 
 	@Override
 	protected ResourcePath getResourcePath() {
@@ -38,8 +40,18 @@ protected ResourcePath getResourcePath() {
 
 	public static GatewayTypeMapping[] getTypeMappings() {
 		List<GatewayTypeMapping> typeMappings = new ArrayList<GatewayTypeMapping>();
+		
+		/* Fully Support Notification types */
 		typeMappings.add(new GatewayTypeMapping(SubscripitonNotification.class, NotificationDomain.Subscription.toString()));
 		typeMappings.add(new GatewayTypeMapping(InvoiceNotification.class, NotificationDomain.Invoice.toString()));
+		typeMappings.add(new GatewayTypeMapping(AmendmentNotification.class, NotificationDomain.Amendment.toString()));
+		typeMappings.add(new GatewayTypeMapping(InvoiceLineNotification.class, NotificationDomain.InvoiceLine.toString()));
+		typeMappings.add(new GatewayTypeMapping(AccountNotification.class, NotificationDomain.Account.toString()));
+		typeMappings.add(new GatewayTypeMapping(WebhookNotification.class, NotificationDomain.Webhook.toString()));
+		
+
+		/* Catch all for other things */
+		typeMappings.add(new GatewayTypeMapping(Notification.class));
 
 		return typeMappings.toArray(new GatewayTypeMapping[]{});
 	}

src/main/java/net/billforward/model/notifications/PaymentMethodSubscriptionLinkNotification.java

@@ -0,0 +1,24 @@
+package net.billforward.model.notifications;
+
+import net.billforward.BillForwardClient;
+import net.billforward.model.InvoiceLine;
+import net.billforward.model.PaymentMethodSubscriptionLink;
+
+import com.google.gson.annotations.Expose;
+
+public class PaymentMethodSubscriptionLinkNotification extends Notification {
+	@Expose protected PaymentMethodSubscriptionLink paymentMethodSubscriptionLink;
+	
+	public PaymentMethodSubscriptionLinkNotification() {
+		super();
+	}
+	
+	public PaymentMethodSubscriptionLink getPaymentMethodSubscriptionLink() {
+		return paymentMethodSubscriptionLink;
+	}
+
+	@Override
+	protected void buildEntity() {
+		paymentMethodSubscriptionLink = BillForwardClient.GSON.fromJson(this.entity, PaymentMethodSubscriptionLink.class);
+	}
+}

src/main/java/net/billforward/model/notifications/WebhookNotification.java

@@ -0,0 +1,23 @@
+package net.billforward.model.notifications;
+
+import net.billforward.BillForwardClient;
+import net.billforward.model.Webhook;
+
+import com.google.gson.annotations.Expose;
+
+public class WebhookNotification extends Notification {
+	@Expose protected Webhook webHook;
+	
+	public WebhookNotification() {
+		super();
+	}
+	
+	public Webhook getWebhook() {
+		return webHook;
+	}
+
+	@Override
+	protected void buildEntity() {
+		webHook = BillForwardClient.GSON.fromJson(this.entity, Webhook.class);
+	}
+}

src/test/java/net/billforward/model/NotificationTests.java

@@ -3,16 +3,16 @@
 import java.io.FileNotFoundException;
 
 import net.billforward.exception.BillforwardException;
+import net.billforward.model.Invoice.InvoiceState;
 import net.billforward.model.notifications.InvoiceNotification;
 import net.billforward.model.notifications.Notification;
 import net.billforward.model.notifications.NotificationHelper;
 
 import org.junit.Test;
 
 public class NotificationTests extends TestBase {
-	//@Test
-	public void parseProvisionedSubscription() throws BillforwardException, FileNotFoundException {;
-		
+	@Test
+	public void parseProvisionedSubscription() throws BillforwardException, FileNotFoundException {
 		String content = getResourceData("notificationExamples/subscription/Provisioned.json");
 		Notification notificaiton = NotificationHelper.parse(content);
 
@@ -23,9 +23,21 @@ public class NotificationTests extends TestBase {
 	public void parsePendingInvoice() throws BillforwardException, FileNotFoundException {;
 
 		String content = getResourceData("notificationExamples/invoice/Pending.json");
+		
+		Notification notification = NotificationHelper.parse(content);
+		InvoiceNotification invoiceNotification = (InvoiceNotification)notification;
+		if(invoiceNotification.getInvoice().getState() == InvoiceState.Pending) {
+			invoiceNotification.getInvoice().issue();
+		}
+		
+		System.out.println(notification);
+	}	
+
+	@Test
+	public void parseAccountUpdated() throws BillforwardException, FileNotFoundException {;
+		
+		String content = getResourceData("notificationExamples/account/Updated.json");
 		Notification notificaiton = NotificationHelper.parse(content);
-		InvoiceNotification invoiceNotification = (InvoiceNotification)notificaiton;
-		invoiceNotification.getInvoice().issue();
 
 		System.out.println(notificaiton);
 	}