apache · prabhjyotsingh · Feb 8, 2016 · Feb 8, 2016 · Feb 9, 2016 · Feb 16, 2016
diff --git a/flink/src/test/java/org/apache/zeppelin/flink/FlinkInterpreterTest.java b/flink/src/test/java/org/apache/zeppelin/flink/FlinkInterpreterTest.java
@@ -40,7 +40,7 @@ public static void setUp() {
  Properties p = new Properties();
  flink = new FlinkInterpreter(p);
  flink.open();
- context = new InterpreterContext(null, null, null, null, null, null, null, null, null, null);
+ context = new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null);
  }
 
  @AfterClass

diff --git a/hive/src/test/java/org/apache/zeppelin/hive/HiveInterpreterTest.java b/hive/src/test/java/org/apache/zeppelin/hive/HiveInterpreterTest.java
@@ -106,7 +106,7 @@ public void testForMapPrefix() throws SQLException, IOException {
 
  String sqlQuery = "(fake) select * from test_table";
 
- InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
 
  // if prefix not found return ERROR and Prefix not found.
  assertEquals(InterpreterResult.Code.ERROR, interpreterResult.code());
@@ -125,9 +125,9 @@ public void readTest() throws IOException {
  HiveInterpreter t = new HiveInterpreter(properties);
  t.open();
 
- assertTrue(t.interpret("show databases", new InterpreterContext("", "1", "","", null,null,null,null,null,null)).message().contains("SCHEMA_NAME"));
+ assertTrue(t.interpret("show databases", new InterpreterContext("", "1", "","", null,null,null,null,null, null, null)).message().contains("SCHEMA_NAME"));
  assertEquals("ID\tNAME\na\ta_name\nb\tb_name\n",
- t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null,null)).message());
+ t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null, null, null)).message());
  }
 
  @Test
