Merge branch 'sergio91pt-issue_592_unsaved_rev_attach_content'

Author: Hideki Itakura

src/main/java/com/couchbase/lite/Attachment.java

@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.zip.GZIPInputStream;
 
 /**
  * A Couchbase Lite Document Attachment.
@@ -124,15 +125,36 @@ public String getContentType() {
     public InputStream getContent() throws CouchbaseLiteException {
         if (body != null) {
             return body;
-        }
-        else {
+        } else {
             Database db = revision.getDatabase();
-            Attachment attachment = db.getAttachmentForSequence(revision.getSequence(), this.name);
+            long sequence = getAttachmentSequence();
+            if (sequence == 0) {
+                throw new CouchbaseLiteException(Status.INTERNAL_SERVER_ERROR);
+            }
+            Attachment attachment = db.getAttachmentForSequence(sequence, this.name);
             body = attachment.getContent();
+            if (attachment.getGZipped()) {
+                // Client does not expect a gzipped stream.
+                // Only Router handles gzipped streams and uses getAttachmentForSequence directly.
+                try {
+                    body = new GZIPInputStream(body);
+                } catch (IOException e) {
+                    throw new CouchbaseLiteException(e.getMessage(), Status.STATUS_ATTACHMENT_ERROR);
+                }
+            }
+            gzipped = false;
             return body;
         }
     }
 
+    private long getAttachmentSequence() {
+        long sequence = revision.getSequence();
+        if (sequence == 0) {
+            sequence = revision.getParentSequence();
+        }
+        return sequence;
+    }
+
     /**
      * This is just for compatibility with iOS implementation.
      *
@@ -141,16 +163,16 @@ public InputStream getContent() throws CouchbaseLiteException {
     @InterfaceAudience.Private
     public URL getContentURL(){
         try {
-            if (revision.getSequence() > 0) {
-                //Database db = revision.getDatabase();
-                //Attachment attachment = db.getAttachmentForSequence(revision.getSequence(), this.name);
-                String path = revision.getDatabase().getAttachmentPathForSequence(revision.getSequence(), this.name);
+            long sequence = getAttachmentSequence();
+            if (sequence > 0) {
+                Database db = revision.getDatabase();
+                //Attachment attachment = db.getAttachmentForSequence(sequence, this.name);
+                String path = db.getAttachmentPathForSequence(sequence, this.name);
                 if (path != null) {
                     return new File(path).toURI().toURL();
                 }
             }
-        }
-        catch(Exception e){
+        } catch(Exception e){
             Log.d(Log.TAG_DATABASE, e.getMessage());
         }
         return null;

src/main/java/com/couchbase/lite/Revision.java

@@ -17,11 +17,6 @@
  */
 public abstract class Revision {
 
-    /**re
-     * The sequence number of this revision.
-     */
-    protected long sequence;
-
     /**
      * The document this is a revision of
      */
@@ -67,7 +62,7 @@ public Document getDocument() {
     }
 
     /**
-     * Gets the Revision's id.
+     * Gets the Revision's id. In the case of an unsaved revision, may return null.
      */
     @InterfaceAudience.Public
     public abstract String getId();
@@ -191,6 +186,12 @@ private Attachment toAttachment(String name, Object attachment) {
     @InterfaceAudience.Public
     public abstract String getParentId();
 
+    /**
+     * @exclude
+     */
+    @InterfaceAudience.Private
+    /* package */ abstract long getParentSequence();
+
     /**
      * Returns the history of this document as an array of CBLRevisions, in forward order.
      * Older revisions are NOT guaranteed to have their properties available.
@@ -274,17 +275,7 @@ public String toString() {
      * @exclude
      */
     @InterfaceAudience.Private
-    /* package */ void setSequence(long sequence) {
-        this.sequence = sequence;
-    }
-
-    /**
-     * @exclude
-     */
-    @InterfaceAudience.Private
-    /* package */ long getSequence() {
-        return sequence;
-    }
+    /* package */ abstract long getSequence();
 
     /**
      * Generation number: 1 for a new document, 2 for the 2nd revision, ...

src/main/java/com/couchbase/lite/SavedRevision.java

@@ -169,6 +169,13 @@ public String getParentId() {
         return parRev.getRevId();
     }
 
+    @Override
+    @InterfaceAudience.Private
+    /* package */ long getParentSequence() {
+        SavedRevision parent = getParent();
+        return (parent != null) ? parent.getSequence() : 0L;
+    }
+
     @Override
     @InterfaceAudience.Public
     public long getSequence() {

src/main/java/com/couchbase/lite/UnsavedRevision.java

@@ -16,6 +16,7 @@
  */
 public final class UnsavedRevision extends Revision {
 
+    private final long parentSequence;
     private Map<String, Object> properties;
 
     /**
@@ -29,8 +30,10 @@ public final class UnsavedRevision extends Revision {
 
         if (parentRevision == null) {
             parentRevID = null;
+            parentSequence = 0L;
         } else {
             parentRevID = parentRevision.getId();
+            parentSequence = parentRevision.getSequence();
         }
 
         Map<String, Object> parentRevisionProperties;
@@ -67,16 +70,18 @@ public void setIsDeletion(boolean isDeletion) {
         }
     }
 
-    /**
-     * Get the id of the owning document.  In the case of an unsaved revision, may return null.
-     * @return
-     */
     @Override
     @InterfaceAudience.Public
     public String getId() {
         return null;
     }
 
+    @Override
+    @InterfaceAudience.Private
+    /* package */ long getSequence() {
+        return 0L;
+    }
+
     /**
      * Set the properties for this revision
      */
@@ -193,6 +198,12 @@ public String getParentId() {
         return parentRevID;
     }
 
+    @Override
+    @InterfaceAudience.Private
+    /* package */ long getParentSequence() {
+        return parentSequence;
+    }
+
     @Override
     @InterfaceAudience.Public
     public List<SavedRevision> getRevisionHistory() throws CouchbaseLiteException {