github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-06 01:40:28 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2526: Sqoop2: findbugs: Fix warning in shell module

Browse Source 
(Colin Ma via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2015-08-25 09:03:33 -07:00
parent 3864ccf036
commit b151ba3844
39 changed files with 111 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
View File

@ -40,6 +40,8 @@
*/
@SuppressWarnings("serial")
public class CloneJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public CloneJobFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
View File

@ -39,6 +39,8 @@
*/
@SuppressWarnings("serial")
public class CloneLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public CloneLinkFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
View File

@ -41,6 +41,8 @@
*/
@SuppressWarnings("serial")
public class CreateJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public CreateJobFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
View File

@ -40,6 +40,8 @@
*/
@SuppressWarnings("serial")
public class CreateLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public CreateLinkFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/CreateRoleFunction.java
View File

@ -31,6 +31,8 @@
@SuppressWarnings("serial")
public class CreateRoleFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public CreateRoleFunction() {
this.addOption(OptionBuilder

1
shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
View File

@ -29,6 +29,7 @@
*/
@SuppressWarnings("serial")
public class DeleteJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DeleteJobFunction() {

2
shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
View File

@ -29,6 +29,8 @@
*/
@SuppressWarnings("serial")
public class DeleteLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DeleteLinkFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/DeleteRoleFunction.java
View File

@ -29,6 +29,8 @@
@SuppressWarnings("serial")
public class DeleteRoleFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DeleteRoleFunction() {
this.addOption(OptionBuilder

1
shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
View File

@ -29,6 +29,7 @@
*/
@SuppressWarnings("serial")
public class DisableJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DisableJobFunction() {

2
shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
View File

@ -29,6 +29,8 @@
*/
@SuppressWarnings("serial")
public class DisableLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public DisableLinkFunction() {
this.addOption(OptionBuilder

1
shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
View File

@ -29,6 +29,7 @@
*/
@SuppressWarnings("serial")
public class EnableJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public EnableJobFunction() {

2
shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
View File

@ -29,6 +29,8 @@
*/
@SuppressWarnings("serial")
public class EnableLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public EnableLinkFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/GrantPrivilegeFunction.java
View File

@ -32,6 +32,8 @@
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

2
shell/src/main/java/org/apache/sqoop/shell/GrantRoleFunction.java
View File

@ -33,6 +33,8 @@
@SuppressWarnings("serial")
public class GrantRoleFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public GrantRoleFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/RevokePrivilegeFunction.java
View File

@ -35,6 +35,8 @@
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

2
shell/src/main/java/org/apache/sqoop/shell/RevokeRoleFunction.java
View File

@ -33,6 +33,8 @@
@SuppressWarnings("serial")
public class RevokeRoleFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public RevokeRoleFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
View File

@ -29,6 +29,8 @@
*/
@SuppressWarnings("serial")
public class SetOptionFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public SetOptionFunction() {
this.addOption(OptionBuilder.hasArg()

1
shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
View File

@ -26,6 +26,7 @@
@SuppressWarnings("serial")
public class SetServerFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public SetServerFunction() {

1
shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
View File

@ -33,6 +33,7 @@
@SuppressWarnings("serial")
public class ShowConnectorFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowConnectorFunction() {

2
shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
View File

@ -30,6 +30,8 @@
*/
@SuppressWarnings("serial")
public class ShowDriverFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
public ShowDriverFunction() {
}

2
shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
View File

@ -39,6 +39,8 @@
*/
@SuppressWarnings("serial")
public class ShowJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowJobFunction() {
this.addOption(OptionBuilder

1
shell/src/main/java/org/apache/sqoop/shell/ShowJobStatusFunction.java
View File

@ -30,6 +30,7 @@
@SuppressWarnings("serial")
public class ShowJobStatusFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowJobStatusFunction() {

4
shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
View File

@ -41,6 +41,8 @@
*/
@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 @@ private List<String> getConnectorNames(List<String> connectorIds) {
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());
}

2
shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
View File

@ -29,6 +29,8 @@
*/
@SuppressWarnings("serial")
public class ShowOptionFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
/**
* Construct new object.
*/

2
shell/src/main/java/org/apache/sqoop/shell/ShowPrincipalFunction.java
View File

@ -33,6 +33,8 @@
@SuppressWarnings("serial")
public class ShowPrincipalFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowPrincipalFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/ShowPrivilegeFunction.java
View File

@ -36,6 +36,8 @@
@SuppressWarnings("serial")
public class ShowPrivilegeFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowPrivilegeFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/ShowRoleFunction.java
View File

@ -35,6 +35,8 @@
@SuppressWarnings("serial")
public class ShowRoleFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowRoleFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
View File

@ -26,6 +26,8 @@
@SuppressWarnings("serial")
public class ShowServerFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowServerFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
View File

@ -32,6 +32,8 @@
@SuppressWarnings("serial")
public class ShowSubmissionFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public ShowSubmissionFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
View File

@ -31,9 +31,9 @@
@SuppressWarnings("serial")
public class ShowVersionFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
private VersionResourceRequest versionRequest;
@SuppressWarnings("static-access")
public ShowVersionFunction() {
this.addOption(OptionBuilder

39
shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java
View File

@ -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 static void main (String[] args) throws Exception {
* @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;
}
}
}
}

38
shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
View File

@ -34,6 +34,7 @@
@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 Object executeFunction(CommandLine line, boolean isInteractive) {
// 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 void finished(MSubmission submission) {
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);
}
}
}

2
shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
View File

@ -29,6 +29,8 @@
@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)

2
shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
View File

@ -40,6 +40,8 @@
*/
@SuppressWarnings("serial")
public class UpdateJobFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public UpdateJobFunction() {
this.addOption(OptionBuilder

2
shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
View File

@ -39,6 +39,8 @@
*/
@SuppressWarnings("serial")
public class UpdateLinkFunction extends SqoopFunction {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
public UpdateLinkFunction() {
this.addOption(OptionBuilder

6
shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
View File

@ -180,16 +180,22 @@ public static boolean fillInput(String prefix, MInput input, CommandLine line) t
// 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());

1
shell/src/main/java/org/apache/sqoop/shell/utils/JobDynamicConfigOptions.java
View File

@ -27,6 +27,7 @@
*/
@SuppressWarnings("serial")
public class JobDynamicConfigOptions extends DynamicConfigOptions<MJob> {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
@Override

1
shell/src/main/java/org/apache/sqoop/shell/utils/LinkDynamicConfigOptions.java
View File

@ -26,6 +26,7 @@
*/
@SuppressWarnings("serial")
public class LinkDynamicConfigOptions extends DynamicConfigOptions<MLink> {
private static final long serialVersionUID = 1L;
@SuppressWarnings("static-access")
@Override

5
shell/src/main/java/org/apache/sqoop/shell/utils/SubmissionDisplayer.java
View File

@ -33,13 +33,14 @@
*/
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 static void displayHeader(MSubmission submission) {
* @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 static void displayProgress(MSubmission submission) {
* @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();