Skip to content

Commit

Permalink
Fix: Replace S3Headers class with JsonObject
Browse files Browse the repository at this point in the history
Related to #47 and #52 but #47 is still necessary.
  • Loading branch information
shawnmaten committed Jan 18, 2018
1 parent 5b0f2f8 commit 77a613f
Showing 1 changed file with 6 additions and 27 deletions.
33 changes: 6 additions & 27 deletions src/main/java/com/filestack/internal/responses/UploadResponse.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.filestack.internal.responses;

import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;

import java.util.HashMap;
Expand All @@ -11,7 +12,7 @@ public class UploadResponse {
@SerializedName("location_url")
private String locationUrl;
@SerializedName("headers")
private S3Headers s3Headers;
private JsonObject s3Headers;

public String getUrl() {
return url;
Expand All @@ -25,32 +26,10 @@ public String getLocationUrl() {
* Return {@link Map} of S3 headers.
*/
public Map<String, String> getS3Headers() {
HashMap<String, String> headers = new HashMap<>();
headers.put("Authorization", s3Headers.auth);
if (s3Headers.acl != null) {
headers.put("x-amz-acl", s3Headers.acl);
HashMap<String, String> out = new HashMap<>();
for (String key : s3Headers.keySet()) {
out.put(key, s3Headers.get(key).getAsString());
}
headers.put("Content-MD5", s3Headers.md5);
headers.put("x-amz-content-sha256", s3Headers.sha256);
headers.put("x-amz-date", s3Headers.date);
if (s3Headers.encryption != null) {
headers.put("x-amz-server-side-encryption", s3Headers.encryption);
}
return headers;
}

private class S3Headers {
@SerializedName("Authorization")
private String auth;
@SerializedName("x-amz-acl")
private String acl;
@SerializedName("Content-MD5")
private String md5;
@SerializedName("x-amz-content-sha256")
private String sha256;
@SerializedName("x-amz-date")
private String date;
@SerializedName("x-amz-server-side-encryption")
private String encryption;
return out;
}
}

0 comments on commit 77a613f

Please sign in to comment.