From 77a613fccd7164d6890c93beb1ca4cac81ef7dde Mon Sep 17 00:00:00 2001
From: Shawn Aten <shawnmaten@gmail.com>
Date: Wed, 17 Jan 2018 18:27:17 -0600
Subject: [PATCH] Fix: Replace S3Headers class with JsonObject

Related to #47 and #52 but #47 is still necessary.
---
 .../internal/responses/UploadResponse.java    | 33 ++++---------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/filestack/internal/responses/UploadResponse.java b/src/main/java/com/filestack/internal/responses/UploadResponse.java
index db8bf16..b1ab542 100644
--- a/src/main/java/com/filestack/internal/responses/UploadResponse.java
+++ b/src/main/java/com/filestack/internal/responses/UploadResponse.java
@@ -1,5 +1,6 @@
 package com.filestack.internal.responses;
 
+import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.HashMap;
@@ -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;
@@ -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;
   }
 }