svn commit: r1581728 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins: blob/BlobStoreBlob.java document/DocumentNodeStore.java

[chetanm]

Author: chetanm
Date: Wed Mar 26 08:03:06 2014
New Revision: 1581728

URL: http://svn.apache.org/r1581728
Log:
OAK-1604 - Support for signed references in Blob (WIP)

-- Provide getBlobid in BlobStoreBlob
-- Use getBlobid in place of relying on Blob#toString for getting blobId

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java?rev=1581728&r1=1581727&r2=1581728&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreBlob.java
 Wed Mar 26 08:03:06 2014
@@ -65,6 +65,10 @@ public class BlobStoreBlob implements Bl
         return blobStore.getReference(blobId);
     }
 
+    public String getBlobId() {
+        return blobId;
+    }
+
     //------------------------------------------------------------< Object >--
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1581728&r1=1581727&r2=1581728&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Wed Mar 26 08:03:06 2014
@@ -266,11 +266,11 @@ public final class DocumentNodeStore
         @Override
         public String serialize(Blob blob) {
             if (blob instanceof BlobStoreBlob) {
-                return blob.toString();
+                return ((BlobStoreBlob) blob).getBlobId();
             }
             String id;
             try {
-                id = createBlob(blob.getNewStream()).toString();
+                id = createBlob(blob.getNewStream()).getBlobId();
             } catch (IOException e) {
                 throw new IllegalStateException(e);
             }
@@ -1208,7 +1208,7 @@ public final class DocumentNodeStore
     }
 
     @Override
-    public Blob createBlob(InputStream inputStream) throws IOException {
+    public BlobStoreBlob createBlob(InputStream inputStream) throws 
IOException {
         return new BlobStoreBlob(blobStore, blobStore.writeBlob(inputStream));
     }
 
@@ -1232,7 +1232,7 @@ public final class DocumentNodeStore
     /**
      * Returns the {@link Blob} with the given blobId.
      *
-     * @param reference the reference of the blob.
+     * @param blobId the blobId of the blob.
      * @return the blob.
      */
     public Blob getBlobFromBlobId(String blobId){