From fadc6d92ffabc0dc4cb2079702ad292df3fd070a Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 8 Feb 2016 21:59:13 +0530 Subject: [PATCH 01/11] userName to be present in InterpreterContext/RemoteInterpreterContext --- conf/shiro.ini | 4 +- .../zeppelin/flink/FlinkInterpreterTest.java | 2 +- .../zeppelin/hive/HiveInterpreterTest.java | 12 +- .../ignite/IgniteInterpreterTest.java | 2 +- .../ignite/IgniteSqlInterpreterTest.java | 2 +- .../zeppelin/jdbc/JDBCInterpreterTest.java | 4 +- .../zeppelin/spark/DepInterpreterTest.java | 2 +- .../zeppelin/spark/SparkInterpreterTest.java | 33 +- .../spark/SparkSqlInterpreterTest.java | 2 +- .../angular/AbstractAngularElemTest.scala | 2 +- .../angular/AbstractAngularModelTest.scala | 2 +- .../interpreter/InterpreterContext.java | 7 + .../interpreter/remote/RemoteInterpreter.java | 1 + .../remote/RemoteInterpreterServer.java | 1 + .../thrift/RemoteInterpreterContext.java | 341 ++++++++++++------ .../thrift/RemoteInterpreterService.thrift | 7 +- .../interpreter/InterpreterContextTest.java | 2 +- .../remote/RemoteAngularObjectTest.java | 1 + .../RemoteInterpreterOutputTestStream.java | 1 + .../remote/RemoteInterpreterTest.java | 9 + .../resource/DistributedResourcePoolTest.java | 1 + .../scheduler/RemoteSchedulerTest.java | 3 + .../zeppelin/socket/NotebookServer.java | 24 +- .../apache/zeppelin/notebook/Paragraph.java | 10 + .../interpreter/InterpreterFactoryTest.java | 2 +- 25 files changed, 309 insertions(+), 168 deletions(-) diff --git a/conf/shiro.ini b/conf/shiro.ini index 1cc3cf809ac..6e40e8687d6 100644 --- a/conf/shiro.ini +++ b/conf/shiro.ini @@ -33,6 +33,6 @@ user2 = password3 # anon means the access is anonymous. # authcBasic means Basic Auth Security # To enfore security, comment the line below and uncomment the next one -/** = anon -#/** = authcBasic +#/** = anon +/** = authcBasic diff --git a/flink/src/test/java/org/apache/zeppelin/flink/FlinkInterpreterTest.java b/flink/src/test/java/org/apache/zeppelin/flink/FlinkInterpreterTest.java index 5a915424b95..30c7be7d67a 100644 --- 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 index 8f1285df98f..8779dacf91d 100644 --- a/hive/src/test/java/org/apache/zeppelin/hive/HiveInterpreterTest.java +++ b/hive/src/test/java/org/apache/zeppelin/hive/HiveInterpreterTest.java @@ -79,9 +79,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 @@ -101,7 +101,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 @@ -117,13 +117,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()); } @@ -139,7 +139,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 index 5976e217b33..f1517631c0b 100644 --- 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 index 7f665236130..9076c360dd6 100644 --- 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 index 049b137055b..0f27c001ccc 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -94,7 +94,7 @@ public void testSelectQuery() 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()); @@ -116,7 +116,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/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java index 11c0beb16c6..e8b076297b7 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java @@ -58,7 +58,7 @@ public void setUp() throws Exception { intpGroup.add(dep); dep.setInterpreterGroup(intpGroup); - context = new InterpreterContext("note", "id", "title", "text", new HashMap(), new GUI(), + context = new InterpreterContext("note", "id", "title", "text", null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), null, new LinkedList(), 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 index ea08f175c0d..3942600d93b 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java @@ -76,22 +76,23 @@ public void setUp() throws Exception { InterpreterGroup intpGroup = new InterpreterGroup(); context = new InterpreterContext("note", "id", "title", "text", - new HashMap(), - new GUI(), - new AngularObjectRegistry(intpGroup.getId(), null), - null, - new LinkedList(), - new InterpreterOutput(new InterpreterOutputListener() { - @Override - public void onAppend(InterpreterOutput out, byte[] line) { - - } - - @Override - public void onUpdate(InterpreterOutput out, byte[] output) { - - } - })); + null, + new HashMap(), + new GUI(), + new AngularObjectRegistry(intpGroup.getId(), null), + null, + new LinkedList(), + 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 index 30de6d6cf0c..a9469452d35 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java @@ -65,7 +65,7 @@ public void setUp() throws Exception { sql.setInterpreterGroup(intpGroup); sql.open(); } - context = new InterpreterContext("note", "id", "title", "text", new HashMap(), new GUI(), + context = new InterpreterContext("note", "id", "title", "text", null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), null, new LinkedList(), new InterpreterOutput(new InterpreterOutputListener() { diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala index 0e870267574..2fd79d9ebe3 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala @@ -32,7 +32,7 @@ trait AbstractAngularElemTest override def beforeEach() { val intpGroup = new InterpreterGroup() - val context = new InterpreterContext("note", "paragraph", "title", "text", + val context = new InterpreterContext("note", "paragraph", "title", "text", null, new util.HashMap[String, Object](), new GUI(), new AngularObjectRegistry( intpGroup.getId(), null), null, diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala index 32a1932c9fa..a2767f1fb32 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala @@ -28,7 +28,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", null, 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 index fd76912f116..75811319946 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java @@ -48,6 +48,7 @@ public static void remove() { private final String paragraphTitle; private final String paragraphId; private final String paragraphText; + private final String user; private final Map config; private GUI gui; private AngularObjectRegistry angularObjectRegistry; @@ -58,6 +59,7 @@ public InterpreterContext(String noteId, String paragraphId, String paragraphTitle, String paragraphText, + String user, Map config, GUI gui, AngularObjectRegistry angularObjectRegistry, @@ -69,6 +71,7 @@ public InterpreterContext(String noteId, this.paragraphId = paragraphId; this.paragraphTitle = paragraphTitle; this.paragraphText = paragraphText; + this.user = user; this.config = config; this.gui = gui; this.angularObjectRegistry = angularObjectRegistry; @@ -94,6 +97,10 @@ public String getParagraphTitle() { return paragraphTitle; } + public String getUser() { + return user; + } + public Map getConfig() { return config; } diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java index 43c934f038e..8bd22d112be 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java +++ b/zeppelin-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(), + ic.getUser(), gson.toJson(ic.getConfig()), gson.toJson(ic.getGui()), gson.toJson(ic.getRunners())); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index c3a0f9020e9..88c70d04546 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -392,6 +392,7 @@ private InterpreterContext convert(RemoteInterpreterContext ric) { ric.getParagraphId(), ric.getParagraphTitle(), ric.getParagraphText(), + ric.getUser(), (Map) gson.fromJson(ric.getConfig(), new TypeToken>() {}.getType()), gson.fromJson(ric.getGui(), GUI.class), diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java index b6a3da1e4f5..6fb355cba30 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java @@ -59,9 +59,10 @@ public class RemoteInterpreterContext implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -73,6 +74,7 @@ public class RemoteInterpreterContext implements org.apache.thrift.TBase byName = new HashMap(); @@ -108,11 +111,13 @@ public static _Fields findByThriftId(int fieldId) { return PARAGRAPH_TITLE; case 4: // PARAGRAPH_TEXT return PARAGRAPH_TEXT; - case 5: // CONFIG + case 5: // USER + return USER; + case 6: // CONFIG return CONFIG; - case 6: // GUI + case 7: // GUI return GUI; - case 7: // RUNNERS + case 8: // RUNNERS return RUNNERS; default: return null; @@ -157,19 +162,21 @@ public String getFieldName() { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NOTE_ID, new org.apache.thrift.meta_data.FieldMetaData("noteId", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.NOTE_ID, new org.apache.thrift.meta_data.FieldMetaData("noteId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_ID, new org.apache.thrift.meta_data.FieldMetaData("paragraphId", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_ID, new org.apache.thrift.meta_data.FieldMetaData("paragraphId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_TITLE, new org.apache.thrift.meta_data.FieldMetaData("paragraphTitle", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_TITLE, new org.apache.thrift.meta_data.FieldMetaData("paragraphTitle", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_TEXT, new org.apache.thrift.meta_data.FieldMetaData("paragraphText", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_TEXT, new org.apache.thrift.meta_data.FieldMetaData("paragraphText", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.CONFIG, new org.apache.thrift.meta_data.FieldMetaData("config", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.GUI, new org.apache.thrift.meta_data.FieldMetaData("gui", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.CONFIG, new org.apache.thrift.meta_data.FieldMetaData("config", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.RUNNERS, new org.apache.thrift.meta_data.FieldMetaData("runners", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.GUI, new org.apache.thrift.meta_data.FieldMetaData("gui", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.RUNNERS, new org.apache.thrift.meta_data.FieldMetaData("runners", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteInterpreterContext.class, metaDataMap); @@ -179,19 +186,21 @@ public RemoteInterpreterContext() { } public RemoteInterpreterContext( - String noteId, - String paragraphId, - String paragraphTitle, - String paragraphText, - String config, - String gui, - String runners) + String noteId, + String paragraphId, + String paragraphTitle, + String paragraphText, + String user, + String config, + String gui, + String runners) { this(); this.noteId = noteId; this.paragraphId = paragraphId; this.paragraphTitle = paragraphTitle; this.paragraphText = paragraphText; + this.user = user; this.config = config; this.gui = gui; this.runners = runners; @@ -213,6 +222,9 @@ public RemoteInterpreterContext(RemoteInterpreterContext other) { if (other.isSetParagraphText()) { this.paragraphText = other.paragraphText; } + if (other.isSetUser()) { + this.user = other.user; + } if (other.isSetConfig()) { this.config = other.config; } @@ -234,6 +246,7 @@ public void clear() { this.paragraphId = null; this.paragraphTitle = null; this.paragraphText = null; + this.user = null; this.config = null; this.gui = null; this.runners = null; @@ -335,6 +348,30 @@ public void setParagraphTextIsSet(boolean value) { } } + public String getUser() { + return this.user; + } + + public RemoteInterpreterContext setUser(String user) { + this.user = user; + return this; + } + + public void unsetUser() { + this.user = null; + } + + /** Returns true if field user is set (has been assigned a value) and false otherwise */ + public boolean isSetUser() { + return this.user != null; + } + + public void setUserIsSet(boolean value) { + if (!value) { + this.user = null; + } + } + public String getConfig() { return this.config; } @@ -409,87 +446,98 @@ public void setRunnersIsSet(boolean value) { public void setFieldValue(_Fields field, Object value) { switch (field) { - case NOTE_ID: - if (value == null) { - unsetNoteId(); - } else { - setNoteId((String)value); - } - break; + case NOTE_ID: + if (value == null) { + unsetNoteId(); + } else { + setNoteId((String)value); + } + break; - case PARAGRAPH_ID: - if (value == null) { - unsetParagraphId(); - } else { - setParagraphId((String)value); - } - break; + case PARAGRAPH_ID: + if (value == null) { + unsetParagraphId(); + } else { + setParagraphId((String)value); + } + break; - case PARAGRAPH_TITLE: - if (value == null) { - unsetParagraphTitle(); - } else { - setParagraphTitle((String)value); - } - break; + case PARAGRAPH_TITLE: + if (value == null) { + unsetParagraphTitle(); + } else { + setParagraphTitle((String)value); + } + break; - case PARAGRAPH_TEXT: - if (value == null) { - unsetParagraphText(); - } else { - setParagraphText((String)value); - } - break; + case PARAGRAPH_TEXT: + if (value == null) { + unsetParagraphText(); + } else { + setParagraphText((String)value); + } + break; - case CONFIG: - if (value == null) { - unsetConfig(); - } else { - setConfig((String)value); - } - break; + case USER: + if (value == null) { + unsetUser(); + } else { + setUser((String) value); + } + break; - case GUI: - if (value == null) { - unsetGui(); - } else { - setGui((String)value); - } - break; + case CONFIG: + if (value == null) { + unsetConfig(); + } else { + setConfig((String)value); + } + break; - case RUNNERS: - if (value == null) { - unsetRunners(); - } else { - setRunners((String)value); - } - break; + case GUI: + if (value == null) { + unsetGui(); + } else { + setGui((String)value); + } + break; + + case RUNNERS: + if (value == null) { + unsetRunners(); + } else { + setRunners((String)value); + } + break; } } public Object getFieldValue(_Fields field) { switch (field) { - case NOTE_ID: - return getNoteId(); + case NOTE_ID: + return getNoteId(); + + case PARAGRAPH_ID: + return getParagraphId(); - case PARAGRAPH_ID: - return getParagraphId(); + case PARAGRAPH_TITLE: + return getParagraphTitle(); - case PARAGRAPH_TITLE: - return getParagraphTitle(); + case PARAGRAPH_TEXT: + return getParagraphText(); - case PARAGRAPH_TEXT: - return getParagraphText(); + case USER: + return getUser(); - case CONFIG: - return getConfig(); + case CONFIG: + return getConfig(); - case GUI: - return getGui(); + case GUI: + return getGui(); - case RUNNERS: - return getRunners(); + case RUNNERS: + return getRunners(); } throw new IllegalStateException(); @@ -502,20 +550,22 @@ public boolean isSet(_Fields field) { } switch (field) { - case NOTE_ID: - return isSetNoteId(); - case PARAGRAPH_ID: - return isSetParagraphId(); - case PARAGRAPH_TITLE: - return isSetParagraphTitle(); - case PARAGRAPH_TEXT: - return isSetParagraphText(); - case CONFIG: - return isSetConfig(); - case GUI: - return isSetGui(); - case RUNNERS: - return isSetRunners(); + case NOTE_ID: + return isSetNoteId(); + case PARAGRAPH_ID: + return isSetParagraphId(); + case PARAGRAPH_TITLE: + return isSetParagraphTitle(); + case PARAGRAPH_TEXT: + return isSetParagraphText(); + case USER: + return isSetUser(); + case CONFIG: + return isSetConfig(); + case GUI: + return isSetGui(); + case RUNNERS: + return isSetRunners(); } throw new IllegalStateException(); } @@ -569,6 +619,15 @@ public boolean equals(RemoteInterpreterContext that) { return false; } + boolean this_present_user = true && this.isSetUser(); + boolean that_present_user = true && that.isSetUser(); + if (this_present_user || that_present_user) { + if (!(this_present_user && that_present_user)) + return false; + if (!this.user.equals(that.user)) + return false; + } + boolean this_present_config = true && this.isSetConfig(); boolean that_present_config = true && that.isSetConfig(); if (this_present_config || that_present_config) { @@ -623,6 +682,11 @@ public int hashCode() { if (present_paragraphText) list.add(paragraphText); + boolean present_user = true && (isSetUser()); + list.add(present_user); + if (present_user) + list.add(user); + boolean present_config = true && (isSetConfig()); list.add(present_config); if (present_config) @@ -689,6 +753,16 @@ public int compareTo(RemoteInterpreterContext other) { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUser()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetConfig()).compareTo(other.isSetConfig()); if (lastComparison != 0) { return lastComparison; @@ -771,6 +845,14 @@ public String toString() { } first = false; if (!first) sb.append(", "); + sb.append("user:"); + if (this.user == null) { + sb.append("null"); + } else { + sb.append(this.user); + } + first = false; + if (!first) sb.append(", "); sb.append("config:"); if (this.config == null) { sb.append("null"); @@ -833,7 +915,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -841,7 +923,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.noteId = iprot.readString(); struct.setNoteIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -849,7 +931,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphId = iprot.readString(); struct.setParagraphIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -857,7 +939,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphTitle = iprot.readString(); struct.setParagraphTitleIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -865,31 +947,39 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphText = iprot.readString(); struct.setParagraphTextIsSet(true); - } else { + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // USER + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.user = iprot.readString(); + struct.setUserIsSet(true); + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // CONFIG + case 6: // CONFIG if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.config = iprot.readString(); struct.setConfigIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // GUI + case 7: // GUI if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.gui = iprot.readString(); struct.setGuiIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // RUNNERS + case 8: // RUNNERS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.runners = iprot.readString(); struct.setRunnersIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -928,6 +1018,11 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RemoteInterpreterC oprot.writeString(struct.paragraphText); oprot.writeFieldEnd(); } + if (struct.user != null) { + oprot.writeFieldBegin(USER_FIELD_DESC); + oprot.writeString(struct.user); + oprot.writeFieldEnd(); + } if (struct.config != null) { oprot.writeFieldBegin(CONFIG_FIELD_DESC); oprot.writeString(struct.config); @@ -973,16 +1068,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCo if (struct.isSetParagraphText()) { optionals.set(3); } - if (struct.isSetConfig()) { + if (struct.isSetUser()) { optionals.set(4); } - if (struct.isSetGui()) { + if (struct.isSetConfig()) { optionals.set(5); } - if (struct.isSetRunners()) { + if (struct.isSetGui()) { optionals.set(6); } - oprot.writeBitSet(optionals, 7); + if (struct.isSetRunners()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.isSetNoteId()) { oprot.writeString(struct.noteId); } @@ -995,6 +1093,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCo if (struct.isSetParagraphText()) { oprot.writeString(struct.paragraphText); } + if (struct.isSetUser()) { + oprot.writeString(struct.user); + } if (struct.isSetConfig()) { oprot.writeString(struct.config); } @@ -1009,7 +1110,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCo @Override public void read(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterContext struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.noteId = iprot.readString(); struct.setNoteIdIsSet(true); @@ -1027,14 +1128,18 @@ public void read(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCon struct.setParagraphTextIsSet(true); } if (incoming.get(4)) { + struct.user = iprot.readString(); + struct.setUserIsSet(true); + } + if (incoming.get(5)) { struct.config = iprot.readString(); struct.setConfigIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.gui = iprot.readString(); struct.setGuiIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.runners = iprot.readString(); struct.setRunnersIsSet(true); } diff --git a/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift b/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift index 3d6a62e3f47..fcefcdf19fd 100644 --- a/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift +++ b/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift @@ -24,9 +24,10 @@ struct RemoteInterpreterContext { 2: string paragraphId, 3: string paragraphTitle, 4: string paragraphText, - 5: string config, // json serialized config - 6: string gui, // json serialized gui - 7: string runners // json serialized runner + 5: string user, + 6: string config, // json serialized config + 7: string gui, // json serialized gui + 8: string runners // json serialized runner } struct RemoteInterpreterResult { diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterContextTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterContextTest.java index 40fd2edbfe6..764c8b3823b 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterContextTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterContextTest.java @@ -27,7 +27,7 @@ public class InterpreterContextTest { public void testThreadLocal() { assertNull(InterpreterContext.get()); - InterpreterContext.set(new InterpreterContext(null, null, null, null, null, null, null, null, null, null)); + InterpreterContext.set(new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null)); assertNotNull(InterpreterContext.get()); InterpreterContext.remove(); diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java index b6801e4fee2..78cbe6b6bda 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java @@ -84,6 +84,7 @@ public void setUp() throws Exception { "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index 7ebe597b08e..2f4073d071d 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -75,6 +75,7 @@ private InterpreterContext createInterpreterContext() { "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index 4af9ba47620..79c962f602b 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -121,6 +121,7 @@ public void testRemoteInterperterCall() throws TTransportException, IOException "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -155,6 +156,7 @@ public void testRemoteInterperterErrorStatus() throws TTransportException, IOExc "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -204,6 +206,7 @@ public void testRemoteSchedulerSharing() throws TTransportException, IOException "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -217,6 +220,7 @@ public void testRemoteSchedulerSharing() throws TTransportException, IOException "id", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -269,6 +273,7 @@ protected Object jobRun() throws Throwable { "jobA", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -304,6 +309,7 @@ protected Object jobRun() throws Throwable { "jobB", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -370,6 +376,7 @@ protected Object jobRun() throws Throwable { jobId, "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -448,6 +455,7 @@ protected Object jobRun() throws Throwable { jobId, "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -547,6 +555,7 @@ protected Object jobRun() throws Throwable { "jobA", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java index bedaa021a66..d07dfe516f8 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java @@ -93,6 +93,7 @@ public void setUp() throws Exception { "id", "title", "text", + null, new HashMap(), new GUI(), null, diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index 2bdcd4ffc12..47b39f3cf8c 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -103,6 +103,7 @@ protected Object jobRun() throws Throwable { "jobId", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -175,6 +176,7 @@ public void testAbortOnPending() throws Exception { "jobId1", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -212,6 +214,7 @@ protected boolean jobAbort() { "jobId2", "title", "text", + null, new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 9a4a378aa99..3515c17e8cc 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -16,20 +16,13 @@ */ package org.apache.zeppelin.socket; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.util.*; -import java.util.concurrent.ConcurrentLinkedQueue; - -import javax.servlet.http.HttpServletRequest; - +import com.google.common.base.Strings; +import com.google.gson.Gson; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.AngularObjectRegistryListener; -import org.apache.zeppelin.display.Input; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterSetting; @@ -37,7 +30,6 @@ import org.apache.zeppelin.notebook.*; import org.apache.zeppelin.scheduler.Job; import org.apache.zeppelin.scheduler.Job.Status; -import org.apache.zeppelin.scheduler.JobListener; import org.apache.zeppelin.server.ZeppelinServer; import org.apache.zeppelin.socket.Message.OP; import org.apache.zeppelin.ticket.TicketContainer; @@ -48,8 +40,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Strings; -import com.google.gson.Gson; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.ConcurrentLinkedQueue; /** * Zeppelin websocket service. @@ -693,6 +689,10 @@ private void runParagraph(NotebookSocket conn, Notebook notebook, String text = (String) fromMessage.get("paragraph"); p.setText(text); p.setTitle((String) fromMessage.get("title")); + if (!fromMessage.principal.equals("anonymous")) { + p.setUser(fromMessage.principal); + } + Map params = (Map) fromMessage .get("params"); p.settings.setParams(params); 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 bf17c358040..49cc6b7bcc7 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 @@ -45,6 +45,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { String title; String text; + String user; Date dateUpdated; private Map config; // paragraph configs like isOpen, colWidth, etc public final GUI settings; // form and parameter settings @@ -55,6 +56,7 @@ public Paragraph(Note note, JobListener listener, NoteInterpreterLoader replLoad this.replLoader = replLoader; title = null; text = null; + user = null; dateUpdated = null; settings = new GUI(); config = new HashMap(); @@ -74,6 +76,13 @@ public void setText(String newText) { this.dateUpdated = new Date(); } + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } public String getTitle() { return title; @@ -276,6 +285,7 @@ private InterpreterContext getInterpreterContext() { getId(), this.getTitle(), this.getText(), + this.getUser(), this.getConfig(), this.settings, registry, diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java index d9e965e82af..7020a47b576 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java @@ -62,7 +62,7 @@ public void setUp() throws Exception { conf = new ZeppelinConfiguration(); depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo"); factory = new InterpreterFactory(conf, new InterpreterOption(false), null, null, depResolver); - context = new InterpreterContext("note", "id", "title", "text", null, null, null, null, null, null); + context = new InterpreterContext("note", "id", "title", "text", null, null, null, null, null, null, null); } From d928203cf6d69b3c6427aa35f047b25a399b3198 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 8 Feb 2016 22:18:37 +0530 Subject: [PATCH 02/11] revert shiri.ini if fromMessage.principal.equals("anonymous") then set user as null --- conf/shiro.ini | 4 ++-- .../main/java/org/apache/zeppelin/socket/NotebookServer.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/shiro.ini b/conf/shiro.ini index 6e40e8687d6..1cc3cf809ac 100644 --- a/conf/shiro.ini +++ b/conf/shiro.ini @@ -33,6 +33,6 @@ user2 = password3 # anon means the access is anonymous. # authcBasic means Basic Auth Security # To enfore security, comment the line below and uncomment the next one -#/** = anon -/** = authcBasic +/** = anon +#/** = authcBasic diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 3515c17e8cc..c458e1d7d20 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -691,6 +691,8 @@ private void runParagraph(NotebookSocket conn, Notebook notebook, p.setTitle((String) fromMessage.get("title")); if (!fromMessage.principal.equals("anonymous")) { p.setUser(fromMessage.principal); + } else { + p.setUser(null); } Map params = (Map) fromMessage From 320790cf4581ba14dfa6791220818058ba3bc7ba Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Tue, 9 Feb 2016 14:30:40 +0530 Subject: [PATCH 03/11] fix for CI, missing change signature --- .../org/apache/zeppelin/scalding/ScaldingInterpreterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java index 1a6f2b9ce5e..4b6f4007a9e 100644 --- a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java +++ b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java @@ -62,7 +62,7 @@ public void setUp() throws Exception { } InterpreterGroup intpGroup = new InterpreterGroup(); - context = new InterpreterContext("note", "id", "title", "text", + context = new InterpreterContext("note", "id", "title", "text", null, new HashMap(), new GUI(), new AngularObjectRegistry( intpGroup.getId(), null), null, new LinkedList(), null); From 57ca5771f968ed93fcc566b24cfa699aaf7fb301 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Tue, 16 Feb 2016 21:53:32 +0530 Subject: [PATCH 04/11] review change create such class AuthenticationInfo, and pass it into InterpreterContext --- .../zeppelin/shell/ShellInterpreter.java | 1 + .../angular/AbstractAngularModelTest.scala | 2 +- .../interpreter/AuthenticationInfo.java | 55 +++ .../interpreter/InterpreterContext.java | 10 +- .../interpreter/remote/RemoteInterpreter.java | 2 +- .../remote/RemoteInterpreterServer.java | 2 +- .../thrift/RemoteInterpreterContext.java | 322 +++++++++--------- .../thrift/RemoteInterpreterEvent.java | 4 +- .../thrift/RemoteInterpreterEventType.java | 2 +- .../thrift/RemoteInterpreterResult.java | 4 +- .../thrift/RemoteInterpreterService.java | 8 +- .../thrift/RemoteInterpreterService.thrift | 2 +- .../zeppelin/socket/NotebookServer.java | 8 +- .../apache/zeppelin/notebook/Paragraph.java | 14 +- 14 files changed, 248 insertions(+), 188 deletions(-) create mode 100644 zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java diff --git a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java index 85aafc59d6e..2dc14958447 100644 --- a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java +++ b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java @@ -66,6 +66,7 @@ public void close() {} @Override public InterpreterResult interpret(String cmd, InterpreterContext contextInterpreter) { logger.debug("Run shell command '" + cmd + "'"); + logger.error("user info found as :::" + contextInterpreter.getAuthenticationInfo().getUser()); CommandLine cmdLine = CommandLine.parse("bash"); cmdLine.addArgument("-c", false); cmdLine.addArgument(cmd, false); diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala index a2767f1fb32..ad1ff2897ce 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala @@ -28,7 +28,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", null, + 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/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java new file mode 100644 index 00000000000..bbd043beb9c --- /dev/null +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.apache.zeppelin.interpreter; + +/*** + * + */ +public class AuthenticationInfo { + String user; + String ticket; + + public AuthenticationInfo() {} + + /*** + * + * @param user + * @param ticket + */ + public AuthenticationInfo(String user, String ticket) { + this.user = user; + this.ticket = ticket; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getTicket() { + return ticket; + } + + public void setTicket(String ticket) { + this.ticket = ticket; + } +} 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 index 75811319946..4dc0db57f18 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java @@ -48,7 +48,7 @@ public static void remove() { private final String paragraphTitle; private final String paragraphId; private final String paragraphText; - private final String user; + private AuthenticationInfo authenticationInfo; private final Map config; private GUI gui; private AngularObjectRegistry angularObjectRegistry; @@ -59,7 +59,7 @@ public InterpreterContext(String noteId, String paragraphId, String paragraphTitle, String paragraphText, - String user, + AuthenticationInfo authenticationInfo, Map config, GUI gui, AngularObjectRegistry angularObjectRegistry, @@ -71,7 +71,7 @@ public InterpreterContext(String noteId, this.paragraphId = paragraphId; this.paragraphTitle = paragraphTitle; this.paragraphText = paragraphText; - this.user = user; + this.authenticationInfo = authenticationInfo; this.config = config; this.gui = gui; this.angularObjectRegistry = angularObjectRegistry; @@ -97,8 +97,8 @@ public String getParagraphTitle() { return paragraphTitle; } - public String getUser() { - return user; + public AuthenticationInfo getAuthenticationInfo() { + return authenticationInfo; } public Map getConfig() { diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java index 8bd22d112be..b1eb458b12e 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java @@ -364,7 +364,7 @@ private RemoteInterpreterContext convert(InterpreterContext ic) { ic.getParagraphId(), ic.getParagraphTitle(), ic.getParagraphText(), - ic.getUser(), + gson.toJson(ic.getAuthenticationInfo()), gson.toJson(ic.getConfig()), gson.toJson(ic.getGui()), gson.toJson(ic.getRunners())); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 88c70d04546..5d130b328a3 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -392,7 +392,7 @@ private InterpreterContext convert(RemoteInterpreterContext ric) { ric.getParagraphId(), ric.getParagraphTitle(), ric.getParagraphText(), - ric.getUser(), + gson.fromJson(ric.getAuthenticationInfo(), AuthenticationInfo.class), (Map) gson.fromJson(ric.getConfig(), new TypeToken>() {}.getType()), gson.fromJson(ric.getGui(), GUI.class), diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java index 6fb355cba30..adcde0f82c2 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-1-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-16") public class RemoteInterpreterContext implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterContext"); @@ -59,7 +59,7 @@ public class RemoteInterpreterContext implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NOTE_ID, new org.apache.thrift.meta_data.FieldMetaData("noteId", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.NOTE_ID, new org.apache.thrift.meta_data.FieldMetaData("noteId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_ID, new org.apache.thrift.meta_data.FieldMetaData("paragraphId", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_ID, new org.apache.thrift.meta_data.FieldMetaData("paragraphId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_TITLE, new org.apache.thrift.meta_data.FieldMetaData("paragraphTitle", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_TITLE, new org.apache.thrift.meta_data.FieldMetaData("paragraphTitle", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PARAGRAPH_TEXT, new org.apache.thrift.meta_data.FieldMetaData("paragraphText", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PARAGRAPH_TEXT, new org.apache.thrift.meta_data.FieldMetaData("paragraphText", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.AUTHENTICATION_INFO, new org.apache.thrift.meta_data.FieldMetaData("authenticationInfo", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.CONFIG, new org.apache.thrift.meta_data.FieldMetaData("config", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.CONFIG, new org.apache.thrift.meta_data.FieldMetaData("config", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.GUI, new org.apache.thrift.meta_data.FieldMetaData("gui", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.GUI, new org.apache.thrift.meta_data.FieldMetaData("gui", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.RUNNERS, new org.apache.thrift.meta_data.FieldMetaData("runners", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.RUNNERS, new org.apache.thrift.meta_data.FieldMetaData("runners", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteInterpreterContext.class, metaDataMap); @@ -186,21 +186,21 @@ public RemoteInterpreterContext() { } public RemoteInterpreterContext( - String noteId, - String paragraphId, - String paragraphTitle, - String paragraphText, - String user, - String config, - String gui, - String runners) + String noteId, + String paragraphId, + String paragraphTitle, + String paragraphText, + String authenticationInfo, + String config, + String gui, + String runners) { this(); this.noteId = noteId; this.paragraphId = paragraphId; this.paragraphTitle = paragraphTitle; this.paragraphText = paragraphText; - this.user = user; + this.authenticationInfo = authenticationInfo; this.config = config; this.gui = gui; this.runners = runners; @@ -222,8 +222,8 @@ public RemoteInterpreterContext(RemoteInterpreterContext other) { if (other.isSetParagraphText()) { this.paragraphText = other.paragraphText; } - if (other.isSetUser()) { - this.user = other.user; + if (other.isSetAuthenticationInfo()) { + this.authenticationInfo = other.authenticationInfo; } if (other.isSetConfig()) { this.config = other.config; @@ -246,7 +246,7 @@ public void clear() { this.paragraphId = null; this.paragraphTitle = null; this.paragraphText = null; - this.user = null; + this.authenticationInfo = null; this.config = null; this.gui = null; this.runners = null; @@ -348,27 +348,27 @@ public void setParagraphTextIsSet(boolean value) { } } - public String getUser() { - return this.user; + public String getAuthenticationInfo() { + return this.authenticationInfo; } - public RemoteInterpreterContext setUser(String user) { - this.user = user; + public RemoteInterpreterContext setAuthenticationInfo(String authenticationInfo) { + this.authenticationInfo = authenticationInfo; return this; } - public void unsetUser() { - this.user = null; + public void unsetAuthenticationInfo() { + this.authenticationInfo = null; } - /** Returns true if field user is set (has been assigned a value) and false otherwise */ - public boolean isSetUser() { - return this.user != null; + /** Returns true if field authenticationInfo is set (has been assigned a value) and false otherwise */ + public boolean isSetAuthenticationInfo() { + return this.authenticationInfo != null; } - public void setUserIsSet(boolean value) { + public void setAuthenticationInfoIsSet(boolean value) { if (!value) { - this.user = null; + this.authenticationInfo = null; } } @@ -446,98 +446,98 @@ public void setRunnersIsSet(boolean value) { public void setFieldValue(_Fields field, Object value) { switch (field) { - case NOTE_ID: - if (value == null) { - unsetNoteId(); - } else { - setNoteId((String)value); - } - break; + case NOTE_ID: + if (value == null) { + unsetNoteId(); + } else { + setNoteId((String)value); + } + break; - case PARAGRAPH_ID: - if (value == null) { - unsetParagraphId(); - } else { - setParagraphId((String)value); - } - break; + case PARAGRAPH_ID: + if (value == null) { + unsetParagraphId(); + } else { + setParagraphId((String)value); + } + break; - case PARAGRAPH_TITLE: - if (value == null) { - unsetParagraphTitle(); - } else { - setParagraphTitle((String)value); - } - break; + case PARAGRAPH_TITLE: + if (value == null) { + unsetParagraphTitle(); + } else { + setParagraphTitle((String)value); + } + break; - case PARAGRAPH_TEXT: - if (value == null) { - unsetParagraphText(); - } else { - setParagraphText((String)value); - } - break; + case PARAGRAPH_TEXT: + if (value == null) { + unsetParagraphText(); + } else { + setParagraphText((String)value); + } + break; - case USER: - if (value == null) { - unsetUser(); - } else { - setUser((String) value); - } - break; + case AUTHENTICATION_INFO: + if (value == null) { + unsetAuthenticationInfo(); + } else { + setAuthenticationInfo((String)value); + } + break; - case CONFIG: - if (value == null) { - unsetConfig(); - } else { - setConfig((String)value); - } - break; + case CONFIG: + if (value == null) { + unsetConfig(); + } else { + setConfig((String)value); + } + break; - case GUI: - if (value == null) { - unsetGui(); - } else { - setGui((String)value); - } - break; + case GUI: + if (value == null) { + unsetGui(); + } else { + setGui((String)value); + } + break; - case RUNNERS: - if (value == null) { - unsetRunners(); - } else { - setRunners((String)value); - } - break; + case RUNNERS: + if (value == null) { + unsetRunners(); + } else { + setRunners((String)value); + } + break; } } public Object getFieldValue(_Fields field) { switch (field) { - case NOTE_ID: - return getNoteId(); + case NOTE_ID: + return getNoteId(); - case PARAGRAPH_ID: - return getParagraphId(); + case PARAGRAPH_ID: + return getParagraphId(); - case PARAGRAPH_TITLE: - return getParagraphTitle(); + case PARAGRAPH_TITLE: + return getParagraphTitle(); - case PARAGRAPH_TEXT: - return getParagraphText(); + case PARAGRAPH_TEXT: + return getParagraphText(); - case USER: - return getUser(); + case AUTHENTICATION_INFO: + return getAuthenticationInfo(); - case CONFIG: - return getConfig(); + case CONFIG: + return getConfig(); - case GUI: - return getGui(); + case GUI: + return getGui(); - case RUNNERS: - return getRunners(); + case RUNNERS: + return getRunners(); } throw new IllegalStateException(); @@ -550,22 +550,22 @@ public boolean isSet(_Fields field) { } switch (field) { - case NOTE_ID: - return isSetNoteId(); - case PARAGRAPH_ID: - return isSetParagraphId(); - case PARAGRAPH_TITLE: - return isSetParagraphTitle(); - case PARAGRAPH_TEXT: - return isSetParagraphText(); - case USER: - return isSetUser(); - case CONFIG: - return isSetConfig(); - case GUI: - return isSetGui(); - case RUNNERS: - return isSetRunners(); + case NOTE_ID: + return isSetNoteId(); + case PARAGRAPH_ID: + return isSetParagraphId(); + case PARAGRAPH_TITLE: + return isSetParagraphTitle(); + case PARAGRAPH_TEXT: + return isSetParagraphText(); + case AUTHENTICATION_INFO: + return isSetAuthenticationInfo(); + case CONFIG: + return isSetConfig(); + case GUI: + return isSetGui(); + case RUNNERS: + return isSetRunners(); } throw new IllegalStateException(); } @@ -619,12 +619,12 @@ public boolean equals(RemoteInterpreterContext that) { return false; } - boolean this_present_user = true && this.isSetUser(); - boolean that_present_user = true && that.isSetUser(); - if (this_present_user || that_present_user) { - if (!(this_present_user && that_present_user)) + boolean this_present_authenticationInfo = true && this.isSetAuthenticationInfo(); + boolean that_present_authenticationInfo = true && that.isSetAuthenticationInfo(); + if (this_present_authenticationInfo || that_present_authenticationInfo) { + if (!(this_present_authenticationInfo && that_present_authenticationInfo)) return false; - if (!this.user.equals(that.user)) + if (!this.authenticationInfo.equals(that.authenticationInfo)) return false; } @@ -682,10 +682,10 @@ public int hashCode() { if (present_paragraphText) list.add(paragraphText); - boolean present_user = true && (isSetUser()); - list.add(present_user); - if (present_user) - list.add(user); + boolean present_authenticationInfo = true && (isSetAuthenticationInfo()); + list.add(present_authenticationInfo); + if (present_authenticationInfo) + list.add(authenticationInfo); boolean present_config = true && (isSetConfig()); list.add(present_config); @@ -753,12 +753,12 @@ public int compareTo(RemoteInterpreterContext other) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); + lastComparison = Boolean.valueOf(isSetAuthenticationInfo()).compareTo(other.isSetAuthenticationInfo()); if (lastComparison != 0) { return lastComparison; } - if (isSetUser()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); + if (isSetAuthenticationInfo()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authenticationInfo, other.authenticationInfo); if (lastComparison != 0) { return lastComparison; } @@ -845,11 +845,11 @@ public String toString() { } first = false; if (!first) sb.append(", "); - sb.append("user:"); - if (this.user == null) { + sb.append("authenticationInfo:"); + if (this.authenticationInfo == null) { sb.append("null"); } else { - sb.append(this.user); + sb.append(this.authenticationInfo); } first = false; if (!first) sb.append(", "); @@ -915,7 +915,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -923,7 +923,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.noteId = iprot.readString(); struct.setNoteIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -931,7 +931,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphId = iprot.readString(); struct.setParagraphIdIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -939,7 +939,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphTitle = iprot.readString(); struct.setParagraphTitleIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -947,15 +947,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.paragraphText = iprot.readString(); struct.setParagraphTextIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // USER + case 5: // AUTHENTICATION_INFO if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); - } else { + struct.authenticationInfo = iprot.readString(); + struct.setAuthenticationInfoIsSet(true); + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -963,7 +963,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.config = iprot.readString(); struct.setConfigIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -971,7 +971,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.gui = iprot.readString(); struct.setGuiIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -979,7 +979,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteInterpreterCo if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.runners = iprot.readString(); struct.setRunnersIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -1018,9 +1018,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RemoteInterpreterC oprot.writeString(struct.paragraphText); oprot.writeFieldEnd(); } - if (struct.user != null) { - oprot.writeFieldBegin(USER_FIELD_DESC); - oprot.writeString(struct.user); + if (struct.authenticationInfo != null) { + oprot.writeFieldBegin(AUTHENTICATION_INFO_FIELD_DESC); + oprot.writeString(struct.authenticationInfo); oprot.writeFieldEnd(); } if (struct.config != null) { @@ -1068,7 +1068,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCo if (struct.isSetParagraphText()) { optionals.set(3); } - if (struct.isSetUser()) { + if (struct.isSetAuthenticationInfo()) { optionals.set(4); } if (struct.isSetConfig()) { @@ -1093,8 +1093,8 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCo if (struct.isSetParagraphText()) { oprot.writeString(struct.paragraphText); } - if (struct.isSetUser()) { - oprot.writeString(struct.user); + if (struct.isSetAuthenticationInfo()) { + oprot.writeString(struct.authenticationInfo); } if (struct.isSetConfig()) { oprot.writeString(struct.config); @@ -1128,8 +1128,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, RemoteInterpreterCon struct.setParagraphTextIsSet(true); } if (incoming.get(4)) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); + struct.authenticationInfo = iprot.readString(); + struct.setAuthenticationInfoIsSet(true); } if (incoming.get(5)) { struct.config = iprot.readString(); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java index e560ec886d9..3df9946bd70 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-1-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-16") public class RemoteInterpreterEvent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterEvent"); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java index 7cb7963130f..664e5ad6cab 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java index 6539756a645..f6ac9b54f81 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-1-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-16") public class RemoteInterpreterResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteInterpreterResult"); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterService.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterService.java index abf4316829d..722ec9d2baf 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterService.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterService.java @@ -16,7 +16,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2016-1-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-16") public class RemoteInterpreterService { public interface Iface { @@ -6900,7 +6900,7 @@ public void setFieldValue(_Fields field, Object value) { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return getSuccess(); } throw new IllegalStateException(); @@ -8079,7 +8079,7 @@ public Object getFieldValue(_Fields field) { return getBuf(); case CURSOR: - return Integer.valueOf(getCursor()); + return getCursor(); } throw new IllegalStateException(); diff --git a/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift b/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift index fcefcdf19fd..d288324fbe8 100644 --- a/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift +++ b/zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift @@ -24,7 +24,7 @@ struct RemoteInterpreterContext { 2: string paragraphId, 3: string paragraphTitle, 4: string paragraphText, - 5: string user, + 5: string authenticationInfo, 6: string config, // json serialized config 7: string gui, // json serialized gui 8: string runners // json serialized runner diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index c458e1d7d20..90a904b5ff1 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -23,6 +23,7 @@ import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.AngularObjectRegistryListener; +import org.apache.zeppelin.interpreter.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterSetting; @@ -690,9 +691,12 @@ private void runParagraph(NotebookSocket conn, Notebook notebook, p.setText(text); p.setTitle((String) fromMessage.get("title")); if (!fromMessage.principal.equals("anonymous")) { - p.setUser(fromMessage.principal); + AuthenticationInfo authenticationInfo = new AuthenticationInfo(fromMessage.principal, + fromMessage.ticket); + p.setAuthenticationInfo(authenticationInfo); + } else { - p.setUser(null); + p.setAuthenticationInfo(new AuthenticationInfo()); } Map params = (Map) fromMessage 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 49cc6b7bcc7..4b4914dd3d9 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 @@ -45,7 +45,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { String title; String text; - String user; + AuthenticationInfo authenticationInfo; Date dateUpdated; private Map config; // paragraph configs like isOpen, colWidth, etc public final GUI settings; // form and parameter settings @@ -56,7 +56,7 @@ public Paragraph(Note note, JobListener listener, NoteInterpreterLoader replLoad this.replLoader = replLoader; title = null; text = null; - user = null; + authenticationInfo = null; dateUpdated = null; settings = new GUI(); config = new HashMap(); @@ -76,12 +76,12 @@ public void setText(String newText) { this.dateUpdated = new Date(); } - public String getUser() { - return user; + public AuthenticationInfo getAuthenticationInfo() { + return authenticationInfo; } - public void setUser(String user) { - this.user = user; + public void setAuthenticationInfo(AuthenticationInfo authenticationInfo) { + this.authenticationInfo = authenticationInfo; } public String getTitle() { @@ -285,7 +285,7 @@ private InterpreterContext getInterpreterContext() { getId(), this.getTitle(), this.getText(), - this.getUser(), + this.getAuthenticationInfo(), this.getConfig(), this.settings, registry, From 34dcc32035128cc7ecd0b4c2ed8ad7342b034ecd Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Tue, 16 Feb 2016 22:14:06 +0530 Subject: [PATCH 05/11] instead of null pass "new AuthenticationInfo()" --- .../scalding/ScaldingInterpreterTest.java | 2 +- .../zeppelin/spark/DepInterpreterTest.java | 8 +++---- .../zeppelin/spark/SparkInterpreterTest.java | 2 +- .../spark/SparkSqlInterpreterTest.java | 3 ++- .../angular/AbstractAngularElemTest.scala | 6 ++--- .../remote/RemoteAngularObjectTest.java | 7 ++---- .../RemoteInterpreterOutputTestStream.java | 2 +- .../remote/RemoteInterpreterTest.java | 23 ++++++++----------- .../resource/DistributedResourcePoolTest.java | 7 ++---- .../scheduler/RemoteSchedulerTest.java | 7 +++--- 10 files changed, 29 insertions(+), 38 deletions(-) diff --git a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java index 4b6f4007a9e..2381c652ed7 100644 --- a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java +++ b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java @@ -62,7 +62,7 @@ public void setUp() throws Exception { } InterpreterGroup intpGroup = new InterpreterGroup(); - context = new InterpreterContext("note", "id", "title", "text", null, + context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry( intpGroup.getId(), null), null, new LinkedList(), 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 index e8b076297b7..eafc6b07dbf 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java @@ -26,10 +26,7 @@ import org.apache.zeppelin.display.AngularObjectRegistry; 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 +55,8 @@ public void setUp() throws Exception { intpGroup.add(dep); dep.setInterpreterGroup(intpGroup); - context = new InterpreterContext("note", "id", "title", "text", null, new HashMap(), new GUI(), + context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(), + new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), null, new LinkedList(), 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 index 3942600d93b..171dbb0cc82 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java @@ -76,7 +76,7 @@ public void setUp() throws Exception { InterpreterGroup intpGroup = new InterpreterGroup(); context = new InterpreterContext("note", "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java index a9469452d35..d85dec214e6 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java @@ -65,7 +65,8 @@ public void setUp() throws Exception { sql.setInterpreterGroup(intpGroup); sql.open(); } - context = new InterpreterContext("note", "id", "title", "text", null, new HashMap(), new GUI(), + context = new InterpreterContext("note", "id", "title", "text", new AuthenticationInfo(), + new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), null, new LinkedList(), new InterpreterOutput(new InterpreterOutputListener() { diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala index 2fd79d9ebe3..303ab16bbcd 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala @@ -32,9 +32,9 @@ trait AbstractAngularElemTest override def beforeEach() { val intpGroup = new InterpreterGroup() - val context = new InterpreterContext("note", "paragraph", "title", "text", null, - new util.HashMap[String, Object](), new GUI(), new AngularObjectRegistry( - intpGroup.getId(), null), + val context = new InterpreterContext("note", "paragraph", "title", "text", + 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/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java index 78cbe6b6bda..df66608efa1 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java @@ -29,10 +29,7 @@ import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.AngularObjectRegistryListener; 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.remote.mock.MockInterpreterAngular; import org.apache.zeppelin.resource.LocalResourcePool; import org.apache.zeppelin.resource.ResourcePool; @@ -84,7 +81,7 @@ public void setUp() throws Exception { "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index 2f4073d071d..ddf6b63fcad 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -75,7 +75,7 @@ private InterpreterContext createInterpreterContext() { "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index 79c962f602b..4758b71965b 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -30,10 +30,7 @@ import org.apache.thrift.transport.TTransportException; import org.apache.zeppelin.display.AngularObjectRegistry; 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.apache.zeppelin.interpreter.remote.mock.MockInterpreterA; import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterB; @@ -121,7 +118,7 @@ public void testRemoteInterperterCall() throws TTransportException, IOException "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -156,7 +153,7 @@ public void testRemoteInterperterErrorStatus() throws TTransportException, IOExc "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -206,7 +203,7 @@ public void testRemoteSchedulerSharing() throws TTransportException, IOException "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -220,7 +217,7 @@ public void testRemoteSchedulerSharing() throws TTransportException, IOException "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -273,7 +270,7 @@ protected Object jobRun() throws Throwable { "jobA", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -309,7 +306,7 @@ protected Object jobRun() throws Throwable { "jobB", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -376,7 +373,7 @@ protected Object jobRun() throws Throwable { jobId, "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -455,7 +452,7 @@ protected Object jobRun() throws Throwable { jobId, "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -555,7 +552,7 @@ protected Object jobRun() throws Throwable { "jobA", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java index d07dfe516f8..96f74848670 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java @@ -18,10 +18,7 @@ import com.google.gson.Gson; 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.remote.RemoteInterpreter; import org.apache.zeppelin.interpreter.remote.RemoteInterpreterEventPoller; import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterResourcePool; @@ -93,7 +90,7 @@ public void setUp() throws Exception { "id", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), null, diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index 47b39f3cf8c..c36a5fa357d 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -30,6 +30,7 @@ import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.GUI; +import org.apache.zeppelin.interpreter.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterContextRunner; import org.apache.zeppelin.interpreter.InterpreterGroup; @@ -103,7 +104,7 @@ protected Object jobRun() throws Throwable { "jobId", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -176,7 +177,7 @@ public void testAbortOnPending() throws Exception { "jobId1", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), @@ -214,7 +215,7 @@ protected boolean jobAbort() { "jobId2", "title", "text", - null, + new AuthenticationInfo(), new HashMap(), new GUI(), new AngularObjectRegistry(intpGroup.getId(), null), From a5a991d2df197d6242d96e2451b4ea0112a7c56e Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Wed, 17 Feb 2016 00:08:10 +0530 Subject: [PATCH 06/11] check for selenium --- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index ddc7a4d7e2d..d0c166dc6d2 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -18,6 +18,8 @@ package org.apache.zeppelin.integration; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; import org.apache.zeppelin.AbstractZeppelinIT; import org.apache.zeppelin.WebDriverManager; import org.apache.zeppelin.ZeppelinITUtils; @@ -114,6 +116,7 @@ public void testMoveUpAndDown() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); + LOG.error("ScreenShot::\ndata:image/png;base64," + new String(Base64.encodeBase64(FileUtils.readFileToByteArray(scrFile)))); throw e; } From 95e7c13086de56df000a6cd014fd02d475bd977d Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Wed, 17 Feb 2016 00:08:55 +0530 Subject: [PATCH 07/11] test for selenium --- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 3 --- .../test/java/org/apache/zeppelin/integration/ZeppelinIT.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index d0c166dc6d2..ddc7a4d7e2d 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -18,8 +18,6 @@ package org.apache.zeppelin.integration; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FileUtils; import org.apache.zeppelin.AbstractZeppelinIT; import org.apache.zeppelin.WebDriverManager; import org.apache.zeppelin.ZeppelinITUtils; @@ -116,7 +114,6 @@ public void testMoveUpAndDown() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - LOG.error("ScreenShot::\ndata:image/png;base64," + new String(Base64.encodeBase64(FileUtils.readFileToByteArray(scrFile)))); throw e; } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java index 4dd20e81bdf..c37fbede1cc 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java @@ -17,6 +17,8 @@ package org.apache.zeppelin.integration; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; import org.apache.zeppelin.AbstractZeppelinIT; import org.apache.zeppelin.WebDriverManager; import org.junit.After; @@ -198,6 +200,7 @@ public void testAngularDisplay() throws Exception { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); + LOG.error("ScreenShot::\ndata:image/png;base64," + new String(Base64.encodeBase64(FileUtils.readFileToByteArray(scrFile)))); throw e; } } From 0709b9c51c6bc7aaa4dafa5c6d52a0eb4530fefe Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Wed, 17 Feb 2016 00:28:37 +0530 Subject: [PATCH 08/11] moving AuthenticationInfo to org.apache.zeppelin.display.AuthenticationInfo --- .../apache/zeppelin/scalding/ScaldingInterpreterTest.java | 1 + .../java/org/apache/zeppelin/spark/DepInterpreterTest.java | 1 + .../java/org/apache/zeppelin/spark/SparkInterpreterTest.java | 1 + .../org/apache/zeppelin/spark/SparkSqlInterpreterTest.java | 1 + .../zeppelin/display/angular/AbstractAngularElemTest.scala | 2 +- .../zeppelin/display/angular/AbstractAngularModelTest.scala | 2 +- .../{interpreter => display}/AuthenticationInfo.java | 2 +- .../org/apache/zeppelin/interpreter/InterpreterContext.java | 1 + .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 5 +---- .../zeppelin/interpreter/remote/RemoteAngularObjectTest.java | 5 +---- .../remote/RemoteInterpreterOutputTestStream.java | 1 + .../zeppelin/interpreter/remote/RemoteInterpreterTest.java | 1 + .../zeppelin/resource/DistributedResourcePoolTest.java | 1 + .../org/apache/zeppelin/scheduler/RemoteSchedulerTest.java | 2 +- .../main/java/org/apache/zeppelin/socket/NotebookServer.java | 2 +- .../main/java/org/apache/zeppelin/notebook/Paragraph.java | 1 + 16 files changed, 16 insertions(+), 13 deletions(-) rename zeppelin-interpreter/src/main/java/org/apache/zeppelin/{interpreter => display}/AuthenticationInfo.java (96%) diff --git a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java index 2381c652ed7..703ad3aeac0 100644 --- 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.display.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterContextRunner; import org.apache.zeppelin.interpreter.InterpreterGroup; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java index eafc6b07dbf..f5a51ce6fae 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java @@ -25,6 +25,7 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java index 171dbb0cc82..59d9a0a39be 100644 --- 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.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java index d85dec214e6..fc8a2b90704 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java @@ -24,6 +24,7 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Type; diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala index 303ab16bbcd..e9f2ef628f3 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala @@ -19,7 +19,7 @@ package org.apache.zeppelin.display.angular import java.io.{ByteArrayOutputStream, PrintStream} import java.util -import org.apache.zeppelin.display.{AngularObject, AngularObjectRegistry, GUI} +import org.apache.zeppelin.display.{AuthenticationInfo, AngularObject, AngularObjectRegistry, GUI} import org.apache.zeppelin.interpreter._ import org.scalatest.concurrent.Eventually import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers} diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala index ad1ff2897ce..ba7f18d0652 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala @@ -16,7 +16,7 @@ */ package org.apache.zeppelin.display.angular -import org.apache.zeppelin.display.{AngularObjectRegistry, GUI} +import org.apache.zeppelin.display.{AuthenticationInfo, AngularObjectRegistry, GUI} import org.apache.zeppelin.interpreter._ import org.scalatest.concurrent.Eventually import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, FlatSpec, Matchers} diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java similarity index 96% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java index bbd043beb9c..5ef39e73c80 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java @@ -16,7 +16,7 @@ */ -package org.apache.zeppelin.interpreter; +package org.apache.zeppelin.display; /*** * 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 index 4dc0db57f18..808dbe9a82c 100644 --- 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.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.resource.ResourcePool; diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 5d130b328a3..fe2c69ac3ec 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/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; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java index df66608efa1..93670ac1026 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java @@ -25,10 +25,7 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -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.remote.mock.MockInterpreterAngular; import org.apache.zeppelin.resource.LocalResourcePool; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index ddf6b63fcad..7da2a990be8 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -18,6 +18,7 @@ package org.apache.zeppelin.interpreter.remote; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterOutputStream; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index 4758b71965b..94681fba6ec 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -29,6 +29,7 @@ import org.apache.thrift.transport.TTransportException; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java index 96f74848670..bdc8f3147da 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java @@ -17,6 +17,7 @@ package org.apache.zeppelin.resource; import com.google.gson.Gson; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.remote.RemoteInterpreter; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index c36a5fa357d..9a425a3a307 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -29,8 +29,8 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; -import org.apache.zeppelin.interpreter.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterContextRunner; import org.apache.zeppelin.interpreter.InterpreterGroup; diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 99bedb2a287..d2ab052040e 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -23,7 +23,7 @@ import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.AngularObjectRegistryListener; -import org.apache.zeppelin.interpreter.AuthenticationInfo; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterSetting; 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 4b4914dd3d9..bbe841ddc79 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 @@ -18,6 +18,7 @@ package org.apache.zeppelin.notebook; import org.apache.zeppelin.display.AngularObjectRegistry; +import org.apache.zeppelin.display.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.display.Input; import org.apache.zeppelin.interpreter.*; From e4a5165c1685d8feae3669c69c4e53b9976b76cb Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 19 Feb 2016 11:11:15 +0530 Subject: [PATCH 09/11] move AuthenticationInfo from dispaly package to user --- .../org/apache/zeppelin/scalding/ScaldingInterpreterTest.java | 2 +- .../java/org/apache/zeppelin/spark/DepInterpreterTest.java | 2 +- .../java/org/apache/zeppelin/spark/SparkInterpreterTest.java | 2 +- .../org/apache/zeppelin/spark/SparkSqlInterpreterTest.java | 3 +-- .../zeppelin/display/angular/AbstractAngularElemTest.scala | 3 ++- .../zeppelin/display/angular/AbstractAngularModelTest.scala | 3 ++- .../org/apache/zeppelin/interpreter/InterpreterContext.java | 2 +- .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 1 + .../apache/zeppelin/{display => user}/AuthenticationInfo.java | 2 +- .../zeppelin/interpreter/remote/RemoteAngularObjectTest.java | 2 +- .../interpreter/remote/RemoteInterpreterOutputTestStream.java | 2 +- .../zeppelin/interpreter/remote/RemoteInterpreterTest.java | 2 +- .../apache/zeppelin/resource/DistributedResourcePoolTest.java | 2 +- .../org/apache/zeppelin/scheduler/RemoteSchedulerTest.java | 2 +- .../main/java/org/apache/zeppelin/socket/NotebookServer.java | 2 +- .../src/main/java/org/apache/zeppelin/notebook/Paragraph.java | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) rename zeppelin-interpreter/src/main/java/org/apache/zeppelin/{display => user}/AuthenticationInfo.java (97%) diff --git a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java index 703ad3aeac0..198fd62b444 100644 --- a/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java +++ b/scalding/src/test/java/org/apache/zeppelin/scalding/ScaldingInterpreterTest.java @@ -26,7 +26,7 @@ import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.GUI; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterContextRunner; import org.apache.zeppelin.interpreter.InterpreterGroup; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java index f5a51ce6fae..11b93284535 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java @@ -25,7 +25,7 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java index 59d9a0a39be..17e844d962a 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java @@ -27,7 +27,7 @@ import org.apache.spark.SparkConf; import org.apache.spark.SparkContext; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java index fc8a2b90704..a95461fa93b 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java @@ -24,11 +24,10 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +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; diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala index e9f2ef628f3..9b5cd6269c8 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala @@ -19,8 +19,9 @@ package org.apache.zeppelin.display.angular import java.io.{ByteArrayOutputStream, PrintStream} import java.util -import org.apache.zeppelin.display.{AuthenticationInfo, AngularObject, AngularObjectRegistry, GUI} +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} diff --git a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala index ba7f18d0652..33ca5086427 100644 --- a/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala +++ b/zeppelin-display/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala @@ -16,8 +16,9 @@ */ package org.apache.zeppelin.display.angular -import org.apache.zeppelin.display.{AuthenticationInfo, AngularObjectRegistry, GUI} +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} 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 index 808dbe9a82c..72c7deaeeed 100644 --- 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,7 +21,7 @@ import java.util.Map; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.resource.ResourcePool; diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index fe2c69ac3ec..3174484e3d2 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -46,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; diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java similarity index 97% rename from zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java rename to zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java index 5ef39e73c80..5d54342c531 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AuthenticationInfo.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/user/AuthenticationInfo.java @@ -16,7 +16,7 @@ */ -package org.apache.zeppelin.display; +package org.apache.zeppelin.user; /*** * diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java index 93670ac1026..bd8f43621f7 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java @@ -29,7 +29,7 @@ import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterAngular; import org.apache.zeppelin.resource.LocalResourcePool; -import org.apache.zeppelin.resource.ResourcePool; +import org.apache.zeppelin.user.AuthenticationInfo; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index 7da2a990be8..c52055c87e2 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -18,7 +18,7 @@ package org.apache.zeppelin.interpreter.remote; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterOutputStream; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index 94681fba6ec..333e4b4df99 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -29,7 +29,7 @@ import org.apache.thrift.transport.TTransportException; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java index bdc8f3147da..138c1e4febb 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java @@ -17,7 +17,7 @@ package org.apache.zeppelin.resource; import com.google.gson.Gson; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.remote.RemoteInterpreter; diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index 9a425a3a307..5acfcc14892 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -29,7 +29,7 @@ import java.util.Properties; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterContextRunner; diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index d2ab052040e..f290015be70 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -23,7 +23,7 @@ import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectRegistry; import org.apache.zeppelin.display.AngularObjectRegistryListener; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterSetting; 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 bbe841ddc79..2882557b161 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 @@ -18,7 +18,7 @@ package org.apache.zeppelin.notebook; import org.apache.zeppelin.display.AngularObjectRegistry; -import org.apache.zeppelin.display.AuthenticationInfo; +import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.display.GUI; import org.apache.zeppelin.display.Input; import org.apache.zeppelin.interpreter.*; From 3c979d2c13cdb22b672d6e8da0e756aa570e626a Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 19 Feb 2016 12:04:11 +0530 Subject: [PATCH 10/11] fixing CI failure --- .../test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java index 6eaad9bf187..42e9d6ede3b 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -109,7 +109,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()); From 563d43f90a88222c9430364a99a1663487da3be5 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Mon, 22 Feb 2016 11:19:47 +0530 Subject: [PATCH 11/11] CI fix, missed earlier --- .../test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java index 8b0989030ad..593d968bbb4 100644 --- a/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java +++ b/jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java @@ -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());