accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/3] accumulo git commit: ACCUMULO-2129 Update javadocs for overridden methods
Date Tue, 07 Apr 2015 01:36:30 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 5ed504c62 -> 698368f2b


http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
index a9bbe55..b9b122c 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
@@ -53,274 +53,172 @@ public class HdfsRandomAccessContent implements RandomAccessContent
{
     this.fis = this.fs.open(this.path);
   }
 
-  /**
-   * @see org.apache.commons.vfs2.RandomAccessContent#close()
-   */
   @Override
   public void close() throws IOException {
     this.fis.close();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.RandomAccessContent#getFilePointer()
-   */
   @Override
   public long getFilePointer() throws IOException {
     return this.fis.getPos();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.RandomAccessContent#getInputStream()
-   */
   @Override
   public InputStream getInputStream() throws IOException {
     return this.fis;
   }
 
-  /**
-   * @see org.apache.commons.vfs2.RandomAccessContent#length()
-   */
   @Override
   public long length() throws IOException {
     return this.fs.getFileStatus(this.path).getLen();
   }
 
-  /**
-   * @see java.io.DataInput#readBoolean()
-   */
   @Override
   public boolean readBoolean() throws IOException {
     return this.fis.readBoolean();
   }
 
-  /**
-   * @see java.io.DataInput#readByte()
-   */
   @Override
   public byte readByte() throws IOException {
     return this.fis.readByte();
   }
 
-  /**
-   * @see java.io.DataInput#readChar()
-   */
   @Override
   public char readChar() throws IOException {
     return this.fis.readChar();
   }
 
-  /**
-   * @see java.io.DataInput#readDouble()
-   */
   @Override
   public double readDouble() throws IOException {
     return this.fis.readDouble();
   }
 
-  /**
-   * @see java.io.DataInput#readFloat()
-   */
   @Override
   public float readFloat() throws IOException {
     return this.fis.readFloat();
   }
 
-  /**
-   * @see java.io.DataInput#readFully(byte[])
-   */
   @Override
   public void readFully(final byte[] b) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataInput#readFully(byte[], int, int)
-   */
   @Override
   public void readFully(final byte[] b, final int off, final int len) throws IOException
{
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataInput#readInt()
-   */
   @Override
   public int readInt() throws IOException {
     return this.fis.readInt();
   }
 
-  /**
-   * @see java.io.DataInput#readLine()
-   */
   @Override
   public String readLine() throws IOException {
     BufferedReader d = new BufferedReader(new InputStreamReader(this.fis, Charset.forName("UTF-8")));
     return d.readLine();
   }
 
-  /**
-   * @see java.io.DataInput#readLong()
-   */
   @Override
   public long readLong() throws IOException {
     return this.fis.readLong();
   }
 
-  /**
-   * @see java.io.DataInput#readShort()
-   */
   @Override
   public short readShort() throws IOException {
     return this.fis.readShort();
   }
 
-  /**
-   * @see java.io.DataInput#readUnsignedByte()
-   */
   @Override
   public int readUnsignedByte() throws IOException {
     return this.fis.readUnsignedByte();
   }
 
-  /**
-   * @see java.io.DataInput#readUnsignedShort()
-   */
   @Override
   public int readUnsignedShort() throws IOException {
     return this.fis.readUnsignedShort();
   }
 
-  /**
-   * @see java.io.DataInput#readUTF()
-   */
   @Override
   public String readUTF() throws IOException {
     return this.fis.readUTF();
   }
 
-  /**
-   * @see org.apache.commons.vfs2.RandomAccessContent#seek(long)
-   */
   @Override
   public void seek(final long pos) throws IOException {
     this.fis.seek(pos);
   }
 
-  /**
-   * @see java.io.DataInput#skipBytes(int)
-   */
   @Override
   public int skipBytes(final int n) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#write(byte[])
-   */
   @Override
   public void write(final byte[] b) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#write(byte[], int, int)
-   */
   @Override
   public void write(final byte[] b, final int off, final int len) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#write(int)
-   */
   @Override
   public void write(final int b) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeBoolean(boolean)
-   */
   @Override
   public void writeBoolean(final boolean v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeByte(int)
-   */
   @Override
   public void writeByte(final int v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeBytes(java.lang.String)
-   */
   @Override
   public void writeBytes(final String s) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeChar(int)
-   */
   @Override
   public void writeChar(final int v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeChars(java.lang.String)
-   */
   @Override
   public void writeChars(final String s) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeDouble(double)
-   */
   @Override
   public void writeDouble(final double v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeFloat(float)
-   */
   @Override
   public void writeFloat(final float v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeInt(int)
-   */
   @Override
   public void writeInt(final int v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeLong(long)
-   */
   @Override
   public void writeLong(final long v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeShort(int)
-   */
   @Override
   public void writeShort(final int v) throws IOException {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @see java.io.DataOutput#writeUTF(java.lang.String)
-   */
   @Override
   public void writeUTF(final String s) throws IOException {
     throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
index d10ca01..2ba4ecf 100644
--- a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
+++ b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
@@ -113,16 +113,19 @@ public class VfsClassLoaderTest extends AccumuloDFSBase {
     private boolean fileDeleted = false;
     private boolean fileCreated = false;
 
+    @Override
     public void fileCreated(FileChangeEvent event) throws Exception {
       // System.out.println(event.getFile() + " created");
       this.fileCreated = true;
     }
 
+    @Override
     public void fileDeleted(FileChangeEvent event) throws Exception {
       // System.out.println(event.getFile() + " deleted");
       this.fileDeleted = true;
     }
 
+    @Override
     public void fileChanged(FileChangeEvent event) throws Exception {
       // System.out.println(event.getFile() + " changed");
       this.fileChanged = true;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
index 1ab2a8a..668b9cc 100644
--- a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
+++ b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
@@ -90,10 +90,12 @@ class TextMemoryUsageTest extends MemoryUsageTest {
 
   }
 
+  @Override
   void init() {
     map = new TreeMap<Text,Value>();
   }
 
+  @Override
   public void addEntry(int i) {
     Text key = new Text(String.format("%0" + keyLen + "d:%0" + colFamLen + "d:%0" + colQualLen
+ "d", i, 0, 0).getBytes());
     //
@@ -107,19 +109,23 @@ class TextMemoryUsageTest extends MemoryUsageTest {
 
   }
 
+  @Override
   public void clear() {
     map.clear();
     map = null;
   }
 
+  @Override
   public int getEstimatedBytesPerEntry() {
     return keyLen + colFamLen + colQualLen + dataLen;
   }
 
+  @Override
   int getNumPasses() {
     return passes;
   }
 
+  @Override
   String getName() {
     return "Text " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
   }
@@ -151,6 +157,7 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
 
   }
 
+  @Override
   void init() {
     imm = new InMemoryMap(false, "/tmp");
     key = new Text();
@@ -160,6 +167,7 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
     colv = new ColumnVisibility(String.format("%0" + colVisLen + "d", 0));
   }
 
+  @Override
   public void addEntry(int i) {
     key.set(String.format("%0" + keyLen + "d", i));
 
@@ -177,10 +185,12 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
 
   }
 
+  @Override
   public int getEstimatedBytesPerEntry() {
     return keyLen + colFamLen + colQualLen + dataLen + 4 + colVisLen;
   }
 
+  @Override
   public void clear() {
     imm = null;
     key = null;
@@ -188,10 +198,12 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
     colq = null;
   }
 
+  @Override
   int getNumPasses() {
     return passes;
   }
 
+  @Override
   String getName() {
     return "IMM " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
   }
@@ -220,6 +232,7 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
 
   }
 
+  @Override
   void init() {
     key = new Text();
 
@@ -232,6 +245,7 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
     }
   }
 
+  @Override
   public void addEntry(int i) {
     key.set(String.format("%0" + keyLen + "d", i));
 
@@ -248,10 +262,12 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
     mutations[i] = m;
   }
 
+  @Override
   public int getEstimatedBytesPerEntry() {
     return keyLen + colFamLen + colQualLen + dataLen;
   }
 
+  @Override
   public void clear() {
     key = null;
     colf = null;
@@ -259,10 +275,12 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
     mutations = null;
   }
 
+  @Override
   int getNumPasses() {
     return passes;
   }
 
+  @Override
   String getName() {
     return "Mutation " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
   }
@@ -285,25 +303,31 @@ class IntObjectMemoryUsageTest extends MemoryUsageTest {
     this.passes = numPasses;
   }
 
+  @Override
   void init() {
     data = new Object[passes];
   }
 
+  @Override
   void addEntry(int i) {
     data[i] = new SimpleObject(i);
 
   }
 
+  @Override
   void clear() {}
 
+  @Override
   int getEstimatedBytesPerEntry() {
     return 4;
   }
 
+  @Override
   String getName() {
     return "int obj";
   }
 
+  @Override
   int getNumPasses() {
     return passes;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
index 673e61d..adafdfb 100644
--- a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
@@ -42,6 +42,7 @@ public class FaultyConditionalWriter implements ConditionalWriter {
 
   }
 
+  @Override
   public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
     ArrayList<Result> resultList = new ArrayList<Result>();
     ArrayList<ConditionalMutation> writes = new ArrayList<ConditionalMutation>();
@@ -68,6 +69,7 @@ public class FaultyConditionalWriter implements ConditionalWriter {
     return resultList.iterator();
   }
 
+  @Override
   public Result write(ConditionalMutation mutation) {
     return write(Collections.singleton(mutation).iterator()).next();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java b/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
index 32a178d..c05fc52 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
@@ -42,6 +42,7 @@ public class DropModIter extends SkippingIterator {
     this.drop = Integer.parseInt(options.get("drop"));
   }
 
+  @Override
   protected void consume() throws IOException {
     while (getSource().hasTop() && Integer.parseInt(getSource().getTopKey().getRow().toString())
% mod == drop) {
       getSource().next();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
index 8d14574..6e02c23 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
@@ -53,7 +53,7 @@ public class Config extends Test {
     return new Setting(property, min, max);
   }
 
-  /* @formatter:off */
+  // @formatter:off
   Setting[] settings = {
       s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
       s(Property.TSERV_BULK_PROCESS_THREADS, 1, 10),
@@ -102,8 +102,7 @@ public class Config extends Test {
       s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, 10 * 1024, 10 * 1024 * 1024L),
       s(Property.TABLE_FILE_REPLICATION, 0, 5),
       s(Property.TABLE_FILE_MAX, 2, 50),};
-
-  /* @formatter:on */
+  // @formatter:on
 
   @Override
   public void visit(State state, Environment env, Properties props) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
index ec4edaf..35636e4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
@@ -54,6 +54,7 @@ public class Transfer extends Test {
       seq = Integer.parseInt(s);
     }
 
+    @Override
     public String toString() {
       return seq + " " + bal;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
b/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
index a3bdd43..405fabb 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
@@ -26,6 +26,7 @@ public class RandomByteArrays extends Stream<byte[]> {
     this.random_arrays = random_arrays;
   }
 
+  @Override
   public byte[] next() {
     return random_arrays.next_bytes();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java b/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
index c59cd1c..3e8d5fd 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
@@ -100,6 +100,7 @@ public class Scan {
       this.current = 0;
     }
 
+    @Override
     public boolean keepScanning() {
       if (current < max) {
         ++current;
@@ -112,6 +113,7 @@ public class Scan {
 
   // Does an infinite number of iterations
   static class ContinuousLoopControl implements LoopControl {
+    @Override
     public boolean keepScanning() {
       return true;
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
index ec89c5d..8915c0d 100644
--- a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
@@ -53,6 +53,7 @@ public class MetaGetsReadersIT extends ConfigurableMacIT {
 
   private static Thread slowScan(final Connector c, final String tableName, final AtomicBoolean
stop) {
     Thread thread = new Thread() {
+      @Override
       public void run() {
         try {
           while (stop.get() == false) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
index ac24083..5da0629 100644
--- a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
@@ -52,6 +52,7 @@ public class TabletServerGivesUpIT extends ConfigurableMacIT {
     // ask the tserver to do something
     final AtomicReference<Exception> ex = new AtomicReference<>();
     Thread splitter = new Thread() {
+      @Override
       public void run() {
         try {
           TreeSet<Text> splits = new TreeSet<>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
index 9104d5f..2004623 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
@@ -46,30 +46,37 @@ public class Span extends org.apache.accumulo.core.trace.Span implements
Cloudtr
     return new Span(span.child(s));
   }
 
+  @Override
   public void start() {
     throw new UnsupportedOperationException("can't start span");
   }
 
+  @Override
   public long accumulatedMillis() {
     return getAccumulatedMillis();
   }
 
+  @Override
   public boolean running() {
     return isRunning();
   }
 
+  @Override
   public String description() {
     return getDescription();
   }
 
+  @Override
   public long spanId() {
     return getSpanId();
   }
 
+  @Override
   public Span parent() {
     throw new UnsupportedOperationException("can't get parent");
   }
 
+  @Override
   public long parentId() {
     return getParentId();
   }


Mime
View raw message