svn commit: r1503178 - in /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs: AbstractBlobStore.java BlobStoreInputStream.java FileBlobStore.java

[th...@apache.org]

Author: thomasm
Date: Mon Jul 15 11:24:01 2013
New Revision: 1503178

URL: http://svn.apache.org/r1503178
Log:
OAK-98 @Override

Modified:
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java?rev=1503178&r1=1503177&r2=1503178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java Mon Jul 15 11:24:01 2013
@@ -146,6 +146,7 @@ public abstract class AbstractBlobStore 
         }
     }
 
+    @Override
     public String writeBlob(InputStream in) throws Exception {
         try {
             ByteArrayOutputStream idStream = new ByteArrayOutputStream();
@@ -259,6 +260,7 @@ public abstract class AbstractBlobStore 
         }
     }
 
+    @Override
     public int readBlob(String blobId, long pos, byte[] buff, int off, int length) throws Exception {
         if (isMarkEnabled()) {
             mark(blobId);
@@ -316,6 +318,7 @@ public abstract class AbstractBlobStore 
         return cache.get(id).data;
     }
 
+    @Override
     public Data load(BlockId id) {
         byte[] data;
         try {
@@ -338,6 +341,7 @@ public abstract class AbstractBlobStore 
      */
     protected abstract byte[] readBlockFromBackend(BlockId id) throws Exception;
 
+    @Override
     public long getBlobLength(String blobId) throws IOException {
         if (isMarkEnabled()) {
             mark(blobId);
@@ -426,6 +430,7 @@ public abstract class AbstractBlobStore 
             this.pos = pos;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (this == other) {
                 return true;
@@ -438,11 +443,13 @@ public abstract class AbstractBlobStore 
                     pos == o.pos;
         }
 
+        @Override
         public int hashCode() {
             return Arrays.hashCode(digest) ^
                     (int) (pos >> 32) ^ (int) pos;
         }
 
+        @Override
         public String toString() {
             return StringUtils.convertBytesToHex(digest) + "@" + pos;
         }
@@ -468,11 +475,13 @@ public abstract class AbstractBlobStore 
             this.data = data;
         }
 
+        @Override
         public String toString() {
             String s = StringUtils.convertBytesToHex(data);
             return s.length() > 100 ? s.substring(0, 100) + ".. (len=" + data.length + ")" : s;
         }
 
+        @Override
         public int getMemory() {
             return data.length;
         }

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java?rev=1503178&r1=1503177&r2=1503178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java Mon Jul 15 11:24:01 2013
@@ -38,6 +38,7 @@ public class BlobStoreInputStream extend
         this.pos = pos;
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         int l;
         try {
@@ -52,6 +53,7 @@ public class BlobStoreInputStream extend
         return l;
     }
 
+    @Override
     public int read() throws IOException {
         if (oneByteBuff == null) {
             oneByteBuff = new byte[1];

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java?rev=1503178&r1=1503177&r2=1503178&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java Mon Jul 15 11:24:01 2013
@@ -42,7 +42,7 @@ public class FileBlobStore extends Abstr
 
     // TODO file operations are not secure (return values not checked, no retry,...)
 
-    public FileBlobStore(String dir) throws IOException {
+    public FileBlobStore(String dir) {
         baseDir = new File(dir);
         baseDir.mkdirs();
     }