Add support for Bank Statements

Bank Statement models and methods added
Bank Feed Connection models & methods merged into BankFeed package
BankFeedTests created.

Author: SidneyAllen

.gitignore

@@ -1,4 +1,5 @@
 /target/
+/src/main/resources/
 .classpath
 .project
 .settings

README.md

@@ -14,7 +14,7 @@ For those using maven, add the dependency and repository to your pom.xml
     <dependency>
 	  <groupId>com.xero</groupId>
 	  <artifactId>xero-java-sdk</artifactId>
-	  <version>1.2.0</version>
+	  <version>1.3.0</version>
 	</dependency>
 
     <repositories>
@@ -412,6 +412,122 @@ List<Invoice> InvoiceList24hour = client.getInvoices(cal.getTime(),null,null);
 System.out.println("How many invoices modified in last 24 hours?: " + InvoiceList24hour.size());
 ```
 
+**BankFeed Endpoints**
+
+Currently, BankFeed endpoints (FeedConnection & Statements) is limited beta financial institutions who are engaged with Xero.  Once these endpoints have been enabled for your Xero Partner App, use the following pattern to make API calls.
+
+```java
+import com.xero.api.*;
+import com.xero.api.ApiClient;
+import com.xero.models.bankfeeds.*;
+import com.xero.models.bankfeeds.Statements;
+import com.xero.models.bankfeeds.FeedConnection.AccountTypeEnum;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.threeten.bp.LocalDate;
+
+// Get Xero API Resource - DEMONSTRATION ONLY get token from Cookie
+TokenStorage storage = new TokenStorage();
+String token = storage.get(request,"token");
+String tokenSecret = storage.get(request,"tokenSecret");
+
+// Initialize the BankFeedApi object and set the token & secret
+ApiClient apiClientForBankFeeds = new ApiClient(config.getBankFeedsUrl(),null,null,null);
+BankFeedsApi bankFeedsApi = new BankFeedsApi(apiClientForBankFeeds);
+bankFeedsApi.setOAuthToken(token, tokenSecret);
+Map<String, String> params = null;
+
+// Get ALL Feed Connections
+try {
+	FeedConnections fc = bankFeedsApi.getFeedConnections(null);
+	System.out.println("Total Banks found: " + fc.getItems().size());
+} catch (Exception e) {
+	System.out.println(e.toString());
+}
+
+// Get one Feed Connection
+try {
+	FeedConnections fc = bankFeedsApi.getFeedConnections(null);
+	FeedConnection oneFC = bankFeedsApi.getFeedConnection("123456789",null);
+	System.out.println("One Bank: " + oneFC.getAccountName());
+} catch (Exception e) {
+	System.out.println(e.toString());
+}
+
+try {
+	FeedConnection newBank = new FeedConnection();
+	newBank.setAccountName("SDK Bank " + SampleData.loadRandomNum());
+	newBank.setAccountNumber("1234" + SampleData.loadRandomNum());
+	newBank.setAccountType(AccountTypeEnum.BANK);
+	newBank.setAccountToken("foobar" + SampleData.loadRandomNum());
+	newBank.setCurrency("GBP");
+	
+	FeedConnections arrayFeedConnections = new FeedConnections();
+	arrayFeedConnections.addItemsItem(newBank);
+	
+	FeedConnections fc1 = bankFeedsApi.createFeedConnections(arrayFeedConnections, null);
+	System.out.println("New Bank with status: " + fc1.getItems().get(0).getStatus());
+} catch (Exception e) {
+	System.out.println(e.toString());
+}
+
+
+// Create Bank Statement
+// Create One Statement
+try {
+	Statements arrayOfStatements = new Statements();
+	Statement newStatement = new Statement();
+	LocalDate stDate = LocalDate.of(2018, 9, 01);
+	newStatement.setStartDate(stDate);
+	LocalDate endDate = LocalDate.of(2018, 9, 15);
+	newStatement.endDate(endDate);
+	StartBalance stBalance = new StartBalance();
+	stBalance.setAmount("100");
+	stBalance.setCreditDebitIndicator(CreditDebitIndicator.CREDIT);
+	newStatement.setStartBalance(stBalance);
+	
+	EndBalance endBalance = new EndBalance();
+	endBalance.setAmount("300");
+	endBalance.setCreditDebitIndicator(CreditDebitIndicator.CREDIT);
+	newStatement.endBalance(endBalance);
+	
+	FeedConnections fc = bankFeedsApi.getFeedConnections(null);
+	newStatement.setFeedConnectionId(fc.getItems().get(0).getId().toString());
+	
+	StatementLine newStatementLine = new StatementLine();
+	newStatementLine.setAmount("50");
+	newStatementLine.setChequeNumber("123");
+	newStatementLine.setDescription("My new line");
+	newStatementLine.setCreditDebitIndicator(CreditDebitIndicator.CREDIT);
+	newStatementLine.setReference("Foobar");
+	newStatementLine.setPayeeName("StarLord");
+	newStatementLine.setTransactionId("1234");
+	LocalDate postedDate = LocalDate.of(2017, 9, 05);
+	newStatementLine.setPostedDate(postedDate);
+
+	StatementLines arrayStatementLines = new StatementLines();
+	arrayStatementLines.add(newStatementLine);
+	
+	newStatement.setStatementLines(arrayStatementLines);
+	arrayOfStatements.addItemsItem(newStatement);
+	Statements rStatements = bankFeedsApi.createStatements(arrayOfStatements, params);
+	
+	System.out.println("New Bank Statement Status: " + rStatements.getItems().get(0).getStatus());
+				
+} catch (Exception e) {
+	// Error throw is of type Statements - it contains an array of Errors.
+	TypeReference<Statements> typeRef = new TypeReference<Statements>() {};
+	Statements statementErrors =  apiClientForBankFeeds.getObjectMapper().readValue(e.getMessage(), typeRef);
+	System.out.println(statementErrors.getItems().get(0).getErrors().get(0).getDetail());
+}
+
+
+
+
+```
+
+
+
 **Exception Handling**
 
 Below is an example of how how to handle errors.

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.xero</groupId>
 	<artifactId>xero-java-sdk</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
 	<name>Xero-Java SDK</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>
@@ -45,7 +45,20 @@
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
+        <!-- This will get hamcrest-core automatically -->
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
         <dependency>
 		    <groupId>org.apache.httpcomponents</groupId>
 		    <artifactId>httpclient</artifactId>

src/main/java/com/xero/api/ApiClient.java

@@ -11,7 +11,6 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.Json;
-import com.xero.api.client.*;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/com/xero/api/Config.java

@@ -18,7 +18,7 @@ public interface Config {
 
     String getAssetsUrl();
 
-    String getFeedConnectionsUrl();
+    String getBankFeedsUrl();
 
     String getRequestTokenUrl();
 

src/main/java/com/xero/api/JsonConfig.java

@@ -24,14 +24,14 @@ public class JsonConfig implements Config {
   private String API_ENDPOINT_URL = "https://api.xero.com/api.xro/2.0/";
   private String FILES_ENDPOINT_URL = "https://api.xero.com/files.xro/1.0/";
   private String ASSETS_ENDPOINT_URL = "https://api.xero.com/assets.xro/1.0";
-  private String FEEDCONNECTIONS_ENDPOINT_URL = "https://api.xero.com/bankfeeds.xro/1.0";
+  private String BANKFEEDS_ENDPOINT_URL = "https://api.xero.com/bankfeeds.xro/1.0";
   private String REQUEST_TOKEN_URL = "https://api.xero.com/oauth/RequestToken";
   private String AUTHENTICATE_URL = "https://api.xero.com/oauth/Authorize";
   private String ACCESS_TOKEN_URL = "https://api.xero.com/oauth/AccessToken";
   private String API_ENDPOINT_STEM = "/api.xro/2.0/";
   private String FILES_ENDPOINT_STEM = "/files.xro/1.0/";
   private String ASSETS_ENDPOINT_STEM = "/assets.xro/1.0/";
-  private String FEEDCONNECTIONS_ENDPOINT_STEM = "/bankfeeds.xro/1.0/";
+  private String BANKFEEDS_ENDPOINT_STEM = "/bankfeeds.xro/1.0/";
   private String REQUEST_TOKEN_STEM = "/oauth/RequestToken";
   private String AUTHENTICATE_STEM = "/oauth/Authorize";
   private String ACCESS_TOKEN_STEM = "/oauth/AccessToken";
@@ -110,8 +110,8 @@ public String getAssetsUrl() {
   }
 
   @Override
-  public String getFeedConnectionsUrl() {
-    return FEEDCONNECTIONS_ENDPOINT_URL;
+  public String getBankFeedsUrl() {
+    return BANKFEEDS_ENDPOINT_URL;
   }  
 
   @Override
@@ -131,7 +131,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.2.0]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.3.0]";
   }
 
   @Override
@@ -336,11 +336,11 @@ private void load() {
 	      		ASSETS_ENDPOINT_URL = API_BASE_URL + ASSETS_ENDPOINT_STEM;
 	      }
 
-	      if (jsonObject.containsKey("FeedConnectionsEndpointPath")) {
-	    	  	String feedConnectionsEndpointPath = (String) jsonObject.get("feedConnectionsEndpointPath");
-	    	  	FEEDCONNECTIONS_ENDPOINT_URL = API_BASE_URL + feedConnectionsEndpointPath;
+	      if (jsonObject.containsKey("BankFeedsEndpointPath")) {
+	    	  	String BankFeedsEndpointPath = (String) jsonObject.get("BankFeedsEndpointPath");
+	    	  	BANKFEEDS_ENDPOINT_URL = API_BASE_URL + BankFeedsEndpointPath;
 	      } else {
-	    	  FEEDCONNECTIONS_ENDPOINT_URL = API_BASE_URL + FEEDCONNECTIONS_ENDPOINT_STEM;
+	    	  BANKFEEDS_ENDPOINT_URL = API_BASE_URL + BANKFEEDS_ENDPOINT_STEM;
 	      }
 
 	      if (jsonObject.containsKey("RequestTokenPath")) {

src/main/java/com/xero/api/OAuthRequestResource.java

@@ -44,8 +44,13 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.client.auth.oauth.OAuthSigner;
 import com.google.api.client.http.GenericUrl;
+import com.xero.api.exception.XeroExceptionHandler;
+import com.xero.models.bankfeeds.Statements;
 
 public class OAuthRequestResource {
 	private String token;
@@ -237,7 +242,9 @@ public final Map<String, String> execute() throws IOException,XeroApiException
 			if(logger.isInfoEnabled()){
 				logger.info("------------------ POST: BODY  -------------------");
 				logger.info(this.body);
+				
 			}
+		
 			httppost.setEntity(new StringEntity(this.body, "utf-8"));
 		    this.createParameters().intercept(httppost,url);
 		  	httppost.setConfig(requestConfig.build());
@@ -293,17 +300,20 @@ public final Map<String, String> execute() throws IOException,XeroApiException
 				String content = "";
 		        entity = response.getEntity();
 		        if(entity != null) {
-		        		content = EntityUtils.toString(entity);
+		        	content = EntityUtils.toString(entity);
 			    }
+	        	
 		        int code = response.getStatusLine().getStatusCode();
-		         if (code == 204) {
+		        
+		        if (code == 204) {
 					content = "<Response><Status>DELETED</Status></Response>";
 		        }
 		        if (code != 200 && code != 201 && code != 202 && code != 204) {
 		            Header rateHeader = response.getFirstHeader("x-rate-limit-problem");
 		            if (rateHeader != null) {
 		                content += "&rate=" + rateHeader.getValue().toLowerCase();
                     }
+		            
 					XeroApiException e = new XeroApiException(code,content);
 		        		throw e;
 		        }
@@ -368,4 +378,14 @@ public OAuthParameters createParameters()
 	public void setProxy(String host, int port, boolean httpsEnabled) {
 
 	}
+	
+	public static boolean isJSONValid(String jsonInString ) {
+    	try {
+    		final ObjectMapper mapper = new ObjectMapper();
+    		mapper.readTree(jsonInString);
+    		return true;
+    	} catch (IOException e) {
+    		return false;
+    	}
+    } 
 }

src/main/java/com/xero/api/XeroApiException.java

@@ -1,10 +1,22 @@
 package com.xero.api;
 
+import com.xero.api.exception.XeroExceptionHandler;
 import com.xero.model.ApiException;
+import com.xero.models.bankfeeds.Statements;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
 public class XeroApiException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
@@ -20,6 +32,7 @@ public XeroApiException(int responseCode) {
 
     public XeroApiException(int responseCode, String message) {
         super(responseCode + " response: " + message);
+        
         this.responseCode = responseCode;
         this.message = message;
     }
@@ -59,4 +72,5 @@ public Map<String, String> getMessages() {
     public ApiException getApiException() {
         return apiException;
     }
+
 }

src/main/java/com/xero/api/XeroClient.java

@@ -4,6 +4,7 @@
 import com.xero.api.exception.XeroExceptionHandler;
 import com.xero.api.jaxb.XeroJAXBMarshaller;
 import com.xero.model.*;
+import com.xero.models.assets.*;
 
 import javax.xml.bind.JAXBElement;
 
@@ -1920,4 +1921,41 @@ public ByteArrayInputStream getAttachmentContentById(String endpoint, String gui
         return getInputStream(endpoint + "/" + guid + "/Attachments/" + attachmentid, null, null, accept);
     }
 
+  //Assets
+    public Assets getAssets() throws XeroApiException, ParseException {
+   
+        try {
+            Map<String, String> params = new HashMap<String, String>();
+
+            params.put("Status","REGISTERED");
+            String resource = "https://api.xero.com/assets.xro/1.0/Assets";
+            String response = this.get2(resource, null, params);
+            
+            TypeReference<Assets> typeRef = new TypeReference<Assets>() {};
+            ApiClient apiClient = new ApiClient();
+			
+            return apiClient.getObjectMapper().readValue(response, typeRef);
+    
+        } catch (IOException e) {
+            throw xeroExceptionHandler.convertException(e);
+        }
+    }
+        
+    protected String get2(String resource, Date modifiedAfter, Map<String, String> params) throws IOException {
+		
+    		OAuthRequestResource req = new OAuthRequestResource(config, signerFactory, resource, "GET", null, params,"application/json");
+        req.setToken(token);
+        req.setTokenSecret(tokenSecret);
+        if (modifiedAfter != null) {
+            req.setIfModifiedSince(modifiedAfter);
+        }
+
+        try {
+       		Map<String, String>  resp = req.execute();
+       		Object r = resp.get("content");
+            return r.toString();
+		} catch (IOException ioe) {
+			 throw xeroExceptionHandler.convertException(ioe);
+		}
+	}
 }