jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1328678 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/mk/client/ main/java/org/apache/jackrabbit/mk/server/ main/java/org/apache/jackrabbit/mk/wrapper/ test/java/org/apache/jackrabbit/mk/ test/java/org/apache/jac...
Date Sat, 21 Apr 2012 14:56:50 GMT
Author: mduerig
Date: Sat Apr 21 14:56:50 2012
New Revision: 1328678

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

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/client/Client.java
Sat Apr 21 14:56:50 2012
@@ -95,6 +95,7 @@ public class Client implements MicroKern
     
     //-------------------------------------------------- implements MicroKernel
     
+    @Override
     public synchronized void dispose() {
         if (!disposed.compareAndSet(false, true)) {
             return;
@@ -102,6 +103,7 @@ public class Client implements MicroKern
         IOUtils.closeQuietly(executor);
     }
 
+    @Override
     public synchronized String getHeadRevision() throws MicroKernelException {
         Request request = null;
         
@@ -115,6 +117,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String getRevisionHistory(long since, int maxEntries)
             throws MicroKernelException {
 
@@ -132,6 +135,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String waitForCommit(String oldHeadRevisionId, long maxWaitMillis)
             throws MicroKernelException, InterruptedException {
 
@@ -149,6 +153,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String getJournal(String fromRevisionId, String toRevisionId, String
filter)
             throws MicroKernelException {
         
@@ -167,6 +172,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String diff(String fromRevisionId, String toRevisionId, String filter)
             throws MicroKernelException {
         Request request = null;
@@ -184,6 +190,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized boolean nodeExists(String path, String revisionId)
             throws MicroKernelException {
 
@@ -201,6 +208,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized long getChildNodeCount(String path, String revisionId)
             throws MicroKernelException {
 
@@ -218,12 +226,14 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String getNodes(String path, String revisionId)
             throws MicroKernelException {
 
         return getNodes(path, revisionId, 1, 0, -1, null);
     }
 
+    @Override
     public synchronized String getNodes(String path, String revisionId, int depth,
             long offset, int count, String filter) throws MicroKernelException {
         
@@ -247,7 +257,8 @@ public class Client implements MicroKern
         }
     }
 
-    public synchronized String commit(String path, String jsonDiff, String revisionId, 
+    @Override
+    public synchronized String commit(String path, String jsonDiff, String revisionId,
             String message) throws MicroKernelException {
         
         Request request = null;
@@ -266,6 +277,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String branch(String trunkRevisionId)
             throws MicroKernelException {
 
@@ -282,6 +294,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String merge(String branchRevisionId, String message)
             throws MicroKernelException {
 
@@ -299,6 +312,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized long getLength(String blobId) throws MicroKernelException {
         Request request = null;
 
@@ -313,6 +327,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized int read(String blobId, long pos, byte[] buff, int off, int length)
             throws MicroKernelException {
 
@@ -331,6 +346,7 @@ public class Client implements MicroKern
         }
     }
 
+    @Override
     public synchronized String write(InputStream in) throws MicroKernelException {
         Request request = null;
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
Sat Apr 21 14:56:50 2012
@@ -91,6 +91,7 @@ class MicroKernelServlet {
     
     static class GetHeadRevision implements Command {
         
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -101,6 +102,7 @@ class MicroKernelServlet {
 
     static class GetRevisionHistory implements Command {
         
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
             
@@ -118,6 +120,7 @@ class MicroKernelServlet {
     
     static class WaitForCommit implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -141,6 +144,7 @@ class MicroKernelServlet {
 
     static class GetJournal implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
             
@@ -161,6 +165,7 @@ class MicroKernelServlet {
 
     static class Diff implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -181,6 +186,7 @@ class MicroKernelServlet {
 
     static class NodeExists implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -196,6 +202,7 @@ class MicroKernelServlet {
 
     static class GetChildNodeCount implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -211,6 +218,7 @@ class MicroKernelServlet {
 
     static class GetNodes implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
             
@@ -238,6 +246,7 @@ class MicroKernelServlet {
 
     static class Commit implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
             
@@ -257,6 +266,7 @@ class MicroKernelServlet {
 
     static class Branch implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -273,6 +283,7 @@ class MicroKernelServlet {
 
     static class Merge implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -288,6 +299,7 @@ class MicroKernelServlet {
 
     static class GetLength implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -301,6 +313,7 @@ class MicroKernelServlet {
 
     static class Read implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 
@@ -326,6 +339,7 @@ class MicroKernelServlet {
 
     static class Write implements Command {
 
+        @Override
         public void execute(MicroKernel mk, Request request, Response response)
                 throws IOException, MicroKernelException {
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
Sat Apr 21 14:56:50 2012
@@ -37,6 +37,7 @@ public class LogWrapper implements Micro
         this.mk = mk;
     }
 
+    @Override
     public String commit(String path, String jsonDiff, String revisionId, String message)
{
         try {
             logMethod("commit", path, jsonDiff, revisionId, message);
@@ -49,6 +50,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public void dispose() {
         try {
             logMethod("dispose");
@@ -60,6 +62,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String getHeadRevision() {
         try {
             logMethod("getHeadRevision");
@@ -72,6 +75,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String getJournal(String fromRevisionId, String toRevisionId, String filter) {
         try {
             logMethod("getJournal", fromRevisionId, toRevisionId);
@@ -84,6 +88,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String diff(String fromRevisionId, String toRevisionId, String filter) {
         try {
             logMethod("diff", fromRevisionId, toRevisionId, filter);
@@ -96,6 +101,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public long getLength(String blobId) {
         try {
             logMethod("getLength", blobId);
@@ -108,6 +114,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String getNodes(String path, String revisionId) {
         try {
             logMethod("getNodes", path, revisionId);
@@ -120,6 +127,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String getNodes(String path, String revisionId, int depth, long offset, int count,
String filter) {
         try {
             logMethod("getNodes", path, revisionId, depth, offset, count, filter);
@@ -132,6 +140,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String getRevisionHistory(long since, int maxEntries) {
         try {
             logMethod("getRevisionHistory", since, maxEntries);
@@ -144,6 +153,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public boolean nodeExists(String path, String revisionId) {
         try {
             logMethod("nodeExists", path, revisionId);
@@ -156,6 +166,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public long getChildNodeCount(String path, String revisionId) {
         try {
             logMethod("getChildNodeCount", path, revisionId);
@@ -168,6 +179,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public int read(String blobId, long pos, byte[] buff, int off, int length) {
         try {
             logMethod("read", blobId, pos, buff, off, length);
@@ -180,6 +192,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws InterruptedException
{
         try {
             logMethod("waitForCommit", oldHeadRevisionId, maxWaitMillis);
@@ -195,6 +208,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String write(InputStream in) {
         try {
             logMethod("write", in.toString());
@@ -207,6 +221,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String branch(String trunkRevisionId) {
         try {
             logMethod("branch", trunkRevisionId);
@@ -219,6 +234,7 @@ public class LogWrapper implements Micro
         }
     }
 
+    @Override
     public String merge(String branchRevisionId, String message) {
         try {
             logMethod("merge", branchRevisionId, message);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
Sat Apr 21 14:56:50 2012
@@ -28,14 +28,17 @@ import org.apache.jackrabbit.mk.json.Jso
  */
 public abstract class MicroKernelWrapperBase implements MicroKernel, MicroKernelWrapper {
 
+    @Override
     public final String commit(String path, String jsonDiff, String revisionId, String message)
{
         return commitStream(path, new JsopTokenizer(jsonDiff), revisionId, message);
     }
 
+    @Override
     public final String getJournal(String fromRevisionId, String toRevisionId, String filter)
{
         return getJournalStream(fromRevisionId, toRevisionId, filter).toString();
     }
 
+    @Override
     public final String getNodes(String path, String revisionId) {
         JsopReader reader = getNodesStream(path, revisionId);
         if (reader != null) {
@@ -45,6 +48,7 @@ public abstract class MicroKernelWrapper
         }
     }
 
+    @Override
     public final String getNodes(String path, String revisionId, int depth, long offset,
int count, String filter) {
         JsopReader reader =
                 getNodesStream(path, revisionId, depth, offset, count, filter);
@@ -55,10 +59,12 @@ public abstract class MicroKernelWrapper
         }
     }
 
+    @Override
     public final String diff(String fromRevisionId, String toRevisionId, String filter) {
         return diffStream(fromRevisionId, toRevisionId, filter).toString();
     }
 
+    @Override
     public final String getRevisionHistory(long since, int maxEntries) {
         return getRevisionsStream(since, maxEntries).toString();
     }
@@ -78,14 +84,17 @@ public abstract class MicroKernelWrapper
 
             MicroKernel wrapped = mk;
 
+            @Override
             public String commitStream(String path, JsopReader jsonDiff, String revisionId,
String message) {
                 return wrapped.commit(path, jsonDiff.toString(), revisionId, message);
             }
 
+            @Override
             public JsopReader getJournalStream(String fromRevisionId, String toRevisionId,
String filter) {
                 return new JsopTokenizer(wrapped.getJournal(fromRevisionId, toRevisionId,
filter));
             }
 
+            @Override
             public JsopReader getNodesStream(String path, String revisionId) {
                 String json = wrapped.getNodes(path, revisionId);
                 if (json != null) {
@@ -95,6 +104,7 @@ public abstract class MicroKernelWrapper
                 }
             }
 
+            @Override
             public JsopReader getNodesStream(String path, String revisionId, int depth, long
offset, int count, String filter) {
                 String json = wrapped.getNodes(
                         path, revisionId, depth, offset, count, filter);
@@ -105,74 +115,92 @@ public abstract class MicroKernelWrapper
                 }
             }
 
+            @Override
             public JsopReader getRevisionsStream(long since, int maxEntries) {
                 return new JsopTokenizer(wrapped.getRevisionHistory(since, maxEntries));
             }
 
+            @Override
             public JsopReader diffStream(String fromRevisionId, String toRevisionId, String
path) {
                 return new JsopTokenizer(wrapped.diff(fromRevisionId, toRevisionId, path));
             }
 
+            @Override
             public String commit(String path, String jsonDiff, String revisionId, String
message) {
                 return wrapped.commit(path, jsonDiff, revisionId, message);
             }
 
+            @Override
             public String branch(String trunkRevisionId) {
                 return wrapped.branch(trunkRevisionId);
             }
 
+            @Override
             public String merge(String branchRevisionId, String message) {
                 return wrapped.merge(branchRevisionId, message);
             }
 
+            @Override
             public String diff(String fromRevisionId, String toRevisionId, String path) {
                 return wrapped.diff(fromRevisionId, toRevisionId, path);
             }
 
+            @Override
             public void dispose() {
                 wrapped.dispose();
             }
 
+            @Override
             public String getHeadRevision() throws MicroKernelException {
                 return wrapped.getHeadRevision();
             }
 
+            @Override
             public String getJournal(String fromRevisionId, String toRevisionId, String filter)
{
                 return wrapped.getJournal(fromRevisionId, toRevisionId, filter);
             }
 
+            @Override
             public long getLength(String blobId) {
                 return wrapped.getLength(blobId);
             }
 
+            @Override
             public String getNodes(String path, String revisionId) {
                 return wrapped.getNodes(path, revisionId);
             }
 
+            @Override
             public String getNodes(String path, String revisionId, int depth, long offset,
int count, String filter) {
                 return wrapped.getNodes(path, revisionId, depth, offset, count, filter);
             }
 
+            @Override
             public String getRevisionHistory(long since, int maxEntries) {
                 return wrapped.getRevisionHistory(since, maxEntries);
             }
 
+            @Override
             public boolean nodeExists(String path, String revisionId) {
                 return wrapped.nodeExists(path, revisionId);
             }
 
+            @Override
             public long getChildNodeCount(String path, String revisionId) {
                 return wrapped.getChildNodeCount(path, revisionId);
             }
 
+            @Override
             public int read(String blobId, long pos, byte[] buff, int off, int length) {
                 return wrapped.read(blobId, pos, buff, off, length);
             }
 
+            @Override
             public String waitForCommit(String oldHeadRevisionId, long maxWaitMillis) throws
InterruptedException {
                 return wrapped.waitForCommit(oldHeadRevisionId, maxWaitMillis);
             }
 
+            @Override
             public String write(InputStream in) {
                 return wrapped.write(in);
             }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
Sat Apr 21 14:56:50 2012
@@ -30,6 +30,7 @@ public class ConcurrentWriteIT extends T
 
     final MicroKernel mk = new MicroKernelImpl();
 
+    @Override
     public void setUp() throws Exception {
         mk.commit("/", "+ \"" + TEST_PATH.substring(1) + "\": {\"jcr:primaryType\":\"nt:unstructured\"}",
mk.getHeadRevision(), null);
     }
@@ -94,6 +95,7 @@ public class ConcurrentWriteIT extends T
             rand = new Random();
         }
 
+        @Override
         public void run() {
             StringBuilder sb = new StringBuilder();
             sb.append("+\"");

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java?rev=1328678&r1=1328677&r2=1328678&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
Sat Apr 21 14:56:50 2012
@@ -34,6 +34,7 @@ public class ConcurrentTest extends Mult
     public void test() throws Exception {
         final AtomicInteger id = new AtomicInteger();
         Concurrent.run(url, new Concurrent.Task() {
+            @Override
             public void call() throws Exception {
                 long start = System.currentTimeMillis();
                 String rev = mk.getHeadRevision();



Mime
View raw message