Merge pull request #14 from thijskok/revised-attachment-handling

Revised attachment handling

Author: thijskok

src/main/java/com/testmonitor/actions/TestResults.java

@@ -100,7 +100,7 @@ public ArrayList<TestResult> search(String query) throws IOException, URISyntaxE
      * @return The created test result
      */
     public TestResult create(TestResult testResult) throws IOException {
-        JSONObject response = this.connector.post("test-results", testResult.toHttpParams());
+        JSONObject response = this.connector.multiPartPost("test-results", testResult.toHttpParams(), testResult.getAttachments());
 
         HashMap<String, Object> newTestResult = (HashMap<String, Object>) response.getJSONObject("data").toMap();
 
@@ -131,7 +131,7 @@ public TestResult update(TestResult testResult) throws IOException {
      * @return The test result
      */
     public TestResult addAttachment(TestResult testResult, File attachment) throws IOException {
-        this.connector.postAttachment("test-result/" + testResult.getId()  + "/attachments", attachment);
+        this.connector.postFile("test-result/" + testResult.getId()  + "/attachments", "file", attachment);
 
         return testResult;
     }

src/main/java/com/testmonitor/api/Connector.java

@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -142,21 +143,49 @@ public JSONObject put(String uri, List<NameValuePair> params) throws IOException
         return this.request(httpput);
     }
 
+    /**
+     * Send a post request using multipart.
+     *
+     * @param uri A relative path
+     * @param params The arguments to post
+     * @param files The files to post
+     *
+     * @return The HTTP response as a JSONObject.
+     */
+    public JSONObject multiPartPost(String uri, List<NameValuePair> params, HashMap<String, File> files) throws IOException {
+        HttpPost httppost = new HttpPost(this.baseUrl(uri));
+
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.setMode(HttpMultipartMode.EXTENDED);
+
+        // Handle plain post parameters
+        params.forEach((pair -> builder.addTextBody(pair.getName(), pair.getValue())));
+
+        // Handle file attachments
+        files.forEach((name, file) -> builder.addPart(name, new FileBody(file, ContentType.DEFAULT_BINARY)));
+
+        HttpEntity entity = builder.build();
+
+        httppost.setEntity(entity);
+
+        return this.request(httppost);
+    }
+
     /**
      * Send an attachment.
      *
      * @param uri A relative path
+     * @param name Field name
      * @param file The file attachment
      *
      * @return The HTTP response as a JSONObject.
      */
-    public JSONObject postAttachment(String uri, File file) throws IOException {
+    public JSONObject postFile(String uri, String name, File file) throws IOException {
         HttpPost post = new HttpPost(this.baseUrl(uri));
-        FileBody fileBody = new FileBody(file, ContentType.DEFAULT_BINARY);
 
         MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.EXTENDED);
-        builder.addPart("file", fileBody);
+        builder.addPart(name, new FileBody(file, ContentType.DEFAULT_BINARY));
 
         HttpEntity entity = builder.build();
 

src/main/java/com/testmonitor/parsers/TestResultParser.java

@@ -7,9 +7,9 @@
 
 public class TestResultParser {
     /**
-     * Parse a JSONObject in a list of milestones
+     * Parse a JSONObject in a list of test results
      *
-     * @param response The JSON response of a request
+     * @param response The JSON response of a reqsuest
      *
      * @return A parsed list of test results
      */
@@ -27,11 +27,11 @@ public static ArrayList<TestResult> parse(JSONObject response)
     }
 
     /**
-     * Parse a hashmap into a milestone.
+     * Parse a hashmap into a test result.
      *
-     * @param item the hashmap that contains the milestone data.
+     * @param item the hashmap that contains the test result data.
      *
-     * @return The parsed milestone
+     * @return The parsed test result
      */
     public static TestResult parse(HashMap<String, Object> item)
     {

src/main/java/com/testmonitor/resources/TestResult.java

@@ -3,7 +3,9 @@
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class TestResult {
@@ -19,6 +21,8 @@ public class TestResult {
 
     private Integer testResultCategoryId;
 
+    private ArrayList<File> attachments = new ArrayList<File>();
+
     public TestResult setId(Integer id) {
         this.id = id;
 
@@ -109,6 +113,20 @@ public TestResult setDraft(String draft) {
         return this;
     }
 
+    public void addAttachment(File attachment) {
+        this.attachments.add(attachment);
+    }
+
+    public HashMap<String, File> getAttachments() {
+        return new HashMap<String, File>() {{
+            attachments.forEach((file) -> put("file", file));
+        }};
+    }
+
+    public void clearAttachments() {
+        this.attachments.clear();
+    }
+
     public List<NameValuePair> toHttpParams() {
         List<NameValuePair> params = new ArrayList<>();