diff --git a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java similarity index 98% rename from livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java rename to livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java index 77c98d9aeb9..b52ba16e57b 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java @@ -49,7 +49,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.ConcurrentHashMap; @@ -57,9 +56,9 @@ /** * Base class for livy interpreters. */ -public abstract class BaseLivyInterprereter extends Interpreter { +public abstract class BaseLivyInterpreter extends Interpreter { - protected static final Logger LOGGER = LoggerFactory.getLogger(BaseLivyInterprereter.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(BaseLivyInterpreter.class); private static Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); private static String SESSION_NOT_FOUND_PATTERN = "\"Session '\\d+' not found.\""; @@ -68,7 +67,6 @@ public abstract class BaseLivyInterprereter extends Interpreter { private int sessionCreationTimeout; private int pullStatusInterval; protected boolean displayAppInfo; - private AtomicBoolean sessionExpired = new AtomicBoolean(false); protected LivyVersion livyVersion; private RestTemplate restTemplate; @@ -77,7 +75,7 @@ public abstract class BaseLivyInterprereter extends Interpreter { private ConcurrentHashMap paragraphId2StmtProgressMap = new ConcurrentHashMap<>(); - public BaseLivyInterprereter(Properties property) { + public BaseLivyInterpreter(Properties property) { super(property); this.livyURL = property.getProperty("zeppelin.livy.url"); this.displayAppInfo = Boolean.parseBoolean( diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySpark3Interpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySpark3Interpreter.java index f1f35384c86..174c2c0a483 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySpark3Interpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySpark3Interpreter.java @@ -17,16 +17,6 @@ package org.apache.zeppelin.livy; -import org.apache.zeppelin.interpreter.*; -import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; -import org.apache.zeppelin.scheduler.Scheduler; -import org.apache.zeppelin.scheduler.SchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Properties; diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkBaseInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkBaseInterpreter.java index c0de234ed57..17b20e3634f 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkBaseInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkBaseInterpreter.java @@ -23,7 +23,7 @@ /** * Base class for PySpark Interpreter */ -public abstract class LivyPySparkBaseInterpreter extends BaseLivyInterprereter { +public abstract class LivyPySparkBaseInterpreter extends BaseLivyInterpreter { public LivyPySparkBaseInterpreter(Properties property) { super(property); diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkInterpreter.java index b5bf10628b4..d664bbe762f 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkInterpreter.java @@ -17,16 +17,6 @@ package org.apache.zeppelin.livy; -import org.apache.zeppelin.interpreter.*; -import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; -import org.apache.zeppelin.scheduler.Scheduler; -import org.apache.zeppelin.scheduler.SchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Properties; diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java index f3a5eab4390..606ef64a8a4 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java @@ -17,23 +17,12 @@ package org.apache.zeppelin.livy; -import org.apache.zeppelin.interpreter.*; -import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; -import org.apache.zeppelin.scheduler.Scheduler; -import org.apache.zeppelin.scheduler.SchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; /** * Livy Spark interpreter for Zeppelin. */ -public class LivySparkInterpreter extends BaseLivyInterprereter { +public class LivySparkInterpreter extends BaseLivyInterpreter { public LivySparkInterpreter(Properties property) { super(property); diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkRInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkRInterpreter.java index 9bd24b707e1..c2704371c64 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkRInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkRInterpreter.java @@ -17,23 +17,13 @@ package org.apache.zeppelin.livy; -import org.apache.zeppelin.interpreter.*; -import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; -import org.apache.zeppelin.scheduler.Scheduler; -import org.apache.zeppelin.scheduler.SchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Properties; /** * Livy PySpark interpreter for Zeppelin. */ -public class LivySparkRInterpreter extends BaseLivyInterprereter { +public class LivySparkRInterpreter extends BaseLivyInterpreter { public LivySparkRInterpreter(Properties property) { super(property); diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java index 9c0d35918a7..d132b5b41db 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java @@ -30,7 +30,7 @@ /** * Livy SparkSQL Interpreter for Zeppelin. */ -public class LivySparkSQLInterpreter extends BaseLivyInterprereter { +public class LivySparkSQLInterpreter extends BaseLivyInterpreter { public static final String ZEPPELIN_LIVY_SPARK_SQL_FIELD_TRUNCATE = "zeppelin.livy.spark.sql.field.truncate"; diff --git a/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java b/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java index 007c0edda3f..6db75e9dd72 100644 --- a/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java +++ b/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java @@ -761,7 +761,7 @@ public void testLivyTutorialNote() throws IOException { } } - private boolean isSpark2(BaseLivyInterprereter interpreter, InterpreterContext context) { + private boolean isSpark2(BaseLivyInterpreter interpreter, InterpreterContext context) { InterpreterResult result = null; if (interpreter instanceof LivySparkRInterpreter) { result = interpreter.interpret("sparkR.session()", context);