From 6cd7d9058ef5e173e7e1e709c0afd20adba5e4ae Mon Sep 17 00:00:00 2001
From: wangbinhui <wangbinhui@hujiang.com>
Date: Thu, 11 May 2017 11:51:09 +0800
Subject: [PATCH] To offer the way to get response headers from Download/Upload
 API call

---
 .../client/core/AbstractStoredObject.java     | 11 +++++++++++
 .../object/AbstractDownloadObjectCommand.java |  1 +
 .../impl/object/AbstractObjectCommand.java    | 19 +++++++++++++++++++
 .../javaswift/joss/model/StoredObject.java    |  4 +++-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/javaswift/joss/client/core/AbstractStoredObject.java b/src/main/java/org/javaswift/joss/client/core/AbstractStoredObject.java
index fcae344b..31a680ba 100644
--- a/src/main/java/org/javaswift/joss/client/core/AbstractStoredObject.java
+++ b/src/main/java/org/javaswift/joss/client/core/AbstractStoredObject.java
@@ -1,5 +1,6 @@
 package org.javaswift.joss.client.core;
 
+import org.apache.http.Header;
 import org.javaswift.joss.command.shared.factory.StoredObjectCommandFactory;
 import org.javaswift.joss.exception.CommandException;
 import org.javaswift.joss.headers.Metadata;
@@ -26,6 +27,8 @@ public abstract class AbstractStoredObject extends AbstractObjectStoreEntity<Obj
     private Container container;
 
     private final StoredObjectCommandFactory commandFactory;
+    
+    private Header[] responseHeaders;
 
     public AbstractStoredObject(Container container, String name, boolean allowCaching) {
         super(allowCaching);
@@ -291,6 +294,14 @@ public boolean verifyTempUrl(String method, String signature, long expiry) {
                 .setFixedExpiry(expiry)
                 .verify(signature, expiry);
     }
+    
+    public Header[] getResponseHeaders() {
+		return responseHeaders;
+	}
+
+	public void setResponseHeaders(Header[] responseHeaders) {
+		this.responseHeaders = responseHeaders;
+	}
 
     public boolean isObject() { return true; }
     public boolean isDirectory() { return false; }
diff --git a/src/main/java/org/javaswift/joss/command/impl/object/AbstractDownloadObjectCommand.java b/src/main/java/org/javaswift/joss/command/impl/object/AbstractDownloadObjectCommand.java
index 2276a59e..8067c901 100644
--- a/src/main/java/org/javaswift/joss/command/impl/object/AbstractDownloadObjectCommand.java
+++ b/src/main/java/org/javaswift/joss/command/impl/object/AbstractDownloadObjectCommand.java
@@ -49,6 +49,7 @@ protected N getReturnObject(HttpResponse response) throws IOException {
         String expectedMd5 = response.getHeaders(ETAG)[0].getValue().replaceAll("\"", "");
         boolean isManifest = Header.headerNotEmpty(response, X_OBJECT_MANIFEST);
         handleEntity(response.getEntity());
+        populateResponseHeaders(response);
         if (    !isManifest &&  // Manifest files may not be checked
                 HttpStatus.SC_PARTIAL_CONTENT != response.getStatusLine().getStatusCode()) {
                                 // etag match on partial content makes no sense)
diff --git a/src/main/java/org/javaswift/joss/command/impl/object/AbstractObjectCommand.java b/src/main/java/org/javaswift/joss/command/impl/object/AbstractObjectCommand.java
index 9f13eb94..70fed74e 100644
--- a/src/main/java/org/javaswift/joss/command/impl/object/AbstractObjectCommand.java
+++ b/src/main/java/org/javaswift/joss/command/impl/object/AbstractObjectCommand.java
@@ -1,5 +1,8 @@
 package org.javaswift.joss.command.impl.object;
 
+import java.io.IOException;
+
+import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.javaswift.joss.command.impl.core.AbstractSecureCommand;
@@ -9,8 +12,24 @@
 
 public abstract class AbstractObjectCommand<M extends HttpRequestBase, N> extends AbstractSecureCommand<M, N> {
 
+	private StoredObject object;
+	
     public AbstractObjectCommand(Account account, HttpClient httpClient, Access access, StoredObject object) {
         super(account, httpClient, getURL(access, object), access.getToken());
+        this.object = object;
+    }
+    
+    public StoredObject getStoredObject() {
+		return object;
+	}
+    
+    public void populateResponseHeaders(HttpResponse response) {
+		object.setResponseHeaders(response.getAllHeaders());
+	}
+    
+    protected N getReturnObject(HttpResponse response) throws IOException {
+		populateResponseHeaders(response);
+        return null; // returns null by default
     }
 
 }
diff --git a/src/main/java/org/javaswift/joss/model/StoredObject.java b/src/main/java/org/javaswift/joss/model/StoredObject.java
index 63fc5b86..df2e542a 100644
--- a/src/main/java/org/javaswift/joss/model/StoredObject.java
+++ b/src/main/java/org/javaswift/joss/model/StoredObject.java
@@ -1,5 +1,6 @@
 package org.javaswift.joss.model;
 
+import org.apache.http.Header;
 import org.javaswift.joss.instructions.DownloadInstructions;
 import org.javaswift.joss.instructions.UploadInstructions;
 
@@ -266,5 +267,6 @@ public interface StoredObject extends ObjectStoreEntity, Comparable<DirectoryOrO
     void setEtag(String etag);
     void setContentLength(long contentLength);
     void setContentTypeWithoutSaving(String contentType);
-
+    void setResponseHeaders(Header[] headers);
+    Header[] getResponseHeaders();
 }