This is an automated email from the ASF dual-hosted git repository.
dmollitor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 2b93695 HIVE-22683: Run Eclipse Cleanup Against beeline Module (David
Mollitor, reviewed by Miklos Gergely)
2b93695 is described below
commit 2b9369570fd5d93c9b25a1c140d74556c03dd7be
Author: David Mollitor <dmolli...@apache.org>
AuthorDate: Sun Jan 5 12:49:37 2020 -0500
HIVE-22683: Run Eclipse Cleanup Against beeline Module (David Mollitor,
reviewed by Miklos Gergely)
---
.../src/java/org/apache/hive/beeline/AbstractOutputFormat.java | 1 +
beeline/src/java/org/apache/hive/beeline/BeeLine.java | 2 +-
beeline/src/java/org/apache/hive/beeline/BeeLineCompleter.java | 1 +
beeline/src/java/org/apache/hive/beeline/ColorBuffer.java | 1 +
beeline/src/java/org/apache/hive/beeline/IncrementalRows.java | 2 ++
.../java/org/apache/hive/beeline/ReflectiveCommandHandler.java | 1 +
beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java | 1 +
beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java | 1 +
.../src/java/org/apache/hive/beeline/VerticalOutputFormat.java | 1 +
.../apache/hive/beeline/hs2connection/HS2ConnectionFileUtils.java | 3 ---
beeline/src/test/org/apache/hive/beeline/ProxyAuthTest.java | 3 ---
.../org/apache/hive/beeline/TestBeeLineExceptionHandling.java | 8 --------
beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java | 8 --------
.../src/test/org/apache/hive/beeline/TestBeelineArgParsing.java | 1 -
beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java | 2 ++
.../org/apache/hive/beeline/TestClientCommandHookFactory.java | 3 ---
beeline/src/test/org/apache/hive/beeline/TestShutdownHook.java | 6 ------
17 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
b/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
index b0e2357..aa80780 100644
--- a/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
+++ b/beeline/src/java/org/apache/hive/beeline/AbstractOutputFormat.java
@@ -28,6 +28,7 @@ package org.apache.hive.beeline;
*/
abstract class AbstractOutputFormat implements OutputFormat {
+ @Override
public int print(Rows rows) {
int count = 0;
Rows.Row header = (Rows.Row) rows.next();
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
index 65ec560..dc79712 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -1878,7 +1878,7 @@ public class BeeLine implements Closeable {
*/
int getSize(ResultSet rs) {
try {
- if (rs.getType() == rs.TYPE_FORWARD_ONLY) {
+ if (rs.getType() == ResultSet.TYPE_FORWARD_ONLY) {
return -1;
}
rs.last();
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineCompleter.java
b/beeline/src/java/org/apache/hive/beeline/BeeLineCompleter.java
index 9c20c57..9213bcf 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLineCompleter.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLineCompleter.java
@@ -41,6 +41,7 @@ class BeeLineCompleter implements Completer {
this.beeLine = beeLine;
}
+ @Override
public int complete(String buf, int pos, List cand) {
if (buf != null && buf.startsWith(BeeLine.COMMAND_PREFIX)
&& !buf.startsWith(BeeLine.COMMAND_PREFIX + "all")
diff --git a/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
b/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
index 1730d49..ba7b4be 100644
--- a/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
+++ b/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java
@@ -236,6 +236,7 @@ final class ColorBuffer implements Comparable<Object> {
}
}
+ @Override
public int compareTo(Object other) {
return getMono().compareTo(((ColorBuffer) other).getMono());
}
diff --git a/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
b/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
index e8af3c3..c462084 100644
--- a/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
+++ b/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
@@ -63,6 +63,7 @@ public class IncrementalRows extends Rows {
}
+ @Override
public boolean hasNext() {
if (endOfResult) {
return false;
@@ -87,6 +88,7 @@ public class IncrementalRows extends Rows {
return (nextRow != null);
}
+ @Override
public Object next() {
if (!hasNext()) {
throw new NoSuchElementException();
diff --git
a/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
b/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
index 2854f15..a37ee89 100644
--- a/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
+++ b/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
@@ -46,6 +46,7 @@ public class ReflectiveCommandHandler extends
AbstractCommandHandler {
this.beeLine = beeLine;
}
+ @Override
public boolean execute(String line) {
lastException = null;
ClientHook hook = ClientCommandHookFactory.get().getHook(beeLine, line);
diff --git a/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
b/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
index 0c220e4..1eefe17 100644
--- a/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
+++ b/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
@@ -37,6 +37,7 @@ class TableNameCompletor implements Completer {
this.beeLine = beeLine;
}
+ @Override
public int complete(String buf, int pos, List cand) {
if (beeLine.getDatabaseConnection() == null) {
return -1;
diff --git a/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
b/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
index 8482f85..f8b8b9c 100644
--- a/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
+++ b/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
@@ -37,6 +37,7 @@ class TableOutputFormat implements OutputFormat {
this.beeLine = beeLine;
}
+ @Override
public int print(Rows rows) {
int index = 0;
ColorBuffer header = null;
diff --git a/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
b/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
index a9488a4..e6458ac 100644
--- a/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
+++ b/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
@@ -36,6 +36,7 @@ class VerticalOutputFormat implements OutputFormat {
this.beeLine = beeLine;
}
+ @Override
public int print(Rows rows) {
int count = 0;
Rows.Row header = (Rows.Row) rows.next();
diff --git
a/beeline/src/java/org/apache/hive/beeline/hs2connection/HS2ConnectionFileUtils.java
b/beeline/src/java/org/apache/hive/beeline/hs2connection/HS2ConnectionFileUtils.java
index 7c064cf..dff2e4d 100644
---
a/beeline/src/java/org/apache/hive/beeline/hs2connection/HS2ConnectionFileUtils.java
+++
b/beeline/src/java/org/apache/hive/beeline/hs2connection/HS2ConnectionFileUtils.java
@@ -22,10 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
-import java.util.Set;
-
import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
public class HS2ConnectionFileUtils {
diff --git a/beeline/src/test/org/apache/hive/beeline/ProxyAuthTest.java
b/beeline/src/test/org/apache/hive/beeline/ProxyAuthTest.java
index 74aed14..52f3ebf 100644
--- a/beeline/src/test/org/apache/hive/beeline/ProxyAuthTest.java
+++ b/beeline/src/test/org/apache/hive/beeline/ProxyAuthTest.java
@@ -26,13 +26,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hive.jdbc.HiveConnection;
import org.apache.hive.service.auth.HiveAuthConstants;
import org.apache.hive.service.cli.session.SessionUtils;
import org.apache.hive.beeline.BeeLine;
-import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.hive.shims.Utils;
/**
diff --git
a/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
b/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
index 14124b0..e8e56f0 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
@@ -20,15 +20,7 @@ package org.apache.hive.beeline;
import org.junit.Assert;
import org.apache.thrift.transport.TTransportException;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
public class TestBeeLineExceptionHandling {
diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
b/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
index 5c0c970..593c217 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
@@ -18,15 +18,7 @@
package org.apache.hive.beeline;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-import java.io.*;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
import static org.mockito.Mockito.*;
public class TestBeeLineOpts {
diff --git
a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
index c632dd3..dcedbc2 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java
@@ -38,7 +38,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hive.common.util.HiveTestUtils;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java
b/beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java
index db44d6b..9478ec5 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java
@@ -87,6 +87,7 @@ public class TestBufferedRows {
when(mockResultSet.next()).thenAnswer(new Answer<Boolean>() {
private int mockRowDataIndex = 0;
+ @Override
public Boolean answer(InvocationOnMock invocation) {
if (mockRowDataIndex < mockRowData.length) {
mockRow.setCurrentRowData(mockRowData[mockRowDataIndex]);
@@ -99,6 +100,7 @@ public class TestBufferedRows {
});
when(mockResultSet.getObject(Matchers.anyInt())).thenAnswer(new
Answer<String>() {
+ @Override
public String answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments();
int index = ((Integer) args[0]).intValue();
diff --git
a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
index 34f628e..7b542a2 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
@@ -20,10 +20,7 @@ package org.apache.hive.beeline;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.times;
-
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
diff --git a/beeline/src/test/org/apache/hive/beeline/TestShutdownHook.java
b/beeline/src/test/org/apache/hive/beeline/TestShutdownHook.java
index 8787cb1..73e6f3e 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestShutdownHook.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestShutdownHook.java
@@ -19,14 +19,8 @@
package org.apache.hive.beeline;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
public class TestShutdownHook {
