merge conflicts

Author: Synapticloop

src/main/java/synapticloop/b2/Action.java

@@ -31,12 +31,9 @@ public enum Action {
 	 * "hide" means a file version marking the file as hidden, so that it will not show up in b2_list_file_names.
 	 */
 	hide,
-	/**
-	 * "upload" means a file that was uploaded.
-	 */
-	upload,
 	/**
 	 * Pending multipart upload. "start" means that a large file has been started, but not finished or canceled.
 	 */
+	upload,
 	start
 }

src/main/java/synapticloop/b2/response/B2FileInfoResponse.java

@@ -1,7 +1,11 @@
 package synapticloop.b2.response;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 /*
- * Copyright (c) 2016 Synapticloop.
+ * Copyright (c) 2016 synapticloop.
  * 
  * All rights reserved.
  * 
@@ -19,13 +23,10 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import synapticloop.b2.Action;
 import synapticloop.b2.exception.B2ApiException;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
 public class B2FileInfoResponse extends BaseB2Response {
 	private static final Logger LOGGER = LoggerFactory.getLogger(B2FileInfoResponse.class);
 
@@ -36,9 +37,9 @@ public class B2FileInfoResponse extends BaseB2Response {
 	private final Long contentLength;
 
 	private final Map<String, String> fileInfo;
-	private final Action action;
-	private final Long size;
-	private final Long uploadTimestamp;
+	private Action action;
+	private final int size;
+	private final long uploadTimestamp;
 
 	/**
 	 * Instantiate a file info response with the JSON response as a string from 
@@ -70,13 +71,19 @@ public B2FileInfoResponse(final JSONObject response) throws B2ApiException {
 
 		String action = this.readString(B2ResponseProperties.KEY_ACTION);
 		if(null != action) {
-			this.action = Action.valueOf(action);
+			try {
+				this.action = Action.valueOf(action);
+			}
+			catch(IllegalArgumentException e) {
+				LOGGER.warn("Unknown action value " + action);
+				this.action = null;
+			}
 		} else {
 			// Default
 			this.action = Action.upload;
 		}
 
-		this.size = this.readLong(B2ResponseProperties.KEY_SIZE);
+		this.size = this.readInt(B2ResponseProperties.KEY_SIZE);
 		this.uploadTimestamp = this.readLong(B2ResponseProperties.KEY_UPLOAD_TIMESTAMP);
 
 		this.warnOnMissedKeys();
@@ -135,14 +142,14 @@ public B2FileInfoResponse(final JSONObject response) throws B2ApiException {
 	/**
 	 * @return The number of bytes in the file.
 	 */
-	public Long getSize() { return this.size; }
+	public int getSize() { return this.size; }
 
 	/**
 	 * Return the timestamp that the file was uploaded
 	 *
 	 * @return the timestamp for when the file was uploaded
 	 */
-	public Long getUploadTimestamp() { return this.uploadTimestamp; }
+	public long getUploadTimestamp() { return this.uploadTimestamp; }
 
 	@Override
 	protected Logger getLogger() { return LOGGER; }
@@ -161,4 +168,4 @@ public String toString() {
 		sb.append('}');
 		return sb.toString();
 	}
-}
+}

src/main/java/synapticloop/b2/response/B2HideFileResponse.java

@@ -43,9 +43,9 @@ public class B2HideFileResponse extends BaseB2Response {
 
 	private final String fileId;
 	private final String fileName;
-	private final Action action;
-	private final Integer size;
-	private final Long uploadTimestamp;
+	private Action action;
+	private final int size;
+	private final long uploadTimestamp;
 
 	/**
 	 * Instantiate a hide file response with the JSON response as a string from 
@@ -61,9 +61,15 @@ public B2HideFileResponse(String json) throws B2ApiException {
 		this.fileId = this.readString(B2ResponseProperties.KEY_FILE_ID);
 		this.fileName = this.readString(B2ResponseProperties.KEY_FILE_NAME);
 
-		final String actionValue = this.readString(B2ResponseProperties.KEY_ACTION);
-		if(null != actionValue) {
-			this.action = Action.valueOf(actionValue);
+		final String action = this.readString(B2ResponseProperties.KEY_ACTION);
+		if(null != action) {
+			try {
+				this.action = Action.valueOf(action);
+			}
+			catch(IllegalArgumentException e) {
+				LOGGER.warn("Unknown action value " + action);
+				this.action = null;
+			}
 		} else {
 			this.action = null;
 		}