Fixed Java Core 1629 - Wrong return code for listener causes problems with puller and deleted items (#98)

This PR is for adapt latest implementation of getDocument() from other platform.

Author: Hideki Itakura

src/main/java/com/couchbase/lite/store/ForestBridge.java

@@ -42,13 +42,15 @@ public static RevisionInternal revisionObject(
             String docID,
             String revID,
             boolean withBody) {
+
+        boolean deleted = doc.selectedRevDeleted();
         if (revID == null)
             revID = doc.getSelectedRevID();
-        RevisionInternal rev = new RevisionInternal(docID, revID, doc.selectedRevDeleted());
+        RevisionInternal rev = new RevisionInternal(docID, revID, deleted);
         rev.setSequence(doc.getSelectedSequence());
         if (withBody) {
             Status status = loadBodyOfRevisionObject(rev, doc);
-            if (status.isError())
+            if (status.isError() && status.getCode() != Status.GONE)
                 return null;
         }
         return rev;
@@ -61,14 +63,12 @@ public static RevisionInternal revisionObject(
      */
     public static Status loadBodyOfRevisionObject(RevisionInternal rev, Document doc) {
         try {
-            if (!doc.selectRevID(rev.getRevID(), true))
-                return new Status(Status.NOT_FOUND);
-            byte[] json = doc.getSelectedBody();
-            if (json != null)
-                rev.setJSON(json);
             rev.setSequence(doc.getSelectedSequence());
+            doc.selectRevID(rev.getRevID(), true);
+            rev.setJSON(doc.getSelectedBody());
             return new Status(Status.OK);
         } catch (ForestException ex) {
+            rev.setMissing(true);
             return err2status(ex);
         }
     }

src/main/java/com/couchbase/lite/store/ForestDBStore.java

@@ -147,7 +147,7 @@ public boolean databaseExists(String directory) {
     public void open() throws CouchbaseLiteException {
         // Flag:
         int flags = readOnly ? Database.ReadOnly : Database.Create;
-        if(autoCompact)
+        if (autoCompact)
             flags |= Database.AutoCompact;
 
         // Encryption:
@@ -292,7 +292,7 @@ public void compact() throws CouchbaseLiteException {
 
     /**
      * @note Throw RuntimeException if TransactionalTask throw Exception.
-     *       Otherwise return true or false
+     * Otherwise return true or false
      */
     @Override
     public boolean runInTransaction(TransactionalTask task) {
@@ -317,17 +317,20 @@ public boolean runInTransaction(TransactionalTask task) {
     }
 
     @Override
-    public RevisionInternal getDocument(String docID, String revID, boolean withBody) {
+    public RevisionInternal getDocument(String docID, String inRevID, boolean withBody, Status outStatus) {
         Document doc = getDocument(docID);
         if (doc == null)
             return null;
         try {
-            Status status = selectRev(doc, revID, withBody);
-            if (status.isError())
+            Status res = selectRev(doc, inRevID, withBody);
+            outStatus.setCode(res.getCode());
+            if (outStatus.isError() && outStatus.getCode() != Status.GONE)
                 return null;
-            if (revID == null && doc.selectedRevDeleted())
+            if (inRevID == null && doc.selectedRevDeleted()) {
+                outStatus.setCode(Status.DELETED);
                 return null;
-            return ForestBridge.revisionObject(doc, docID, revID, withBody);
+            }
+            return ForestBridge.revisionObject(doc, docID, inRevID, withBody);
         } finally {
             doc.free();
         }

src/main/java/com/couchbase/lite/store/ForestDBViewStore.java

@@ -33,7 +33,6 @@
 import com.couchbase.lite.Reducer;
 import com.couchbase.lite.Status;
 import com.couchbase.lite.internal.RevisionInternal;
-import com.couchbase.lite.support.FileDirUtils;
 import com.couchbase.lite.support.action.Action;
 import com.couchbase.lite.support.action.ActionBlock;
 import com.couchbase.lite.support.action.ActionException;
@@ -50,7 +49,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -406,17 +404,19 @@ public List<QueryRow> regularQuery(QueryOptions options) throws CouchbaseLiteExc
                     String linkedID = null;
                     if (value instanceof Map)
                         linkedID = (String) ((Map) value).get("_id");
+                    Status status = new Status();
                     if (linkedID != null) {
                         // http://wiki.apache.org/couchdb/Introduction_to_CouchDB_views
                         // #Linked_documents
                         String linkedRev = (String) ((Map) value).get("_rev");
-                        docRevision = _dbStore.getDocument(linkedID, linkedRev, true);
+                        docRevision = _dbStore.getDocument(linkedID, linkedRev, true, status);
                         if (docRevision != null)
                             sequence = docRevision.getSequence();
                         else
-                            Log.w(TAG, "Couldn't load linked doc %s rev %s", linkedID, linkedRev);
+                            Log.w(TAG, "Couldn't load linked doc %s rev %s: status %d",
+                                    linkedID, linkedRev, status.getCode());
                     } else {
-                        docRevision = _dbStore.getDocument(docID, null, true);
+                        docRevision = _dbStore.getDocument(docID, null, true, status);
                     }
                 }
                 Log.v(TAG, "Query %s: Found row with key=%s, value=%s, id=%s",
@@ -583,7 +583,7 @@ private View openIndex(int flags) throws ForestException {
     private View openIndex(int flags, boolean dryRun) throws ForestException {
         if (_view == null) {
             // Flags:
-            if(_dbStore.getAutoCompact())
+            if (_dbStore.getAutoCompact())
                 flags |= Database.AutoCompact;
 
             // Encryption:
@@ -746,7 +746,7 @@ private static String oldViewNameToFileName(String viewName) throws CouchbaseLit
 
     protected static String fileNameToViewName(String fileName) throws CouchbaseLiteException {
         Matcher m = kViewNameRegex.matcher(fileName);
-        if(!m.matches())
+        if (!m.matches())
             throw new CouchbaseLiteException(Status.BAD_PARAM);
         String viewName = fileName.substring(0, fileName.indexOf("."));
         return unescapeViewName(viewName);