Repository: sqoop Updated Branches: refs/heads/sqoop2 e24263a2e -> f8641cf57
SQOOP-2684: Sqoop2: Upgrade groovy to 2.4.0 (Dian Fu 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/f8641cf5 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f8641cf5 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f8641cf5 Branch: refs/heads/sqoop2 Commit: f8641cf572c57d43856b2137d0466abc798169ae Parents: e24263a Author: Jarek Jarcec Cecho <[email protected]> Authored: Tue Nov 17 08:56:16 2015 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Tue Nov 17 08:56:16 2015 -0800 ---------------------------------------------------------------------- pom.xml | 3 +++ shell/pom.xml | 10 +++++----- .../org/apache/sqoop/shell/CloneCommand.java | 4 ++-- .../apache/sqoop/shell/CloneJobFunction.java | 3 ++- .../apache/sqoop/shell/CloneLinkFunction.java | 3 ++- .../org/apache/sqoop/shell/CreateCommand.java | 4 ++-- .../apache/sqoop/shell/CreateJobFunction.java | 3 ++- .../apache/sqoop/shell/CreateLinkFunction.java | 3 ++- .../org/apache/sqoop/shell/DeleteCommand.java | 4 ++-- .../org/apache/sqoop/shell/DisableCommand.java | 4 ++-- .../org/apache/sqoop/shell/EnableCommand.java | 4 ++-- .../org/apache/sqoop/shell/GrantCommand.java | 4 ++-- .../org/apache/sqoop/shell/HelpCommand.java | 4 ++-- .../org/apache/sqoop/shell/RevokeCommand.java | 4 ++-- .../java/org/apache/sqoop/shell/SetCommand.java | 4 ++-- .../apache/sqoop/shell/ShellEnvironment.java | 3 ++- .../org/apache/sqoop/shell/ShowCommand.java | 4 ++-- .../org/apache/sqoop/shell/SqoopCommand.java | 9 ++++----- .../java/org/apache/sqoop/shell/SqoopShell.java | 2 +- .../org/apache/sqoop/shell/StartCommand.java | 4 ++-- .../org/apache/sqoop/shell/StatusCommand.java | 4 ++-- .../org/apache/sqoop/shell/StopCommand.java | 4 ++-- .../org/apache/sqoop/shell/UpdateCommand.java | 4 ++-- .../apache/sqoop/shell/UpdateJobFunction.java | 3 ++- .../apache/sqoop/shell/UpdateLinkFunction.java | 3 ++- .../apache/sqoop/shell/utils/ConfigFiller.java | 21 ++++++++++---------- .../apache/sqoop/shell/TestCloneCommand.java | 5 ++--- .../apache/sqoop/shell/TestCreateCommand.java | 5 ++--- .../apache/sqoop/shell/TestUpdateCommand.java | 5 ++--- .../sqoop/shell/utils/TestConfigFiller.java | 5 ++--- 30 files changed, 74 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f33958c..91721ce 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,9 @@ limitations under the License. <jcommander.version>1.27</jcommander.version> <findbugs.version>1.3.2</findbugs.version> <jetty.version>9.2.13.v20150730</jetty.version> + <jline.version>2.13</jline.version> + <groovy.version>2.4.0</groovy.version> + <jansi.version>1.7</jansi.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index c70c745..1949a8e 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -48,17 +48,17 @@ limitations under the License. <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${commons-cli.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.6</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>0.9.94</version> + <version>${jline.version}</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -69,12 +69,12 @@ limitations under the License. <dependency> <groupId>org.fusesource.jansi</groupId> <artifactId>jansi</artifactId> - <version>1.7</version> + <version>${jansi.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.8.5</version> + <version>${groovy.version}</version> </dependency> <dependency> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/CloneCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneCommand.java b/shell/src/main/java/org/apache/sqoop/shell/CloneCommand.java index f71f82c..2525a24 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CloneCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CloneCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * Client side cloning of connection and job objects. */ public class CloneCommand extends SqoopCommand { - public CloneCommand(Shell shell) { + public CloneCommand(Groovysh shell) { super(shell, Constants.CMD_CLONE, Constants.CMD_CLONE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 ecea579..15cfad7 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.common.Direction; @@ -32,6 +31,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 b46a19f..a679be8 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.model.MLink; @@ -31,6 +30,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/CreateCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateCommand.java b/shell/src/main/java/org/apache/sqoop/shell/CreateCommand.java index a16ba5b..e5ff7f9 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CreateCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CreateCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class CreateCommand extends SqoopCommand { - public CreateCommand(Shell shell) { + public CreateCommand(Groovysh shell) { super(shell, Constants.CMD_CREATE, Constants.CMD_CREATE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 03ceaba..79caa0d 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.common.Direction; @@ -33,6 +32,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 e392846..289c3c3 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.model.MConnector; @@ -32,6 +31,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/DeleteCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteCommand.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteCommand.java index 4b66505..0056254 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/DeleteCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class DeleteCommand extends SqoopCommand { - public DeleteCommand(Shell shell) { + public DeleteCommand(Groovysh shell) { super(shell, Constants.CMD_DELETE, Constants.CMD_DELETE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/DisableCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableCommand.java b/shell/src/main/java/org/apache/sqoop/shell/DisableCommand.java index 03aa922..f5a54fd 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/DisableCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/DisableCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class DisableCommand extends SqoopCommand { - public DisableCommand(Shell shell) { + public DisableCommand(Groovysh shell) { super(shell, Constants.CMD_DISABLE, Constants.CMD_DISABLE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/EnableCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableCommand.java b/shell/src/main/java/org/apache/sqoop/shell/EnableCommand.java index 42cc9fc..d95e9fa 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/EnableCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/EnableCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class EnableCommand extends SqoopCommand { - public EnableCommand(Shell shell) { + public EnableCommand(Groovysh shell) { super(shell, Constants.CMD_ENABLE, Constants.CMD_ENABLE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/GrantCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/GrantCommand.java b/shell/src/main/java/org/apache/sqoop/shell/GrantCommand.java index b4b77b0..e2c6875 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/GrantCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/GrantCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class GrantCommand extends SqoopCommand { - public GrantCommand(Shell shell) { + public GrantCommand(Groovysh shell) { super(shell, Constants.CMD_GRANT, Constants.CMD_GRANT_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java b/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java index e8d531f..d3ee811 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/HelpCommand.java @@ -28,14 +28,14 @@ import org.apache.sqoop.shell.core.ShellError; import org.apache.sqoop.shell.core.Constants; import org.codehaus.groovy.tools.shell.Command; import org.codehaus.groovy.tools.shell.CommandSupport; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; import org.codehaus.groovy.tools.shell.util.SimpleCompletor; import static org.apache.sqoop.shell.ShellEnvironment.*; public class HelpCommand extends CommandSupport { - protected HelpCommand(Shell shell) { + protected HelpCommand(Groovysh shell) { super(shell, Constants.CMD_HELP, Constants.CMD_HELP_SC); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/RevokeCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/RevokeCommand.java b/shell/src/main/java/org/apache/sqoop/shell/RevokeCommand.java index 0cb30e4..da89ee1 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/RevokeCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/RevokeCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class RevokeCommand extends SqoopCommand { - public RevokeCommand(Shell shell) { + public RevokeCommand(Groovysh shell) { super(shell, Constants.CMD_REVOKE, Constants.CMD_REVOKE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/SetCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetCommand.java b/shell/src/main/java/org/apache/sqoop/shell/SetCommand.java index 3b8f4c2..0a04e3d 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/SetCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/SetCommand.java @@ -19,11 +19,11 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; public class SetCommand extends SqoopCommand { - protected SetCommand(Shell shell) { + protected SetCommand(Groovysh shell) { super(shell, Constants.CMD_SET, Constants.CMD_SET_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java b/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java index 55a0f27..36d0712 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java +++ b/shell/src/main/java/org/apache/sqoop/shell/ShellEnvironment.java @@ -30,7 +30,8 @@ import java.text.MessageFormat; import java.util.Locale; import java.util.ResourceBundle; -import jline.ConsoleReader; +import jline.console.ConsoleReader; + /** * Static internal environment of the shell shared across all commands and http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/ShowCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowCommand.java b/shell/src/main/java/org/apache/sqoop/shell/ShowCommand.java index 82c52da..c148eeb 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/ShowCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/ShowCommand.java @@ -19,11 +19,11 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; public class ShowCommand extends SqoopCommand { - protected ShowCommand(Shell shell) { + protected ShowCommand(Groovysh shell) { super(shell, Constants.CMD_SHOW, Constants.CMD_SHOW_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/SqoopCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/SqoopCommand.java b/shell/src/main/java/org/apache/sqoop/shell/SqoopCommand.java index fdb7a5b..3578b0e 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/SqoopCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/SqoopCommand.java @@ -29,7 +29,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.shell.core.ShellError; import org.apache.sqoop.utils.ClassUtils; import org.codehaus.groovy.tools.shell.ComplexCommandSupport; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; import static org.apache.sqoop.shell.ShellEnvironment.*; @@ -61,23 +61,22 @@ public abstract class SqoopCommand extends ComplexCommandSupport { */ private final Map<String, SqoopFunction> functionInstances; - protected SqoopCommand(Shell shell, + protected SqoopCommand(Groovysh shell, String name, String shortcut) { this(shell, name, shortcut, null); } - protected SqoopCommand(Shell shell, + protected SqoopCommand(Groovysh shell, String name, String shortcut, Map<String, Class<? extends SqoopFunction>> funcs) { - super(shell, name, shortcut); + super(shell, name, shortcut, new LinkedList<String>()); this.name = name; this.functionNames = funcs; this.functionInstances = new HashMap<String, SqoopFunction>(); - this.functions = new LinkedList<String>(); if (funcs != null) { this.functions.addAll(funcs.keySet()); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 33fddbf..7e4a7df 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java +++ b/shell/src/main/java/org/apache/sqoop/shell/SqoopShell.java @@ -125,7 +125,7 @@ public final class SqoopShell { // Switch to interactive mode setInteractive(true); - shell.run(args); + shell.run(null); } else { // Batch mode (with a script file): http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/StartCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/StartCommand.java b/shell/src/main/java/org/apache/sqoop/shell/StartCommand.java index 7c56980..679c1f7 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/StartCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/StartCommand.java @@ -19,11 +19,11 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; public class StartCommand extends SqoopCommand { - protected StartCommand(Shell shell) { + protected StartCommand(Groovysh shell) { super(shell, Constants.CMD_START, Constants.CMD_START_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/StatusCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/StatusCommand.java b/shell/src/main/java/org/apache/sqoop/shell/StatusCommand.java index 5b4ef1f..6082799 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/StatusCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/StatusCommand.java @@ -19,11 +19,11 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; public class StatusCommand extends SqoopCommand { - protected StatusCommand(Shell shell) { + protected StatusCommand(Groovysh shell) { super(shell, Constants.CMD_STATUS, Constants.CMD_STATUS_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/StopCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/StopCommand.java b/shell/src/main/java/org/apache/sqoop/shell/StopCommand.java index 50b2e81..83c571a 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/StopCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/StopCommand.java @@ -19,11 +19,11 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; public class StopCommand extends SqoopCommand { - protected StopCommand(Shell shell) { + protected StopCommand(Groovysh shell) { super(shell, Constants.CMD_STOP, Constants.CMD_STOP_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/main/java/org/apache/sqoop/shell/UpdateCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateCommand.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateCommand.java index c75d5f5..e1a06c4 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/UpdateCommand.java +++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateCommand.java @@ -19,14 +19,14 @@ package org.apache.sqoop.shell; import com.google.common.collect.ImmutableMap; import org.apache.sqoop.shell.core.Constants; -import org.codehaus.groovy.tools.shell.Shell; +import org.codehaus.groovy.tools.shell.Groovysh; /** * */ public class UpdateCommand extends SqoopCommand { - public UpdateCommand(Shell shell) { + public UpdateCommand(Groovysh shell) { super(shell, Constants.CMD_UPDATE, Constants.CMD_UPDATE_SC, http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 fe6a155..49cfd0b 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.common.Direction; @@ -32,6 +31,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 c5359ce..1bb7cd5 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.shell; -import jline.ConsoleReader; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.sqoop.model.MLink; @@ -31,6 +30,8 @@ import java.io.IOException; import java.util.List; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; import static org.apache.sqoop.shell.utils.ConfigFiller.*; http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/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 86d8230..98407ce 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 @@ -17,8 +17,6 @@ */ package org.apache.sqoop.shell.utils; -import jline.ConsoleReader; - import org.apache.commons.cli.CommandLine; import org.apache.commons.lang.StringUtils; import org.apache.sqoop.model.InputEditable; @@ -47,6 +45,8 @@ import java.util.Map; import java.util.HashMap; import java.util.ResourceBundle; +import jline.console.ConsoleReader; + import static org.apache.sqoop.shell.ShellEnvironment.*; /** @@ -693,8 +693,8 @@ public final class ConfigFiller { } // Special prompt for List element - reader.printString("element# "); - reader.flushConsole(); + reader.print("element# "); + reader.flush(); if(input.isSensitive()) { userTyped = reader.readLine('*'); @@ -757,14 +757,14 @@ public final class ConfigFiller { } // Prompt - reader.printString("Choose: "); + reader.print("Choose: "); // Fill previously filled index when available if(lastChoice != -1) { reader.putString(Integer.toString(lastChoice)); } - reader.flushConsole(); + reader.flush(); String userTyped; if(input.isSensitive()) { @@ -841,8 +841,8 @@ public final class ConfigFiller { } // Special prompt for Map entry - reader.printString("entry# "); - reader.flushConsole(); + reader.print("entry# "); + reader.flush(); if(input.isSensitive()) { userTyped = reader.readLine('*'); @@ -1017,6 +1017,7 @@ public final class ConfigFiller { // However do not printout if this input contains sensitive information. if(!input.isEmpty() && !input.isSensitive()) { reader.putString(input.getValue()); + reader.flush(); } // Get the data @@ -1103,8 +1104,8 @@ public final class ConfigFiller { @SuppressWarnings("rawtypes") static void generatePrompt(ConsoleReader reader, ResourceBundle bundle, MInput input) throws IOException { - reader.printString(bundle.getString(input.getLabelKey()) + ": "); - reader.flushConsole(); + reader.print(bundle.getString(input.getLabelKey()) + ": "); + reader.flush(); } static String getName(ConsoleReader reader, String name) throws IOException { http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/test/java/org/apache/sqoop/shell/TestCloneCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/sqoop/shell/TestCloneCommand.java b/shell/src/test/java/org/apache/sqoop/shell/TestCloneCommand.java index c45501c..7a139ba 100644 --- a/shell/src/test/java/org/apache/sqoop/shell/TestCloneCommand.java +++ b/shell/src/test/java/org/apache/sqoop/shell/TestCloneCommand.java @@ -28,7 +28,6 @@ import static org.testng.Assert.fail; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.ResourceBundle; -import jline.ConsoleReader; +import jline.console.ConsoleReader; import org.apache.commons.lang.StringUtils; import org.apache.sqoop.client.SqoopClient; @@ -87,7 +86,7 @@ public class TestCloneCommand { data = new byte[1000]; in = new ByteArrayInputStream(data); - reader = new ConsoleReader(in, new OutputStreamWriter(System.out)); + reader = new ConsoleReader(in, System.out); ShellEnvironment.setConsoleReader(reader); resourceBundle = new ResourceBundle() { @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/test/java/org/apache/sqoop/shell/TestCreateCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/sqoop/shell/TestCreateCommand.java b/shell/src/test/java/org/apache/sqoop/shell/TestCreateCommand.java index 2f91897..0316a60 100644 --- a/shell/src/test/java/org/apache/sqoop/shell/TestCreateCommand.java +++ b/shell/src/test/java/org/apache/sqoop/shell/TestCreateCommand.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.ResourceBundle; -import jline.ConsoleReader; +import jline.console.ConsoleReader; import org.apache.commons.lang.StringUtils; import org.apache.sqoop.client.SqoopClient; @@ -87,7 +86,7 @@ public class TestCreateCommand { data = new byte[1000]; in = new ByteArrayInputStream(data); - reader = new ConsoleReader(in, new OutputStreamWriter(System.out)); + reader = new ConsoleReader(in, System.out); ShellEnvironment.setConsoleReader(reader); resourceBundle = new ResourceBundle() { @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/test/java/org/apache/sqoop/shell/TestUpdateCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/sqoop/shell/TestUpdateCommand.java b/shell/src/test/java/org/apache/sqoop/shell/TestUpdateCommand.java index d5df497..d8f061a 100644 --- a/shell/src/test/java/org/apache/sqoop/shell/TestUpdateCommand.java +++ b/shell/src/test/java/org/apache/sqoop/shell/TestUpdateCommand.java @@ -28,7 +28,6 @@ import static org.testng.Assert.fail; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.ResourceBundle; -import jline.ConsoleReader; +import jline.console.ConsoleReader; import org.apache.commons.lang.StringUtils; import org.apache.sqoop.client.SqoopClient; @@ -88,7 +87,7 @@ public class TestUpdateCommand { data = new byte[1000]; in = new ByteArrayInputStream(data); - reader = new ConsoleReader(in, new OutputStreamWriter(System.out)); + reader = new ConsoleReader(in, System.out); ShellEnvironment.setConsoleReader(reader); resourceBundle = new ResourceBundle() { @Override http://git-wip-us.apache.org/repos/asf/sqoop/blob/f8641cf5/shell/src/test/java/org/apache/sqoop/shell/utils/TestConfigFiller.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/sqoop/shell/utils/TestConfigFiller.java b/shell/src/test/java/org/apache/sqoop/shell/utils/TestConfigFiller.java index 1917a1d..924f0d9 100644 --- a/shell/src/test/java/org/apache/sqoop/shell/utils/TestConfigFiller.java +++ b/shell/src/test/java/org/apache/sqoop/shell/utils/TestConfigFiller.java @@ -26,13 +26,12 @@ import static org.testng.Assert.assertNull; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.ResourceBundle; -import jline.ConsoleReader; +import jline.console.ConsoleReader; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -67,7 +66,7 @@ public class TestConfigFiller { line = mock(CommandLine.class); data = new byte[1000]; in = new ByteArrayInputStream(data); - reader = new ConsoleReader(in, new OutputStreamWriter(System.out)); + reader = new ConsoleReader(in, System.out); resourceBundle = new ResourceBundle() { @Override protected Object handleGetObject(String key) {
