Realtime pricing calc

Author: Ian Saunders

README.md

@@ -17,14 +17,14 @@ Add this dependency to your project's POM:
     <dependency>
       <groupId>net.billforward</groupId>
       <artifactId>billforward-java</artifactId>
-      <version>1.2014.253</version>
+      <version>1.2014.254</version>
     </dependency>
 
 ### Gradle users
 
 Add this dependency to your project's build file:
 
-    compile "net.billforward:billforward-java:1.2014.253"
+    compile "net.billforward:billforward-java:1.2014.254"
 
 ### Others
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>net.billforward</groupId>
     <artifactId>billforward-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.2014.253</version>
+    <version>1.2014.254</version>
     <name>billforward-java</name>
     <url>https://github.com/billforward/bf-java</url>
     <licenses>

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

@@ -90,9 +90,9 @@ public String getApiUrl() {
 		for(GatewayTypeMapping mapping : mappings) {
 			apiConfigAdapter.registerSubtype((Class)mapping.getApiType(), mapping.getName());
 		}
-		
+		//2014-09-12T03:00:17Z
 		GSON = new GsonBuilder()
-		.setDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+		.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 		.excludeFieldsWithoutExposeAnnotation()
 		.registerTypeAdapterFactory(apiConfigAdapter)
 		.setFieldNamingPolicy(FieldNamingPolicy.IDENTITY)
@@ -332,12 +332,44 @@ private BillForwardResponse makeURLConnectionRequest(RequestMethod method, Strin
 		}
 	}
 
