You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2012/03/14 12:23:22 UTC
svn commit: r1300507 - in /jackrabbit/sandbox/microkernel/src:
main/java/org/apache/jackrabbit/mk/blobs/
main/java/org/apache/jackrabbit/mk/fs/
main/java/org/apache/jackrabbit/mk/index/
main/java/org/apache/jackrabbit/mk/json/ main/java/org/apache/jack...
Author: thomasm
Date: Wed Mar 14 11:23:20 2012
New Revision: 1300507
URL: http://svn.apache.org/viewvc?rev=1300507&view=rev
Log:
Add missing @Override
Modified:
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileBase.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileCache.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileChannelInputStream.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePath.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathCache.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathDisk.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathWrapper.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopStream.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopTokenizer.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/Cache.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/SimpleLRUCache.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/IndexWrapper.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/BloomFilterUtilsTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/CommitGateTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/Concurrent.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/IOUtilsTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java Wed Mar 14 11:23:20 2012
@@ -382,6 +382,7 @@ public abstract class AbstractBlobStore
this.pos = pos;
}
+ @Override
public boolean equals(Object other) {
if (this == other) {
return true;
@@ -391,11 +392,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;
}
@@ -413,6 +416,7 @@ 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;
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java Wed Mar 14 11:23:20 2012
@@ -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/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileBase.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileBase.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileBase.java Wed Mar 14 11:23:20 2012
@@ -29,57 +29,74 @@ import java.nio.channels.WritableByteCha
*/
public abstract class FileBase extends FileChannel {
+ @Override
public void force(boolean metaData) throws IOException {
// ignore
}
+ @Override
public FileLock lock(long position, long size, boolean shared) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public MappedByteBuffer map(MapMode mode, long position, long size) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public abstract long position() throws IOException;
+ @Override
public abstract FileChannel position(long newPosition) throws IOException;
+ @Override
public abstract int read(ByteBuffer dst) throws IOException;
+ @Override
public int read(ByteBuffer dst, long position) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public abstract long size() throws IOException;
+ @Override
public long transferFrom(ReadableByteChannel src, long position, long count) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public long transferTo(long position, long count, WritableByteChannel target)
throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public abstract FileChannel truncate(long size) throws IOException;
+ @Override
public FileLock tryLock(long position, long size, boolean shared) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public abstract int write(ByteBuffer src) throws IOException;
+ @Override
public int write(ByteBuffer src, long position) throws IOException {
throw new UnsupportedOperationException(); }
+ @Override
public long write(ByteBuffer[] srcs, int offset, int length) throws IOException {
throw new UnsupportedOperationException(); }
+ @Override
protected void implCloseChannel() throws IOException {
// ignore
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileCache.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileCache.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileCache.java Wed Mar 14 11:23:20 2012
@@ -50,10 +50,12 @@ public class FileCache extends FileBase
this.size = base.size();
}
+ @Override
public long position() throws IOException {
return pos;
}
+ @Override
public FileChannel position(long newPosition) throws IOException {
this.pos = newPosition;
return this;
@@ -79,6 +81,7 @@ public class FileCache extends FileBase
return true;
}
+ @Override
public int read(ByteBuffer dst) throws IOException {
flush();
long readPos = (pos / BLOCK_SIZE) * BLOCK_SIZE;
@@ -105,10 +108,12 @@ public class FileCache extends FileBase
return len;
}
+ @Override
public long size() throws IOException {
return size;
}
+ @Override
public FileChannel truncate(long newSize) throws IOException {
flush();
readCache.clear();
@@ -118,6 +123,7 @@ public class FileCache extends FileBase
return this;
}
+ @Override
public int write(ByteBuffer src) throws IOException {
if (readCache.size() > 0) {
readCache.clear();
@@ -136,6 +142,7 @@ public class FileCache extends FileBase
ByteArrayOutputStream buff = new ByteArrayOutputStream(APPEND_BUFFER_SIZE_INIT);
appendBuffer = new AtomicReference<ByteArrayOutputStream>(buff);
appendFlushThread = new Thread("Flush " + name) {
+ @Override
public void run() {
try {
do {
@@ -170,6 +177,7 @@ public class FileCache extends FileBase
return len;
}
+ @Override
protected void implCloseChannel() throws IOException {
if (appendBuffer != null) {
appendFlushThread.interrupt();
@@ -183,16 +191,19 @@ public class FileCache extends FileBase
base.close();
}
+ @Override
public void force(boolean metaData) throws IOException {
flush();
base.force(metaData);
}
+ @Override
public FileLock tryLock(long position, long size, boolean shared) throws IOException {
flush();
return base.tryLock(position, size, shared);
}
+ @Override
public String toString() {
return "cache:" + base.toString();
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileChannelInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileChannelInputStream.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileChannelInputStream.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FileChannelInputStream.java Wed Mar 14 11:23:20 2012
@@ -30,6 +30,7 @@ public class FileChannelInputStream exte
this.closeChannel = closeChannel;
}
+ @Override
public int read() throws IOException {
if (channel.position() >= channel.size()) {
return -1;
@@ -38,10 +39,12 @@ public class FileChannelInputStream exte
return buffer[0] & 0xff;
}
+ @Override
public int read(byte[] b) throws IOException {
return read(b, 0, b.length);
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
if (channel.position() + len < channel.size()) {
FileUtils.readFully(channel, ByteBuffer.wrap(b, off, len));
@@ -50,12 +53,14 @@ public class FileChannelInputStream exte
return super.read(b, off, len);
}
+ @Override
public long skip(long n) throws IOException {
n = Math.min(channel.size() - channel.position(), n);
channel.position(channel.position() + n);
return n;
}
+ @Override
public void close() throws IOException {
if (closeChannel) {
channel.close();
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePath.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePath.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePath.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePath.java Wed Mar 14 11:23:20 2012
@@ -287,6 +287,7 @@ public abstract class FilePath {
*
* @return the path as a string
*/
+ @Override
public String toString() {
return name;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathCache.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathCache.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathCache.java Wed Mar 14 11:23:20 2012
@@ -24,10 +24,12 @@ import java.nio.channels.FileChannel;
*/
public class FilePathCache extends FilePathWrapper {
+ @Override
public FileChannel open(String mode) throws IOException {
return new FileCache(getBase().name, getBase().open(mode));
}
+ @Override
public String getScheme() {
return "cache";
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathDisk.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathDisk.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathDisk.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathDisk.java Wed Mar 14 11:23:20 2012
@@ -41,12 +41,14 @@ public class FilePathDisk extends FilePa
private static final String FILE_SEPARATOR = System.getProperty("file.separator", "/");
private static final int MAX_FILE_RETRY = 16;
+ @Override
public FilePathDisk getPath(String path) {
FilePathDisk p = new FilePathDisk();
p.name = translateFileName(path);
return p;
}
+ @Override
public long size() {
return new File(name).length();
}
@@ -81,6 +83,7 @@ public class FilePathDisk extends FilePa
return fileName;
}
+ @Override
public void moveTo(FilePath newName) throws IOException {
File oldFile = new File(name);
File newFile = new File(newName.name);
@@ -118,6 +121,7 @@ public class FilePathDisk extends FilePa
}
}
+ @Override
public boolean createFile() {
File file = new File(name);
for (int i = 0; i < MAX_FILE_RETRY; i++) {
@@ -131,10 +135,12 @@ public class FilePathDisk extends FilePa
return false;
}
+ @Override
public boolean exists() {
return new File(name).exists();
}
+ @Override
public void delete() throws IOException {
File file = new File(name);
for (int i = 0; i < MAX_FILE_RETRY; i++) {
@@ -147,6 +153,7 @@ public class FilePathDisk extends FilePa
throw new IOException("Could not delete " + name);
}
+ @Override
public List<FilePath> newDirectoryStream() throws IOException {
ArrayList<FilePath> list = new ArrayList<FilePath>();
File f = new File(name);
@@ -163,33 +170,40 @@ public class FilePathDisk extends FilePa
return list;
}
+ @Override
public boolean canWrite() {
return canWriteInternal(new File(name));
}
+ @Override
public boolean setReadOnly() {
File f = new File(name);
return f.setReadOnly();
}
+ @Override
public FilePathDisk toRealPath() throws IOException {
String fileName = new File(name).getCanonicalPath();
return getPath(fileName);
}
+ @Override
public FilePath getParent() {
String p = new File(name).getParent();
return p == null ? null : getPath(p);
}
+ @Override
public boolean isDirectory() {
return new File(name).isDirectory();
}
+ @Override
public boolean isAbsolute() {
return new File(name).isAbsolute();
}
+ @Override
public long lastModified() {
return new File(name).lastModified();
}
@@ -224,6 +238,7 @@ public class FilePathDisk extends FilePa
}
}
+ @Override
public void createDirectory() throws IOException {
File f = new File(name);
if (f.exists()) {
@@ -242,6 +257,7 @@ public class FilePathDisk extends FilePa
throw new IOException("Could not create " + name);
}
+ @Override
public OutputStream newOutputStream(boolean append) throws IOException {
File file = new File(name);
File parent = file.getParentFile();
@@ -252,6 +268,7 @@ public class FilePathDisk extends FilePa
return out;
}
+ @Override
public InputStream newInputStream() throws IOException {
if (name.indexOf(':') > 1) {
// if the : is in position 1, a windows file access is assumed: C:.. or D:
@@ -296,14 +313,17 @@ public class FilePathDisk extends FilePa
}
}
+ @Override
public FileChannel open(String mode) throws IOException {
return new FileDisk(name, mode);
}
+ @Override
public String getScheme() {
return "file";
}
+ @Override
public FilePath createTempFile(String suffix, boolean deleteOnExit, boolean inTempDir)
throws IOException {
String fileName = name + ".";
@@ -335,6 +355,7 @@ public class FilePathDisk extends FilePa
}
}
+ @Override
public FilePath resolve(String other) {
return other == null ? this : getPath(name + "/" + other);
}
@@ -356,10 +377,12 @@ class FileDisk extends FileBase {
this.name = fileName;
}
+ @Override
public void force(boolean metaData) throws IOException {
file.getFD().sync();
}
+ @Override
public FileChannel truncate(long newLength) throws IOException {
if (newLength < file.length()) {
// some implementations actually only support truncate
@@ -369,22 +392,27 @@ class FileDisk extends FileBase {
return this;
}
+ @Override
public synchronized FileLock tryLock(long position, long size, boolean shared) throws IOException {
return file.getChannel().tryLock();
}
+ @Override
public void implCloseChannel() throws IOException {
file.close();
}
+ @Override
public long position() throws IOException {
return pos;
}
+ @Override
public long size() throws IOException {
return file.length();
}
+ @Override
public int read(ByteBuffer dst) throws IOException {
int len = file.read(dst.array(), dst.position(), dst.remaining());
if (len > 0) {
@@ -394,6 +422,7 @@ class FileDisk extends FileBase {
return len;
}
+ @Override
public FileChannel position(long pos) throws IOException {
if (this.pos != pos) {
file.seek(pos);
@@ -402,6 +431,7 @@ class FileDisk extends FileBase {
return this;
}
+ @Override
public int write(ByteBuffer src) throws IOException {
int len = src.remaining();
file.write(src.array(), src.position(), len);
@@ -410,6 +440,7 @@ class FileDisk extends FileBase {
return len;
}
+ @Override
public String toString() {
return name;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathWrapper.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathWrapper.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/fs/FilePathWrapper.java Wed Mar 14 11:23:20 2012
@@ -21,6 +21,7 @@ public abstract class FilePathWrapper ex
private FilePath base;
+ @Override
public FilePathWrapper getPath(String path) {
return create(path, unwrap(path));
}
@@ -68,46 +69,57 @@ public abstract class FilePathWrapper ex
return base;
}
+ @Override
public boolean canWrite() {
return base.canWrite();
}
+ @Override
public void createDirectory() throws IOException {
base.createDirectory();
}
+ @Override
public boolean createFile() {
return base.createFile();
}
+ @Override
public void delete() throws IOException {
base.delete();
}
+ @Override
public boolean exists() {
return base.exists();
}
+ @Override
public FilePath getParent() {
return wrap(base.getParent());
}
+ @Override
public boolean isAbsolute() {
return base.isAbsolute();
}
+ @Override
public boolean isDirectory() {
return base.isDirectory();
}
+ @Override
public long lastModified() {
return base.lastModified();
}
+ @Override
public FilePath toRealPath() throws IOException {
return wrap(base.toRealPath());
}
+ @Override
public List<FilePath> newDirectoryStream() throws IOException {
List<FilePath> list = base.newDirectoryStream();
for (int i = 0, len = list.size(); i < len; i++) {
@@ -116,35 +128,43 @@ public abstract class FilePathWrapper ex
return list;
}
+ @Override
public void moveTo(FilePath newName) throws IOException {
base.moveTo(((FilePathWrapper) newName).base);
}
+ @Override
public InputStream newInputStream() throws IOException {
return base.newInputStream();
}
+ @Override
public OutputStream newOutputStream(boolean append) throws IOException {
return base.newOutputStream(append);
}
+ @Override
public FileChannel open(String mode) throws IOException {
return base.open(mode);
}
+ @Override
public boolean setReadOnly() {
return base.setReadOnly();
}
+ @Override
public long size() {
return base.size();
}
+ @Override
public FilePath createTempFile(String suffix, boolean deleteOnExit, boolean inTempDir)
throws IOException {
return wrap(base.createTempFile(suffix, deleteOnExit, inTempDir));
}
+ @Override
public FilePath resolve(String other) {
return other == null ? this : wrap(base.resolve(other));
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java Wed Mar 14 11:23:20 2012
@@ -34,10 +34,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 +69,7 @@ class BTreeLeaf extends BTreePage {
tree.bufferSetArray(getPath(), "values", values);
}
+ @Override
void writeCreate() {
tree.modified(this);
JsopBuilder jsop = new JsopBuilder();
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java Wed Mar 14 11:23:20 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/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java Wed Mar 14 11:23:20 2012
@@ -216,6 +216,7 @@ public class JsopBuilder implements Jsop
/**
* Get the generated string.
*/
+ @Override
public String toString() {
return buff.toString();
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopStream.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopStream.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopStream.java Wed Mar 14 11:23:20 2012
@@ -267,6 +267,7 @@ public class JsopStream implements JsopR
return read(JsopTokenizer.STRING);
}
+ @Override
public String toString() {
JsopBuilder buff = new JsopBuilder();
for (int i = 0; i < len; i++) {
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopTokenizer.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopTokenizer.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopTokenizer.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopTokenizer.java Wed Mar 14 11:23:20 2012
@@ -55,6 +55,7 @@ public class JsopTokenizer implements Js
read();
}
+ @Override
public String toString() {
return jsop;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java Wed Mar 14 11:23:20 2012
@@ -96,6 +96,7 @@ public class JsopArray extends Jsop impl
return list.size();
}
+ @Override
public String toString() {
if (jsop == null) {
JsopBuilder w = new JsopBuilder();
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java Wed Mar 14 11:23:20 2012
@@ -131,6 +131,7 @@ public class JsopObject extends Jsop imp
jsop = null;
}
+ @Override
public String toString() {
if (jsop == null) {
JsopBuilder w = new JsopBuilder();
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeId.java Wed Mar 14 11:23:20 2012
@@ -42,6 +42,7 @@ public class NodeId {
return map.getNode(x);
}
+ @Override
public String toString() {
return Long.toString(x);
}
@@ -74,14 +75,17 @@ public class NodeId {
this.node = node;
}
+ @Override
public NodeImpl getNode(NodeMap map) {
return node;
}
+ @Override
public String toString() {
return node.toString();
}
+ @Override
public boolean isInline() {
return true;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java Wed Mar 14 11:23:20 2012
@@ -524,6 +524,7 @@ public class NodeImpl implements Cache.V
return propertyValuePairs[index + index + 1];
}
+ @Override
public String toString() {
String s = asString();
if (path != null) {
@@ -537,12 +538,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
}
@@ -704,6 +708,7 @@ public class NodeImpl implements Cache.V
return memory;
}
+ @Override
public int hashCode() {
int hash = Arrays.hashCode(propertyValuePairs);
if (childNodes != null) {
@@ -712,6 +717,7 @@ public class NodeImpl implements Cache.V
return hash;
}
+ @Override
public boolean equals(Object other) {
if (other == this) {
return true;
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java Wed Mar 14 11:23:20 2012
@@ -173,6 +173,7 @@ public class NodeListSmall implements No
return result;
}
+ @Override
public String toString() {
JsopWriter json = new JsopBuilder();
json.object();
@@ -217,6 +218,7 @@ public class NodeListSmall implements No
return memory;
}
+ @Override
public int hashCode() {
if (size == 0) {
return 0;
@@ -226,6 +228,7 @@ public class NodeListSmall implements No
Arrays.hashCode(sort);
}
+ @Override
public boolean equals(Object other) {
if (other == this) {
return true;
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java Wed Mar 14 11:23:20 2012
@@ -258,6 +258,7 @@ public class NodeListTrie implements Nod
NodeId id;
String prefix;
+ @Override
public String toString() {
return prefix;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java Wed Mar 14 11:23:20 2012
@@ -72,6 +72,7 @@ public class NodeMapInDb extends NodeMap
}
}
+ @Override
public synchronized NodeId addNode(NodeImpl node) {
return addNode(node, true);
}
@@ -91,6 +92,7 @@ public class NodeMapInDb extends NodeMap
return x;
}
+ @Override
public NodeImpl getNode(long x) {
return x < 0 ? temp.get(x) : cache.get(x);
}
@@ -108,6 +110,7 @@ public class NodeMapInDb extends NodeMap
}
}
+ @Override
public synchronized NodeId commit(NodeImpl newRoot) {
addNode(newRoot, false);
try {
@@ -154,15 +157,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 +183,7 @@ public class NodeMapInDb extends NodeMap
return n;
}
+ @Override
public synchronized void close() {
try {
conn.close();
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java Wed Mar 14 11:23:20 2012
@@ -79,6 +79,7 @@ public class NodeMapInMongoDb extends No
}
}
+ @Override
public synchronized NodeId addNode(NodeImpl node) {
return addNode(node, true);
}
@@ -98,6 +99,7 @@ public class NodeMapInMongoDb extends No
return x;
}
+ @Override
public NodeImpl getNode(long x) {
return x < 0 ? temp.get(x) : cache.get(x);
}
@@ -113,6 +115,7 @@ public class NodeMapInMongoDb extends No
}
}
+ @Override
public synchronized NodeId commit(NodeImpl newRoot) {
addNode(newRoot, false);
try {
@@ -161,15 +164,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 +189,7 @@ public class NodeMapInMongoDb extends No
return n;
}
+ @Override
public synchronized void close() {
con.close();
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/Revision.java Wed Mar 14 11:23:20 2012
@@ -101,6 +101,7 @@ public class Revision implements Compara
return id < o.id ? -1 : id > o.id ? 1 : 0;
}
+ @Override
public String toString() {
return new JsopBuilder().object().
key("id").value(formatId(id)).
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java Wed Mar 14 11:23:20 2012
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.mk.simple;
-import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.blobs.AbstractBlobStore;
import org.apache.jackrabbit.mk.blobs.FileBlobStore;
import org.apache.jackrabbit.mk.blobs.MemoryBlobStore;
@@ -60,7 +59,7 @@ Node structure:
/**
* A simple MicroKernel implementation.
*/
-public class SimpleKernelImpl extends WrapperBase implements MicroKernel {
+public class SimpleKernelImpl extends WrapperBase {
private static final HashMap<String, SimpleKernelImpl> INSTANCES = new HashMap<String, SimpleKernelImpl>();
@@ -601,6 +600,7 @@ public class SimpleKernelImpl extends Wr
}
}
+ @Override
public String toString() {
return "simple:" + name;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/Cache.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/Cache.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/Cache.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/Cache.java Wed Mar 14 11:23:20 2012
@@ -30,6 +30,7 @@ public class Cache<K, V extends Cache.Va
private static final long serialVersionUID = 1L;
+ @Override
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
if (memoryUsed.get() < maxMemoryBytes) {
return false;
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java Wed Mar 14 11:23:20 2012
@@ -37,6 +37,7 @@ public class MicroKernelInputStream exte
this.id = id;
}
+ @Override
public int read(byte[] b, int off, int len) {
int l = mk.read(id, pos, b, off, len);
if (l < 0) {
@@ -46,6 +47,7 @@ public class MicroKernelInputStream exte
return l;
}
+ @Override
public int read() throws IOException {
if (oneByteBuff == null) {
oneByteBuff = new byte[1];
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java Wed Mar 14 11:23:20 2012
@@ -215,21 +215,18 @@ public class PathUtils {
if (next == null) {
if (pos >= path.length()) {
return false;
- }
- else {
+ } else {
int i = path.indexOf('/', pos);
if (i < 0) {
next = path.substring(pos);
pos = path.length();
- }
- else {
+ } else {
next = path.substring(pos, i);
pos = i + 1;
}
return true;
}
- }
- else {
+ } else {
return true;
}
}
@@ -239,8 +236,7 @@ public class PathUtils {
String next = this.next;
this.next = null;
return next;
- }
- else {
+ } else {
throw new NoSuchElementException();
}
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/SimpleLRUCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/SimpleLRUCache.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/SimpleLRUCache.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/util/SimpleLRUCache.java Wed Mar 14 11:23:20 2012
@@ -51,6 +51,7 @@ public class SimpleLRUCache<K, V> extend
this.size = size;
}
+ @Override
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
return size() > size;
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/IndexWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/IndexWrapper.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/IndexWrapper.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/IndexWrapper.java Wed Mar 14 11:23:20 2012
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.mk.util.Pat
/**
* The index mechanism, as a wrapper.
*/
-public class IndexWrapper extends WrapperBase implements MicroKernel {
+public class IndexWrapper extends WrapperBase {
private static final String INDEX_PATH = "/index";
private static final String TYPE_PREFIX = "prefix:";
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java Wed Mar 14 11:23:20 2012
@@ -41,7 +41,7 @@ import org.apache.jackrabbit.mk.util.Sim
* This implementation is not meant for production, it is only used to find
* (performance and other) problems when using such an approach.
*/
-public class SecurityWrapper extends WrapperBase implements MicroKernel {
+public class SecurityWrapper extends WrapperBase {
private final Wrapper mk;
private final boolean admin, write;
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java Wed Mar 14 11:23:20 2012
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.mk.util.Pat
* All mounted repositories contains the configuration as follows:
* /:mount/rep1 { url: "mk:...", paths: "/a,/b" }.
*/
-public class VirtualRepositoryWrapper extends WrapperBase implements MicroKernel {
+public class VirtualRepositoryWrapper extends WrapperBase {
private static final String PREFIX = "virtual:";
private static final String MOUNT = "/:mount";
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java Wed Mar 14 11:23:20 2012
@@ -39,6 +39,7 @@ public class HashTest extends MultiMkTes
super(url);
}
+ @Override
@After
public void tearDown() throws InterruptedException {
if (isSimpleKernel(mk)) {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/DescendantCountTest.java Wed Mar 14 11:23:20 2012
@@ -36,6 +36,7 @@ public class DescendantCountTest extends
super(url);
}
+ @Override
@After
public void tearDown() throws InterruptedException {
if (isSimpleKernel(mk)) {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java Wed Mar 14 11:23:20 2012
@@ -37,6 +37,7 @@ public class LargeNodeTest extends Multi
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -44,6 +45,7 @@ public class LargeNodeTest extends Multi
commit("/", "+ \"t\": {\"a\":{}, \"b\":{}, \"c\":{}}");
}
+ @Override
@After
public void tearDown() throws InterruptedException {
if (isSimpleKernel(mk)) {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java Wed Mar 14 11:23:20 2012
@@ -39,6 +39,7 @@ public class ManyRevisionsTest extends M
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java Wed Mar 14 11:23:20 2012
@@ -38,11 +38,13 @@ public class NodeVersionTest extends Mul
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
}
+ @Override
@After
public void tearDown() throws InterruptedException {
if (isSimpleKernel(mk)) {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/BloomFilterUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/BloomFilterUtilsTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/BloomFilterUtilsTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/BloomFilterUtilsTest.java Wed Mar 14 11:23:20 2012
@@ -192,6 +192,7 @@ public class BloomFilterUtilsTest {
@Test
public void negativeHashCode() {
BloomFilterUtils.add(new byte[0], new Object() {
+ @Override
public int hashCode() {
return -1;
}
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/CommitGateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/CommitGateTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/CommitGateTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/CommitGateTest.java Wed Mar 14 11:23:20 2012
@@ -35,6 +35,7 @@ public class CommitGateTest extends Test
Thread[] threads = new Thread[threadCount];
for (int i = 0; i < 10; i++) {
Thread t = threads[i] = new Thread() {
+ @Override
public void run() {
String head = null;
while (true) {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/Concurrent.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/Concurrent.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/Concurrent.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/Concurrent.java Wed Mar 14 11:23:20 2012
@@ -54,6 +54,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/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/IOUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/IOUtilsTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/IOUtilsTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/util/IOUtilsTest.java Wed Mar 14 11:23:20 2012
@@ -38,6 +38,7 @@ public class IOUtilsTest extends TestCas
final AtomicInteger readCount = new AtomicInteger();
r.nextBytes(data);
FilterInputStream in = new FilterInputStream(new ByteArrayInputStream(data)) {
+ @Override
public int read(byte[] buffer, int off, int max) throws IOException {
readCount.incrementAndGet();
if (r.nextInt(10) == 0) {
@@ -67,6 +68,7 @@ public class IOUtilsTest extends TestCas
byte[] data = new byte[1000];
r.nextBytes(data);
FilterInputStream in = new FilterInputStream(new ByteArrayInputStream(data)) {
+ @Override
public int read(byte[] buffer, int off, int max) throws IOException {
return in.read(buffer, off, Math.min(10, max));
}
@@ -95,6 +97,7 @@ public class IOUtilsTest extends TestCas
IOUtils.writeString(out, s);
byte[] data = out.toByteArray();
ByteArrayInputStream in = new ByteArrayInputStream(data) {
+ @Override
public int read(byte[] b, int off, int len) {
if (r.nextBoolean()) {
len = r.nextInt(len);
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java Wed Mar 14 11:23:20 2012
@@ -36,6 +36,7 @@ public class IndexWrapperTest extends Mu
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java Wed Mar 14 11:23:20 2012
@@ -46,6 +46,7 @@ public class SecurityWrapperTest extends
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -60,6 +61,7 @@ public class SecurityWrapperTest extends
mkGuest = MicroKernelFactory.getInstance("sec:guest@guest:" + url);
}
+ @Override
@After
public void tearDown() throws InterruptedException {
try {
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java?rev=1300507&r1=1300506&r2=1300507&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java Wed Mar 14 11:23:20 2012
@@ -43,6 +43,7 @@ public class VirtualRepositoryWrapperTes
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -59,6 +60,7 @@ public class VirtualRepositoryWrapperTes
mkVirtual = MicroKernelFactory.getInstance("virtual:" + url1);
}
+ @Override
@After
public void tearDown() throws InterruptedException {
try {