Repository: zeppelin Updated Branches: refs/heads/master 24a7e1810 -> f7ce7fad1
use static field logger instead of function ### What is this PR for? Create static field logger in Paragraph instead of function to make the code style consistent. This is a trivial and straightforward change, so I didn't create jira for it. ### What type of PR is it? [Refactoring] Author: Jeff Zhang <[email protected]> Closes #1175 from zjffdu/logger and squashes the following commits: 21240ce [Jeff Zhang] remove unnecessary code b965253 [Jeff Zhang] use static field logger instead of function Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f7ce7fad Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f7ce7fad Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f7ce7fad Branch: refs/heads/master Commit: f7ce7fad160efe0b97dc08afcd0a7c5d90cc9c3d Parents: 24a7e18 Author: Jeff Zhang <[email protected]> Authored: Wed Jul 13 15:16:34 2016 +0800 Committer: Prabhjyot Singh <[email protected]> Committed: Mon Jul 18 11:05:26 2016 +0530 ---------------------------------------------------------------------- .../org/apache/zeppelin/markdown/MarkdownTest.java | 1 - .../org/apache/zeppelin/notebook/Paragraph.java | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f7ce7fad/markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java ---------------------------------------------------------------------- diff --git a/markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java b/markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java index 86d6c59..ae1c17e 100644 --- a/markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java +++ b/markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java @@ -43,7 +43,6 @@ public class MarkdownTest { md.open(); InterpreterResult result = md.interpret("This is ~~deleted~~ text", null); assertEquals("<p>This is <s>deleted</s> text</p>\n", result.message()); - System.out.println(MarkdownTest.class.getName()); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f7ce7fad/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java index d1a7824..7317406 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java @@ -50,6 +50,7 @@ import com.google.common.annotations.VisibleForTesting; public class Paragraph extends Job implements Serializable, Cloneable { private static final long serialVersionUID = -6328572073497992016L; + private static Logger logger = LoggerFactory.getLogger(Paragraph.class); private transient InterpreterFactory factory; private transient Note note; private transient AuthenticationInfo authenticationInfo; @@ -251,9 +252,9 @@ public class Paragraph extends Job implements Serializable, Cloneable { protected Object jobRun() throws Throwable { String replName = getRequiredReplName(); Interpreter repl = getRepl(replName); - logger().info("run paragraph {} using {} " + repl, getId(), replName); + logger.info("run paragraph {} using {} " + repl, getId(), replName); if (repl == null) { - logger().error("Can not find interpreter name " + repl); + logger.error("Can not find interpreter name " + repl); throw new RuntimeException("Can not find interpreter for " + getRequiredReplName()); } @@ -274,7 +275,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { settings.setForms(inputs); script = Input.getSimpleQuery(settings.getParams(), scriptBody); } - logger().debug("RUN : " + script); + logger.debug("RUN : " + script); try { InterpreterContext context = getInterpreterContext(); InterpreterContext.set(context); @@ -357,7 +358,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { try { message = new String(out.toByteArray()); } catch (IOException e) { - logger().error(e.getMessage(), e); + logger.error(e.getMessage(), e); t = e; } setReturn(new InterpreterResult(Code.SUCCESS, out.getType(), message), t); @@ -418,13 +419,6 @@ public class Paragraph extends Job implements Serializable, Cloneable { } } - - private Logger logger() { - Logger logger = LoggerFactory.getLogger(Paragraph.class); - return logger; - } - - public Map<String, Object> getConfig() { return config; }
