Repository: zeppelin Updated Branches: refs/heads/master fe07e5a49 -> 1add74b4b
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java index da68087..1747c36 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java @@ -14,26 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.zeppelin.rest; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import com.google.common.collect.Sets; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import org.apache.commons.httpclient.methods.DeleteMethod; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.lang3.StringUtils; -import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; -import org.apache.zeppelin.notebook.Note; -import org.apache.zeppelin.notebook.Paragraph; -import org.apache.zeppelin.server.ZeppelinServer; -import org.apache.zeppelin.user.AuthenticationInfo; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -41,14 +39,20 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; -import static org.junit.Assert.*; +import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; +import org.apache.zeppelin.notebook.Note; +import org.apache.zeppelin.notebook.Paragraph; +import org.apache.zeppelin.server.ZeppelinServer; +import org.apache.zeppelin.user.AuthenticationInfo; /** - * BASIC Zeppelin rest api tests - * + * BASIC Zeppelin rest api tests. */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ZeppelinRestApiTest extends AbstractTestRestApi { @@ -70,9 +74,9 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { anonymous = new AuthenticationInfo("anonymous"); } - /*** - * ROOT API TEST - ***/ + /** + * ROOT API TEST. + **/ @Test public void getApiRoot() throws IOException { // when @@ -102,8 +106,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { LOG.info("testGetNoteInfo \n" + get.getResponseBodyAsString()); assertThat("test note get method:", get, isAllowed()); - Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); assertNotNull(resp); assertEquals("OK", resp.get("status")); @@ -136,15 +140,15 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { "{\"title\": \"title1\", \"text\": \"text1\"}," + "{\"title\": \"title2\", \"text\": \"text2\"}," + "{\"title\": \"titleConfig\", \"text\": \"text3\", " + - "\"config\": {\"colWidth\": 9.0, \"title\": true, "+ - "\"results\": [{\"graph\": {\"mode\": \"pieChart\"}}] "+ + "\"config\": {\"colWidth\": 9.0, \"title\": true, " + + "\"results\": [{\"graph\": {\"mode\": \"pieChart\"}}] " + "}}]} "; PostMethod post = httpPost("/notebook/", jsonRequest); LOG.info("testNoteCreate \n" + post.getResponseBodyAsString()); assertThat("test note create method:", post, isAllowed()); - Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); String newNoteId = (String) resp.get("body"); LOG.info("newNoteId:=" + newNoteId); @@ -165,11 +169,11 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { } assertTrue("paragraph title check failed", p.getTitle().startsWith("title")); assertTrue("paragraph text check failed", p.getText().startsWith("text")); - if ( p.getTitle().equals("titleConfig")){ + if (p.getTitle().equals("titleConfig")) { assertEquals("paragraph col width check failed", 9.0, p.getConfig().get("colWidth")); assertTrue("paragraph show title check failed", ((boolean) p.getConfig().get("title"))); - Map graph = ((List<Map>)p.getConfig().get("results")).get(0); - String mode = ((Map)graph.get("graph")).get("mode").toString(); + Map graph = ((List<Map>) p.getConfig().get("results")).get(0); + String mode = ((Map) graph.get("graph")).get("mode").toString(); assertEquals("paragraph graph mode check failed", "pieChart", mode); } } @@ -185,8 +189,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { LOG.info("testNoteCreate \n" + post.getResponseBodyAsString()); assertThat("test note create method:", post, isAllowed()); - Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); String newNoteId = (String) resp.get("body"); LOG.info("newNoteId:=" + newNoteId); @@ -203,7 +207,6 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { // cleanup ZeppelinServer.notebook.removeNote(newNoteId, anonymous); post.releaseConnection(); - } @Test @@ -222,7 +225,6 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { testDeleteNote("bad_ID"); } - @Test public void testExportNote() throws IOException { LOG.info("testExportNote"); @@ -250,7 +252,6 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { LOG.info("export JSON:=" + exportJSON); ZeppelinServer.notebook.removeNote(sourceNoteId, anonymous); get.releaseConnection(); - } @Test @@ -305,7 +306,6 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { } private void testDeleteNote(String noteId) throws IOException { - DeleteMethod delete = httpDelete(("/notebook/" + noteId)); LOG.info("testDeleteNote delete response\n" + delete.getResponseBodyAsString()); assertThat("Test delete method:", delete, isAllowed()); @@ -318,7 +318,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { } @Test - public void testCloneNote() throws IOException, CloneNotSupportedException, IllegalArgumentException { + public void testCloneNote() throws IOException, IllegalArgumentException { LOG.info("testCloneNote"); // Create note to clone Note note = ZeppelinServer.notebook.createNote(anonymous); @@ -339,15 +339,16 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { LOG.info("testNoteClone \n" + post.getResponseBodyAsString()); assertThat("test note clone method:", post, isAllowed()); - Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); String newNoteId = (String) resp.get("body"); LOG.info("newNoteId:=" + newNoteId); Note newNote = ZeppelinServer.notebook.getNote(newNoteId); assertNotNull("Can not find new note by id", newNote); assertEquals("Compare note names", noteName, newNote.getName()); - assertEquals("Compare paragraphs count", note.getParagraphs().size(), newNote.getParagraphs().size()); + assertEquals("Compare paragraphs count", note.getParagraphs().size(), + newNote.getParagraphs().size()); //cleanup ZeppelinServer.notebook.removeNote(note.getId(), anonymous); ZeppelinServer.notebook.removeNote(newNote.getId(), anonymous); @@ -359,12 +360,13 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { LOG.info("testListNotes"); GetMethod get = httpGet("/notebook/ "); assertThat("List notes method", get, isAllowed()); - Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); List<Map<String, String>> body = (List<Map<String, String>>) resp.get("body"); //TODO(khalid): anonymous or specific user notes? HashSet<String> anonymous = Sets.newHashSet("anonymous"); - assertEquals("List notes are equal", ZeppelinServer.notebook.getAllNotes(anonymous).size(), body.size()); + assertEquals("List notes are equal", ZeppelinServer.notebook.getAllNotes(anonymous) + .size(), body.size()); get.releaseConnection(); } @@ -449,8 +451,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { get.releaseConnection(); LOG.info("test get note job: \n" + responseBody); - Map<String, Object> resp = gson.fromJson(responseBody, new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(responseBody, + new TypeToken<Map<String, Object>>() {}.getType()); List<Map<String, Object>> paragraphs = (List<Map<String, Object>>) resp.get("body"); assertEquals(1, paragraphs.size()); @@ -596,8 +598,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { GetMethod getNoteJobs = httpGet("/notebook/job/" + note.getId()); assertThat("test note jobs run:", getNoteJobs, isAllowed()); - Map<String, Object> resp = gson.fromJson(getNoteJobs.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(getNoteJobs.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); List<Map<String, String>> body = (List<Map<String, String>>) resp.get("body"); assertFalse(body.get(0).containsKey("started")); assertFalse(body.get(0).containsKey("finished")); @@ -616,8 +618,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { assertThat("Test insert method:", post, isAllowed()); post.releaseConnection(); - Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); String newParagraphId = (String) resp.get("body"); LOG.info("newParagraphId:=" + newParagraphId); @@ -644,8 +646,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { assertEquals("text2", paragraphAtIdx0.getText()); //append paragraph providing graph - String jsonRequest3 = "{\"title\": \"title3\", \"text\": \"text3\", "+ - "\"config\": {\"colWidth\": 9.0, \"title\": true, "+ + String jsonRequest3 = "{\"title\": \"title3\", \"text\": \"text3\", " + + "\"config\": {\"colWidth\": 9.0, \"title\": true, " + "\"results\": [{\"graph\": {\"mode\": \"pieChart\"}}]}}"; PostMethod post3 = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest3); LOG.info("testInsertParagraph response4\n" + post3.getResponseBodyAsString()); @@ -655,13 +657,12 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { Paragraph p = note.getLastParagraph(); assertEquals("title3", p.getTitle()); assertEquals("text3", p.getText()); - Map result = ((List<Map>)p.getConfig().get("results")).get(0); - String mode = ((Map)result.get("graph")).get("mode").toString(); + Map result = ((List<Map>) p.getConfig().get("results")).get(0); + String mode = ((Map) result.get("graph")).get("mode").toString(); assertEquals("pieChart", mode); assertEquals(9.0, p.getConfig().get("colWidth")); assertTrue(((boolean) p.getConfig().get("title"))); - ZeppelinServer.notebook.removeNote(note.getId(), anonymous); } @@ -671,30 +672,36 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { String jsonRequest = "{\"title\": \"title1\", \"text\": \"text1\"}"; PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest); - Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() {}.getType()); + Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); post.releaseConnection(); String newParagraphId = (String) resp.get("body"); - Paragraph newParagraph = ZeppelinServer.notebook.getNote(note.getId()).getParagraph(newParagraphId); + Paragraph newParagraph = ZeppelinServer.notebook.getNote(note.getId()) + .getParagraph(newParagraphId); assertEquals("title1", newParagraph.getTitle()); assertEquals("text1", newParagraph.getText()); String updateRequest = "{\"text\": \"updated text\"}"; - PutMethod put = httpPut("/notebook/" + note.getId() + "/paragraph/" + newParagraphId, updateRequest); + PutMethod put = httpPut("/notebook/" + note.getId() + "/paragraph/" + newParagraphId, + updateRequest); assertThat("Test update method:", put, isAllowed()); put.releaseConnection(); - Paragraph updatedParagraph = ZeppelinServer.notebook.getNote(note.getId()).getParagraph(newParagraphId); + Paragraph updatedParagraph = ZeppelinServer.notebook.getNote(note.getId()) + .getParagraph(newParagraphId); assertEquals("title1", updatedParagraph.getTitle()); assertEquals("updated text", updatedParagraph.getText()); String updateBothRequest = "{\"title\": \"updated title\", \"text\" : \"updated text 2\" }"; - PutMethod updatePut = httpPut("/notebook/" + note.getId() + "/paragraph/" + newParagraphId, updateBothRequest); + PutMethod updatePut = httpPut("/notebook/" + note.getId() + "/paragraph/" + newParagraphId, + updateBothRequest); updatePut.releaseConnection(); - Paragraph updatedBothParagraph = ZeppelinServer.notebook.getNote(note.getId()).getParagraph(newParagraphId); + Paragraph updatedBothParagraph = ZeppelinServer.notebook.getNote(note.getId()) + .getParagraph(newParagraphId); assertEquals("updated title", updatedBothParagraph.getTitle()); assertEquals("updated text 2", updatedBothParagraph.getText()); @@ -716,8 +723,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { assertThat("Test get method: ", get, isAllowed()); get.releaseConnection(); - Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { - }.getType()); + Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), + new TypeToken<Map<String, Object>>() {}.getType()); assertNotNull(resp); assertEquals("OK", resp.get("status")); @@ -745,7 +752,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { note.persist(anonymous); - PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph/" + p2.getId() + "/move/" + 0, ""); + PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph/" + p2.getId() + + "/move/" + 0, ""); assertThat("Test post method: ", post, isAllowed()); post.releaseConnection(); @@ -756,7 +764,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { assertEquals(p2.getTitle(), paragraphAtIdx0.getTitle()); assertEquals(p2.getText(), paragraphAtIdx0.getText()); - PostMethod post2 = httpPost("/notebook/" + note.getId() + "/paragraph/" + p2.getId() + "/move/" + 10, ""); + PostMethod post2 = httpPost("/notebook/" + note.getId() + "/paragraph/" + p2.getId() + + "/move/" + 10, ""); assertThat("Test post method: ", post2, isBadRequest()); post.releaseConnection(); @@ -787,7 +796,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { @Test public void testTitleSearch() throws IOException { Note note = ZeppelinServer.notebook.createNote(anonymous); - String jsonRequest = "{\"title\": \"testTitleSearchOfParagraph\", \"text\": \"ThisIsToTestSearchMethodWithTitle \"}"; + String jsonRequest = "{\"title\": \"testTitleSearchOfParagraph\", " + + "\"text\": \"ThisIsToTestSearchMethodWithTitle \"}"; PostMethod postNoteText = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest); postNoteText.releaseConnection(); @@ -809,5 +819,4 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { searchNote.releaseConnection(); ZeppelinServer.notebook.removeNote(note.getId(), anonymous); } - } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java index 12d6f14..6198c7b 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java @@ -16,20 +16,10 @@ */ package org.apache.zeppelin.rest; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.commons.io.FileUtils; -import org.apache.zeppelin.conf.ZeppelinConfiguration; -import org.apache.zeppelin.display.AngularObject; -import org.apache.zeppelin.interpreter.InterpreterException; -import org.apache.zeppelin.interpreter.InterpreterNotFoundException; -import org.apache.zeppelin.interpreter.InterpreterProperty; -import org.apache.zeppelin.interpreter.InterpreterResult; -import org.apache.zeppelin.interpreter.InterpreterSetting; -import org.apache.zeppelin.interpreter.SparkDownloadUtils; -import org.apache.zeppelin.notebook.Note; -import org.apache.zeppelin.notebook.Paragraph; -import org.apache.zeppelin.scheduler.Job.Status; -import org.apache.zeppelin.server.ZeppelinServer; -import org.apache.zeppelin.user.AuthenticationInfo; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -45,15 +35,26 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.zeppelin.conf.ZeppelinConfiguration; +import org.apache.zeppelin.display.AngularObject; +import org.apache.zeppelin.interpreter.InterpreterException; +import org.apache.zeppelin.interpreter.InterpreterNotFoundException; +import org.apache.zeppelin.interpreter.InterpreterProperty; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterSetting; +import org.apache.zeppelin.interpreter.SparkDownloadUtils; +import org.apache.zeppelin.notebook.Note; +import org.apache.zeppelin.notebook.Paragraph; +import org.apache.zeppelin.scheduler.Job.Status; +import org.apache.zeppelin.server.ZeppelinServer; +import org.apache.zeppelin.user.AuthenticationInfo; /** * Test against spark cluster. */ @RunWith(value = Parameterized.class) public class ZeppelinSparkClusterTest extends AbstractTestRestApi { - private static Logger LOGGER = LoggerFactory.getLogger(ZeppelinSparkClusterTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ZeppelinSparkClusterTest.class); private String sparkVersion; private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous"); @@ -95,16 +96,20 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { new InterpreterProperty("spark.cores.max", "2")); sparkProperties.put("zeppelin.spark.useHiveContext", new InterpreterProperty("zeppelin.spark.useHiveContext", "false")); - sparkProperties.put("zeppelin.pyspark.useIPython", new InterpreterProperty("zeppelin.pyspark.useIPython", "false")); - sparkProperties.put("zeppelin.spark.useNew", new InterpreterProperty("zeppelin.spark.useNew", "true")); - sparkProperties.put("zeppelin.spark.test", new InterpreterProperty("zeppelin.spark.test", "true")); + sparkProperties.put("zeppelin.pyspark.useIPython", + new InterpreterProperty("zeppelin.pyspark.useIPython", "false")); + sparkProperties.put("zeppelin.spark.useNew", + new InterpreterProperty("zeppelin.spark.useNew", "true")); + sparkProperties.put("zeppelin.spark.test", + new InterpreterProperty("zeppelin.spark.test", "true")); ZeppelinServer.notebook.getInterpreterSettingManager().restart(sparkIntpSetting.getId()); } @BeforeClass public static void setUp() throws Exception { - System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HELIUM_REGISTRY.getVarName(), "helium"); + System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HELIUM_REGISTRY.getVarName(), + "helium"); AbstractTestRestApi.startUp(ZeppelinSparkClusterTest.class.getSimpleName()); } @@ -146,7 +151,6 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { assertTrue(p.getResult().message().get(0).getData().contains("error: ")); } - @Test public void basicRDDTransformationAndActionTest() throws IOException { Note note = ZeppelinServer.notebook.createNote(anonymous); @@ -238,7 +242,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { waitForFinish(p); assertEquals(Status.FINISHED, p.getStatus()); assertEquals(InterpreterResult.Type.TABLE, p.getResult().message().get(0).getType()); - // TODO (zjffdu), one more \n is appended, need to investigate why. + // TODO(zjffdu), one more \n is appended, need to investigate why. assertEquals("age\tid\n20\t1\n", p.getResult().message().get(0).getData()); // test udf @@ -252,7 +256,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { // test exception p = note.addNewParagraph(anonymous); - /** + /* %pyspark a=1 @@ -536,8 +540,8 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p1.setText("%spark z.angularBind(\"name\", \"world\")"); note.run(p1.getId(), true); assertEquals(Status.FINISHED, p1.getStatus()); - List<AngularObject> angularObjects = - p1.getBindedInterpreter().getInterpreterGroup().getAngularObjectRegistry().getAll(note.getId(), null); + List<AngularObject> angularObjects = p1.getBindedInterpreter().getInterpreterGroup() + .getAngularObjectRegistry().getAll(note.getId(), null); assertEquals(1, angularObjects.size()); assertEquals("name", angularObjects.get(0).getName()); assertEquals("world", angularObjects.get(0).get()); @@ -547,8 +551,8 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p2.setText("%spark z.angularUnbind(\"name\")"); note.run(p2.getId(), true); assertEquals(Status.FINISHED, p2.getStatus()); - angularObjects = - p1.getBindedInterpreter().getInterpreterGroup().getAngularObjectRegistry().getAll(note.getId(), null); + angularObjects = p1.getBindedInterpreter().getInterpreterGroup().getAngularObjectRegistry() + .getAll(note.getId(), null); assertEquals(0, angularObjects.size()); // add global angular object @@ -556,8 +560,8 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p3.setText("%spark z.angularBindGlobal(\"name2\", \"world2\")"); note.run(p3.getId(), true); assertEquals(Status.FINISHED, p3.getStatus()); - List<AngularObject> globalAngularObjects = - p3.getBindedInterpreter().getInterpreterGroup().getAngularObjectRegistry().getAll(null, null); + List<AngularObject> globalAngularObjects = p3.getBindedInterpreter().getInterpreterGroup() + .getAngularObjectRegistry().getAll(null, null); assertEquals(1, globalAngularObjects.size()); assertEquals("name2", globalAngularObjects.get(0).getName()); assertEquals("world2", globalAngularObjects.get(0).get()); @@ -567,8 +571,8 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi { p4.setText("%spark z.angularUnbindGlobal(\"name2\")"); note.run(p4.getId(), true); assertEquals(Status.FINISHED, p4.getStatus()); - globalAngularObjects = - p4.getBindedInterpreter().getInterpreterGroup().getAngularObjectRegistry().getAll(note.getId(), null); + globalAngularObjects = p4.getBindedInterpreter().getInterpreterGroup() + .getAngularObjectRegistry().getAll(note.getId(), null); assertEquals(0, globalAngularObjects.size()); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/security/DirAccessTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/security/DirAccessTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/security/DirAccessTest.java index b8d5b20..dc281bc 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/security/DirAccessTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/security/DirAccessTest.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.zeppelin.security; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; +import org.junit.Test; + import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.rest.AbstractTestRestApi; -import org.junit.Test; public class DirAccessTest extends AbstractTestRestApi { - @Test public void testDirAccessForbidden() throws Exception { synchronized (this) { - System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED.getVarName(), "false"); + System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED + .getVarName(), "false"); AbstractTestRestApi.startUp(DirAccessTest.class.getSimpleName()); HttpClient httpClient = new HttpClient(); GetMethod getMethod = new GetMethod(getUrlToTest() + "/app/"); @@ -42,7 +42,8 @@ public class DirAccessTest extends AbstractTestRestApi { @Test public void testDirAccessOk() throws Exception { synchronized (this) { - System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED.getVarName(), "true"); + System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED + .getVarName(), "true"); AbstractTestRestApi.startUp(DirAccessTest.class.getSimpleName()); HttpClient httpClient = new HttpClient(); GetMethod getMethod = new GetMethod(getUrlToTest() + "/app/"); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java index 1527816..ac6f168 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/security/SecurityUtilsTest.java @@ -16,28 +16,31 @@ */ package org.apache.zeppelin.security; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import org.apache.commons.configuration.ConfigurationException; -import org.apache.zeppelin.conf.ZeppelinConfiguration; -import org.apache.zeppelin.utils.SecurityUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import sun.security.acl.PrincipalImpl; +import java.net.InetAddress; import java.net.URISyntaxException; import java.net.UnknownHostException; -import java.net.InetAddress; + +import sun.security.acl.PrincipalImpl; + +import org.apache.zeppelin.conf.ZeppelinConfiguration; +import org.apache.zeppelin.utils.SecurityUtils; @RunWith(PowerMockRunner.class) @PrepareForTest(org.apache.shiro.SecurityUtils.class) public class SecurityUtilsTest { - @Mock org.apache.shiro.subject.Subject subject; @@ -47,7 +50,8 @@ public class SecurityUtilsTest { } @Test - public void isInvalidFromConfig() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void isInvalidFromConfig() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertFalse(SecurityUtils.isValidOrigin("http://otherinvalidhost.com";, new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml")))); } @@ -65,42 +69,47 @@ public class SecurityUtilsTest { } @Test - public void isValidFromConfig() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void isValidFromConfig() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertTrue(SecurityUtils.isValidOrigin("http://otherhost.com";, new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml")))); } @Test - public void isValidFromStar() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void isValidFromStar() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertTrue(SecurityUtils.isValidOrigin("http://anyhost.com";, new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site-star.xml")))); } @Test - public void nullOrigin() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void nullOrigin() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertFalse(SecurityUtils.isValidOrigin(null, new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml")))); } @Test - public void nullOriginWithStar() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void nullOriginWithStar() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertTrue(SecurityUtils.isValidOrigin(null, new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site-star.xml")))); } @Test - public void emptyOrigin() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void emptyOrigin() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertFalse(SecurityUtils.isValidOrigin("", new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml")))); } @Test - public void notAURIOrigin() throws URISyntaxException, UnknownHostException, ConfigurationException { + public void notAURIOrigin() + throws URISyntaxException, UnknownHostException, ConfigurationException { assertFalse(SecurityUtils.isValidOrigin("test123", new ZeppelinConfiguration(this.getClass().getResource("/zeppelin-site.xml")))); } - @Test public void canGetPrincipalName() { String expectedName = "java.security.Principal.getName()"; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java index 7ee9951..ff713ea 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java @@ -16,75 +16,76 @@ */ package org.apache.zeppelin.server; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.junit.Assert; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import java.io.IOException; + import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.*; - /** - * Basic CORS REST API tests + * Basic CORS REST API tests. */ public class CorsFilterTest { + public static String[] headers = new String[8]; + public static Integer count = 0; - public static String[] headers = new String[8]; - public static Integer count = 0; - - @Test - @SuppressWarnings("rawtypes") - public void ValidCorsFilterTest() throws IOException, ServletException { - CorsFilter filter = new CorsFilter(); - HttpServletResponse mockResponse = mock(HttpServletResponse.class); - FilterChain mockedFilterChain = mock(FilterChain.class); - HttpServletRequest mockRequest = mock(HttpServletRequest.class); - when(mockRequest.getHeader("Origin")).thenReturn("http://localhost:8080";); - when(mockRequest.getMethod()).thenReturn("Empty"); - when(mockRequest.getServerName()).thenReturn("localhost"); - count = 0; + @Test + @SuppressWarnings("rawtypes") + public void validCorsFilterTest() throws IOException, ServletException { + CorsFilter filter = new CorsFilter(); + HttpServletResponse mockResponse = mock(HttpServletResponse.class); + FilterChain mockedFilterChain = mock(FilterChain.class); + HttpServletRequest mockRequest = mock(HttpServletRequest.class); + when(mockRequest.getHeader("Origin")).thenReturn("http://localhost:8080";); + when(mockRequest.getMethod()).thenReturn("Empty"); + when(mockRequest.getServerName()).thenReturn("localhost"); + count = 0; - doAnswer(new Answer() { - @Override - public Object answer(InvocationOnMock invocationOnMock) throws Throwable { - headers[count] = invocationOnMock.getArguments()[1].toString(); - count++; - return null; - } - }).when(mockResponse).setHeader(anyString(), anyString()); + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocationOnMock) throws Throwable { + headers[count] = invocationOnMock.getArguments()[1].toString(); + count++; + return null; + } + }).when(mockResponse).setHeader(anyString(), anyString()); - filter.doFilter(mockRequest, mockResponse, mockedFilterChain); - Assert.assertTrue(headers[0].equals("http://localhost:8080";)); - } + filter.doFilter(mockRequest, mockResponse, mockedFilterChain); + Assert.assertTrue(headers[0].equals("http://localhost:8080";)); + } - @Test - @SuppressWarnings("rawtypes") - public void InvalidCorsFilterTest() throws IOException, ServletException { - CorsFilter filter = new CorsFilter(); - HttpServletResponse mockResponse = mock(HttpServletResponse.class); - FilterChain mockedFilterChain = mock(FilterChain.class); - HttpServletRequest mockRequest = mock(HttpServletRequest.class); - when(mockRequest.getHeader("Origin")).thenReturn("http://evillocalhost:8080";); - when(mockRequest.getMethod()).thenReturn("Empty"); - when(mockRequest.getServerName()).thenReturn("evillocalhost"); + @Test + @SuppressWarnings("rawtypes") + public void invalidCorsFilterTest() throws IOException, ServletException { + CorsFilter filter = new CorsFilter(); + HttpServletResponse mockResponse = mock(HttpServletResponse.class); + FilterChain mockedFilterChain = mock(FilterChain.class); + HttpServletRequest mockRequest = mock(HttpServletRequest.class); + when(mockRequest.getHeader("Origin")).thenReturn("http://evillocalhost:8080";); + when(mockRequest.getMethod()).thenReturn("Empty"); + when(mockRequest.getServerName()).thenReturn("evillocalhost"); - doAnswer(new Answer() { - @Override - public Object answer(InvocationOnMock invocationOnMock) throws Throwable { - headers[count] = invocationOnMock.getArguments()[1].toString(); - count++; - return null; - } - }).when(mockResponse).setHeader(anyString(), anyString()); + doAnswer(new Answer() { + @Override + public Object answer(InvocationOnMock invocationOnMock) throws Throwable { + headers[count] = invocationOnMock.getArguments()[1].toString(); + count++; + return null; + } + }).when(mockResponse).setHeader(anyString(), anyString()); - filter.doFilter(mockRequest, mockResponse, mockedFilterChain); - Assert.assertTrue(headers[0].equals("")); - } + filter.doFilter(mockRequest, mockResponse, mockedFilterChain); + Assert.assertTrue(headers[0].equals("")); + } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java index 0b68ca6..68c206b 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java @@ -16,8 +16,37 @@ */ package org.apache.zeppelin.socket; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import static java.util.Arrays.asList; + import com.google.gson.Gson; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.HashSet; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + import org.apache.zeppelin.display.AngularObject; import org.apache.zeppelin.display.AngularObjectBuilder; import org.apache.zeppelin.display.AngularObjectRegistry; @@ -33,26 +62,9 @@ import org.apache.zeppelin.rest.AbstractTestRestApi; import org.apache.zeppelin.scheduler.Job; import org.apache.zeppelin.server.ZeppelinServer; import org.apache.zeppelin.user.AuthenticationInfo; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import javax.servlet.http.HttpServletRequest; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.HashSet; -import java.util.List; - -import static java.util.Arrays.asList; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - /** - * Basic REST API tests for notebookServer + * Basic REST API tests for notebookServer. */ public class NotebookServerTest extends AbstractTestRestApi { private static Notebook notebook; @@ -96,13 +108,15 @@ public class NotebookServerTest extends AbstractTestRestApi { } @Test - public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() throws IOException, InterruptedException { + public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() + throws IOException, InterruptedException { // create a notebook Note note1 = notebook.createNote(anonymous); // get reference to interpreterGroup InterpreterGroup interpreterGroup = null; - List<InterpreterSetting> settings = notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId()); + List<InterpreterSetting> settings = notebook.getInterpreterSettingManager() + .getInterpreterSettings(note1.getId()); for (InterpreterSetting setting : settings) { if (setting.getName().equals("md")) { interpreterGroup = setting.getOrCreateInterpreterGroup("anonymous", "sharedProcess"); @@ -117,7 +131,7 @@ public class NotebookServerTest extends AbstractTestRestApi { note1.run(p1.getId()); // wait for paragraph finished - while(true) { + while (true) { if (p1.getStatus() == Job.Status.FINISHED) { break; } @@ -182,7 +196,8 @@ public class NotebookServerTest extends AbstractTestRestApi { assertNotEquals(null, notebook.getNote(note.getId())); assertEquals("Test Zeppelin notebook import", notebook.getNote(note.getId()).getName()); - assertEquals("Test paragraphs import", notebook.getNote(note.getId()).getParagraphs().get(0).getText()); + assertEquals("Test paragraphs import", notebook.getNote(note.getId()).getParagraphs().get(0) + .getText()); notebook.removeNote(note.getId(), anonymous); } @@ -205,16 +220,17 @@ public class NotebookServerTest extends AbstractTestRestApi { final Paragraph paragraph = mock(Paragraph.class, RETURNS_DEEP_STUBS); when(note.getParagraph("paragraphId")).thenReturn(paragraph); - final RemoteAngularObjectRegistry mdRegistry = mock(RemoteAngularObjectRegistry.class); final InterpreterGroup mdGroup = new InterpreterGroup("mdGroup"); mdGroup.setAngularObjectRegistry(mdRegistry); when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup); - final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", "paragraphId"); + final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", + "paragraphId"); - when(mdRegistry.addAndNotifyRemoteProcess(varName, value, "noteId", "paragraphId")).thenReturn(ao1); + when(mdRegistry.addAndNotifyRemoteProcess(varName, value, "noteId", "paragraphId")) + .thenReturn(ao1); NotebookSocket conn = mock(NotebookSocket.class); NotebookSocket otherConn = mock(NotebookSocket.class); @@ -260,8 +276,8 @@ public class NotebookServerTest extends AbstractTestRestApi { when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup); - - final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", "paragraphId"); + final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", + "paragraphId"); when(mdRegistry.add(varName, value, "noteId", "paragraphId")).thenReturn(ao1); @@ -306,7 +322,8 @@ public class NotebookServerTest extends AbstractTestRestApi { when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup); - final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", "paragraphId"); + final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", + "paragraphId"); when(mdRegistry.removeAndNotifyRemoteProcess(varName, "noteId", "paragraphId")).thenReturn(ao1); NotebookSocket conn = mock(NotebookSocket.class); NotebookSocket otherConn = mock(NotebookSocket.class); @@ -351,7 +368,8 @@ public class NotebookServerTest extends AbstractTestRestApi { when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup); - final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", "paragraphId"); + final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId", + "paragraphId"); when(mdRegistry.remove(varName, "noteId", "paragraphId")).thenReturn(ao1); @@ -419,6 +437,4 @@ public class NotebookServerTest extends AbstractTestRestApi { when(sock.getRequest()).thenReturn(mockRequest); return sock; } - } - http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/java/org/apache/zeppelin/ticket/TicketContainerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ticket/TicketContainerTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ticket/TicketContainerTest.java index 91d2cb3..02f48f7 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ticket/TicketContainerTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ticket/TicketContainerTest.java @@ -14,48 +14,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.zeppelin.ticket; -import org.junit.Before; -import org.junit.Test; - -import java.net.UnknownHostException; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + public class TicketContainerTest { private TicketContainer container; @Before - public void setUp() throws Exception { + public void setUp() { container = TicketContainer.instance; } @Test - public void isValidAnonymous() throws UnknownHostException { + public void isValidAnonymous() { boolean ok = container.isValid("anonymous", "anonymous"); assertTrue(ok); } @Test - public void isValidExistingPrincipal() throws UnknownHostException { + public void isValidExistingPrincipal() { String ticket = container.getTicket("someuser1"); boolean ok = container.isValid("someuser1", ticket); assertTrue(ok); } @Test - public void isValidNonExistingPrincipal() throws UnknownHostException { + public void isValidNonExistingPrincipal() { boolean ok = container.isValid("unknownuser", "someticket"); assertFalse(ok); } @Test - public void isValidunkownTicket() throws UnknownHostException { + public void isValidunkownTicket() { String ticket = container.getTicket("someuser2"); - boolean ok = container.isValid("someuser2", ticket+"makeitinvalid"); + boolean ok = container.isValid("someuser2", ticket + "makeitinvalid"); assertFalse(ok); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1add74b4/zeppelin-server/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/resources/log4j.properties b/zeppelin-server/src/test/resources/log4j.properties index ce9bc50..2bf5837 100644 --- a/zeppelin-server/src/test/resources/log4j.properties +++ b/zeppelin-server/src/test/resources/log4j.properties @@ -41,4 +41,4 @@ log4j.logger.DataNucleus.Datastore=ERROR # Log all JDBC parameters log4j.logger.org.hibernate.type=ALL -log4j.logger.org.apache.hadoop=WARN \ No newline at end of file +log4j.logger.org.apache.hadoop=WARN
