Improve exception safety of HttpUtil and add response message

Author: tterrag1098

src/main/java/com/creatubbles/api/request/amazon/UploadS3ImageRequest.java

@@ -4,6 +4,7 @@
 import com.creatubbles.api.core.CreatubblesRequest;
 import com.creatubbles.api.response.amazon.UploadS3ImageResponse;
 import com.creatubbles.api.util.HttpUtil;
+import com.creatubbles.api.util.HttpUtil.Response;
 
 import java.io.IOException;
 
@@ -32,12 +33,13 @@ public CreatubblesRequest<UploadS3ImageResponse> execute() {
         resetResponse();
         UploadS3ImageResponse response = new UploadS3ImageResponse();
         try {
-            response.success = isSuccessStatusCode(HttpUtil.uploadObject(data, url, HttpUtil.IMAGE_JPEG_CONTENT_TYPE));
+            Response resp = HttpUtil.uploadObject(data, url, HttpUtil.IMAGE_JPEG_CONTENT_TYPE);
+            response.success = isSuccessStatusCode(resp.code);
+            response.message = resp.message;
             setResponseCache(response);
         } catch (IOException e) {
             e.printStackTrace();
         }
         return this;
     }
-
-}
+}

src/main/java/com/creatubbles/api/util/HttpUtil.java

@@ -7,26 +7,46 @@
 import java.net.URL;
 
 public class HttpUtil {
+    
+    public static class Response {
+        public String message;
+        public int code;
+    }
 
     public static final String IMAGE_JPEG_CONTENT_TYPE = "image/jpeg";
 
-    public static int uploadObject(byte[] data, String url, String  contentType) throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) (new URL(url).openConnection());
-        connection.setDoOutput(true);
-        connection.setUseCaches(false);
-        connection.setRequestMethod(HttpMethod.PUT.name());
-        connection.setRequestProperty("Content-Type", contentType);
-        OutputStream out = connection.getOutputStream();
-        ByteArrayInputStream in = new ByteArrayInputStream(data);
-        byte[] buffer = new byte[4096];
-        int bytesRead = -1;
-        while ((bytesRead = in.read(buffer)) != -1) {
-            out.write(buffer, 0, bytesRead);
+    public static Response uploadObject(byte[] data, String url, String contentType) throws IOException {
+        HttpURLConnection connection = null;
+        Response ret = new Response();
+        try {
+            connection = (HttpURLConnection) (new URL(url).openConnection());
+            connection.setDoOutput(true);
+            connection.setUseCaches(false);
+            connection.setRequestMethod(HttpMethod.PUT.name());
+            connection.setRequestProperty("Content-Type", contentType);
+            OutputStream out = null;
+            try {
+                out = connection.getOutputStream();
+                ByteArrayInputStream in = new ByteArrayInputStream(data);
+                byte[] buffer = new byte[4096];
+                int bytesRead = -1;
+                while ((bytesRead = in.read(buffer)) != -1) {
+                    out.write(buffer, 0, bytesRead);
+                }
+                in.close();
+            } finally {
+                if (out != null) {
+                    out.flush();
+                    out.close();
+                }
+            }
+        } finally {
+            if (connection != null) {
+                ret.code = connection.getResponseCode();
+                ret.message = connection.getResponseMessage();
+                connection.disconnect();
+            }
         }
-        out.flush();
-        in.close();
-        out.close();
-        return connection.getResponseCode();
+        return ret;
     }
-
 }