You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/09/01 12:14:36 UTC
[hbase] branch master updated: HBASE-22962 Fix typo in javadoc
description (#569)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 97fbaa6 HBASE-22962 Fix typo in javadoc description (#569)
97fbaa6 is described below
commit 97fbaa658e54f32b387ad090a306048c817bdce5
Author: 康智冬 <wo...@gmail.com>
AuthorDate: Sun Sep 1 20:14:31 2019 +0800
HBASE-22962 Fix typo in javadoc description (#569)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../java/org/apache/hadoop/hbase/backup/util/BackupUtils.java | 2 +-
.../main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java | 2 +-
.../java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java | 2 +-
.../java/org/apache/hadoop/hbase/http/TestGlobalFilter.java | 2 +-
.../test/java/org/apache/hadoop/hbase/http/TestPathFilter.java | 2 +-
.../java/org/apache/hadoop/hbase/http/TestServletFilter.java | 4 ++--
.../java/org/apache/hadoop/hbase/http/log/TestLogLevel.java | 10 +++++-----
.../java/org/apache/hadoop/hbase/rest/client/Response.java | 2 +-
.../hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 2 +-
.../hbase/replication/regionserver/ReplicationSyncUp.java | 2 +-
.../test/java/org/apache/hadoop/hbase/GenericTestUtils.java | 2 +-
.../main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java | 2 +-
.../org/apache/hadoop/hbase/thrift2/TestThriftConnection.java | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
index 4a0a820..6c13cc8 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
@@ -535,7 +535,7 @@ public final class BackupUtils {
}
/**
- * Return the 'path' component of a Path. In Hadoop, Path is an URI. This method returns the
+ * Return the 'path' component of a Path. In Hadoop, Path is a URI. This method returns the
* 'path' component of a Path's URI: e.g. If a Path is
* <code>hdfs://example.org:9000/hbase_trunk/TestTable/compaction.dir</code>, this method returns
* <code>/hbase_trunk/TestTable/compaction.dir</code>. This method is useful if you want to print
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java
index 04779c2..a9b361c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CommonFSUtils.java
@@ -337,7 +337,7 @@ public abstract class CommonFSUtils {
}
/**
- * Return the 'path' component of a Path. In Hadoop, Path is an URI. This
+ * Return the 'path' component of a Path. In Hadoop, Path is a URI. This
* method returns the 'path' component of a Path's URI: e.g. If a Path is
* <code>hdfs://example.org:9000/hbase_trunk/TestTable/compaction.dir</code>,
* this method returns <code>/hbase_trunk/TestTable/compaction.dir</code>.
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java
index 00ea56d..3dbf7c3 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/jmx/JMXJsonServlet.java
@@ -119,7 +119,7 @@ public class JMXJsonServlet extends HttpServlet {
/**
* If query string includes 'description', then we will emit bean and attribute descriptions to
* output IFF they are not null and IFF the description is not the same as the attribute name:
- * i.e. specify an URL like so: /jmx?description=true
+ * i.e. specify a URL like so: /jmx?description=true
*/
private static final String INCLUDE_DESCRIPTION = "description";
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java
index cb377cb..1917655 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java
@@ -89,7 +89,7 @@ public class TestGlobalFilter extends HttpServerFunctionalTest {
public void testServletFilter() throws Exception {
Configuration conf = new Configuration();
- //start a http server with CountingFilter
+ //start an http server with CountingFilter
conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY,
RecordingFilter.Initializer.class.getName());
HttpServer http = createTestServer(conf);
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java
index 1e0d5af..7737b29 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java
@@ -89,7 +89,7 @@ public class TestPathFilter extends HttpServerFunctionalTest {
public void testPathSpecFilters() throws Exception {
Configuration conf = new Configuration();
- //start a http server with CountingFilter
+ //start an http server with CountingFilter
conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY,
RecordingFilter.Initializer.class.getName());
String[] pathSpecs = { "/path", "/path/*" };
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java
index ee035dd..cddfb1b 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java
@@ -101,7 +101,7 @@ public class TestServletFilter extends HttpServerFunctionalTest {
public void testServletFilter() throws Exception {
Configuration conf = new Configuration();
- //start a http server with CountingFilter
+ //start an http server with CountingFilter
conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY,
SimpleFilter.Initializer.class.getName());
HttpServer http = createTestServer(conf);
@@ -163,7 +163,7 @@ public class TestServletFilter extends HttpServerFunctionalTest {
@Test
public void testServletFilterWhenInitThrowsException() throws Exception {
Configuration conf = new Configuration();
- // start a http server with ErrorFilter
+ // start an http server with ErrorFilter
conf.set(HttpServer.FILTER_INITIALIZERS_PROPERTY,
ErrorFilter.Initializer.class.getName());
HttpServer http = createTestServer(conf);
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
index 489dbd8..91b967d 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
@@ -107,7 +107,7 @@ public class TestLogLevel {
setupSSL(BASEDIR);
kdc = setupMiniKdc();
- // Create two principles: a client and a HTTP principal
+ // Create two principles: a client and an HTTP principal
kdc.createPrincipal(KEYTAB_FILE, clientPrincipal, HTTP_PRINCIPAL);
}
@@ -407,7 +407,7 @@ public class TestLogLevel {
try {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTPS,
false);
- fail("A HTTPS Client should not have succeeded in connecting to a " +
+ fail("An HTTPS Client should not have succeeded in connecting to a " +
"HTTP server");
} catch (SSLException e) {
exceptionShouldContains("Unrecognized SSL message", e);
@@ -426,7 +426,7 @@ public class TestLogLevel {
try {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTP, LogLevel.PROTOCOL_HTTPS,
true);
- fail("A HTTPS Client should not have succeeded in connecting to a " +
+ fail("An HTTPS Client should not have succeeded in connecting to a " +
"HTTP server");
} catch (SSLException e) {
exceptionShouldContains("Unrecognized SSL message", e);
@@ -446,7 +446,7 @@ public class TestLogLevel {
try {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTP,
false);
- fail("A HTTP Client should not have succeeded in connecting to a " +
+ fail("An HTTP Client should not have succeeded in connecting to a " +
"HTTPS server");
} catch (SocketException e) {
exceptionShouldContains("Unexpected end of file from server", e);
@@ -466,7 +466,7 @@ public class TestLogLevel {
try {
testDynamicLogLevel(LogLevel.PROTOCOL_HTTPS, LogLevel.PROTOCOL_HTTP,
true);
- fail("A HTTP Client should not have succeeded in connecting to a " +
+ fail("An HTTP Client should not have succeeded in connecting to a " +
"HTTPS server");
} catch (SocketException e) {
exceptionShouldContains("Unexpected end of file from server", e);
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java
index adffc12..518e9bb 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java
@@ -29,7 +29,7 @@ import org.apache.http.Header;
import org.apache.http.HttpResponse;
/**
- * The HTTP result code, response headers, and body of a HTTP response.
+ * The HTTP result code, response headers, and body of an HTTP response.
*/
@InterfaceAudience.Public
public class Response {
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java
index d80789f..3f14f4f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheableDeserializerIdManager.java
@@ -40,7 +40,7 @@ public class CacheableDeserializerIdManager {
/**
* Register the given {@link Cacheable} -- usually an hfileblock instance, these implement
- * the Cacheable Interface -- deserializer and generate an unique identifier id for it and return
+ * the Cacheable Interface -- deserializer and generate a unique identifier id for it and return
* this as our result.
* @return the identifier of given cacheable deserializer
* @see #getDeserializer(int)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 74611d0..bb2aadb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -465,7 +465,7 @@ public class HMaster extends HRegionServer implements MasterServices {
redirectHost = request.getServerName();
if(!Addressing.isLocalAddress(InetAddress.getByName(redirectHost))) {
LOG.warn("Couldn't resolve '" + redirectHost + "' as an address local to this node and '" +
- MASTER_HOSTNAME_KEY + "' is not set; client will get a HTTP 400 response. If " +
+ MASTER_HOSTNAME_KEY + "' is not set; client will get an HTTP 400 response. If " +
"your HBase deployment relies on client accessible names that the region server process " +
"can't resolve locally, then you should set the previously mentioned configuration variable " +
"to an appropriate hostname.");
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
index bbd7675..5dc8427 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
@@ -104,7 +104,7 @@ public class ReplicationSyncUp extends Configured implements Tool {
ZKWatcher zkw;
DummyServer(ZKWatcher zkw) {
- // an unique name in case the first run fails
+ // a unique name in case the first run fails
hostname = System.currentTimeMillis() + ".SyncUpTool.replication.org";
this.zkw = zkw;
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java
index b1b0943..1bde5ae 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/GenericTestUtils.java
@@ -59,7 +59,7 @@ public abstract class GenericTestUtils {
/**
* Generates a process-wide unique sequence number.
- * @return an unique sequence number
+ * @return a unique sequence number
*/
public static int uniqueSequenceId() {
return sequence.incrementAndGet();
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index 598b306..999f469 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -324,7 +324,7 @@ public class ThriftServer extends Configured implements Tool {
}
/**
- * Setup a HTTP Server using Jetty to serve calls from THttpClient
+ * Setup an HTTP Server using Jetty to serve calls from THttpClient
*
* @throws IOException IOException
*/
diff --git a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftConnection.java b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftConnection.java
index 2ab5a6e..a9d4ee9 100644
--- a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftConnection.java
+++ b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftConnection.java
@@ -168,7 +168,7 @@ public class TestThriftConnection {
httpPort = HBaseTestingUtility.randomFreePort();
// Start a thrift server
thriftServer = startThriftServer(thriftPort, false);
- // Start a HTTP thrift server
+ // Start an HTTP thrift server
thriftHttpServer = startThriftServer(httpPort, true);
thriftConnection = createConnection(thriftPort, false);
thriftHttpConnection = createConnection(httpPort, true);