Repository: accumulo Updated Branches: refs/heads/1.8 443f22099 -> 73b4fbbaf refs/heads/master e2856a4da -> 6592bb122
ACCUMULO-4309 Fix paragraph tags in javadocs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/73b4fbba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/73b4fbba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/73b4fbba Branch: refs/heads/1.8 Commit: 73b4fbbafe11190c73d375e5987913883d5cfdc3 Parents: 443f220 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue May 10 19:53:07 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue May 10 19:53:07 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/ScannerBase.java | 2 -- .../accumulo/core/client/ZooKeeperInstance.java | 1 - .../core/client/mapred/InputFormatBase.java | 1 - .../core/client/mapreduce/InputFormatBase.java | 1 - .../core/client/mapreduce/InputTableConfig.java | 1 - .../mapreduce/lib/impl/InputConfigurator.java | 1 - .../mapreduce/lib/util/InputConfigurator.java | 1 - .../accumulo/core/constraints/Constraint.java | 5 ----- .../org/apache/accumulo/core/data/Mutation.java | 3 --- .../accumulo/monitor/servlets/DefaultServlet.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 3 --- .../apache/accumulo/test/functional/ScanIdIT.java | 4 ++-- .../accumulo/test/util/SerializationUtil.java | 17 ----------------- 13 files changed, 3 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java index 51f6fae..2f66445 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java @@ -66,7 +66,6 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> { void updateScanIteratorOption(String iteratorName, String key, String value); /** - * <p> * Adds a column family to the list of columns that will be fetched by this scanner. By default when no columns have been added the scanner fetches all * columns. To fetch multiple column families call this function multiple times. * @@ -83,7 +82,6 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> { void fetchColumnFamily(Text col); /** - * <p> * Adds a column to the list of columns that will be fetched by this scanner. The column is identified by family and qualifier. By default when no columns * have been added the scanner fetches all columns. * http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java index 28f3604..4a4dd5f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java @@ -48,7 +48,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * <p> * An implementation of instance that looks in zookeeper to find information needed to connect to an instance of accumulo. * * <p> http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java index a9403a5..ed8accd 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java @@ -251,7 +251,6 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> { } /** - * <p> * Enable reading offline tables. By default, this feature is disabled and only online tables are scanned. This will make the map reduce job directly read the * table's files. If the table is not offline, then the job will fail. If the table comes online during the map reduce job, it is likely that the job will * fail. http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java index e5a0b90..2f77928 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java @@ -250,7 +250,6 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> { } /** - * <p> * Enable reading offline tables. By default, this feature is disabled and only online tables are scanned. This will make the map reduce job directly read the * table's files. If the table is not offline, then the job will fail. If the table comes online during the map reduce job, it is likely that the job will * fail. http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java index 51ad7eb..305e7e2 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java @@ -174,7 +174,6 @@ public class InputTableConfig implements Writable { } /** - * <p> * Enable reading offline tables. By default, this feature is disabled and only online tables are scanned. This will make the map reduce job directly read the * table's files. If the table is not offline, then the job will fail. If the table comes online during the map reduce job, it is likely that the job will * fail. http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java index 4cc3055..f96c8f4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java @@ -499,7 +499,6 @@ public class InputConfigurator extends ConfiguratorBase { } /** - * <p> * Enable reading offline tables. By default, this feature is disabled and only online tables are scanned. This will make the map reduce job directly read the * table's files. If the table is not offline, then the job will fail. If the table comes online during the map reduce job, it is likely that the job will * fail. http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java index 8d0c4b1..b85253c 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java @@ -367,7 +367,6 @@ public class InputConfigurator extends ConfiguratorBase { } /** - * <p> * Enable reading offline tables. By default, this feature is disabled and only online tables are scanned. This will make the map reduce job directly read the * table's files. If the table is not offline, then the job will fail. If the table comes online during the map reduce job, it is likely that the job will * fail. http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/constraints/Constraint.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/constraints/Constraint.java b/core/src/main/java/org/apache/accumulo/core/constraints/Constraint.java index 78ec0ac..a936ef5 100644 --- a/core/src/main/java/org/apache/accumulo/core/constraints/Constraint.java +++ b/core/src/main/java/org/apache/accumulo/core/constraints/Constraint.java @@ -24,24 +24,19 @@ import org.apache.accumulo.core.security.AuthorizationContainer; import org.apache.accumulo.core.security.Authorizations; /** - * <p> * Constraint objects are used to determine if mutations will be applied to a table. - * </p> * * <p> * This interface expects implementers to return violation codes. The reason codes are returned instead of arbitrary strings to encourage conciseness. * Conciseness is needed because violations are aggregated. If a user sends a batch of 10,000 mutations to Accumulo, only aggregated counts about which * violations occurred are returned. If the constraint implementer were allowed to return arbitrary violation strings like the following: - * </p> * * <p> * Value "abc" is not a number<br> * Value "vbg" is not a number - * </p> * * <p> * This would not aggregate very well, because the same violation is represented with two different strings. - * </p> */ public interface Constraint { http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/core/src/main/java/org/apache/accumulo/core/data/Mutation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java index 1d15ef4..8deb2ed 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java @@ -38,7 +38,6 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; /** - * <p> * Mutation represents an action that manipulates a row in a table. A mutation holds a list of column/value pairs that represent an atomic set of modifications * to make to a row. * @@ -53,13 +52,11 @@ import org.apache.hadoop.io.WritableUtils; * <p> * All of the put methods append data to the mutation; they do not overwrite anything that was previously put. The mutation holds a list of all columns/values * that were put into it. - * </p> * * <p> * The putDelete() methods do not remove something that was previously added to the mutation; rather, they indicate that Accumulo should insert a delete marker * for that row column. A delete marker effectively hides entries for that row column with a timestamp earlier than the marker's. (The hidden data is eventually * removed during Accumulo garbage collection.) - * </p> */ public class Mutation implements Writable { http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java index 8148565..383d7bc 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java @@ -195,7 +195,7 @@ public class DefaultServlet extends BasicServlet { sb.append("</tr></table>\n"); sb.append("<br />\n"); - sb.append("<p/><table class=\"noborder\">\n"); + sb.append("<p><table class=\"noborder\">\n"); sb.append("<tr><td>\n"); plotData(sb, "Ingest (Entries/s)", Monitor.getIngestRateOverTime(), false); http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java index 357a8fb..f11c34f 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java @@ -1202,14 +1202,11 @@ public class ShellServerIT extends SharedMiniClusterBase { } /** - * <p> * Simple <code>Formatter</code> that will convert each character in the Value from decimal to hexadecimal. Will automatically skip over characters in the * value which do not fall within the [0-9,a-f] range. - * </p> * * <p> * Example: <code>'0'</code> will be displayed as <code>'0x30'</code> - * </p> */ public static class HexFormatter implements Formatter { private Iterator<Entry<Key,Value>> iter = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java index 71956f4..aa25b93 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java @@ -185,7 +185,7 @@ public class ScanIdIT extends AccumuloClusterHarness { /** * Runs scanner in separate thread to allow multiple scanners to execute in parallel. - * <p/> + * <p> * The thread run method is terminated when the testInProgress flag is set to false. */ private static class ScannerThread implements Runnable { @@ -325,7 +325,7 @@ public class ScanIdIT extends AccumuloClusterHarness { /** * Generate some sample data using random row id to distribute across splits. - * <p/> + * <p> * The primary goal is to determine that each scanner is assigned a unique scan id. This test does check that the count value for fam1 increases if a scanner * reads multiple value, but this is secondary consideration for this test, that is included for completeness. * http://git-wip-us.apache.org/repos/asf/accumulo/blob/73b4fbba/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java b/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java index b683139..bc3c53e 100644 --- a/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java +++ b/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java @@ -38,7 +38,6 @@ import java.util.Objects; * * <p> * For serializing and de-serializing objects. - * </p> */ public class SerializationUtil { private static final Logger log = LoggerFactory.getLogger(SerializationUtil.class); @@ -144,18 +143,12 @@ public class SerializationUtil { // ----------------------------------------------------------------------- /** - * <p> * Serializes an {@code Object} to the specified stream. - * </p> - * <p/> * <p> * The stream will be closed once the object is written. This avoids the need for a finally clause, and maybe also exception handling, in the application * code. - * </p> - * <p/> * <p> * The stream passed in is not buffered internally within this method. This is the responsibility of your application if desired. - * </p> * * @param obj * the object to serialize to bytes, may be null @@ -183,9 +176,7 @@ public class SerializationUtil { } /** - * <p> * Serializes an {@code Object} to a byte array for storage/serialization. - * </p> * * @param obj * the object to serialize to bytes @@ -201,18 +192,12 @@ public class SerializationUtil { // ----------------------------------------------------------------------- /** - * <p> * Deserializes an {@code Object} from the specified stream. - * </p> - * <p/> * <p> * The stream will be closed once the object is written. This avoids the need for a finally clause, and maybe also exception handling, in the application * code. - * </p> - * <p/> * <p> * The stream passed in is not buffered internally within this method. This is the responsibility of your application if desired. - * </p> * * @param inputStream * the serialized object input stream, must not be null @@ -239,9 +224,7 @@ public class SerializationUtil { } /** - * <p> * Deserializes a single {@code Object} from an array of bytes. - * </p> * * @param objectData * the serialized object, must not be null
