From c626bf4a9b4e52da8ca8b6a0b4940fa9fb6a5f65 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Tue, 19 Jun 2018 10:52:28 +0800 Subject: [PATCH] ZEPPELIN-3149. checkstyle of beam --- beam/pom.xml | 7 +++++ .../apache/zeppelin/beam/BeamInterpreter.java | 15 +++++------ .../org/apache/zeppelin/beam/StaticRepl.java | 26 ++++++++----------- .../zeppelin/beam/BeamInterpreterTest.java | 16 +++++------- 4 files changed, 32 insertions(+), 32 deletions(-) rename beam/src/{main => }/test/org/apache/zeppelin/beam/BeamInterpreterTest.java (96%) diff --git a/beam/pom.xml b/beam/pom.xml index 726ec147d50..e82e25e3fc5 100644 --- a/beam/pom.xml +++ b/beam/pom.xml @@ -253,6 +253,13 @@ maven-resources-plugin + + org.apache.maven.plugins + maven-checkstyle-plugin + + false + + diff --git a/beam/src/main/java/org/apache/zeppelin/beam/BeamInterpreter.java b/beam/src/main/java/org/apache/zeppelin/beam/BeamInterpreter.java index 37ccfae44fe..24704df34c7 100644 --- a/beam/src/main/java/org/apache/zeppelin/beam/BeamInterpreter.java +++ b/beam/src/main/java/org/apache/zeppelin/beam/BeamInterpreter.java @@ -17,12 +17,6 @@ package org.apache.zeppelin.beam; -import java.io.File; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.UUID; - import org.apache.zeppelin.interpreter.Interpreter; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterResult; @@ -30,9 +24,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import java.util.UUID; + /** * Beam interpreter - * */ public class BeamInterpreter extends Interpreter { @@ -93,7 +92,7 @@ public int getProgress(InterpreterContext context) { @Override public List completion(String buf, int cursor, - InterpreterContext interpreterContext) { + InterpreterContext interpreterContext) { return Collections.emptyList(); } diff --git a/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java b/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java index ed81146bb1c..b5d8356cd49 100644 --- a/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java +++ b/beam/src/main/java/org/apache/zeppelin/beam/StaticRepl.java @@ -17,6 +17,12 @@ package org.apache.zeppelin.beam; +import com.thoughtworks.qdox.JavaProjectBuilder; +import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.JavaSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; @@ -24,14 +30,6 @@ import javax.tools.JavaFileObject; import javax.tools.SimpleJavaFileObject; import javax.tools.ToolProvider; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.thoughtworks.qdox.JavaProjectBuilder; -import com.thoughtworks.qdox.model.JavaClass; -import com.thoughtworks.qdox.model.JavaSource; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintStream; @@ -44,9 +42,7 @@ import java.util.List; /** - * * StaticRepl for compling the java code in memory - * */ public class StaticRepl { static Logger logger = LoggerFactory.getLogger(StaticRepl.class); @@ -70,7 +66,7 @@ public static String execute(String generatedClassName, String code) throws Exce for (int j = 0; j < classes.get(i).getMethods().size(); j++) { if (classes.get(i).getMethods().get(j).getName().equals("main") && classes.get(i) - .getMethods().get(j).isStatic()) { + .getMethods().get(j).isStatic()) { mainClassName = classes.get(i).getName(); hasMain = true; break; @@ -133,12 +129,12 @@ public static String execute(String generatedClassName, String code) throws Exce try { // creating new class loader - URLClassLoader classLoader = URLClassLoader.newInstance(new URL[] { new File("").toURI() - .toURL() }); + URLClassLoader classLoader = URLClassLoader.newInstance(new URL[]{new File("").toURI() + .toURL()}); // execute the Main method Class.forName(generatedClassName, true, classLoader) - .getDeclaredMethod("main", new Class[] { String[].class }) - .invoke(null, new Object[] { null }); + .getDeclaredMethod("main", new Class[]{String[].class}) + .invoke(null, new Object[]{null}); System.out.flush(); System.err.flush(); diff --git a/beam/src/main/test/org/apache/zeppelin/beam/BeamInterpreterTest.java b/beam/src/test/org/apache/zeppelin/beam/BeamInterpreterTest.java similarity index 96% rename from beam/src/main/test/org/apache/zeppelin/beam/BeamInterpreterTest.java rename to beam/src/test/org/apache/zeppelin/beam/BeamInterpreterTest.java index 1fef7a63993..d1c56ee06ec 100644 --- a/beam/src/main/test/org/apache/zeppelin/beam/BeamInterpreterTest.java +++ b/beam/src/test/org/apache/zeppelin/beam/BeamInterpreterTest.java @@ -17,21 +17,20 @@ package org.apache.zeppelin.beam; -import static org.junit.Assert.assertEquals; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Properties; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterResult; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Properties; + +import static org.junit.Assert.assertEquals; + /** - * * BeamInterpreterTest - * */ public class BeamInterpreterTest { @@ -43,8 +42,7 @@ public static void setUp() { Properties p = new Properties(); beam = new BeamInterpreter(p); beam.open(); - context = new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null, - null); + context = InterpreterContext.builder().build(); } @AfterClass