You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2014/09/23 19:21:20 UTC
git commit: HBASE-12024 Fix javadoc warning.
Repository: hbase
Updated Branches:
refs/heads/master 263579102 -> a94f7b140
HBASE-12024 Fix javadoc warning.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a94f7b14
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a94f7b14
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a94f7b14
Branch: refs/heads/master
Commit: a94f7b1400bb13d6cf6bc965dcae0fa0398fb869
Parents: 2635791
Author: anoopsjohn <an...@gmail.com>
Authored: Tue Sep 23 22:50:55 2014 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Tue Sep 23 22:50:55 2014 +0530
----------------------------------------------------------------------
.../hadoop/hbase/client/ConnectionFactory.java | 1 -
.../hadoop/hbase/client/HConnectionManager.java | 18 +++++++++---------
.../client/UnmodifyableHTableDescriptor.java | 6 ------
.../org/apache/hadoop/hbase/security/User.java | 6 +-----
4 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a94f7b14/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java
index 0c054ed..4a8bdfe 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionFactory.java
@@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.security.UserProvider;
* From this {@link Connection} {@link Table} implementations are retrieved
* with {@link Connection#getTable(TableName)}. Example:
* <pre>
- * {@code
* Connection connection = ConnectionFactory.createConnection(config);
* Table table = connection.getTable(TableName.valueOf("table1"));
* try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a94f7b14/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
index ef0a69c..01d3f36 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.security.User;
* From this {@link HConnection} {@link HTableInterface} implementations are retrieved
* with {@link HConnection#getTable(byte[])}. Example:
* <pre>
- * {@code
* HConnection connection = HConnectionManager.createConnection(config);
* HTableInterface table = connection.getTable(TableName.valueOf("table1"));
* try {
@@ -43,7 +42,7 @@ import org.apache.hadoop.hbase.security.User;
* table.close();
* connection.close();
* }
- * }</pre>
+ * </pre>
* <p>This class has a static Map of {@link HConnection} instances keyed by
* {@link HConnectionKey}; A {@link HConnectionKey} is identified by a set of
* {@link Configuration} properties. Invocations of {@link #getConnection(Configuration)}
@@ -125,7 +124,7 @@ public class HConnectionManager extends ConnectionFactory {
* calling {@link HConnection#close()} on the returned connection instance.
*
* This is the recommended way to create HConnections.
- * {@code
+ * <pre>
* HConnection connection = HConnectionManager.createConnection(conf);
* HTableInterface table = connection.getTable("mytable");
* try {
@@ -135,6 +134,7 @@ public class HConnectionManager extends ConnectionFactory {
* table.close();
* connection.close();
* }
+ * </pre>
*
* @param conf configuration
* @return HConnection object for <code>conf</code>
@@ -152,7 +152,7 @@ public class HConnectionManager extends ConnectionFactory {
* {@link #getConnection(Configuration)}. The caller is responsible for
* calling {@link HConnection#close()} on the returned connection instance.
* This is the recommended way to create HConnections.
- * {@code
+ * <pre>
* ExecutorService pool = ...;
* HConnection connection = HConnectionManager.createConnection(conf, pool);
* HTableInterface table = connection.getTable("mytable");
@@ -160,7 +160,7 @@ public class HConnectionManager extends ConnectionFactory {
* ...
* table.close();
* connection.close();
- * }
+ * </pre>
* @param conf configuration
* @param pool the thread pool to use for batch operation in HTables used via this HConnection
* @return HConnection object for <code>conf</code>
@@ -178,7 +178,7 @@ public class HConnectionManager extends ConnectionFactory {
* {@link #getConnection(Configuration)}. The caller is responsible for
* calling {@link HConnection#close()} on the returned connection instance.
* This is the recommended way to create HConnections.
- * {@code
+ * <pre>
* ExecutorService pool = ...;
* HConnection connection = HConnectionManager.createConnection(conf, pool);
* HTableInterface table = connection.getTable("mytable");
@@ -186,7 +186,7 @@ public class HConnectionManager extends ConnectionFactory {
* ...
* table.close();
* connection.close();
- * }
+ * </pre>
* @param conf configuration
* @param user the user the connection is for
* @return HConnection object for <code>conf</code>
@@ -204,7 +204,7 @@ public class HConnectionManager extends ConnectionFactory {
* {@link #getConnection(Configuration)}. The caller is responsible for
* calling {@link HConnection#close()} on the returned connection instance.
* This is the recommended way to create HConnections.
- * {@code
+ * <pre>
* ExecutorService pool = ...;
* HConnection connection = HConnectionManager.createConnection(conf, pool);
* HTableInterface table = connection.getTable("mytable");
@@ -212,7 +212,7 @@ public class HConnectionManager extends ConnectionFactory {
* ...
* table.close();
* connection.close();
- * }
+ * </pre>
* @param conf configuration
* @param pool the thread pool to use for batch operation in HTables used via this HConnection
* @param user the user the connection is for
http://git-wip-us.apache.org/repos/asf/hbase/blob/a94f7b14/hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java
index 95c2128..f512712 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/UnmodifyableHTableDescriptor.java
@@ -61,7 +61,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
/**
* Does NOT add a column family. This object is immutable
* @param family HColumnDescriptor of familyto add.
- * @return
*/
@Override
public HTableDescriptor addFamily(final HColumnDescriptor family) {
@@ -79,7 +78,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
}
/**
- * @return
* @see org.apache.hadoop.hbase.HTableDescriptor#setReadOnly(boolean)
*/
@Override
@@ -88,7 +86,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
}
/**
- * @return
* @see org.apache.hadoop.hbase.HTableDescriptor#setValue(byte[], byte[])
*/
@Override
@@ -97,7 +94,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
}
/**
- * @return
* @see org.apache.hadoop.hbase.HTableDescriptor#setValue(java.lang.String, java.lang.String)
*/
@Override
@@ -106,7 +102,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
}
/**
- * @return
* @see org.apache.hadoop.hbase.HTableDescriptor#setMaxFileSize(long)
*/
@Override
@@ -115,7 +110,6 @@ public class UnmodifyableHTableDescriptor extends HTableDescriptor {
}
/**
- * @return
* @see org.apache.hadoop.hbase.HTableDescriptor#setMemStoreFlushSize(long)
*/
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/a94f7b14/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java
index fd12e47..df0c322 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/security/User.java
@@ -24,8 +24,6 @@ import java.lang.reflect.UndeclaredThrowableException;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.util.Methods;
@@ -51,8 +49,6 @@ public abstract class User {
public static final String HBASE_SECURITY_CONF_KEY =
"hbase.security.authentication";
- private static Log LOG = LogFactory.getLog(User.class);
-
protected UserGroupInformation ugi;
public UserGroupInformation getUGI() {
@@ -167,7 +163,7 @@ public abstract class User {
/**
* Executes the given action as the login user
* @param action
- * @return
+ * @return the result of the action
* @throws IOException
* @throws InterruptedException
*/