ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e17f45 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e17f45 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3e17f45 Branch: refs/heads/master Commit: d3e17f4582634e0f4985c1f3a92afcd67e999427 Parents: 22de8d5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Sep 12 18:16:09 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Sep 12 18:16:09 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/BatchScanner.java | 1 - .../accumulo/core/client/ConditionalWriter.java | 3 --- .../org/apache/accumulo/core/client/Instance.java | 4 ++-- .../accumulo/core/client/admin/TableOperations.java | 6 ------ .../accumulo/core/client/impl/OfflineScanner.java | 13 ------------- .../apache/accumulo/core/file/BloomFilterLayer.java | 1 - .../accumulo/core/file/rfile/bcfile/BCFile.java | 3 --- .../core/iterators/system/LocalityGroupIterator.java | 4 ---- .../accumulo/core/security/VisibilityEvaluator.java | 2 +- .../accumulo/core/security/crypto/CryptoModule.java | 2 -- .../accumulo/core/client/mock/MockConnectorTest.java | 2 -- .../examples/simple/client/RandomBatchScanner.java | 1 - .../examples/simple/client/RowOperations.java | 11 ----------- .../examples/simple/mapreduce/TeraSortIngest.java | 2 -- .../main/java/org/apache/accumulo/fate/TStore.java | 2 -- .../org/apache/accumulo/fate/zookeeper/ZooLock.java | 2 -- .../accumulo/server/tabletserver/MemoryManager.java | 2 -- .../java/org/apache/accumulo/server/util/ZooZap.java | 3 --- .../accumulo/gc/GarbageCollectionEnvironment.java | 14 -------------- .../apache/accumulo/gc/SimpleGarbageCollector.java | 1 - .../org/apache/accumulo/master/TestMergeState.java | 6 ------ .../java/org/apache/accumulo/monitor/Monitor.java | 3 --- .../org/apache/accumulo/tserver/TabletServer.java | 3 --- .../accumulo/tserver/log/TabletServerLogger.java | 1 - .../start/classloader/AccumuloClassLoader.java | 5 ----- .../org/apache/accumulo/test/randomwalk/Module.java | 1 - .../apache/accumulo/test/randomwalk/bulk/Verify.java | 4 ---- .../test/functional/SparseColumnFamilyIT.java | 6 ------ 28 files changed, 3 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java index e332d3c..aa57297 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java @@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase { * <p> * If not set, there is not timeout. The BatchScanner will retry forever. * - * @param timeout * @param timeUnit * determines how timeout is interpreted * @since 1.5.0 http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java index 95f73bb..f9848c4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java @@ -116,7 +116,6 @@ public interface ConditionalWriter { * This method returns one result for each mutation passed to it. This method is thread safe. Multiple threads can safely use a single conditional writer. * Sharing a conditional writer between multiple threads may result in batching of request to tablet servers. * - * @param mutations * @return Result for each mutation submitted. The mutations may still be processing in the background when this method returns, if so the iterator will * block. */ @@ -125,8 +124,6 @@ public interface ConditionalWriter { /** * This method has the same thread safety guarantees as @link {@link #write(Iterator)} * - * - * @param mutation * @return Result for the submitted mutation */ http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/Instance.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java index 05cc7f2..a55312e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java +++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java @@ -127,7 +127,7 @@ public interface Instance { * * @return the AccumuloConfiguration that specifies properties related to interacting with this instance * @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed. - * @see {@link InstanceOperations#getSystemConfiguration()} for client-side reading of the server-side configuration. + * @see InstanceOperations#getSystemConfiguration() for client-side reading of the server-side configuration. */ @Deprecated AccumuloConfiguration getConfiguration(); @@ -138,7 +138,7 @@ public interface Instance { * @param conf * accumulo configuration * @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed. - * @see {@link InstanceOperations#setProperty(String, String)} + * @see InstanceOperations#setProperty(String, String) */ @Deprecated void setConfiguration(AccumuloConfiguration conf); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java index b81eb6d..97f538d 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java @@ -525,7 +525,6 @@ public interface TableOperations { * when there is a general accumulo error * @throws AccumuloSecurityException * when the user does not have the proper permissions - * @throws TableNotFoundException * @since 1.6.0 */ void offline(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException; @@ -552,7 +551,6 @@ public interface TableOperations { * when there is a general accumulo error * @throws AccumuloSecurityException * when the user does not have the proper permissions - * @throws TableNotFoundException * @since 1.6.0 */ void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException; @@ -659,8 +657,6 @@ public interface TableOperations { * the name of the table * @param setting * object specifying the properties of the iterator - * @throws AccumuloException - * @throws TableNotFoundException */ void checkIteratorConflicts(String tableName, IteratorSetting setting, EnumSet<IteratorScope> scopes) throws AccumuloException, TableNotFoundException; @@ -711,8 +707,6 @@ public interface TableOperations { * @param tables * a set of tables * @return a list of disk usage objects containing linked table names and sizes - * @throws AccumuloException - * @throws AccumuloSecurityException * @since 1.6.0 */ List<DiskUsage> getDiskUsage(Set<String> tables) throws AccumuloException, AccumuloSecurityException, TableNotFoundException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java index 522125f..50953d5 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java @@ -169,12 +169,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> { } } - /** - * @throws TableNotFoundException - * @throws IOException - * @throws AccumuloException - * - */ private void nextTablet() throws TableNotFoundException, AccumuloException, IOException { Range nextRange = null; @@ -286,13 +280,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> { return new Pair<KeyExtent,String>(extent, location); } - /** - * @param absFiles - * @return - * @throws AccumuloException - * @throws TableNotFoundException - * @throws IOException - */ private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException, IOException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java index d0e736c..7ab01fa 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java +++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java @@ -300,7 +300,6 @@ public class BloomFilterLayer { * @param range * range of keys to check * @return false iff key doesn't exist, true if key probably exists. - * @throws IOException */ boolean probablyHasKey(Range range) throws IOException { if (bloomFilter == null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java index ca97e01..044989d 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java @@ -209,7 +209,6 @@ public final class BCFile { * Get the current position in file. * * @return The current byte offset in underlying file. - * @throws IOException */ long getCurrentPos() throws IOException { return fsOut.getPos() + fsBufferedOutput.size(); @@ -221,8 +220,6 @@ public final class BCFile { /** * Current size of compressed data. - * - * @throws IOException */ long getCompressedSize() throws IOException { long ret = getCurrentPos() - posStart; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java index c0045ac..71d2d8b 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java @@ -41,10 +41,6 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible private static final Collection<ByteSequence> EMPTY_CF_SET = Collections.emptySet(); public static class LocalityGroup { - /** - * @param localityGroup - * @param env - */ private LocalityGroup(LocalityGroup localityGroup, IteratorEnvironment env) { this(localityGroup.columnFamilies, localityGroup.isDefaultLocalityGroup); this.iterator = (InterruptibleIterator) localityGroup.iterator.deepCopy(env); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java index 725b2c7..6baa17c 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java +++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java @@ -82,7 +82,7 @@ public class VisibilityEvaluator { * Creates a new evaluator for the authorizations found in the given * environment. * - * @param environment environment containing authorizations + * @param env environment containing authorizations */ VisibilityEvaluator(Environment env) { this.auths = env.getAuthorizationsContainer(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java index 783709a..535c141 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java @@ -48,7 +48,6 @@ public interface CryptoModule { * the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream. * @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getEncryptedOutputStream()} set to a stream that is not null. * That stream may be exactly the same stream as {@link CryptoModuleParameters#getPlaintextInputStream()} if the params object specifies no cryptography. - * @throws IOException */ CryptoModuleParameters getEncryptingOutputStream(CryptoModuleParameters params) throws IOException; @@ -70,7 +69,6 @@ public interface CryptoModule { * the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream. * @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getPlaintextInputStream()} set to a stream that is not null. * That stream may be exactly the same stream as {@link CryptoModuleParameters#getEncryptedInputStream()} if the params object specifies no cryptography. - * @throws IOException */ CryptoModuleParameters getDecryptingInputStream(CryptoModuleParameters params) throws IOException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java index ca57bd4..7ccae0a 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java @@ -259,8 +259,6 @@ public class MockConnectorTest { * Table to check * @param count * number of entries to expect in the table - * @param count - * number of rows the table should contain */ private void checkRemaining(Connector c, String tableName, int count) throws Exception { Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java index 5fe23a5..3111c5b 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java @@ -115,7 +115,6 @@ public class RandomBatchScanner { /** * Prints a count of the number of rows mapped to false. * - * @param expectedRows * @return boolean indicating "were all the rows found?" */ private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java index 7f19bc4..5276109 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java @@ -165,13 +165,6 @@ public class RowOperations { /** * Deletes a row given a text object - * - * @param opts - * - * @param row - * @throws TableNotFoundException - * @throws AccumuloSecurityException - * @throws AccumuloException */ private static void deleteRow(ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException { deleteRow(getRow(scanOpts, row)); @@ -179,8 +172,6 @@ public class RowOperations { /** * Deletes a row, given a Scanner of JUST that row - * - * @param scanner */ private static void deleteRow(Scanner scanner) throws MutationsRejectedException { Mutation deleter = null; @@ -198,8 +189,6 @@ public class RowOperations { /** * Just a generic print function given an iterator. Not necessarily just for printing a single row - * - * @param scanner */ private static void printRow(Scanner scanner) { // iterates through and prints http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java index f9f2d39..fe71b85 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java @@ -275,8 +275,6 @@ public class TeraSortIngest extends Configured implements Tool { /** * Add the rowid to the row. - * - * @param rowId */ private Text getRowIdString(long rowId) { Text paddedRowIdString = new Text(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/TStore.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java index 882cdbd..3adb493 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java +++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java @@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> { /** * Remove the last pushed operation from the given transaction. - * - * @param tid */ void pop(long tid); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java index 38559a7..c4f3489 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java +++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java @@ -47,8 +47,6 @@ public class ZooLock implements Watcher { /** * lost the ability to monitor the lock node, and its status is unknown - * - * @param e */ void unableToMonitorLockNode(Throwable e); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java index f03b04b..5e6fecc 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java @@ -33,8 +33,6 @@ public interface MemoryManager { /** * Initialize the memory manager. - * - * @param conf */ void init(ServerConfiguration conf); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java index 489d4bc..78d5edd 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java @@ -32,9 +32,6 @@ public class ZooZap { static boolean verbose = false; - /** - * @param args - */ private static void message(String msg) { if (verbose) System.out.println(msg); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java index 3e36617..0294ce1 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java @@ -46,9 +46,6 @@ public interface GarbageCollectionEnvironment { * A row to resume from if a previous invocation was stopped due to finding an extremely large number of candidates to remove which would have * exceeded memory limitations * @return A collection of candidates files for deletion, may not be the complete collection of files for deletion at this point in time - * @throws TableNotFoundException - * @throws AccumuloException - * @throws AccumuloSecurityException */ List<String> getCandidates(String continuePoint) throws TableNotFoundException, AccumuloException, AccumuloSecurityException; @@ -56,9 +53,6 @@ public interface GarbageCollectionEnvironment { * Fetch a list of paths for all bulk loads in progress (blip) from a given table, {@link RootTable#NAME} or {@link MetadataTable#NAME} * * @return The list of files for each bulk load currently in progress. - * @throws TableNotFoundException - * @throws AccumuloException - * @throws AccumuloSecurityException */ Iterator<String> getBlipIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException; @@ -66,9 +60,6 @@ public interface GarbageCollectionEnvironment { * Fetches the references to files, {@link DataFileColumnFamily#NAME} or {@link ScanFileColumnFamily#NAME}, from tablets * * @return An {@link Iterator} of {@link Entry}<{@link Key}, {@link Value}> which constitute a reference to a file. - * @throws TableNotFoundException - * @throws AccumuloException - * @throws AccumuloSecurityException */ Iterator<Entry<Key,Value>> getReferenceIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException; @@ -84,10 +75,6 @@ public interface GarbageCollectionEnvironment { * * @param candidateMap * A Map from relative path to absolute path for files to be deleted. - * @throws IOException - * @throws AccumuloSecurityException - * @throws AccumuloException - * @throws TableNotFoundException */ void delete(SortedMap<String,String> candidateMap) throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException; @@ -96,7 +83,6 @@ public interface GarbageCollectionEnvironment { * * @param tableID * The id of the table whose directory we are to operate on - * @throws IOException */ void deleteTableDirIfEmpty(String tableID) throws IOException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index a1c9673..4617299 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -590,7 +590,6 @@ public class SimpleGarbageCollector implements Iface { * Moves a file to trash. If this garbage collector is not using trash, this method returns false and leaves the file alone. If the file is missing, this * method returns false as opposed to throwing an exception. * - * @param path * @return true if the file was moved to trash * @throws IOException * if the volume manager encountered a problem http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java index bea9381..29dfefb 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java +++ b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java @@ -179,12 +179,6 @@ public class TestMergeState { } - /** - * @param state - * @param metaDataStateStore - * @param locations - * @return - */ private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) { MergeStats stats = new MergeStats(state.mergeInfo); stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index b0124a9..47ddaef 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -547,9 +547,6 @@ public class Monitor { /** * Get the monitor lock in ZooKeeper - * - * @throws KeeperException - * @throws InterruptedException */ private void getMonitorLock() throws KeeperException, InterruptedException { final String zRoot = ZooUtil.getRoot(instance); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 80d5662..807bb8e 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -412,10 +412,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu /** * while a session is reserved, it cannot be canceled or removed - * - * @param sessionId */ - synchronized Session reserveSession(long sessionId) { Session session = sessions.get(sessionId); if (session != null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java index d25ee75..aaf62f3 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java @@ -97,7 +97,6 @@ public class TabletServerLogger { * lock to use * @param code * a test/work pair - * @throws IOException */ private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException { // Get a read lock http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java index b38fc47..f17147f 100644 --- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java @@ -96,7 +96,6 @@ public class AccumuloClassLoader { * * @param d * XMLDocument to search through - * @param propertyName */ private static String getAccumuloClassPathStrings(Document d, String propertyName) { NodeList pnodes = d.getElementsByTagName("property"); @@ -165,10 +164,6 @@ public class AccumuloClassLoader { /** * Populate the list of URLs with the items in the classpath string - * - * @param classpath - * @param urls - * @throws MalformedURLException */ private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException { classpath = classpath.trim(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java index 2568480..c71d2d0 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java @@ -134,7 +134,6 @@ public class Module extends Node { * Chooses a random neighbor node * * @return Node or null if no edges - * @throws Exception */ private String randomNeighbor() throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java index b2299aa..aed790c 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java @@ -138,10 +138,6 @@ public class Verify extends Test { } } - /** - * @param startBadEntry - * @param lastBadEntry - */ private static void report(Text startBadRow, Text lastBadRow, Value value) { System.out.println("Bad value " + new String(value.get(), Constants.UTF8)); System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java index 9d68f76..0b63d01 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java @@ -89,12 +89,6 @@ public class SparseColumnFamilyIT extends SimpleMacIT { } } - /** - * @param i - * @param j - * @param k - * @return - */ private Mutation nm(int row, int cf, int val) { Mutation m = new Mutation(String.format("%06d", row)); m.put(String.format("%03d", cf), "", "" + val);