added support to get Attachement by ID

Author: SidneyAllen

README.md

@@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml
     <dependency>
 	  <groupId>com.xero</groupId>
 	  <artifactId>xero-java-sdk</artifactId>
-	  <version>1.0.7</version>
+	  <version>1.0.8</version>
 	</dependency>
 
     <repositories>

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.xero</groupId>
 	<artifactId>xero-java-sdk</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.7</version>
+	<version>1.0.8</version>
 	<name>Xero-Java SDK</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>

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

@@ -114,7 +114,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.0.7]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.0.8]";
   }
 
   @Override

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

@@ -1901,7 +1901,6 @@ protected String normalizeFileNameForURI(final String fileName) {
             .replaceAll("[^\\p{Alnum}\\-_.~]", "");
     }
 
-
     public String getAttachmentContent(String endpoint, String guid, String filename, String accept, String dirPath)
         throws IOException {
         String encodedFileName = URLEncoder.encode(filename, "UTF-8").replace("+", "%20");
@@ -1913,4 +1912,9 @@ public ByteArrayInputStream getAttachmentContent(String endpoint, String guid, S
         String encodedFileName = URLEncoder.encode(filename, "UTF-8").replace("+", "%20");
         return getInputStream(endpoint + "/" + guid + "/Attachments/" + encodedFileName, null, null, accept);
     }
+    
+    public ByteArrayInputStream getAttachmentContentById(String endpoint, String guid, String attachmentid, String accept)
+        throws IOException {
+        return getInputStream(endpoint + "/" + guid + "/Attachments/" + attachmentid, null, null, accept);
+    }
 }

src/main/java/com/xero/example/RequestResourceServlet.java

@@ -7,7 +7,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-
+import java.net.URLEncoder;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.ArrayList;
@@ -36,8 +36,8 @@ public class RequestResourceServlet extends HttpServlet
 {
 	private static final long serialVersionUID = 1L; 
 	private Config config = JsonConfig.getInstance();
-    final static Logger logger = LogManager.getLogger(OAuthRequestResource.class);
-   
+	final static Logger logger = LogManager.getLogger(OAuthRequestResource.class);
+	   
 	private String htmlString =  "<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css\" integrity=\"sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7\" crossorigin=\"anonymous\">"
 			+ "<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css\" integrity=\"sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r\" crossorigin=\"anonymous\">"
 			+ "<script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js\" integrity=\"sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS\" crossorigin=\"anonymous\"></script>"
@@ -208,11 +208,11 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 				System.out.println(getInvoiceAttachment.get(0).getFileName() + " --- " +getInvoiceAttachment.get(0).getMimeType());
 
 				File f = new File("./");
-				String fileName1 = "filename.jpg";
+				String fileName1 = getInvoiceAttachment.get(0).getFileName();
 				String dirPath =  f.getCanonicalPath();
 				String saveFilePath = dirPath + File.separator + fileName1;
-				
-				InputStream in = client.getAttachmentContent("Invoices", newInvoice.get(0).getInvoiceID(),getInvoiceAttachment.get(0).getFileName(),getInvoiceAttachment.get(0).getMimeType());
+			
+				InputStream in = client.getAttachmentContentById("Invoices",newInvoice.get(0).getInvoiceID(),getInvoiceAttachment.get(0).getAttachmentID(),getInvoiceAttachment.get(0).getMimeType());
 
 				OutputStream out = new FileOutputStream(saveFilePath);