You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2015/08/25 18:03:57 UTC
sqoop git commit: SQOOP-2526: Sqoop2: findbugs: Fix warning in shell
module
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 3864ccf03 -> b151ba384
SQOOP-2526: Sqoop2: findbugs: Fix warning in shell module
(Colin Ma via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/b151ba38
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/b151ba38
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/b151ba38
Branch: refs/heads/sqoop2
Commit: b151ba3844625a8a5f3baaeae32973af7f3d0f3b
Parents: 3864ccf
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Tue Aug 25 09:03:33 2015 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Tue Aug 25 09:03:33 2015 -0700
----------------------------------------------------------------------
.../apache/sqoop/shell/CloneJobFunction.java | 2 +
.../apache/sqoop/shell/CloneLinkFunction.java | 2 +
.../apache/sqoop/shell/CreateJobFunction.java | 2 +
.../apache/sqoop/shell/CreateLinkFunction.java | 2 +
.../apache/sqoop/shell/CreateRoleFunction.java | 2 +
.../apache/sqoop/shell/DeleteJobFunction.java | 1 +
.../apache/sqoop/shell/DeleteLinkFunction.java | 2 +
.../apache/sqoop/shell/DeleteRoleFunction.java | 2 +
.../apache/sqoop/shell/DisableJobFunction.java | 1 +
.../apache/sqoop/shell/DisableLinkFunction.java | 2 +
.../apache/sqoop/shell/EnableJobFunction.java | 1 +
.../apache/sqoop/shell/EnableLinkFunction.java | 2 +
.../sqoop/shell/GrantPrivilegeFunction.java | 2 +
.../apache/sqoop/shell/GrantRoleFunction.java | 2 +
.../sqoop/shell/RevokePrivilegeFunction.java | 2 +
.../apache/sqoop/shell/RevokeRoleFunction.java | 2 +
.../apache/sqoop/shell/SetOptionFunction.java | 2 +
.../apache/sqoop/shell/SetServerFunction.java | 1 +
.../sqoop/shell/ShowConnectorFunction.java | 1 +
.../apache/sqoop/shell/ShowDriverFunction.java | 2 +
.../org/apache/sqoop/shell/ShowJobFunction.java | 2 +
.../sqoop/shell/ShowJobStatusFunction.java | 1 +
.../apache/sqoop/shell/ShowLinkFunction.java | 4 +-
.../apache/sqoop/shell/ShowOptionFunction.java | 2 +
.../sqoop/shell/ShowPrincipalFunction.java | 2 +
.../sqoop/shell/ShowPrivilegeFunction.java | 2 +
.../apache/sqoop/shell/ShowRoleFunction.java | 2 +
.../apache/sqoop/shell/ShowServerFunction.java | 2 +
.../sqoop/shell/ShowSubmissionFunction.java | 2 +
.../apache/sqoop/shell/ShowVersionFunction.java | 2 +-
.../java/org/apache/sqoop/shell/SqoopShell.java | 39 ++++++++++----------
.../apache/sqoop/shell/StartJobFunction.java | 38 ++++++++++---------
.../org/apache/sqoop/shell/StopJobFunction.java | 2 +
.../apache/sqoop/shell/UpdateJobFunction.java | 2 +
.../apache/sqoop/shell/UpdateLinkFunction.java | 2 +
.../apache/sqoop/shell/utils/ConfigFiller.java | 6 +++
.../shell/utils/JobDynamicConfigOptions.java | 1 +
.../shell/utils/LinkDynamicConfigOptions.java | 1 +
.../sqoop/shell/utils/SubmissionDisplayer.java | 5 ++-
39 files changed, 111 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
index de7774b..b28ece2 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
@@ -40,6 +40,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class CloneJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public CloneJobFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
index 17ad5cc..b76346b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
@@ -39,6 +39,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class CloneLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public CloneLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
index b706397..4091c2d 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
@@ -41,6 +41,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class CreateJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public CreateJobFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
index 2619094..21e4092 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
@@ -40,6 +40,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class CreateLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public CreateLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
index 10d06b5..252a4a0 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
@@ -31,6 +31,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class CreateRoleFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public CreateRoleFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
index 229879b..7f3a76f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
@@ -29,6 +29,7 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class DeleteJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DeleteJobFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
index bb9c7c5..1d45b62 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class DeleteLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public DeleteLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
index 7209dca..27bf223 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class DeleteRoleFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public DeleteRoleFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
index a066172..df693eb 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
@@ -29,6 +29,7 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class DisableJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DisableJobFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
index 0f38b99..50cec54 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class DisableLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public DisableLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
index 8b4435e..73962bb 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
@@ -29,6 +29,7 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class EnableJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public EnableJobFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
index 64814d2..6e3a5df 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class EnableLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public EnableLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
index b7bb4b9..1b0c52f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
@@ -32,6 +32,8 @@ import java.util.Arrays;
import static org.apache.sqoop.shell.ShellEnvironment.*;
public class GrantPrivilegeFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public GrantPrivilegeFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
index 2714e81..ef0972b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
@@ -33,6 +33,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class GrantRoleFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public GrantRoleFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
index d32f6dd..efe3042 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
@@ -35,6 +35,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
import static org.apache.sqoop.shell.utils.ConfigFiller.errorMessage;
public class RevokePrivilegeFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public RevokePrivilegeFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
index 8ce3518..90aa10a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
@@ -33,6 +33,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class RevokeRoleFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public RevokeRoleFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
index 3f5f570..3613302 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class SetOptionFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public SetOptionFunction() {
this.addOption(OptionBuilder.hasArg()
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
index 0bab98a..e430f9d 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
@@ -26,6 +26,7 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
@SuppressWarnings("serial")
public class SetServerFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public SetServerFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
index f248683..6efb51c 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
@@ -33,6 +33,7 @@ import static org.apache.sqoop.shell.utils.ConfigDisplayer.*;
@SuppressWarnings("serial")
public class ShowConnectorFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowConnectorFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
index 421f65d..77539b3 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
@@ -30,6 +30,8 @@ import org.apache.sqoop.validation.Status;
*/
@SuppressWarnings("serial")
public class ShowDriverFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
public ShowDriverFunction() {
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
index c283727..21873cc 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
@@ -39,6 +39,8 @@ import static org.apache.sqoop.shell.utils.ConfigDisplayer.*;
*/
@SuppressWarnings("serial")
public class ShowJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowJobFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
index 4be8003..d0cb213 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
@@ -30,6 +30,7 @@ import org.apache.sqoop.validation.Status;
@SuppressWarnings("serial")
public class ShowJobStatusFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowJobStatusFunction() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
index 84194d9..04dd228 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
@@ -41,6 +41,8 @@ import static org.apache.sqoop.shell.utils.ConfigDisplayer.*;
*/
@SuppressWarnings("serial")
public class ShowLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowLinkFunction() {
this.addOption(OptionBuilder
@@ -142,7 +144,7 @@ public class ShowLinkFunction extends SqoopFunction {
for (String connectorId : connectorIds) {
if (!connectorIdToName.containsKey(connectorId)) {
try {
- MConnector connector = client.getConnector(Long.valueOf(connectorId));
+ MConnector connector = client.getConnector(Long.parseLong(connectorId));
if (connector != null) {
connectorIdToName.put(connectorId, connector.getUniqueName());
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
index 46eabf7..41d3f1a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
@@ -29,6 +29,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
@SuppressWarnings("serial")
public class ShowOptionFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
/**
* Construct new object.
*/
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
index 94bca85..8935026 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
@@ -33,6 +33,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class ShowPrincipalFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowPrincipalFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
index 6aaa1aa..2cf6972 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
@@ -36,6 +36,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class ShowPrivilegeFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowPrivilegeFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
index e4c9e81..6b61921 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
@@ -35,6 +35,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.resourceString;
@SuppressWarnings("serial")
public class ShowRoleFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowRoleFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
index cf9df7f..902e6d7 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
@@ -26,6 +26,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
@SuppressWarnings("serial")
public class ShowServerFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowServerFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
index 0c006db..c4d30cb 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
@@ -32,6 +32,8 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
@SuppressWarnings("serial")
public class ShowSubmissionFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public ShowSubmissionFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
index 310d83b..28d5de7 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
@@ -31,9 +31,9 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
@SuppressWarnings("serial")
public class ShowVersionFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
private VersionResourceRequest versionRequest;
-
@SuppressWarnings("static-access")
public ShowVersionFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java b/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
index e319839..33fddbf 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
@@ -17,10 +17,8 @@
*/
package org.apache.sqoop.shell;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.Charset;
import java.util.HashSet;
import java.util.Iterator;
@@ -54,7 +52,7 @@ public final class SqoopShell {
/**
* Hash of commands that we want to have in history in all cases.
*/
- public final static HashSet<String> commandsToKeep;
+ private final static HashSet<String> commandsToKeep;
static {
commandsToKeep = new HashSet<String>();
@@ -149,26 +147,27 @@ public final class SqoopShell {
* @throws IOException
*/
private static void interpretFileContent(File script, Groovysh shell) throws IOException {
- BufferedReader in = new BufferedReader(new FileReader(script));
- String line;
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(script), Charset.forName("UTF-8")))) {
+ String line;
- // Iterate over all lines and executed them one by one
- while ((line = in.readLine()) != null) {
+ // Iterate over all lines and executed them one by one
+ while ((line = in.readLine()) != null) {
- // Skip comments and empty lines as we don't need to interpret those
- if(line.isEmpty() || line.startsWith("#")) {
- continue;
- }
+ // Skip comments and empty lines as we don't need to interpret those
+ if (line.isEmpty() || line.startsWith("#")) {
+ continue;
+ }
- // Render shell and command to get user perception that it was run as usual
- print(shell.renderPrompt());
- println(line);
+ // Render shell and command to get user perception that it was run as usual
+ print(shell.renderPrompt());
+ println(line);
- // Manually trigger command line parsing
- Object result = shell.execute(line);
+ // Manually trigger command line parsing
+ Object result = shell.execute(line);
- if (result == null) {
- break;
+ if (result == null) {
+ break;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
index 4d32685..136893e 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
@@ -34,6 +34,7 @@ import org.apache.sqoop.validation.Status;
@SuppressWarnings("serial")
public class StartJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
public static final Logger LOG = Logger.getLogger(StartJobFunction.class);
@SuppressWarnings("static-access")
@@ -53,27 +54,10 @@ public class StartJobFunction extends SqoopFunction {
// Poll until finished
if (line.hasOption(Constants.OPT_SYNCHRONOUS) && line.hasOption(Constants.OPT_JID)) {
long pollTimeout = getPollTimeout();
- SubmissionCallback callback = new SubmissionCallback() {
- @Override
- public void submitted(MSubmission submission) {
- SubmissionDisplayer.displayHeader(submission);
- SubmissionDisplayer.displayProgress(submission);
- }
-
- @Override
- public void updated(MSubmission submission) {
- SubmissionDisplayer.displayProgress(submission);
- }
-
- @Override
- public void finished(MSubmission submission) {
- SubmissionDisplayer.displayFooter(submission);
- }
- };
try {
//client.startJob(getLong(line, Constants.OPT_JID), callback, pollTimeout);
- client.startJob(line.getOptionValue(Constants.OPT_JID), callback, pollTimeout);
+ client.startJob(line.getOptionValue(Constants.OPT_JID), new SJFCallback(), pollTimeout);
} catch (InterruptedException e) {
throw new SqoopException(ShellError.SHELL_0007, e);
}
@@ -92,4 +76,22 @@ public class StartJobFunction extends SqoopFunction {
return Status.OK;
}
+
+ private static class SJFCallback implements SubmissionCallback {
+ @Override
+ public void submitted(MSubmission submission) {
+ SubmissionDisplayer.displayHeader(submission);
+ SubmissionDisplayer.displayProgress(submission);
+ }
+
+ @Override
+ public void updated(MSubmission submission) {
+ SubmissionDisplayer.displayProgress(submission);
+ }
+
+ @Override
+ public void finished(MSubmission submission) {
+ SubmissionDisplayer.displayFooter(submission);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
index a1980d4..fe77903 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
@@ -29,6 +29,8 @@ import org.apache.sqoop.validation.Status;
@SuppressWarnings("serial")
public class StopJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public StopJobFunction() {
this.addOption(OptionBuilder.hasArg().withArgName(Constants.OPT_JID)
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
index 5c15532..ba85d63 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
@@ -40,6 +40,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class UpdateJobFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public UpdateJobFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
index bf1ddab..e815220 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
@@ -39,6 +39,8 @@ import static org.apache.sqoop.shell.utils.ConfigFiller.*;
*/
@SuppressWarnings("serial")
public class UpdateLinkFunction extends SqoopFunction {
+ private static final long serialVersionUID = 1L;
+
@SuppressWarnings("static-access")
public UpdateLinkFunction() {
this.addOption(OptionBuilder
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
index b3345b6..63b1267 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
@@ -180,16 +180,22 @@ public final class ConfigFiller {
// Based on the input type, let's perconfig specific load
switch (input.getType()) {
case STRING:
+ assert input instanceof MStringInput;
return fillInputString(prefix, (MStringInput) input, line);
case INTEGER:
+ assert input instanceof MIntegerInput;
return fillInputInteger(prefix, (MIntegerInput) input, line);
case LONG:
+ assert input instanceof MLongInput;
return fillInputLong(prefix, (MLongInput) input, line);
case BOOLEAN:
+ assert input instanceof MBooleanInput;
return fillInputBoolean(prefix, (MBooleanInput) input, line);
case MAP:
+ assert input instanceof MMapInput;
return fillInputMap(prefix, (MMapInput) input, line);
case ENUM:
+ assert input instanceof MEnumInput;
return fillInputEnum(prefix, (MEnumInput) input, line);
default:
println("Unsupported data type " + input.getType());
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java b/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
index 7060d65..2f9ec41 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
@@ -27,6 +27,7 @@ import org.apache.sqoop.model.MJob;
*/
@SuppressWarnings("serial")
public class JobDynamicConfigOptions extends DynamicConfigOptions<MJob> {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
@Override
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java b/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
index ef279f7..c6cc6e4 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
@@ -26,6 +26,7 @@ import org.apache.sqoop.model.MLink;
*/
@SuppressWarnings("serial")
public class LinkDynamicConfigOptions extends DynamicConfigOptions<MLink> {
+ private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
@Override
http://git-wip-us.apache.org/repos/asf/sqoop/blob/b151ba38/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java b/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
index bb0268a..3a78371 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
@@ -33,13 +33,14 @@ import static org.apache.sqoop.shell.ShellEnvironment.*;
*/
public final class SubmissionDisplayer {
- private final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ private final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss z";
/**
* On job submission, displays the initial job info
* @param submission
*/
public static void displayHeader(MSubmission submission) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
println("@|bold "+ resourceString(Constants.RES_SUBMISSION_SUBMISSION_DETAIL) +"|@");
print(resourceString(Constants.RES_SUBMISSION_JOB_ID)+": ");
@@ -84,6 +85,7 @@ public final class SubmissionDisplayer {
* @param submission
*/
public static void displayProgress(MSubmission submission) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
StringBuilder sb = new StringBuilder();
if(submission.getStatus().isRunning()) {
sb.append(dateFormat.format(submission.getLastUpdateDate())+": @|green "+submission.getStatus()+ " |@");
@@ -106,6 +108,7 @@ public final class SubmissionDisplayer {
* @param submission
*/
public static void displayFooter(MSubmission submission) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
if (submission.getStatus().toString().equals(SubmissionStatus.SUCCEEDED.toString())) {
println(dateFormat.format(submission.getLastUpdateDate())+": @|green "+submission.getStatus()+ " |@");
Counters counters = submission.getCounters();