ACCUMULO-3451 comply with checkstyle rules Adds javadoc and style changes to pass checkstyle enforcement rules.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/901d60ef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/901d60ef Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/901d60ef Branch: refs/heads/1.6 Commit: 901d60ef1cf72c2d55c90746fce94e108a992d3b Parents: d2c116f Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Dec 24 15:22:30 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 8 20:25:40 2015 -0500 ---------------------------------------------------------------------- .../core/client/admin/InstanceOperations.java | 6 +++--- .../java/org/apache/accumulo/core/data/Value.java | 7 +++---- .../apache/accumulo/core/file/rfile/CreateEmpty.java | 4 ++-- .../accumulo/core/file/rfile/bcfile/TFile.java | 4 ++-- .../accumulo/core/file/rfile/bcfile/Utils.java | 1 + .../org/apache/accumulo/core/iterators/Combiner.java | 2 +- .../apache/accumulo/core/iterators/LongCombiner.java | 4 ++-- .../accumulo/core/iterators/OptionDescriber.java | 4 ++-- .../accumulo/core/iterators/TypedValueCombiner.java | 10 +++++----- .../core/iterators/user/SummingArrayCombiner.java | 5 +++-- .../accumulo/core/security/ColumnVisibility.java | 10 +++++----- .../crypto/DefaultSecretKeyEncryptionStrategy.java | 3 ++- .../accumulo/core/util/format/BinaryFormatter.java | 7 ++++--- .../accumulo/core/util/shell/commands/DUCommand.java | 4 +++- .../core/util/shell/commands/EGrepCommand.java | 3 ++- .../core/util/shell/commands/HistoryCommand.java | 4 +--- .../util/shell/commands/QuotedStringTokenizer.java | 15 ++++++--------- .../examples/simple/mapreduce/TableToFile.java | 4 ++-- .../java/org/apache/accumulo/server/Accumulo.java | 4 ++-- .../accumulo/server/tabletserver/Compactor.java | 6 ++++-- .../org/apache/accumulo/server/util/Initialize.java | 3 ++- .../main/java/org/apache/accumulo/start/Main.java | 4 ++-- .../start/classloader/AccumuloClassLoader.java | 4 ++-- .../test/randomwalk/security/CreateTable.java | 5 ++--- .../test/randomwalk/security/CreateUser.java | 5 ++--- 25 files changed, 65 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java index 049dd85..8cb656c 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java @@ -82,7 +82,7 @@ public interface InstanceOperations { * List the active scans on tablet server. * * @param tserver - * The tablet server address should be of the form <ip address>:<port> + * The tablet server address should be of the form {@code <ip address>:<port>} * @return A list of active scans on tablet server. */ @@ -92,7 +92,7 @@ public interface InstanceOperations { * List the active compaction running on a tablet server * * @param tserver - * The tablet server address should be of the form <ip address>:<port> + * The tablet server address should be of the form {@code <ip address>:<port>} * @return the list of active compactions * @since 1.5.0 */ @@ -103,7 +103,7 @@ public interface InstanceOperations { * Throws an exception if a tablet server can not be contacted. * * @param tserver - * The tablet server address should be of the form <ip address>:<port> + * The tablet server address should be of the form {@code <ip address>:<port>} * @since 1.5.0 */ public void ping(String tserver) throws AccumuloException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/data/Value.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/Value.java b/core/src/main/java/org/apache/accumulo/core/data/Value.java index ba89d6c..b937203 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Value.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Value.java @@ -139,12 +139,13 @@ public class Value implements WritableComparable<Object> { return this.value.length; } + @Override public void readFields(final DataInput in) throws IOException { this.value = new byte[in.readInt()]; in.readFully(this.value, 0, this.value.length); } - /** {@inheritDoc} */ + @Override public void write(final DataOutput out) throws IOException { out.writeInt(this.value.length); out.write(this.value, 0, this.value.length); @@ -152,7 +153,6 @@ public class Value implements WritableComparable<Object> { // Below methods copied from BytesWritable - /** {@inheritDoc} */ @Override public int hashCode() { return WritableComparator.hashBytes(value, this.value.length); @@ -165,6 +165,7 @@ public class Value implements WritableComparable<Object> { * The other bytes writable * @return Positive if left is bigger than right, 0 if they are equal, and negative if left is smaller than right. */ + @Override public int compareTo(Object right_obj) { return compareTo(((Value) right_obj).get()); } @@ -179,7 +180,6 @@ public class Value implements WritableComparable<Object> { return (diff != 0) ? diff : WritableComparator.compareBytes(this.value, 0, this.value.length, that, 0, that.length); } - /** {@inheritDoc} */ @Override public boolean equals(Object right_obj) { if (right_obj instanceof byte[]) { @@ -207,7 +207,6 @@ public class Value implements WritableComparable<Object> { super(Value.class); } - /** {@inheritDoc} */ @Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { return comparator.compare(b1, s1, l1, b2, s2, l2); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java index bd9fa43..8d54088 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/CreateEmpty.java @@ -59,8 +59,8 @@ public class CreateEmpty { static class Opts extends Help { @Parameter(names = {"-c", "--codec"}, description = "the compression codec to use.", validateWith = IsSupportedCompressionAlgorithm.class) String codec = TFile.COMPRESSION_NONE; - @Parameter( - description = " <path> { <path> ... } Each path given is a URL. Relative paths are resolved according to the default filesystem defined in your Hadoop configuration, which is usually an HDFS instance.", + @Parameter(description = " <path> { <path> ... } Each path given is a URL. " + + "Relative paths are resolved according to the default filesystem defined in your Hadoop configuration, which is usually an HDFS instance.", required = true, validateWith = NamedLikeRFile.class) List<String> files = new ArrayList<String>(); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java index e21598a..400695b 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java @@ -1065,9 +1065,9 @@ public class TFile { * @param reader * The TFile reader object. * @param beginKey - * Begin key of the scan. If null, scan from the first <K,V> entry of the TFile. + * Begin key of the scan. If null, scan from the first {@code <K,V>} entry of the TFile. * @param endKey - * End key of the scan. If null, scan up to the last <K, V> entry of the TFile. + * End key of the scan. If null, scan up to the last {@code <K, V>} entry of the TFile. */ protected Scanner(Reader reader, RawComparable beginKey, RawComparable endKey) throws IOException { this(reader, (beginKey == null) ? reader.begin() : reader.getBlockContainsKey(beginKey, false), reader.end()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java index fb0277a..84b861b 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java @@ -164,6 +164,7 @@ public final class Utils { * <li>if (FB in [-104, -73]), return (FB+88)<<16 + (NB[0]&0xff)<<8 + NB[1]&0xff; * <li>if (FB in [-120, -105]), return (FB+112)<<24 + (NB[0]&0xff)<<16 + (NB[1]&0xff)<<8 + NB[2]&0xff; * <li>if (FB in [-128, -121]), return interpret NB[FB+129] as a signed big-endian integer. + * </ul> * * @param in * input stream http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java index 41e4e1e..f75076d 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java @@ -70,7 +70,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib * Constructs an iterator over Values whose Keys are versions of the current topKey of the source SortedKeyValueIterator. * * @param source - * The SortedKeyValueIterator<Key,Value> from which to read data. + * The {@code SortedKeyValueIterator<Key,Value>} from which to read data. */ public ValueIterator(SortedKeyValueIterator<Key,Value> source) { this.source = source; http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java index 0bffbf7..cfdfd6e 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java @@ -33,7 +33,7 @@ import org.apache.hadoop.io.WritableUtils; /** * A TypedValueCombiner that translates each Value to a Long before reducing, then encodes the reduced Long back to a Value. * - * Subclasses must implement a typedReduce method: public Long typedReduce(Key key, Iterator<Long> iter); + * Subclasses must implement a typedReduce method: {@code public Long typedReduce(Key key, Iterator<Long> iter);} * * This typedReduce method will be passed the most recent Key and an iterator over the Values (translated to Longs) for all non-deleted versions of that Key. * @@ -226,7 +226,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> { * @param is * IteratorSetting object to configure. * @param encoderClass - * Class<? extends Encoder<Long>> specifying the encoding type. + * {@code Class<? extends Encoder<Long>>} specifying the encoding type. */ public static void setEncodingType(IteratorSetting is, Class<? extends Encoder<Long>> encoderClass) { is.addOption(TYPE, CLASS_PREFIX + encoderClass.getName()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java index 6158bfc..6593ecd 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java @@ -50,8 +50,8 @@ public interface OptionDescriber { * @param unnamedOptionDescriptions * is a list of descriptions of additional options that don't have fixed names (null if unused). The descriptions are intended to describe a * category, and the user will provide parameter names and values in that category; e.g., the FilteringIterator needs a list of Filters intended to - * be named by their priority numbers, so its unnamedOptionDescriptions = - * Collections.singletonList("<filterPriorityNumber> <ageoff|regex|filterClass>") + * be named by their priority numbers, so its<br> + * {@code unnamedOptionDescriptions = Collections.singletonList("<filterPriorityNumber> <ageoff|regex|filterClass>")} */ public IteratorOptions(String name, String description, Map<String,String> namedOptions, List<String> unnamedOptionDescriptions) { this.name = name; http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java index d1ae9f5..0f26fab 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java @@ -29,7 +29,7 @@ import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader; /** * A Combiner that decodes each Value to type V before reducing, then encodes the result of typedReduce back to Value. * - * Subclasses must implement a typedReduce method: public V typedReduce(Key key, Iterator<V> iter); + * Subclasses must implement a typedReduce method: {@code public V typedReduce(Key key, Iterator<V> iter);} * * This typedReduce method will be passed the most recent Key and an iterator over the Values (translated to Vs) for all non-deleted versions of that Key. * @@ -42,7 +42,7 @@ public abstract class TypedValueCombiner<V> extends Combiner { protected static final String LOSSY = "lossy"; /** - * A Java Iterator that translates an Iterator<Value> to an Iterator<V> using the decode method of an Encoder. + * A Java Iterator that translates an {@code Iterator<Value>} to an {@code Iterator<V>} using the decode method of an Encoder. */ private static class VIterator<V> implements Iterator<V> { private Iterator<Value> source; @@ -50,7 +50,7 @@ public abstract class TypedValueCombiner<V> extends Combiner { private boolean lossy; /** - * Constructs an Iterator<V> from an Iterator<Value> + * Constructs an {@code Iterator<V>} from an {@code Iterator<Value>} * * @param iter * The source iterator @@ -114,14 +114,14 @@ public abstract class TypedValueCombiner<V> extends Combiner { } /** - * Sets the Encoder<V> used to translate Values to V and back. + * Sets the {@code Encoder<V>} used to translate Values to V and back. */ protected void setEncoder(Encoder<V> encoder) { this.encoder = encoder; } /** - * Instantiates and sets the Encoder<V> used to translate Values to V and back. + * Instantiates and sets the {@code Encoder<V>} used to translate Values to V and back. * * @throws IllegalArgumentException * if ClassNotFoundException, InstantiationException, or IllegalAccessException occurs http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java index efced19..c2023c2 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java @@ -122,7 +122,8 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> { public IteratorOptions describeOptions() { IteratorOptions io = super.describeOptions(); io.setName("sumarray"); - io.setDescription("SummingArrayCombiner can interpret Values as arrays of Longs using a variety of encodings (arrays of variable length longs or fixed length longs, or comma-separated strings) before summing element-wise."); + io.setDescription("SummingArrayCombiner can interpret Values as arrays of Longs using a variety of encodings " + + "(arrays of variable length longs or fixed length longs, or comma-separated strings) before summing element-wise."); io.addNamedOption(TYPE, "<VARLEN|FIXEDLEN|STRING|fullClassName>"); return io; } @@ -248,7 +249,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> { * @param is * IteratorSetting object to configure. * @param encoderClass - * Class<? extends Encoder<List<Long>>> specifying the encoding type. + * {@code Class<? extends Encoder<List<Long>>>} specifying the encoding type. */ public static void setEncodingType(IteratorSetting is, Class<? extends Encoder<List<Long>>> encoderClass) { is.addOption(TYPE, CLASS_PREFIX + encoderClass.getName()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java index e0c8e17..78ad4c9 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java +++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java @@ -38,24 +38,24 @@ import org.apache.hadoop.io.WritableComparator; * definition of an expression. * * <P> - * The expression is a sequence of characters from the set [A-Za-z0-9_-.] along with the binary operators "&" and "|" indicating that both operands are + * The expression is a sequence of characters from the set [A-Za-z0-9_-.] along with the binary operators "&" and "|" indicating that both operands are * necessary, or the either is necessary. The following are valid expressions for visibility: * * <pre> * A * A|B - * (A|B)&(C|D) - * orange|(red&yellow) + * (A|B)&(C|D) + * orange|(red&yellow) * </pre> * * <P> * The following are not valid expressions for visibility: * * <pre> - * A|B&C + * A|B&C * A=B * A|B| - * A&|B + * A&|B * () * ) * dog|!cat http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultSecretKeyEncryptionStrategy.java index bb72ce5..4fd367c 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultSecretKeyEncryptionStrategy.java @@ -204,7 +204,8 @@ public class DefaultSecretKeyEncryptionStrategy implements SecretKeyEncryptionSt if (!fs.exists(pathToKey)) { if (encryptionMode == Cipher.DECRYPT_MODE) { - log.error("There was a call to decrypt the session key but no key encryption key exists. Either restore it, reconfigure the conf file to point to it in HDFS, or throw the affected data away and begin again."); + log.error("There was a call to decrypt the session key but no key encryption key exists. " + + "Either restore it, reconfigure the conf file to point to it in HDFS, or throw the affected data away and begin again."); throw new RuntimeException("Could not find key encryption key file in configured location in HDFS (" + pathToKeyName + ")"); } else { initializeKeyEncryptingKey(fs, pathToKey, context); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java index d60d076..89a380f 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java @@ -36,16 +36,19 @@ public class BinaryFormatter implements Formatter { doTimestamps = printTimestamps; } + @Override public boolean hasNext() { checkState(si, true); return si.hasNext(); } + @Override public String next() { checkState(si, true); return formatEntry(si.next(), doTimestamps); } + @Override public void remove() { checkState(si, true); si.remove(); @@ -108,9 +111,7 @@ public class BinaryFormatter implements Formatter { sb.append("\\x").append(String.format("%02X", c)); } return sb; - } - - else { + } else { for (int i = 0; i < len; i++) { int c = 0xff & ba[offset + i]; http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java index ca80e37..8215a5a 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java @@ -38,6 +38,7 @@ public class DUCommand extends Command { private Option optTablePattern, optHumanReadble; + @Override public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException, TableNotFoundException { final SortedSet<String> tablesToFlush = new TreeSet<String>(Arrays.asList(cl.getArgs())); @@ -79,7 +80,8 @@ public class DUCommand extends Command { @Override public String description() { - return "prints how much space, in bytes, is used by files referenced by a table. When multiple tables are specified it prints how much space, in bytes, is used by files shared between tables, if any."; + return "prints how much space, in bytes, is used by files referenced by a table. " + + "When multiple tables are specified it prints how much space, in bytes, is used by files shared between tables, if any."; } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java index b2b2663..16cc5d1 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java @@ -41,7 +41,8 @@ public class EGrepCommand extends GrepCommand { @Override public String description() { - return "searches each row, column family, column qualifier and value, in parallel, on the server side (using a java Matcher, so put .* before and after your term if you're not matching the whole element)"; + return "searches each row, column family, column qualifier and value, in parallel, on the server side " + + "(using a java Matcher, so put .* before and after your term if you're not matching the whole element)"; } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java index 0ad94f1..145bb75 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java @@ -61,9 +61,7 @@ public class HistoryCommand extends Command { out.close(); } } - } - - else { + } else { BufferedReader in = null; try { in = new BufferedReader(new InputStreamReader(new FileInputStream(histDir + "/shell_history.txt"), UTF_8)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java index 18de460..f2b78cd 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java @@ -73,9 +73,8 @@ public class QuotedStringTokenizer implements Iterable<String> { } else { throw new BadArgumentException("can only escape single quotes, double quotes, the space character, the backslash, and hex input", input, i); } - } - // in a hex escape sequence - else if (hexChars != null) { + } else if (hexChars != null) { + // in a hex escape sequence final int digit = Character.digit(ch, 16); if (digit < 0) { throw new BadArgumentException("expected hex character", input, i); @@ -93,9 +92,8 @@ public class QuotedStringTokenizer implements Iterable<String> { token[tokenLength++] = b; hexChars = null; } - } - // in a quote, either end the quote, start escape, or continue a token - else if (inQuote) { + } else if (inQuote) { + // in a quote, either end the quote, start escape, or continue a token if (ch == inQuoteChar) { inQuote = false; tokens.add(new String(token, 0, tokenLength, Shell.CHARSET)); @@ -105,9 +103,8 @@ public class QuotedStringTokenizer implements Iterable<String> { } else { token[tokenLength++] = inputBytes[i]; } - } - // not in a quote, either enter a quote, end a token, start escape, or continue a token - else { + } else { + // not in a quote, either enter a quote, end a token, start escape, or continue a token if (ch == '\'' || ch == '"') { if (tokenLength > 0) { tokens.add(new String(token, 0, tokenLength, Shell.CHARSET)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java index 79aae12..a785727 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java @@ -41,8 +41,8 @@ import org.apache.hadoop.util.ToolRunner; import com.beust.jcommander.Parameter; /** - * Takes a table and outputs the specified column to a set of part files on hdfs accumulo accumulo.examples.mapreduce.TableToFile <username> <password> - * <tablename> <column> <hdfs-output-path> + * Takes a table and outputs the specified column to a set of part files on hdfs + * {@code accumulo accumulo.examples.mapreduce.TableToFile <username> <password> <tablename> <column> <hdfs-output-path>} */ public class TableToFile extends Configured implements Tool { http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/server/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/src/main/java/org/apache/accumulo/server/Accumulo.java index 0509601..1727bec 100644 --- a/server/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -299,8 +299,8 @@ public class Accumulo { final ReadOnlyTStore<Accumulo> fate = new ReadOnlyStore<Accumulo>(new ZooStore<Accumulo>( ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZFATE, ZooReaderWriter.getRetryingInstance())); if (!(fate.list().isEmpty())) { - throw new AccumuloException( - "Aborting upgrade because there are outstanding FATE transactions from a previous Accumulo version. Please see the README document for instructions on what to do under your previous version."); + throw new AccumuloException("Aborting upgrade because there are outstanding FATE transactions from a previous Accumulo version. " + + "Please see the README document for instructions on what to do under your previous version."); } } catch (Exception exception) { log.fatal("Problem verifying Fate readiness", exception); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java index c0c1e4b..9569e9a 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java @@ -75,6 +75,7 @@ public class Compactor implements Callable<CompactionStats> { private long count; + @Override public CountingIterator deepCopy(IteratorEnvironment env) { return new CountingIterator(this, env); } @@ -183,7 +184,7 @@ public class Compactor implements Callable<CompactionStats> { CompactionReason reason; - if (compactor.imm != null) + if (compactor.imm != null) { switch (compactor.mincReason) { case USER: reason = CompactionReason.USER; @@ -196,7 +197,7 @@ public class Compactor implements Callable<CompactionStats> { reason = CompactionReason.SYSTEM; break; } - else + } else { switch (compactor.reason) { case USER: reason = CompactionReason.USER; @@ -212,6 +213,7 @@ public class Compactor implements Callable<CompactionStats> { reason = CompactionReason.SYSTEM; break; } + } List<IterInfo> iiList = new ArrayList<IterInfo>(); Map<String,Map<String,String>> iterOptions = new HashMap<String,Map<String,String>>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/server/src/main/java/org/apache/accumulo/server/util/Initialize.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java index e626fd8..31d53eb 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java +++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java @@ -157,7 +157,8 @@ public class Initialize { c.printNewline(); c.printString(" bin/accumulo " + org.apache.accumulo.server.util.ChangeSecret.class.getName() + " oldPassword newPassword."); c.printNewline(); - c.printString("You will also need to edit your secret in your configuration file by adding the property instance.secret to your conf/accumulo-site.xml. Without this accumulo will not operate correctly"); + c.printString("You will also need to edit your secret in your configuration file by adding the property instance.secret to your conf/accumulo-site.xml. " + + "Without this accumulo will not operate correctly"); c.printNewline(); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/start/src/main/java/org/apache/accumulo/start/Main.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java index f9b1ab9..a80ebe6 100644 --- a/start/src/main/java/org/apache/accumulo/start/Main.java +++ b/start/src/main/java/org/apache/accumulo/start/Main.java @@ -141,7 +141,7 @@ public class Main { } private static void printUsage() { - System.out - .println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info | tracer | proxy | zookeeper | info | version | help | <accumulo class> args"); + System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info " + + "| tracer | proxy | zookeeper | info | version | help | <accumulo class> args"); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/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 2673b5a..d9e2821 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 @@ -71,8 +71,8 @@ public class AccumuloClassLoader { } /** - * Parses and XML Document for a property node for a <name> with the value propertyName if it finds one the function return that property's value for its - * <value> node. If not found the function will return null + * Parses and XML Document for a property node for a <name> with the value propertyName if it finds one the function return that property's value for its + * <value> node. If not found the function will return null * * @param d * XMLDocument to search through http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java index 90d7735..61b146a 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java @@ -44,9 +44,8 @@ public class CreateTable extends Test { if (ae.getSecurityErrorCode().equals(SecurityErrorCode.PERMISSION_DENIED)) { if (hasPermission) throw new AccumuloException("Got a security exception when I should have had permission.", ae); - else - // create table anyway for sake of state - { + else { + // create table anyway for sake of state try { state.getConnector().tableOperations().create(tableName); WalkingSecurity.get(state).initTable(tableName); http://git-wip-us.apache.org/repos/asf/accumulo/blob/901d60ef/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java index 4ec9d22..1f539ff 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java @@ -43,9 +43,8 @@ public class CreateUser extends Test { case PERMISSION_DENIED: if (hasPermission) throw new AccumuloException("Got a security exception when I should have had permission.", ae); - else - // create user anyway for sake of state - { + else { + // create user anyway for sake of state if (!exists) { state.getConnector().securityOperations().createLocalUser(tableUserName, tabUserPass); WalkingSecurity.get(state).createUser(tableUserName, tabUserPass);