@@ -147,7 +147,7 @@ public void readTestWithConfiguration() throws IOException {
  t.open();
 
  assertEquals("ID\tNAME\na\ta_name\nb\tb_name\n",
- t.interpret("(h2)\n select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null,null)).message());
+ t.interpret("(h2)\n select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null, null, null)).message());
  }
 
  @Test
@@ -163,13 +163,13 @@ public void jdbcRestart() throws IOException, SQLException, ClassNotFoundExcepti
  t.open();
 
  InterpreterResult interpreterResult =
- t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
  assertEquals("ID\tNAME\na\ta_name\nb\tb_name\n", interpreterResult.message());
 
  t.getConnection("default").close();
 
  interpreterResult =
- t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ t.interpret("select * from test_table", new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
  assertEquals("ID\tNAME\na\ta_name\nb\tb_name\n", interpreterResult.message());
  }
 
@@ -185,7 +185,7 @@ public void test() throws IOException {
  HiveInterpreter t = new HiveInterpreter(properties);
  t.open();
 
- InterpreterContext interpreterContext = new InterpreterContext(null, "a", null, null, null, null, null, null, null, null);
+ InterpreterContext interpreterContext = new InterpreterContext(null, "a", null, null, null, null, null, null, null, null, null);
 
  //simple select test
  InterpreterResult result = t.interpret("select * from test_table", interpreterContext);

diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java
@@ -40,7 +40,7 @@ public class IgniteInterpreterTest {
  private static final String HOST = "127.0.0.1:47500..47509";
 
  private static final InterpreterContext INTP_CONTEXT =
-new InterpreterContext(null, null, null, null, null, null, null, null, null, null);
+ new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null);
 
  private IgniteInterpreter intp;
  private Ignite ignite;

diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
@@ -44,7 +44,7 @@ public class IgniteSqlInterpreterTest {
  private static final String HOST = "127.0.0.1:47500..47509";
 
  private static final InterpreterContext INTP_CONTEXT =
-new InterpreterContext(null, null, null, null, null, null, null, null, null, null);
+ new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null);
 
  private Ignite ignite;
  private IgniteSqlInterpreter intp;

diff --git a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
@@ -107,7 +107,7 @@ public void testForMapPrefix() throws SQLException, IOException {
 
  String sqlQuery = "(fake) select * from test_table";
 
- InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
 
  // if prefix not found return ERROR and Prefix not found.
  assertEquals(InterpreterResult.Code.ERROR, interpreterResult.code());
@@ -139,7 +139,7 @@ public void testSelectQuery() throws SQLException, IOException {
 
  String sqlQuery = "select * from test_table WHERE ID in ('a', 'b')";
 
- InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
 
  assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code());
  assertEquals(InterpreterResult.Type.TABLE, interpreterResult.type());
@@ -160,7 +160,7 @@ public void testSelectQueryWithNull() throws SQLException, IOException {
 
  String sqlQuery = "select * from test_table WHERE ID = 'c'";
 
- InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
 
  assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code());
  assertEquals(InterpreterResult.Type.TABLE, interpreterResult.type());
@@ -183,7 +183,7 @@ public void testSelectQueryMaxResult() throws SQLException, IOException {
 
  String sqlQuery = "select * from test_table";
 
- InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null,null));
+ InterpreterResult interpreterResult = t.interpret(sqlQuery, new InterpreterContext("", "1", "","", null,null,null,null,null, null, null));
 
  assertEquals(InterpreterResult.Code.SUCCESS, interpreterResult.code());
  assertEquals(InterpreterResult.Type.TABLE, interpreterResult.type());

diff --git a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java
@@ -26,6 +26,7 @@
 
 import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.display.GUI;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.interpreter.InterpreterContext;
 import org.apache.zeppelin.interpreter.InterpreterContextRunner;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
@@ -62,7 +63,7 @@ public void setUp() throws Exception {
  }
 
  InterpreterGroup intpGroup = new InterpreterGroup();
- context = new InterpreterContext("note", "id", "title", "text",
+ context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(),
  new HashMap<String, Object>(), new GUI(), new AngularObjectRegistry(
  intpGroup.getId(), null), null,
  new LinkedList<InterpreterContextRunner>(), null);

diff --git a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java
@@ -25,11 +25,9 @@
 import java.util.Properties;
 
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.display.GUI;
-import org.apache.zeppelin.interpreter.InterpreterContext;
-import org.apache.zeppelin.interpreter.InterpreterContextRunner;
-import org.apache.zeppelin.interpreter.InterpreterGroup;
-import org.apache.zeppelin.interpreter.InterpreterResult;
+import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.InterpreterResult.Code;
 import org.junit.After;
 import org.junit.Before;
@@ -58,7 +56,8 @@ public void setUp() throws Exception {
  intpGroup.add(dep);
  dep.setInterpreterGroup(intpGroup);
 
- context = new InterpreterContext("note", "id", "title", "text", new HashMap<String, Object>(), new GUI(),
+ context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(),
+ new HashMap<String, Object>(), new GUI(),
  new AngularObjectRegistry(intpGroup.getId(), null),
  null,
  new LinkedList<InterpreterContextRunner>(), null);

diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
@@ -27,6 +27,7 @@
 import org.apache.spark.SparkConf;
 import org.apache.spark.SparkContext;
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.display.GUI;
 import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.InterpreterResult.Code;
@@ -76,22 +77,23 @@ public void setUp() throws Exception {
 
  InterpreterGroup intpGroup = new InterpreterGroup();
  context = new InterpreterContext("note", "id", "title", "text",
- new HashMap<String, Object>(),
- new GUI(),
- new AngularObjectRegistry(intpGroup.getId(), null),
- null,
- new LinkedList<InterpreterContextRunner>(),
- new InterpreterOutput(new InterpreterOutputListener() {
- @Override
- public void onAppend(InterpreterOutput out, byte[] line) {
-
- }
-
- @Override
- public void onUpdate(InterpreterOutput out, byte[] output) {
-
- }
- }));
+ new AuthenticationInfo(),
+ new HashMap<String, Object>(),
+ new GUI(),
+ new AngularObjectRegistry(intpGroup.getId(), null),
+ null,
+ new LinkedList<InterpreterContextRunner>(),
+ new InterpreterOutput(new InterpreterOutputListener() {
+ @Override
+ public void onAppend(InterpreterOutput out, byte[] line) {
+
+ }
+
+ @Override
+ public void onUpdate(InterpreterOutput out, byte[] output) {
+
+ }
+ }));
  }
 
  @After

diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java
@@ -24,10 +24,10 @@
 import java.util.Properties;
 
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.display.GUI;
 import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.InterpreterResult.Type;
-import org.apache.zeppelin.resource.LocalResourcePool;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -65,7 +65,8 @@ public void setUp() throws Exception {
  sql.setInterpreterGroup(intpGroup);
  sql.open();
  }
- context = new InterpreterContext("note", "id", "title", "text", new HashMap<String, Object>(), new GUI(),
+ context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(),
+ new HashMap<String, Object>(), new GUI(),
  new AngularObjectRegistry(intpGroup.getId(), null),
  null,
  new LinkedList<InterpreterContextRunner>(), new InterpreterOutput(new InterpreterOutputListener() {

diff --git a/...-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/...-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
@@ -21,6 +21,7 @@ import java.util
 
 import org.apache.zeppelin.display.{AngularObject, AngularObjectRegistry, GUI}
 import org.apache.zeppelin.interpreter._
+import org.apache.zeppelin.user.AuthenticationInfo
 import org.scalatest.concurrent.Eventually
 import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers}
 
@@ -33,8 +34,8 @@ trait AbstractAngularElemTest
  override def beforeEach() {
  val intpGroup = new InterpreterGroup()
  val context = new InterpreterContext("note", "paragraph", "title", "text",
- new util.HashMap[String, Object](), new GUI(), new AngularObjectRegistry(
-intpGroup.getId(), null),
+ new AuthenticationInfo(), new util.HashMap[String, Object](), new GUI(),
+new AngularObjectRegistry(intpGroup.getId(), null),
  null,
  new util.LinkedList[InterpreterContextRunner](),
  new InterpreterOutput(new InterpreterOutputListener() {

diff --git a/...display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala b/...display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
@@ -18,6 +18,7 @@ package org.apache.zeppelin.display.angular
 
 import org.apache.zeppelin.display.{AngularObjectRegistry, GUI}
 import org.apache.zeppelin.interpreter._
+import org.apache.zeppelin.user.AuthenticationInfo
 import org.scalatest.concurrent.Eventually
 import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers}
 
@@ -28,7 +29,7 @@ trait AbstractAngularModelTest extends FlatSpec
 with BeforeAndAfter with BeforeAndAfterEach with Eventually with Matchers {
  override def beforeEach() {
  val intpGroup = new InterpreterGroup()
- val context = new InterpreterContext("note", "id", "title", "text",
+ val context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(),
  new java.util.HashMap[String, Object](), new GUI(), new AngularObjectRegistry(
  intpGroup.getId(), null),
  null,

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.display.GUI;
 import org.apache.zeppelin.resource.ResourcePool;
 
@@ -48,6 +49,7 @@ public static void remove() {
  private final String paragraphTitle;
  private final String paragraphId;
  private final String paragraphText;
+ private AuthenticationInfo authenticationInfo;
  private final Map<String, Object> config;
  private GUI gui;
  private AngularObjectRegistry angularObjectRegistry;
@@ -58,6 +60,7 @@ public InterpreterContext(String noteId,
  String paragraphId,
  String paragraphTitle,
  String paragraphText,
+ AuthenticationInfo authenticationInfo,
  Map<String, Object> config,
  GUI gui,
  AngularObjectRegistry angularObjectRegistry,
@@ -69,6 +72,7 @@ public InterpreterContext(String noteId,
  this.paragraphId = paragraphId;
  this.paragraphTitle = paragraphTitle;
  this.paragraphText = paragraphText;
+ this.authenticationInfo = authenticationInfo;
  this.config = config;
  this.gui = gui;
  this.angularObjectRegistry = angularObjectRegistry;
@@ -94,6 +98,10 @@ public String getParagraphTitle() {
  return paragraphTitle;
  }
 
+ public AuthenticationInfo getAuthenticationInfo() {
+ return authenticationInfo;
+ }
+
  public Map<String, Object> getConfig() {
  return config;
  }

diff --git a/...n-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/...n-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
@@ -364,6 +364,7 @@ private RemoteInterpreterContext convert(InterpreterContext ic) {
  ic.getParagraphId(),
  ic.getParagraphTitle(),
  ic.getParagraphText(),
+ gson.toJson(ic.getAuthenticationInfo()),
  gson.toJson(ic.getConfig()),
  gson.toJson(ic.getGui()),
  gson.toJson(ic.getRunners()));

diff --git a/...rpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/...rpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
@@ -33,10 +33,7 @@
 import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.zeppelin.display.AngularObject;
-import org.apache.zeppelin.display.AngularObjectRegistry;
-import org.apache.zeppelin.display.AngularObjectRegistryListener;
-import org.apache.zeppelin.display.GUI;
+import org.apache.zeppelin.display.*;
 import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.InterpreterResult.Code;
 import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterContext;
@@ -49,6 +46,7 @@
 import org.apache.zeppelin.scheduler.JobListener;
 import org.apache.zeppelin.scheduler.JobProgressPoller;
 import org.apache.zeppelin.scheduler.Scheduler;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -392,6 +390,7 @@ private InterpreterContext convert(RemoteInterpreterContext ric) {
  ric.getParagraphId(),
  ric.getParagraphTitle(),
  ric.getParagraphText(),
+ gson.fromJson(ric.getAuthenticationInfo(), AuthenticationInfo.class),
  (Map<String, Object>) gson.fromJson(ric.getConfig(),
  new TypeToken<Map<String, Object>>() {}.getType()),
  gson.fromJson(ric.getGui(), GUI.class),