Skip to content

HBASE-22962 Fix typo in javadoc description #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ public static FileStatus[] listStatus(final FileSystem fs, final Path dir,
}

/**
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ public static String removeWALRootPath(Path path, final Configuration conf) thro
}

/**
* 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>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void initFilter(FilterContainer container, Configuration conf) {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void initFilter(FilterContainer container, Configuration conf) {
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/*" };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private static void assertExceptionContains(String string, Throwable t) {
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);
Expand Down Expand Up @@ -163,7 +163,7 @@ public void initFilter(FilterContainer container, Configuration conf) {
@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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static void setUp() throws Exception {
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);
}

Expand Down Expand Up @@ -407,7 +407,7 @@ public void testLogLevelByHttp() throws Exception {
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);
Expand All @@ -426,7 +426,7 @@ public void testLogLevelByHttpWithSpnego() throws Exception {
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);
Expand All @@ -446,7 +446,7 @@ public void testLogLevelByHttps() throws Exception {
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);
Expand All @@ -466,7 +466,7 @@ public void testLogLevelByHttpsWithSpnego() throws Exception {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ public void doGet(HttpServletRequest request,
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.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class DummyServer implements Server {
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static String getMethodName() {

/**
* Generates a process-wide unique sequence number.
* @return an unique sequence number
* @return a unique sequence number
*/
public static int uniqueSequenceId() {
return sequence.incrementAndGet();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ protected TServlet createTServlet(TProtocolFactory protocolFactory) throws IOExc
}

/**
* 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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public static void setUp() throws Exception {
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);
Expand Down