Repository: zeppelin Updated Branches: refs/heads/branch-0.8 4a8735530 -> ec9c231b0
[HOTFIX] Fix CI on branch-0.8 The build is broken in branch-0.8 after the merge of https://github.com/apache/zeppelin/pull/3117 (ZEPPELIN-3691). This is to fix that. Along with above this fixes the checkstyle violation in UniverseUtil.java[235] (LineLength) [Hot Fix] * CI should be green * Does the licenses files need update? N/A * Is there breaking changes for older versions? N/A * Does this needs documentation? N/A Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Closes #3187 from prabhjyotsingh/hotfix/ZEPPELIN-3691 and squashes the following commits: a677568 [Prabhjyot Singh] Checkstyle violation in UniverseUtil.java[235] (sizes) LineLength b2ebada [Prabhjyot Singh] fix CI in branch-0.8 Change-Id: I3720bd45093997752e8286299cd29a4826d0897e Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ec9c231b Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ec9c231b Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ec9c231b Branch: refs/heads/branch-0.8 Commit: ec9c231b0bbefd3343ac7b34909c675b7ef5d652 Parents: 4a87355 Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Authored: Tue Sep 25 15:23:57 2018 +0530 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Wed Sep 26 09:09:55 2018 +0530 ---------------------------------------------------------------------- .../java/org/apache/zeppelin/sap/universe/UniverseUtil.java | 3 ++- .../main/java/org/apache/zeppelin/notebook/Notebook.java | 2 +- .../java/org/apache/zeppelin/notebook/NotebookTest.java | 9 +++------ 3 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ec9c231b/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java ---------------------------------------------------------------------- diff --git a/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java b/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java index 6f24639..5ccf331 100644 --- a/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java +++ b/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java @@ -232,7 +232,8 @@ public class UniverseUtil { continue; } if (pathClosed && singleQuoteClosed && c == ',') { - select.append(parseResultObj(resultObj.toString().replaceAll("(?i)distinc", ""), nodeInfos)); + select.append(parseResultObj(resultObj.toString().replaceAll("(?i)distinc", ""), + nodeInfos)); resultObj = new StringBuilder(); } else { resultObj.append(c); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ec9c231b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java index 0a4b494..59ac45b 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java @@ -84,7 +84,7 @@ public class Notebook implements NoteEventListener { private final FolderView folders = new FolderView(); private ZeppelinConfiguration conf; private StdSchedulerFactory quertzSchedFact; - private org.quartz.Scheduler quartzSched; + org.quartz.Scheduler quartzSched; private JobListenerFactory jobListenerFactory; private NotebookRepo notebookRepo; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ec9c231b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java index 6167513..dc9e470 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java @@ -46,10 +46,7 @@ import org.apache.zeppelin.user.Credentials; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.runner.JUnitCore; -import org.junit.runner.Request; -import org.junit.runner.Result; -import org.mockito.internal.runners.JUnit44RunnerImpl; +import org.quartz.JobKey; import org.quartz.SchedulerException; import org.quartz.impl.matchers.GroupMatcher; import org.slf4j.Logger; @@ -701,9 +698,9 @@ public class NotebookTest extends AbstractInterpreterTest implements JobListener config.put("cron", "* * * * * ?"); note.setConfig(config); - final int jobsBeforeRefresh = notebook.quartzSched.getJobKeys(GroupMatcher.anyGroup()).size(); + final int jobsBeforeRefresh = notebook.quartzSched.getJobKeys(GroupMatcher.<JobKey>anyGroup()).size(); notebook.refreshCron(note.getId()); - final int jobsAfterRefresh = notebook.quartzSched.getJobKeys(GroupMatcher.anyGroup()).size(); + final int jobsAfterRefresh = notebook.quartzSched.getJobKeys(GroupMatcher.<JobKey>anyGroup()).size(); assertEquals(jobsBeforeRefresh, jobsAfterRefresh);