-	public <T> APIResponse<T> request(RequestMethod method, String url, T obj, Type responseType) throws AuthenticationException, 
-																															InvalidRequestException, 
-																															APIConnectionException, 
-																															CardException, 
-																															APIException {
 
+	
+	public <TRequest, TResponse> TResponse requestUntyped(RequestMethod method, String url, TRequest obj, Type responseType) throws AuthenticationException, 
+																										 InvalidRequestException, 
+																										 APIConnectionException, 
+																										 CardException, 
+																										 APIException {
+		url = String.format("%s/%s", apiUrl, url);
+		String originalDNSCacheTTL = null;
+		Boolean allowedToSetTTL = true;
+		try {
+			originalDNSCacheTTL = java.security.Security.getProperty(DNS_CACHE_TTL_PROPERTY_NAME);
+			// disable DNS cache
+			java.security.Security.setProperty(DNS_CACHE_TTL_PROPERTY_NAME, "0");
+		} catch (SecurityException se) {
+			allowedToSetTTL = false;
+		}
+
+		try {
+			return _requestUntyped(responseType, method, url, obj, apiKey);
+		} finally {
+			if (allowedToSetTTL) {
+				if (originalDNSCacheTTL == null) {
+					// value unspecified by implementation
+					// DNS_CACHE_TTL_PROPERTY_NAME of -1 = cache forever
+					java.security.Security.setProperty(DNS_CACHE_TTL_PROPERTY_NAME, "-1");
+				} else {
+					java.security.Security.setProperty(DNS_CACHE_TTL_PROPERTY_NAME, originalDNSCacheTTL);
+				}
+			}
+		}
+	}
+	
+	public <T> APIResponse<T> request(RequestMethod method, String url, T obj, Type responseType) throws AuthenticationException, 
+																										 InvalidRequestException, 
+																										 APIConnectionException, 
+																										 CardException, 
+																										 APIException {
 		url = String.format("%s/%s", apiUrl, url);
 		String originalDNSCacheTTL = null;
 		Boolean allowedToSetTTL = true;
@@ -364,6 +396,36 @@ public <T> APIResponse<T> request(RequestMethod method, String url, T obj, Type
 		}
 	}
 
+	
+	protected <TRequest, TResponse> TResponse  _requestUntyped(Type responseType, RequestMethod method, String url, TRequest obj, String apiKey) throws AuthenticationException,
+			InvalidRequestException, APIConnectionException, CardException,
+			APIException {
+		if ((apiKey == null || apiKey.length() == 0) && (apiKey == null || apiKey.length() == 0)) {
+			throw new AuthenticationException(
+					"No API key provided. (HINT: set your API key using 'BillForward.apiKey = <API-KEY>'. "
+							+ "You can generate API keys from the BillForward web interface. "
+							+ "See https://BillForward.com/api for details or email support@BillForward.com if you have questions.");
+		}
+
+		String query = "";
+		if(obj != null) {
+			query = GSON.toJson(obj);
+		}
+
+		BillForwardResponse response = makeURLConnectionRequest(method, url, query, apiKey);
+		int rCode = response.getResponseCode();
+		String rBody = response.getResponseBody();
+		if (rCode < 200 || rCode >= 300) {
+			handleAPIError(rBody, rCode);
+		}
+		
+		
+		TResponse acc = GSON.fromJson(rBody, responseType);
+		return acc;
+	}
+
+
+	
 	protected <T> APIResponse<T>  _request(Type responseType, RequestMethod method, String url, T obj, String apiKey) throws AuthenticationException,
 			InvalidRequestException, APIConnectionException, CardException,
 			APIException {

src/main/java/net/billforward/model/Account.java

@@ -1,5 +1,7 @@
 package net.billforward.model;
 
+import java.util.Date;
+
 import net.billforward.BillForwardClient;
 import net.billforward.exception.APIConnectionException;
 import net.billforward.exception.APIException;
@@ -23,8 +25,8 @@ public class Account extends MutableEntity<Account> {
 	@Expose protected String userID;
 	@Expose protected int successfulSubscriptions;
 	@Expose protected boolean  deleted;
-	@Expose protected String created;
-	@Expose protected String updated;
+	@Expose protected Date created;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
 	@Expose protected Profile profile;
 	@Expose protected PaymentMethod[] paymentMethods;
@@ -83,14 +85,14 @@ public void setDeleted(boolean deleted) {
 	/**
 	 * @return The UTC DateTime when the object was created. 
 	 */
-	public String getCreated() {
+	public Date getCreated() {
 		return created;
 	}
 
 	/**
 	 * @return The UTC DateTime when the object was last updated. 
 	 */
-	public String getUpdated() {
+	public Date getUpdated() {
 		return updated;
 	}
 
@@ -125,6 +127,7 @@ public static Account create(Account account) throws AuthenticationException, In
 
 	public static Account getByID(String ID) throws AuthenticationException, InvalidRequestException, APIConnectionException, CardException, APIException {
 		Account[] accs = getByID(ID, ResourcePath());
+		if(accs == null || accs.length == 0) return null;
 		return accs[0];
 	}
 

src/main/java/net/billforward/model/Address.java

@@ -1,5 +1,7 @@
 package net.billforward.model;
 
+import java.util.Date;
+
 import net.billforward.BillForwardClient;
 import net.billforward.exception.APIConnectionException;
 import net.billforward.exception.APIException;
@@ -24,9 +26,9 @@ public class Address  extends MutableEntity<Address> {
 	@Expose protected String landline = "";
 	@Expose protected Boolean primaryAddress;
 	@Expose protected Boolean deleted;
-	@Expose protected String updated;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
-	@Expose protected String created;
+	@Expose protected Date created;
 
 	public String getID() {
 		return id;
@@ -124,15 +126,15 @@ public void setDeleted(Boolean deleted) {
 		this.deleted = deleted;
 	}
 
-	public String getUpdated() {
+	public Date getUpdated() {
 		return updated;
 	}
 
 	public String getChangedBy() {
 		return changedBy;
 	}
 
-	public String getCreated() {
+	public Date getCreated() {
 		return created;
 	}
 

src/main/java/net/billforward/model/Alias.java

@@ -1,5 +1,7 @@
 package net.billforward.model;
 
+import java.util.Date;
+
 import net.billforward.BillForwardClient;
 
 import com.google.gson.annotations.Expose;
@@ -10,9 +12,9 @@ public class Alias extends BillingEntity {
 	@Expose protected String organizationID;
 	@Expose protected String alias;
 	@Expose protected boolean deleted;
-	@Expose protected String updated;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
-	@Expose protected String created;
+	@Expose protected Date created;
 
 	public String getID() {
 		return id;

src/main/java/net/billforward/model/BillingEntity.java

@@ -1,6 +1,8 @@
 package net.billforward.model;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 
 import net.billforward.BillForwardClient;
 import net.billforward.exception.APIConnectionException;

src/main/java/net/billforward/model/DunningLine.java

@@ -1,5 +1,7 @@
 package net.billforward.model;
 
+import java.util.Date;
+
 import net.billforward.BillForwardClient;
 
 import com.google.gson.annotations.Expose;
@@ -11,9 +13,9 @@ public class DunningLine extends MutableEntity<DunningLine> {
 	@Expose protected int attemptIx;
 	@Expose protected int minutesDelay;
 	@Expose protected boolean deleted;
-	@Expose protected String updated;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
-	@Expose protected String created;
+	@Expose protected Date created;
 	@Expose protected Organization organization;
 
 	public String getID() {

src/main/java/net/billforward/model/FixedTermDefinition.java

@@ -1,6 +1,7 @@
 package net.billforward.model;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import net.billforward.BillForwardClient;
 
@@ -14,12 +15,12 @@ public class FixedTermDefinition extends MutableEntity<TaxationStrategy> {
 	@Expose protected String expiryBehaviour;
 	@Expose protected int firstTermPeriods;
 	@Expose protected int subsequentTermPeriods;
-	@Expose protected String productRatePlanAsOfTime;
+	@Expose protected Date productRatePlanAsOfTime;
 	@Expose protected BigDecimal uplift;
 	@Expose protected Boolean deleted;
-	@Expose protected String updated;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
-	@Expose protected String created;
+	@Expose protected Date created;
 
 	public String getID() {
 		return id;

src/main/java/net/billforward/model/Invoice.java

@@ -1,6 +1,7 @@
 package net.billforward.model;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import net.billforward.BillForwardClient;
 import net.billforward.exception.APIConnectionException;
@@ -18,14 +19,14 @@ public class Invoice extends BillingEntity {
 	@Expose protected String accountID;
 	@Expose protected String organizationID;
 	@Expose protected String state;
-	@Expose protected String periodStart;
-	@Expose protected String periodEnd;
+	@Expose protected Date periodStart;
+	@Expose protected Date periodEnd;
 	@Expose protected Boolean deleted = false;
 	@Expose protected int totalExecutionAttempts;
-	@Expose protected String lastExecutionAttempt;
-	@Expose protected String nextExecutionAttempt;
-	@Expose protected String finalExecutionAttempt;
-	@Expose protected String paymentReceived;
+	@Expose protected Date lastExecutionAttempt;
+	@Expose protected Date nextExecutionAttempt;
+	@Expose protected Date finalExecutionAttempt;
+	@Expose protected Date paymentReceived;
 	@Expose protected String currency;
 	@Expose protected BigDecimal costExcludingTax;
 	@Expose protected BigDecimal invoiceCost;
@@ -37,9 +38,9 @@ public class Invoice extends BillingEntity {
 	@Expose protected String managedBy;
 	@Expose protected Boolean initialInvoice;
 	@Expose protected int versionNumber;
-	@Expose protected String updated;
+	@Expose protected Date updated;
 	@Expose protected String changedBy;
-	@Expose protected String created;	
+	@Expose protected Date created;	
 
 	protected InvoiceLine[] invoiceLines;
 	protected InvoicePayment[] invoicePayments;
@@ -68,11 +69,11 @@ public InvoiceState getState() {
 		return InvoiceState.valueOf(state);
 	}
 
-	public String getPeriodStart() {
+	public Date getPeriodStart() {
 		return periodStart;
 	}
 
-	public String getPeriodEnd() {
+	public Date getPeriodEnd() {
 		return periodEnd;
 	}
 
@@ -84,19 +85,19 @@ public int getTotalExecutionAttempts() {
 		return totalExecutionAttempts;
 	}
 
-	public String getLastExecutionAttempt() {
+	public Date getLastExecutionAttempt() {
 		return lastExecutionAttempt;
 	}
 
-	public String getNextExecutionAttempt() {
+	public Date getNextExecutionAttempt() {
 		return nextExecutionAttempt;
 	}
 
-	public String getFinalExecutionAttempt() {
+	public Date getFinalExecutionAttempt() {
 		return finalExecutionAttempt;
 	}
 
-	public String getPaymentReceived() {
+	public Date getPaymentReceived() {
 		return paymentReceived;
 	}
 
@@ -148,15 +149,15 @@ public int getVersionNumber() {
 		return versionNumber;
 	}
 
-	public String getUpdated() {
+	public Date getUpdated() {
 		return updated;
 	}
 
 	public String getChangedBy() {
 		return changedBy;
 	}
 
-	public String getCreated() {
+	public Date getCreated() {
 		return created;
 	}