jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1328674 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/mk/client/ main/java/org/apache/jackrabbit/mk/index/ main/java/org/apache/jackrabbit/mk/server/ main/java/org/apache/jackrabbit/mk/simple/ main/java/org/apach...
Date Sat, 21 Apr 2012 14:49:08 GMT
Author: mduerig
Date: Sat Apr 21 14:49:06 2012
New Revision: 1328674

URL: http://svn.apache.org/viewvc?rev=1328674&view=rev
Log:
add missing @Override

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/HttpExecutor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Request.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Cursor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/BoundaryInputStream.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/FileServlet.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Request.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Response.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Server.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/Profiler.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/Concurrent.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentCacheTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/HttpExecutor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/HttpExecutor.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/HttpExecutor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/HttpExecutor.java Sat Apr 21 14:49:06 2012
@@ -202,6 +202,7 @@ class HttpExecutor implements Closeable 
     /**
      * Close this executor.
      */
+    @Override
     public void close() {
         IOUtils.closeQuietly(socketOut);
         IOUtils.closeQuietly(socketIn);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Request.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Request.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Request.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Request.java Sat Apr 21 14:49:06 2012
@@ -181,6 +181,7 @@ class Request implements Closeable {
         return count == 0 && len != 0 ? -1 : count;
     }
     
+    @Override
     public void close() {
         IOUtils.closeQuietly(resultIn);
         

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java Sat Apr 21 14:49:06 2012
@@ -16,11 +16,12 @@
  */
 package org.apache.jackrabbit.mk.index;
 
-import java.util.Arrays;
 import org.apache.jackrabbit.mk.json.JsopBuilder;
 import org.apache.jackrabbit.mk.util.ArrayUtils;
 import org.apache.jackrabbit.mk.util.PathUtils;
 
+import java.util.Arrays;
+
 /**
  * An index leaf page.
  */
@@ -34,10 +35,12 @@ class BTreeLeaf extends BTreePage {
         return parent == null ? null : parent.next(this);
     }
 
+    @Override
     BTreeLeaf firstLeaf() {
         return this;
     }
 
+    @Override
     void split(BTreeNode newParent, String newName, int pos, String siblingName) {
         setParent(newParent, newName, true);
         String[] k2 = Arrays.copyOfRange(keys, pos, keys.length, String[].class);
@@ -67,6 +70,7 @@ class BTreeLeaf extends BTreePage {
         tree.bufferSetArray(getPath(), "values", values);
     }
 
+    @Override
     void writeCreate() {
         tree.modified(this);
         JsopBuilder jsop = new JsopBuilder();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java Sat Apr 21 14:49:06 2012
@@ -44,10 +44,12 @@ class BTreeNode extends BTreePage {
         return Integer.toString(max + 1);
     }
 
+    @Override
     BTreeLeaf firstLeaf() {
         return tree.getPage(this, children[0]).firstLeaf();
     }
 
+    @Override
     void split(BTreeNode newParent, String newName, int pos, String siblingName) {
         setParent(newParent, newName, true);
         String[] k2 = Arrays.copyOfRange(keys, pos + 1, keys.length, String[].class);
@@ -99,6 +101,7 @@ class BTreeNode extends BTreePage {
         tree.bufferSetArray(getPath(), "children", children);
     }
 
+    @Override
     void writeCreate() {
         tree.modified(this);
         JsopBuilder jsop = new JsopBuilder();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Cursor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Cursor.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Cursor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Cursor.java Sat Apr 21 14:49:06 2012
@@ -28,10 +28,12 @@ public class Cursor implements Iterator<
     private int pos;
     private String currentValue;
 
+    @Override
     public boolean hasNext() {
         return current != null;
     }
 
+    @Override
     public String next() {
         if (current == null) {
             currentValue = null;
@@ -61,6 +63,7 @@ public class Cursor implements Iterator<
         }
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
@@ -88,14 +91,17 @@ public class Cursor implements Iterator<
                 }
             }
         }
+        @Override
         public boolean hasNext() {
             return value != null;
         }
+        @Override
         public String next() {
             String v = value;
             step();
             return v;
         }
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java Sat Apr 21 14:49:06 2012
@@ -52,42 +52,52 @@ public class IndexWrapper extends MicroK
         this.indexer = new Indexer(mk);
     }
 
+    @Override
     public String getHeadRevision() {
         return mk.getHeadRevision();
     }
 
+    @Override
     public long getLength(String blobId) {
         return mk.getLength(blobId);
     }
 
+    @Override
     public boolean nodeExists(String path, String revisionId) {
         return mk.nodeExists(path, revisionId);
     }
 
+    @Override
     public long getChildNodeCount(String path, String revisionId) {
         return mk.getChildNodeCount(path, revisionId);
     }
 
+    @Override
     public int read(String blobId, long pos, byte[] buff, int off, int length) {
         return mk.read(blobId, pos, buff, off, length);
     }
 
+    @Override
     public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws MicroKernelException, InterruptedException {
         return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
     }
 
+    @Override
     public String write(InputStream in) {
         return mk.write(in);
     }
 
+    @Override
     public String branch(String trunkRevisionId) {
         return mk.branch(trunkRevisionId);
     }
 
+    @Override
     public String merge(String branchRevisionId, String message) {
         return mk.merge(branchRevisionId, message);
     }
 
+    @Override
     public String commitStream(String rootPath, JsopReader jsonDiff, String revisionId, String message) {
         if (!rootPath.startsWith(INDEX_PATH)) {
             String rev = mk.commitStream(rootPath, jsonDiff, revisionId, message);
@@ -142,6 +152,7 @@ public class IndexWrapper extends MicroK
         return null;
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId, int depth, long offset, int count, String filter) {
         if (!path.startsWith(INDEX_PATH)) {
             return mk.getNodesStream(path, revisionId, depth, offset, count, filter);
@@ -198,22 +209,27 @@ public class IndexWrapper extends MicroK
         return s;
     }
 
+    @Override
     public JsopReader diffStream(String fromRevisionId, String toRevisionId, String filter) {
         return mk.diffStream(fromRevisionId, toRevisionId, filter);
     }
 
+    @Override
     public JsopReader getJournalStream(String fromRevisionId, String toRevisionId, String filter) {
         return mk.getJournalStream(fromRevisionId, toRevisionId, filter);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId) {
         return getNodesStream(path, revisionId, 1, 0, -1, null);
     }
 
+    @Override
     public JsopReader getRevisionsStream(long since, int maxEntries) {
         return mk.getRevisionsStream(since, maxEntries);
     }
 
+    @Override
     public void dispose() {
         mk.dispose();
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java Sat Apr 21 14:49:06 2012
@@ -44,10 +44,12 @@ public class PrefixIndex implements Inde
         return new PrefixIndex(indexer, prefix);
     }
 
+    @Override
     public String getName() {
         return tree.getName();
     }
 
+    @Override
     public void addOrRemoveNode(NodeImpl node, boolean add) {
         String nodePath = node.getPath();
         for (int i = 0, size = node.getPropertyCount(); i < size; i++) {
@@ -57,6 +59,7 @@ public class PrefixIndex implements Inde
         }
     }
 
+    @Override
     public void addOrRemoveProperty(String nodePath, String propertyName,
             String value, boolean add) {
         JsopTokenizer t = new JsopTokenizer(value);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java Sat Apr 21 14:49:06 2012
@@ -52,10 +52,12 @@ public class PropertyIndex implements In
         return new PropertyIndex(indexer, propertyName, unique);
     }
 
+    @Override
     public String getName() {
         return tree.getName();
     }
 
+    @Override
     public void addOrRemoveNode(NodeImpl node, boolean add) {
         String value = node.getProperty(propertyName);
         if (value != null) {
@@ -63,6 +65,7 @@ public class PropertyIndex implements In
         }
     }
 
+    @Override
     public void addOrRemoveProperty(String nodePath, String propertyName,
             String value, boolean add) {
         if (this.propertyName.equals(propertyName)) {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/BoundaryInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/BoundaryInputStream.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/BoundaryInputStream.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/BoundaryInputStream.java Sat Apr 21 14:49:06 2012
@@ -67,6 +67,7 @@ class BoundaryInputStream extends InputS
         buf = new byte[size];
     }
 
+    @Override
     public int read() throws IOException {
         if (eos) {
             return -1;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/FileServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/FileServlet.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/FileServlet.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/FileServlet.java Sat Apr 21 14:49:06 2012
@@ -33,6 +33,7 @@ class FileServlet implements Servlet {
     /** Just one instance, no need to make constructor public */
     private FileServlet() {}
 
+    @Override
     public void service(Request request, Response response) throws IOException {
         String file = request.getFile();
         if (file.endsWith("/")) {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Request.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Request.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Request.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Request.java Sat Apr 21 14:49:06 2012
@@ -270,6 +270,7 @@ class Request implements Closeable {
         return HTTP_11_PROTOCOL.equals(protocol);
     }
     
+    @Override
     public void close() {
         if (in != null) {
             try {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Response.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Response.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Response.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Response.java Sat Apr 21 14:49:06 2012
@@ -142,6 +142,7 @@ class Response implements Closeable {
         }
     }
 
+    @Override
     public void close() throws IOException {
         committed = true;
         

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Server.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Server.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Server.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/Server.java Sat Apr 21 14:49:06 2012
@@ -115,6 +115,7 @@ public class Server {
         es = createExecutorService();
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 accept();
             }
@@ -126,6 +127,7 @@ public class Server {
             while (!stopped.get()) {
                 final Socket socket = ss.accept();
                 es.execute(new Runnable() {
+                    @Override
                     public void run() {
                         process(socket);
                     }
@@ -157,6 +159,7 @@ public class Server {
         }
 
         HttpProcessor processor = new HttpProcessor(socket, new Servlet() {
+            @Override
             public void service(Request request, Response response)
                     throws IOException {
                 Server.this.service(request, response);
@@ -260,6 +263,7 @@ public class Server {
         server.start();
 
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+            @Override
             public void run() {
                 server.stop();
             }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java Sat Apr 21 14:49:06 2012
@@ -74,6 +74,7 @@ public class NodeId {
             this.node = node;
         }
 
+        @Override
         public NodeImpl getNode(NodeMap map) {
             return node;
         }
@@ -82,6 +83,7 @@ public class NodeId {
             return node.toString();
         }
 
+        @Override
         public boolean isInline() {
             return true;
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java Sat Apr 21 14:49:06 2012
@@ -539,12 +539,15 @@ public class NodeImpl implements Cache.V
             try {
                 MessageDigest d = MessageDigest.getInstance("SHA-1");
                 DigestOutputStream out = new DigestOutputStream(new OutputStream() {
+                    @Override
                     public void write(byte[] buff, int off, int length) {
                         // ignore
                     }
+                    @Override
                     public void write(byte[] buff) {
                         // ignore
                     }
+                    @Override
                     public void write(int b) {
                         // ignore
                     }
@@ -691,6 +694,7 @@ public class NodeImpl implements Cache.V
         void accept(NodeId childId);
     }
 
+    @Override
     public int getMemory() {
         if (memory == 0) {
             String[] pv = propertyValuePairs;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java Sat Apr 21 14:49:06 2012
@@ -70,10 +70,12 @@ public class NodeListSmall implements No
         this.size = size;
     }
 
+    @Override
     public long size() {
         return size;
     }
 
+    @Override
     public boolean containsKey(String name) {
         return find(name) >= 0;
     }
@@ -102,6 +104,7 @@ public class NodeListSmall implements No
         return -(min + 1);
     }
 
+    @Override
     public NodeId get(String name) {
         int index = find(name);
         if (index < 0) {
@@ -110,6 +113,7 @@ public class NodeListSmall implements No
         return children[sort[index]];
     }
 
+    @Override
     public void add(String name, NodeId x) {
         int index = find(name);
         if (index >= 0) {
@@ -123,6 +127,7 @@ public class NodeListSmall implements No
         size++;
     }
 
+    @Override
     public void replace(String name, NodeId x) {
         int index = find(name);
         if (index < 0) {
@@ -131,27 +136,33 @@ public class NodeListSmall implements No
         children = ArrayUtils.arrayReplace(children, sort[index], x);
     }
 
+    @Override
     public String getName(long pos) {
         return pos >= names.length ? null : names[(int) pos];
     }
 
+    @Override
     public Iterator<String> getNames(final long offset, final int maxCount) {
         return  new Iterator<String>() {
             int pos = (int) offset;
             int remaining = maxCount;
+            @Override
             public boolean hasNext() {
                 return pos < size && remaining > 0;
             }
+            @Override
             public String next() {
                 remaining--;
                 return names[pos++];
             }
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
         };
     }
 
+    @Override
     public NodeId remove(String name) {
         int index = find(name);
         if (index < 0) {
@@ -183,6 +194,7 @@ public class NodeListSmall implements No
         return json.toString();
     }
 
+    @Override
     public NodeList createClone(NodeMap map, long revId) {
         NodeList result = new NodeListSmall(names, children, sort, size);
         if (size > map.getMaxMemoryChildren()) {
@@ -191,12 +203,14 @@ public class NodeListSmall implements No
         return result;
     }
 
+    @Override
     public void visit(ChildVisitor v) {
         for (NodeId c : children) {
             v.accept(c);
         }
     }
 
+    @Override
     public void append(JsopWriter json, NodeMap map) {
         for (int i = 0; i < size; i++) {
             json.key(names[i]);
@@ -209,6 +223,7 @@ public class NodeListSmall implements No
         }
     }
 
+    @Override
     public int getMemory() {
         int memory = 100;
         for (int i = 0; i < names.length; i++) {
@@ -244,6 +259,7 @@ public class NodeListSmall implements No
         return false;
     }
 
+    @Override
     public void updateHash(NodeMap map, OutputStream out) throws IOException {
         if (children != null) {
             try {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java Sat Apr 21 14:49:06 2012
@@ -99,6 +99,7 @@ public class NodeListTrie implements Nod
         children.add(index, c);
     }
 
+    @Override
     public boolean containsKey(String name) {
         int index = getChildIndex(name);
         if (index < 0) {
@@ -120,6 +121,7 @@ public class NodeListTrie implements Nod
         return n.getNodeList();
     }
 
+    @Override
     public NodeId get(String name) {
         int index = getChildIndex(name);
         if (index < 0) {
@@ -130,6 +132,7 @@ public class NodeListTrie implements Nod
         return list.get(name);
     }
 
+    @Override
     public String getName(long pos) {
         int i = 0;
         for (; i < children.size(); i++) {
@@ -144,6 +147,7 @@ public class NodeListTrie implements Nod
         return null;
     }
 
+    @Override
     public Iterator<String> getNames(long offset, final int maxCount) {
         int i = 0;
         for (; i < children.size(); i++) {
@@ -161,6 +165,7 @@ public class NodeListTrie implements Nod
             int remaining = maxCount;
             long offset = off;
             Iterator<String> it;
+            @Override
             public boolean hasNext() {
                 if (it != null && it.hasNext()) {
                     return true;
@@ -175,6 +180,7 @@ public class NodeListTrie implements Nod
                 return false;
             }
 
+            @Override
             public String next() {
                 if (hasNext()) {
                     remaining--;
@@ -184,6 +190,7 @@ public class NodeListTrie implements Nod
                 }
             }
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
@@ -210,6 +217,7 @@ public class NodeListTrie implements Nod
         return -(min + 1);
     }
 
+    @Override
     public void add(String name, NodeId x) {
         int index = getChildIndex(name);
         if (index < 0) {
@@ -225,6 +233,7 @@ public class NodeListTrie implements Nod
         size++;
     }
 
+    @Override
     public void replace(String name, NodeId x) {
         int index = getChildIndex(name);
         if (index < 0) {
@@ -236,6 +245,7 @@ public class NodeListTrie implements Nod
         }
     }
 
+    @Override
     public NodeId remove(String name) {
         int index = getChildIndex(name);
         if (index < 0) {
@@ -246,6 +256,7 @@ public class NodeListTrie implements Nod
         return list.remove(name);
     }
 
+    @Override
     public long size() {
         return size;
     }
@@ -264,6 +275,7 @@ public class NodeListTrie implements Nod
 
     }
 
+    @Override
     public NodeList createClone(NodeMap map, long revId) {
         if (revId == this.revId) {
             return this;
@@ -292,12 +304,14 @@ public class NodeListTrie implements Nod
         return result;
     }
 
+    @Override
     public void visit(ChildVisitor v) {
         for (Child c : children) {
             v.accept(c.id);
         }
     }
 
+    @Override
     public void append(JsopWriter json, NodeMap map) {
         for (Child c : children) {
             json.key(NodeImpl.CHILDREN);
@@ -349,10 +363,12 @@ public class NodeListTrie implements Nod
         return list;
     }
 
+    @Override
     public int getMemory() {
         return children.size() * 100;
     }
 
+    @Override
     public void updateHash(NodeMap map, OutputStream out) throws IOException {
         for (Child c : children) {
             byte[] hash = c.id.getHash();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java Sat Apr 21 14:49:06 2012
@@ -109,6 +109,7 @@ public class NodeMap {
         if (hash) {
             final NodeMap map = this;
             root.visit(new ChildVisitor() {
+                @Override
                 public void accept(NodeId childId) {
                     if (childId.isInline()) {
                         NodeImpl t = childId.getNode(map);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java Sat Apr 21 14:49:06 2012
@@ -72,6 +72,7 @@ public class NodeMapInDb extends NodeMap
         }
     }
 
+    @Override
     public synchronized NodeId addNode(NodeImpl node) {
         return addNode(node, true);
     }
@@ -91,10 +92,12 @@ public class NodeMapInDb extends NodeMap
         return x;
     }
 
+    @Override
     public NodeImpl getNode(long x) {
         return x < 0 ? temp.get(x) : cache.get(x);
     }
 
+    @Override
     public NodeImpl load(Long key) {
         try {
             select.setLong(1, key);
@@ -108,12 +111,14 @@ public class NodeMapInDb extends NodeMap
         }
     }
 
+    @Override
     public synchronized NodeId commit(NodeImpl newRoot) {
         addNode(newRoot, false);
         try {
             final NodeMap map = this;
             final ArrayList<Long> list = new ArrayList<Long>();
             newRoot.visit(new ChildVisitor() {
+                @Override
                 public void accept(NodeId childId) {
                     if (childId.getLong() < 0) {
                         NodeImpl t = temp.get(childId.getLong());
@@ -154,15 +159,18 @@ public class NodeMapInDb extends NodeMap
         return root.getId();
     }
 
+    @Override
     public NodeId getId(NodeId id) {
         long x = id.getLong();
         return (x > 0 || !pos.containsKey(x)) ? id : NodeId.get(pos.get(x));
     }
 
+    @Override
     public NodeId getRootId() {
         return root.getId();
     }
 
+    @Override
     public NodeImpl getInfo(String path) {
         NodeImpl n = new NodeImpl(this, 0);
         n.setProperty("url", JsopBuilder.encode(url));
@@ -177,6 +185,7 @@ public class NodeMapInDb extends NodeMap
         return n;
     }
 
+    @Override
     public synchronized void close() {
         try {
             conn.close();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java Sat Apr 21 14:49:06 2012
@@ -79,6 +79,7 @@ public class NodeMapInMongoDb extends No
         }
     }
 
+    @Override
     public synchronized NodeId addNode(NodeImpl node) {
         return addNode(node, true);
     }
@@ -98,10 +99,12 @@ public class NodeMapInMongoDb extends No
         return x;
     }
 
+    @Override
     public NodeImpl getNode(long x) {
         return x < 0 ? temp.get(x) : cache.get(x);
     }
 
+    @Override
     public NodeImpl load(Long key) {
         try {
             BasicDBObject k = new BasicDBObject(KEY_FIELD, key);
@@ -113,12 +116,14 @@ public class NodeMapInMongoDb extends No
         }
     }
 
+    @Override
     public synchronized NodeId commit(NodeImpl newRoot) {
         addNode(newRoot, false);
         try {
             final NodeMap map = this;
             final ArrayList<Long> list = new ArrayList<Long>();
             newRoot.visit(new ChildVisitor() {
+                @Override
                 public void accept(NodeId childId) {
                     if (childId.getLong() < 0) {
                         NodeImpl t = temp.get(childId.getLong());
@@ -161,15 +166,18 @@ public class NodeMapInMongoDb extends No
         return root.getId();
     }
 
+    @Override
     public NodeId getId(NodeId id) {
         long x = id.getLong();
         return (x > 0 || !pos.containsKey(x)) ? id : NodeId.get(pos.get(x));
     }
 
+    @Override
     public NodeId getRootId() {
         return root.getId();
     }
 
+    @Override
     public NodeImpl getInfo(String path) {
         NodeImpl n = new NodeImpl(this, 0);
         for (Entry<String, String> e : properties.entrySet()) {
@@ -183,6 +191,7 @@ public class NodeMapInMongoDb extends No
         return n;
     }
 
+    @Override
     public synchronized void close() {
         con.close();
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java Sat Apr 21 14:49:06 2012
@@ -97,6 +97,7 @@ public class Revision implements Compara
         return "";
     }
 
+    @Override
     public int compareTo(Revision o) {
         return id < o.id ? -1 : id > o.id ? 1 : 0;
     }
@@ -140,6 +141,7 @@ public class Revision implements Compara
         endObject().newline();
     }
 
+    @Override
     public int getMemory() {
         return (getDiff().length() + getMsg().length()) * 2;
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java Sat Apr 21 14:49:06 2012
@@ -129,6 +129,7 @@ public class SimpleKernelImpl extends Mi
         }
     }
 
+    @Override
     public synchronized String commitStream(String rootPath, JsopReader jsonDiff, String revisionId, String message) {
         revisionId = revisionId == null ? headRevision : revisionId;
 
@@ -335,10 +336,12 @@ public class SimpleKernelImpl extends Mi
         return nodeMap.getRootId().getNode(nodeMap);
     }
 
+    @Override
     public String getHeadRevision() {
         return headRevision;
     }
 
+    @Override
     public JsopReader getRevisionsStream(long since, int maxEntries) {
         NodeImpl node = getRoot();
         long sinceNanos = since * 1000000;
@@ -377,10 +380,12 @@ public class SimpleKernelImpl extends Mi
         return buff.endArray();
     }
 
+    @Override
     public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
         return gate.waitForCommit(oldHeadRevisionId, maxWaitMillis);
     }
 
+    @Override
     public JsopReader getJournalStream(String fromRevisionId, String toRevisionId, String filter) {
         fromRevisionId = fromRevisionId == null ? headRevision : fromRevisionId;
         toRevisionId = toRevisionId == null ? headRevision : toRevisionId;
@@ -448,6 +453,7 @@ public class SimpleKernelImpl extends Mi
     }
 
 
+    @Override
     public JsopReader diffStream(String fromRevisionId, String toRevisionId, String filter) {
         fromRevisionId = fromRevisionId == null ? headRevision : fromRevisionId;
         toRevisionId = toRevisionId == null ? headRevision : toRevisionId;
@@ -465,10 +471,12 @@ public class SimpleKernelImpl extends Mi
      * @param revisionId the revision
      * @return the json string
      */
+    @Override
     public JsopReader getNodesStream(String path, String revisionId) {
         return getNodesStream(path, revisionId, 1, 0, -1, null);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId, int depth, long offset, int count, String filter) {
         revisionId = revisionId == null ? headRevision : revisionId;
 
@@ -528,6 +536,7 @@ public class SimpleKernelImpl extends Mi
         }
     }
 
+    @Override
     public boolean nodeExists(String path, String revisionId) {
         revisionId = revisionId == null ? headRevision : revisionId;
 
@@ -542,6 +551,7 @@ public class SimpleKernelImpl extends Mi
         return getRevisionDataRoot(revisionId).exists(path.substring(1));
     }
 
+    @Override
     public long getChildNodeCount(String path, String revisionId) {
         revisionId = revisionId == null ? headRevision : revisionId;
 
@@ -551,18 +561,22 @@ public class SimpleKernelImpl extends Mi
         return getRevisionDataRoot(revisionId).getNode(path).getChildNodeCount();
     }
 
+    @Override
     public long getLength(String blobId) {
         return ds.getBlobLength(blobId);
     }
 
+    @Override
     public int read(String blobId, long pos, byte[] buff, int off, int length) {
         return ds.readBlob(blobId, pos, buff, off, length);
     }
 
+    @Override
     public String write(InputStream in) {
         return ds.writeBlob(in);
     }
 
+    @Override
     public synchronized void dispose() {
         if (!disposed) {
             disposed = true;
@@ -581,6 +595,7 @@ public class SimpleKernelImpl extends Mi
         return "simple:" + name;
     }
 
+    @Override
     public String branch(String trunkRevisionId) throws MicroKernelException {
         trunkRevisionId = trunkRevisionId == null ? headRevision : trunkRevisionId;
 
@@ -588,6 +603,7 @@ public class SimpleKernelImpl extends Mi
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public String merge(String branchRevisionId, String message) throws MicroKernelException {
         // TODO OAK-45 support
         throw new UnsupportedOperationException();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java Sat Apr 21 14:49:06 2012
@@ -82,6 +82,7 @@ public class SecurityWrapper extends Mic
         this.write = canWrite;
     }
 
+    @Override
     public String commitStream(String rootPath, JsopReader jsonDiff, String revisionId, String message) {
         checkRights(rootPath, true);
         if (!admin) {
@@ -90,13 +91,16 @@ public class SecurityWrapper extends Mic
         return mk.commitStream(rootPath, jsonDiff, revisionId, message);
     }
 
+    @Override
     public void dispose() {
     }
 
+    @Override
     public String getHeadRevision() {
         return mk.getHeadRevision();
     }
 
+    @Override
     public JsopReader getJournalStream(String fromRevisionId, String toRevisionId, String filter) {
         rightsRevision = getHeadRevision();
         JsopReader t = mk.getJournalStream(fromRevisionId, toRevisionId, filter);
@@ -140,6 +144,7 @@ public class SecurityWrapper extends Mic
         return buff;
     }
 
+    @Override
     public JsopReader diffStream(String fromRevisionId, String toRevisionId, String path) {
         rightsRevision = getHeadRevision();
         JsopReader diff = mk.diffStream(fromRevisionId, toRevisionId, path);
@@ -269,14 +274,17 @@ public class SecurityWrapper extends Mic
         return false;
     }
 
+    @Override
     public long getLength(String blobId) {
         return mk.getLength(blobId);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId) {
         return getNodesStream(path, revisionId, 1, 0, -1, null);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId, int depth, long offset, int count, String filter) {
         rightsRevision = getHeadRevision();
         if (!checkRights(path, false)) {
@@ -300,10 +308,12 @@ public class SecurityWrapper extends Mic
         return buff;
     }
 
+    @Override
     public JsopReader getRevisionsStream(long since, int maxEntries) {
         return mk.getRevisionsStream(since, maxEntries);
     }
 
+    @Override
     public boolean nodeExists(String path, String revisionId) {
         rightsRevision = getHeadRevision();
         if (!checkRights(path, false)) {
@@ -312,6 +322,7 @@ public class SecurityWrapper extends Mic
         return mk.nodeExists(path, revisionId);
     }
 
+    @Override
     public long getChildNodeCount(String path, String revisionId) {
         rightsRevision = getHeadRevision();
         if (!checkRights(path, false)) {
@@ -320,25 +331,30 @@ public class SecurityWrapper extends Mic
         return mk.getChildNodeCount(path, revisionId);
     }
 
+    @Override
     public int read(String blobId, long pos, byte[] buff, int off, int length) {
         return mk.read(blobId, pos, buff, off, length);
     }
 
+    @Override
     public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
         return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
     }
 
+    @Override
     public String write(InputStream in) {
         rightsRevision = getHeadRevision();
         checkRights(null, true);
         return mk.write(in);
     }
 
+    @Override
     public String branch(String trunkRevisionId) {
         // TODO OAK-45 support
         return mk.branch(trunkRevisionId);
     }
 
+    @Override
     public String merge(String branchRevisionId, String message) {
         // TODO OAK-45 support
         return mk.merge(branchRevisionId, message);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java Sat Apr 21 14:49:06 2012
@@ -105,6 +105,7 @@ public class VirtualRepositoryWrapper ex
         }
     }
 
+    @Override
     public String commitStream(String rootPath, JsopReader t, String revisionId, String message) {
         while (true) {
             int r = t.read();
@@ -225,6 +226,7 @@ public class VirtualRepositoryWrapper ex
         return builder;
     }
 
+    @Override
     public void dispose() {
         for (MicroKernel m : mounts.values()) {
             m.dispose();
@@ -232,6 +234,7 @@ public class VirtualRepositoryWrapper ex
         mk.dispose();
     }
 
+    @Override
     public String getHeadRevision() {
         StringBuilder buff = new StringBuilder();
         if (revisions.size() != mounts.size()) {
@@ -253,22 +256,27 @@ public class VirtualRepositoryWrapper ex
         return buff.toString();
     }
 
+    @Override
     public JsopReader getJournalStream(String fromRevisionId, String toRevisionId, String filter) {
         return mk.getJournalStream(fromRevisionId, toRevisionId, filter);
     }
 
+    @Override
     public JsopReader diffStream(String fromRevisionId, String toRevisionId, String path) throws MicroKernelException {
         return mk.diffStream(fromRevisionId, toRevisionId, path);
     }
 
+    @Override
     public long getLength(String blobId) {
         return mk.getLength(blobId);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId) {
         return getNodesStream(path, revisionId, 1, 0, -1, null);
     }
 
+    @Override
     public JsopReader getNodesStream(String path, String revisionId, int depth, long offset, int count, String filter) {
         String mount = getMount(path);
         if (mount == null) {
@@ -288,10 +296,12 @@ public class VirtualRepositoryWrapper ex
         throw ExceptionFactory.get("Unknown revision: " + revisionId + " mount: " + mount);
     }
 
+    @Override
     public JsopReader getRevisionsStream(long since, int maxEntries) {
         return mk.getRevisionsStream(since, maxEntries);
     }
 
+    @Override
     public boolean nodeExists(String path, String revisionId) {
         String mount = getMount(path);
         if (mount == null) {
@@ -302,6 +312,7 @@ public class VirtualRepositoryWrapper ex
         return mk.nodeExists(path, rev);
     }
 
+    @Override
     public long getChildNodeCount(String path, String revisionId) {
         String mount = getMount(path);
         if (mount == null) {
@@ -312,23 +323,28 @@ public class VirtualRepositoryWrapper ex
         return mk.getChildNodeCount(path, rev);
     }
 
+    @Override
     public int read(String blobId, long pos, byte[] buff, int off, int length) {
         return mk.read(blobId, pos, buff, off, length);
     }
 
+    @Override
     public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException {
         return mk.waitForCommit(oldHeadRevisionId, maxWaitMillis);
     }
 
+    @Override
     public String write(InputStream in) {
         return mk.write(in);
     }
 
+    @Override
     public String branch(String trunkRevisionId) {
         // TODO OAK-45 support
         return mk.branch(trunkRevisionId);
     }
 
+    @Override
     public String merge(String branchRevisionId, String message) {
         // TODO OAK-45 support
         return mk.merge(branchRevisionId, message);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/Profiler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/Profiler.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/Profiler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/Profiler.java Sat Apr 21 14:49:06 2012
@@ -82,6 +82,7 @@ public class Profiler implements Runnabl
         }
     }
 
+    @Override
     public void run() {
         time = System.currentTimeMillis();
         while (!stop) {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/Concurrent.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/Concurrent.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/Concurrent.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/Concurrent.java Sat Apr 21 14:49:06 2012
@@ -53,6 +53,7 @@ public class Concurrent {
         }
         for (int i = 0; i < threadCount; i++) {
             Thread t = new Thread("Task " + i) {
+                @Override
                 public void run() {
                     while (!stopped.get()) {
                         try {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java Sat Apr 21 14:49:06 2012
@@ -44,6 +44,7 @@ public class ConcurrentBlobTest {
     public void test() throws Exception {
         final AtomicInteger id = new AtomicInteger();
         Concurrent.run("blob", new Concurrent.Task() {
+            @Override
             public void call() throws Exception {
                 int i = id.getAndIncrement();
                 ByteArrayOutputStream out = new ByteArrayOutputStream();

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentCacheTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentCacheTest.java Sat Apr 21 14:49:06 2012
@@ -33,6 +33,7 @@ public class ConcurrentCacheTest impleme
     @Test
     public void test() throws Exception {
         Concurrent.run("cache", new Concurrent.Task() {
+            @Override
             public void call() throws Exception {
                 int k = value++ % 10;
                 Data v = cache.get(k);
@@ -41,6 +42,7 @@ public class ConcurrentCacheTest impleme
         });
     }
 
+    @Override
     public Data load(Integer key) {
         int start = counter.get();
         try {
@@ -62,6 +64,7 @@ public class ConcurrentCacheTest impleme
             this.value = value;
         }
 
+        @Override
         public int getMemory() {
             return 1;
         }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java Sat Apr 21 14:49:06 2012
@@ -39,6 +39,7 @@ public class HashTest extends MultiMkTes
         super(url);
     }
 
+    @Override
     @After
     public void tearDown() throws InterruptedException {
         if (isSimpleKernel(mk)) {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java Sat Apr 21 14:49:06 2012
@@ -43,6 +43,7 @@ public class JsopArray extends Jsop impl
         list = new ArrayList<String>();
     }
 
+    @Override
     public Object get(int index) {
         init();
         String s = load(index);
@@ -85,11 +86,13 @@ public class JsopArray extends Jsop impl
         }
     }
 
+    @Override
     public boolean isEmpty() {
         init();
         return list == EMPTY_LIST;
     }
 
+    @Override
     public int size() {
         init();
         load(Integer.MAX_VALUE);
@@ -110,12 +113,14 @@ public class JsopArray extends Jsop impl
         return jsop.substring(start);
     }
 
+    @Override
     public boolean add(Object e) {
         initWrite();
         list.add(toString(e));
         return true;
     }
 
+    @Override
     public void clear() {
         initWrite();
         list.clear();
@@ -130,30 +135,37 @@ public class JsopArray extends Jsop impl
         load(Integer.MAX_VALUE);
     }
 
+    @Override
     public void add(int index, Object element) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(Collection<? extends Object> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends Object> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean contains(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean containsAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int indexOf(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Iterator<Object> iterator() {
         return new Iterator<Object>() {
 
@@ -177,46 +189,57 @@ public class JsopArray extends Jsop impl
         };
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public ListIterator<Object> listIterator() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public ListIterator<Object> listIterator(int index) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean remove(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object remove(int index) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object set(int index, Object element) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public List<Object> subList(int fromIndex, int toIndex) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object[] toArray() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> T[] toArray(T[] a) {
         throw new UnsupportedOperationException();
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java Sat Apr 21 14:49:06 2012
@@ -64,6 +64,7 @@ public class JsopObject extends Jsop imp
         }
     }
 
+    @Override
     public Object get(Object key) {
         init();
         String v = map.get(key);
@@ -107,16 +108,19 @@ public class JsopObject extends Jsop imp
         return null;
     }
 
+    @Override
     public boolean containsKey(Object key) {
         get(key);
         return map.containsKey(key);
     }
 
+    @Override
     public boolean isEmpty() {
         init();
         return map == EMPTY_MAP;
     }
 
+    @Override
     public int size() {
         readAll();
         return map.size();
@@ -158,37 +162,45 @@ public class JsopObject extends Jsop imp
         return jsop.substring(start);
     }
 
+    @Override
     public void clear() {
         initWrite();
         map.clear();
     }
 
+    @Override
     public Object put(String key, Object value) {
         initWrite();
         String old = map.put(key, toString(value));
         return Jsop.parse(old);
     }
 
+    @Override
     public boolean containsValue(Object value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Set<Entry<String, Object>> entrySet() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Set<String> keySet() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void putAll(Map<? extends String, ? extends Object> m) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Collection<Object> values() {
         throw new UnsupportedOperationException();
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java Sat Apr 21 14:49:06 2012
@@ -35,6 +35,7 @@ public class DescendantCountTest extends
         super(url);
     }
 
+    @Override
     @After
     public void tearDown() throws InterruptedException {
         if (isSimpleKernel(mk)) {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java Sat Apr 21 14:49:06 2012
@@ -36,6 +36,7 @@ public class LargeNodeTest extends Multi
         super(url);
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -43,6 +44,7 @@ public class LargeNodeTest extends Multi
         commit("/", "+ \"t\": {\"a\":{}, \"b\":{}, \"c\":{}}");
     }
 
+    @Override
     @After
     public void tearDown() throws InterruptedException {
         if (isSimpleKernel(mk)) {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java?rev=1328674&r1=1328673&r2=1328674&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java Sat Apr 21 14:49:06 2012
@@ -38,6 +38,7 @@ public class ManyRevisionsTest extends M
         super(url);
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();



Mime
View raw message