Merge pull request javaswift#62 from roikku/master

Added access to the manifest of StoredObjects

src/main/java/org/javaswift/joss/client/core/AbstractStoredObject.java

@@ -55,6 +55,11 @@ public String getEtag() {
         checkForInfoAndAllowHeaderSet();
         return info.getEtag();
     }
+
+    public String getManifest() {
+        checkForInfoAndAllowHeaderSet();
+        return info.getManifest() ;
+    }
 
     public long getContentLength() {
         checkForInfoAndAllowHeaderSet();

src/main/java/org/javaswift/joss/command/impl/object/ObjectInformationCommandImpl.java

@@ -30,6 +30,7 @@ protected ObjectInformation getReturnObject(HttpResponse response) throws IOExce
         info.setContentLength(ObjectContentLength.fromResponse(response));
         info.setContentType(ObjectContentType.fromResponse(response));
         info.setDeleteAt(DeleteAt.fromResponse(response));
+        info.setManifest(ObjectManifest.fromResponse(response));
         return info;
     }
 

src/main/java/org/javaswift/joss/headers/object/ObjectManifest.java

@@ -1,5 +1,6 @@
 package org.javaswift.joss.headers.object;
 
+import org.apache.http.HttpResponse;
 import org.javaswift.joss.headers.SimpleHeader;
 
 public class ObjectManifest extends SimpleHeader {
@@ -23,4 +24,7 @@ public String getObjectPrefix() {
         return this.getHeaderValue().substring(this.getHeaderValue().indexOf("/") + 1);
     }
 
+    public static ObjectManifest fromResponse(HttpResponse response) {
+    	return new ObjectManifest(convertResponseHeader(response, X_OBJECT_MANIFEST));
+    }
 }

src/main/java/org/javaswift/joss/information/ObjectInformation.java

@@ -15,6 +15,7 @@ public class ObjectInformation extends AbstractInformation {
     private ObjectContentType contentType;
     private DeleteAfter deleteAfter;
     private DeleteAt deleteAt;
+    private ObjectManifest manifest ;
 
     public Date getLastModifiedAsDate() {
         return lastModified == null ? null : lastModified.getDate();
@@ -78,6 +79,14 @@ public void addHeader(Collection<Header> headers, Header header) {
         }
         headers.add(header);
     }
+
+    public String getManifest () {
+    	return (manifest == null) ? (null) : (manifest.getHeaderValue()) ;
+    }
+
+    public void setManifest(ObjectManifest manifest) {
+        this.manifest = manifest;
+    }
 
     public Collection<Header> getHeaders() {
         Collection<Header> headers = new ArrayList<Header>();

src/main/java/org/javaswift/joss/model/StoredObject.java

@@ -187,6 +187,14 @@ public interface StoredObject extends ObjectStoreEntity, Comparable<DirectoryOrO
     * @return etag or hash of the StoredObject
     */
     public String getEtag();
+
+    /**
+    * The manifest of the StoredObject (relevant for large objects that are segmented). 
+    * If the Container was read by Container.list, this value will not be refetched from 
+    * the server, unless caching is disabled.
+    * @return manifest of the StoredObject, or null if the object has no manifest
+    */
+    public String getManifest();
 
     /**
     * The number of the bytes used by the StoredObject. If the Container was read by Container.list, this

src/main/java/org/javaswift/joss/swift/SwiftStoredObject.java

@@ -69,6 +69,7 @@ public ObjectInformation getInfo() {
         objectInformation.setEtag(etag);
         objectInformation.setLastModified(new ObjectLastModified(lastModified));
         objectInformation.setDeleteAt(deleteAt);
+        objectInformation.setManifest(objectManifest);
         return objectInformation;
     }
 

src/test/java/org/javaswift/joss/client/mock/StoredObjectMockTest.java

@@ -405,4 +405,12 @@ public void uploadSegmentedObjectsThrowsException(@Mocked final UploadInstructio
         object.uploadObject(instructions);
     }
 
+    @Test
+    public void getManifest() {
+        Container manifests = account.getContainer("manifests").create();
+        StoredObject manifest = manifests.getObject("manifest");
+        manifest.uploadObject(new UploadInstructions(new byte[] {} ).setObjectManifest(new ObjectManifest("segments/segment")));
+
+        assertEquals("segments/segment", manifest.getManifest());
+    }
 }

src/test/java/org/javaswift/joss/command/impl/object/ObjectInformationCommandImplTest.java

@@ -19,6 +19,7 @@
 import static org.javaswift.joss.headers.object.ObjectContentType.CONTENT_TYPE;
 import static org.javaswift.joss.headers.object.ObjectLastModified.LAST_MODIFIED;
 import static org.javaswift.joss.headers.object.ObjectMetadata.X_OBJECT_META_PREFIX;
+import static org.javaswift.joss.headers.object.ObjectManifest.X_OBJECT_MANIFEST;
 
 public class ObjectInformationCommandImplTest extends BaseCommandTest {
 
@@ -37,6 +38,7 @@ private void prepareMetadata() {
         prepareHeader(response, CONTENT_LENGTH, "654321", headers);
         prepareHeader(response, CONTENT_TYPE, "image/png", headers);
         prepareHeader(response, X_DELETE_AT, "1339429105", headers);
+        prepareHeader(response, X_OBJECT_MANIFEST, "container_segments/object", headers);
         prepareHeadersForRetrieval(response, headers);
     }
 
@@ -58,6 +60,7 @@ public void getInfoSuccess() throws IOException {
         assertEquals(654321, info.getContentLength());
         assertEquals("image/png", info.getContentType());
         assertEquals("1339429105", info.getDeleteAt().getHeaderValue());
+        assertEquals("container_segments/object", info.getManifest());
     }
 
     @Test (expected = NotFoundException.class)

src/test/java/org/javaswift/joss/information/ObjectInformationTest.java

@@ -4,6 +4,7 @@
 import org.javaswift.joss.headers.object.DeleteAfter;
 import org.javaswift.joss.headers.object.DeleteAt;
 import org.javaswift.joss.headers.object.ObjectContentType;
+import org.javaswift.joss.headers.object.ObjectManifest;
 import org.javaswift.joss.headers.object.ObjectMetadata;
 import org.junit.Test;
 
@@ -23,6 +24,7 @@ public void joinMetadataAndContentType() {
         info.setDeleteAfter(new DeleteAfter(42));
         info.setDeleteAt(new DeleteAt(new Date()));
         info.setContentType(new ObjectContentType("text/plain"));
+        info.setManifest(new ObjectManifest("container_segments/object"));
         Collection<Header> headers = info.getHeadersIncludingHeader(new ObjectContentType("image/png"));
         assertEquals(5, headers.size());
         for (Header header : headers) {
@@ -45,4 +47,10 @@ public void noHeader() {
         Collection<Header> headers = info.getHeaders();
         assertEquals(0, headers.size());
     }
+
+    @Test
+    public void getManifest() {
+        ObjectInformation info = new ObjectInformation();
+        assertNull(info.getManifest());
+    }
 }