Repository: zeppelin Updated Branches: refs/heads/master 93ac1d523 -> 73d99b880
ZEPPELIN-1224: Fix typo in method name ### What is this PR for? Get the correct method to invoke, for autocompletion ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1224 ### How should this be tested? Try to get the auto complete suggestion.(`cmd + .`) We should not get `NoSuchMethodError` and suggestions should be listed rightly ### Screenshots (if appropriate) NA ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Karup <karuppa...@outlook.com> Closes #1214 from karup1990/ZEPPELIN-1224 and squashes the following commits: 5d68984 [Karup] Fix variable names cd3df44 [Karup] Fix typo in method name Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/73d99b88 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/73d99b88 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/73d99b88 Branch: refs/heads/master Commit: 73d99b880634809d615a063911573cb68b5d4864 Parents: 93ac1d5 Author: Karup <karuppa...@outlook.com> Authored: Fri Jul 22 12:39:20 2016 +0530 Committer: Lee moon soo <m...@apache.org> Committed: Wed Jul 27 07:47:55 2016 +0900 ---------------------------------------------------------------------- .../main/java/org/apache/zeppelin/spark/DepInterpreter.java | 8 ++++---- .../java/org/apache/zeppelin/spark/SparkInterpreter.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73d99b88/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java index 5dc5d03..146ae16 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java @@ -76,9 +76,9 @@ public class DepInterpreter extends Interpreter { private ByteArrayOutputStream out; private SparkDependencyContext depc; /** - * completor - org.apache.spark.repl.SparkJLineCompletion (scala 2.10) + * completer - org.apache.spark.repl.SparkJLineCompletion (scala 2.10) */ - private Object completor; + private Object completer; private SparkILoop interpreter; static final Logger LOGGER = LoggerFactory.getLogger(DepInterpreter.class); @@ -176,7 +176,7 @@ public class DepInterpreter extends Interpreter { depc = new SparkDependencyContext(getProperty("zeppelin.dep.localrepo"), getProperty("zeppelin.dep.additionalRemoteRepository")); if (Utils.isScala2_10()) { - completor = Utils.instantiateClass( + completer = Utils.instantiateClass( "org.apache.spark.repl.SparkJLineCompletion", new Class[]{Utils.findClass("org.apache.spark.repl.SparkIMain")}, new Object[]{intp}); @@ -286,7 +286,7 @@ public class DepInterpreter extends Interpreter { @Override public List<InterpreterCompletion> completion(String buf, int cursor) { if (Utils.isScala2_10()) { - ScalaCompleter c = (ScalaCompleter) Utils.invokeMethod(completor, "completer"); + ScalaCompleter c = (ScalaCompleter) Utils.invokeMethod(completer, "completer"); Candidates ret = c.complete(buf, cursor); List<String> candidates = WrapAsJava$.MODULE$.seqAsJavaList(ret.candidates()); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73d99b88/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index 4707611..f716f7f 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -110,9 +110,9 @@ public class SparkInterpreter extends Interpreter { private SparkDependencyResolver dep; /** - * completor - org.apache.spark.repl.SparkJLineCompletion (scala 2.10) + * completer - org.apache.spark.repl.SparkJLineCompletion (scala 2.10) */ - private Object completor; + private Object completer; private Map<String, Object> binder; private SparkVersion sparkVersion; @@ -704,7 +704,7 @@ public class SparkInterpreter extends Interpreter { } } - completor = Utils.instantiateClass( + completer = Utils.instantiateClass( "org.apache.spark.repl.SparkJLineCompletion", new Class[]{Utils.findClass("org.apache.spark.repl.SparkIMain")}, new Object[]{intp}); @@ -895,7 +895,7 @@ public class SparkInterpreter extends Interpreter { cursor = completionText.length(); } if (Utils.isScala2_10()) { - ScalaCompleter c = (ScalaCompleter) Utils.invokeMethod(completor, "completor"); + ScalaCompleter c = (ScalaCompleter) Utils.invokeMethod(completer, "completer"); Candidates ret = c.complete(completionText, cursor); List<String> candidates = WrapAsJava$.MODULE$.seqAsJavaList(ret.candidates());
