Merge pull request #26 from iterate-ch/feature/action-field

Feature/action field

Author: synapticloop

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

@@ -76,11 +76,7 @@ public B2FileInfoResponse(final JSONObject response) throws B2ApiException {
 			}
 			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);

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

@@ -24,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import synapticloop.b2.Action;
 import synapticloop.b2.exception.B2ApiException;
 
 public class B2FileResponse extends BaseB2Response {
@@ -37,6 +38,7 @@ public class B2FileResponse extends BaseB2Response {
 	private final String contentSha1;
 	private final String contentType;
 	private final Map<String, String> fileInfo;
+	private Action action;
 
 	/**
 	 * Instantiate a file response with the JSON response as a string from 
@@ -69,6 +71,16 @@ public B2FileResponse(String json) throws B2ApiException {
 			}
 		}
 
+		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.warnOnMissedKeys();
 	}
 

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

@@ -38,7 +38,7 @@ public class B2FinishLargeFileResponse extends BaseB2Response {
 	private final String contentType;
 
 	private final Map<String, String> fileInfo;
-	private final Action action;
+	private Action action;
 
 	public B2FinishLargeFileResponse(final String json) throws B2ApiException {
 		super(json);
@@ -63,10 +63,12 @@ public B2FinishLargeFileResponse(final String json) throws B2ApiException {
 
 		String action = this.readString(B2ResponseProperties.KEY_ACTION);
 		if(null != action) {
-			this.action = Action.valueOf(action);
-		} else {
-			// Default
-			this.action = Action.upload;
+			try {
+				this.action = Action.valueOf(action);
+			}
+			catch(IllegalArgumentException e) {
+				LOGGER.warn("Unknown action value " + action);
+			}
 		}
 
 		this.warnOnMissedKeys();