Merge branch 'pr/16'

Author: Synapticloop

src/main/java/synapticloop/b2/B2ApiClient.java

@@ -25,14 +25,8 @@ public class B2ApiException extends Exception {
 	private String code;
 	private String message;
 	private int status = -1;
-	private String originalMessage;
 
-	/**
-	 * Create a new B2Api Exception
-	 */
-	public B2ApiException() {
-		super();
-	}
+	private final String json;
 
 	/**
 	 * Create a new B2 Exception with a message.  If the message is in JSON (as 
@@ -45,11 +39,12 @@ public B2ApiException() {
 	 *   <li>message - A human-readable message, in English, saying what went wrong.</li>
 	 * </ul>
 	 * 
-	 * @param message The message of the exception
+	 * @param json The message of the exception
 	 */
-	public B2ApiException(String message) {
-		super(message);
-		parseMessage(message);
+	public B2ApiException(String json) {
+		super(json);
+		this.json = json;
+		this.parse(json);
 	}
 
 	/**
@@ -63,44 +58,28 @@ public B2ApiException(String message) {
 	 *   <li>message - A human-readable message, in English, saying what went wrong.</li>
 	 * </ul>
 	 * 
-	 * @param message The message of the exception
+	 * @param json The message of the exception
 	 * @param cause the root cause of the exception
 	 */
-	public B2ApiException(String message, Throwable cause) {
-		super(message, cause);
-		parseMessage(message);
-	}
-
-	/**
-	 * Create a new B2Api Exception with a root cause
-	 * 
-	 * @param cause The root cause of the exception
-	 */
-	public B2ApiException(Throwable cause) {
-		super(cause);
+	public B2ApiException(String json, Throwable cause) {
+		super(json, cause);
+		this.json = json;
+		this.parse(json);
 	}
 
-	private void parseMessage(String json) {
-		this.originalMessage = json;
-
-		if(null == json) {
-			return;
-		}
 
-		try {
-			JSONObject jsonObject = new JSONObject(json);
+	private void parse(String json) {
+		if (null != json) {
+			try {
+				JSONObject jsonObject = new JSONObject(json);
+				this.message = jsonObject.optString("message", null);
+				this.status = jsonObject.optInt("status", -1);
+				this.code = jsonObject.optString("code", null);
 
-			String tempMessage = jsonObject.getString("message");
-			if(null != tempMessage) {
-				this.message = tempMessage;
+			} catch (JSONException ex) {
+				// Ignore
+				this.message = json;
 			}
-
-			this.status = jsonObject.optInt("status");
-			this.code = jsonObject.optString("code", null);
-
-		} catch (JSONException ex) {
-			this.code = "not_json";
-			this.message = json;
 		}
 	}
 
@@ -129,8 +108,8 @@ public String getMessage() {
 	 * 
 	 * @return the original message text
 	 */
-	public String getOriginalMessage() { 
-		return this.originalMessage; 
+	public String getJson() {
+		return this.json;
 	}
 
 	/**

src/main/java/synapticloop/b2/exception/B2ApiException.java

@@ -72,12 +72,8 @@ public B2AuthorizeAccountRequest(CloseableHttpClient client, String accountId,
 	 * 
 	 * @throws B2ApiException if there was an error with the call
 	 */
-	public B2AuthorizeAccountResponse getResponse() throws B2ApiException {
+	public B2AuthorizeAccountResponse getResponse() throws B2ApiException, IOException {
 		final CloseableHttpResponse httpResponse = executeGet();
-		try {
-			return(new B2AuthorizeAccountResponse(EntityUtils.toString(httpResponse.getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+		return new B2AuthorizeAccountResponse(EntityUtils.toString(httpResponse.getEntity()));
 	}
 }

src/main/java/synapticloop/b2/request/B2AuthorizeAccountRequest.java

@@ -72,11 +72,7 @@ public B2CreateBucketRequest(CloseableHttpClient client, B2AuthorizeAccountRespo
 	 * 
 	 * @throws B2ApiException if there was an error with the call
 	 */
-	public B2BucketResponse getResponse() throws B2ApiException {
-		try {
-			return(new B2BucketResponse(EntityUtils.toString(executePost().getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+	public B2BucketResponse getResponse() throws B2ApiException, IOException {
+		return new B2BucketResponse(EntityUtils.toString(executePost().getEntity()));
 	}
 }

src/main/java/synapticloop/b2/request/B2CreateBucketRequest.java

@@ -61,11 +61,7 @@ public B2DeleteBucketRequest(CloseableHttpClient client, B2AuthorizeAccountRespo
 	 * @throws B2ApiException if there was an error with the call, or if you are
 	 *     trying to delete a bucket which is not empty
 	 */
-	public B2BucketResponse getResponse() throws B2ApiException {
-		try {
-			return(new B2BucketResponse(EntityUtils.toString(executePost().getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+	public B2BucketResponse getResponse() throws B2ApiException, IOException {
+		return new B2BucketResponse(EntityUtils.toString(executePost().getEntity()));
 	}
 }

src/main/java/synapticloop/b2/request/B2DeleteBucketRequest.java

@@ -66,11 +66,7 @@ public B2DeleteFileVersionRequest(CloseableHttpClient client, B2AuthorizeAccount
 	 * 
 	 * @throws B2ApiException if there was an error with the call
 	 */
-	public B2DeleteFileVersionResponse getResponse() throws B2ApiException {
-		try {
-			return(new B2DeleteFileVersionResponse(EntityUtils.toString(executePost().getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+	public B2DeleteFileVersionResponse getResponse() throws B2ApiException, IOException {
+		return new B2DeleteFileVersionResponse(EntityUtils.toString(executePost().getEntity()));
 	}
 }

src/main/java/synapticloop/b2/request/B2DeleteFileVersionRequest.java

@@ -23,6 +23,8 @@
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2DownloadFileResponse;
 
+import java.io.IOException;
+
 /**
  * <p>Downloads one file from B2.</p>
  * 
@@ -112,7 +114,7 @@ public B2DownloadFileByIdRequest(CloseableHttpClient client, B2AuthorizeAccountR
 	 * @return The download file response
 	 * @throws B2ApiException If there was an error with the call
 	 */
-	public B2DownloadFileResponse getResponse() throws B2ApiException {
-		return (new B2DownloadFileResponse(executeGet()));
+	public B2DownloadFileResponse getResponse() throws B2ApiException, IOException {
+		return new B2DownloadFileResponse(executeGet());
 	}
 }

src/main/java/synapticloop/b2/request/B2DownloadFileByIdRequest.java

@@ -24,6 +24,8 @@
 import synapticloop.b2.response.B2DownloadFileResponse;
 import synapticloop.b2.util.URLEncoder;
 
+import java.io.IOException;
+
 /**
  * <p>Downloads one file by providing the name of the bucket and the name of the file.</p>
  * 
@@ -91,7 +93,7 @@ public B2DownloadFileByNameRequest(CloseableHttpClient client, B2AuthorizeAccoun
 	 * 
 	 * @throws B2ApiException If there was an error with the call
 	 */
-	public B2DownloadFileResponse getResponse() throws B2ApiException {
-		return(new B2DownloadFileResponse(executeGet()));
+	public B2DownloadFileResponse getResponse() throws B2ApiException, IOException {
+		return new B2DownloadFileResponse(executeGet());
 	}
 }

src/main/java/synapticloop/b2/request/B2DownloadFileByNameRequest.java

@@ -62,11 +62,7 @@ public B2GetFileInfoRequest(CloseableHttpClient client, B2AuthorizeAccountRespon
 	 * 
 	 * @throws B2ApiException if there was an error with the call
 	 */
-	public B2FileResponse getResponse() throws B2ApiException {
-		try {
-			return(new B2FileResponse(EntityUtils.toString(executePost().getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+	public B2FileResponse getResponse() throws B2ApiException, IOException {
+		return new B2FileResponse(EntityUtils.toString(executePost().getEntity()));
 	}
 }

src/main/java/synapticloop/b2/request/B2GetFileInfoRequest.java

@@ -61,11 +61,7 @@ public B2GetUploadUrlRequest(CloseableHttpClient client, B2AuthorizeAccountRespo
 	 * 
 	 * @throws B2ApiException if something went wrong
 	 */
-	public B2GetUploadUrlResponse getResponse() throws B2ApiException {
-		try {
-			return(new B2GetUploadUrlResponse(EntityUtils.toString(executePost().getEntity())));
-		} catch(IOException e) {
-			throw new B2ApiException(e);
-		}
+	public B2GetUploadUrlResponse getResponse() throws B2ApiException, IOException {
+		return new B2GetUploadUrlResponse(EntityUtils.toString(executePost().getEntity()));
 	}
 }