[ZEPPELIN-1549] Change NotebookID variable name to NoteID ### What is this PR for? This PR fixes wrong written NotebookID to NoteID.
### What type of PR is it? [Improvement] ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1549 ### Questions: * Does the licenses files need update? No. * Is there breaking changes for older versions? No. * Does this needs documentation? No Author: hyonzin <[email protected]> Author: ì íì§ <[email protected]> Author: Mina Lee <[email protected]> Closes #1518 from hyonzin/ZEPPELIN-1549 and squashes the following commits: 2c5d461 [hyonzin] fix pullNoteID to pullNoteId f843abd [hyonzin] Fix missed line 22aecb3 [hyonzin] Merge branch 'master' of https://github.com/apache/zeppelin into ZEPPELIN-1549 ac03666 [ì íì§] Merge pull request #1 from minahlee/ZEPPELIN-1549 8b3fffd [Mina Lee] Change notebook to note and fix indentation 000605f [hyonzin] Change clonedNotebookId to clonedNoteId 496695c [hyonzin] Change noteID to noteId 1e87463 [hyonzin] Remove tab indent 5647d37 [hyonzin] Rebase and solve conflicts 09bacd8 [hyonzin] Fix more lines unchanged 070bc2d [hyonzin] fix more in ZeppelinRestApiTest.java 24822a3 [hyonzin] Fix more code not changed (notebookIndex to noteSearchService) 4b4e1e8 [hyonzin] Fix detail (function's name) & Change some placeholder 429203d [hyonzin] Fix details & convention to camel 5fa270d [hyonzin] pull upstream master & fix some details 294bea5 [hyonzin] Fix some wrong written term: Notebook -> Note cc0d315 [hyonzin] Change NotebookID variable name to NoteID Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4f6a0e34 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4f6a0e34 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4f6a0e34 Branch: refs/heads/master Commit: 4f6a0e34ffd17c38326e873c89062c62ede1b053 Parents: ba5a2d8 Author: hyonzin <[email protected]> Authored: Mon Oct 24 20:26:33 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Tue Oct 25 14:51:07 2016 +0900 ---------------------------------------------------------------------- docs/install/install.md | 4 +- docs/install/virtual_machine.md | 2 +- docs/manual/notebookashomepage.md | 28 +-- docs/rest-api/rest-notebook.md | 114 ++++----- .../apache/zeppelin/lens/LensInterpreter.java | 2 +- scripts/vagrant/zeppelin-dev/README.md | 2 +- .../angular/notebookscope/AngularElem.scala | 2 +- .../angular/paragraphscope/AngularElem.scala | 2 +- .../apache/zeppelin/rest/NotebookRestApi.java | 239 +++++++++---------- .../zeppelin/rest/message/NewNoteRequest.java | 44 ++++ .../rest/message/NewNotebookRequest.java | 44 ---- .../apache/zeppelin/server/ZeppelinServer.java | 9 +- .../apache/zeppelin/socket/NotebookServer.java | 118 ++++----- .../org/apache/zeppelin/AbstractZeppelinIT.java | 2 +- .../zeppelin/integration/AuthenticationIT.java | 8 +- .../apache/zeppelin/integration/ZeppelinIT.java | 2 +- .../zeppelin/rest/NotebookRestApiTest.java | 12 +- .../zeppelin/rest/ZeppelinRestApiTest.java | 200 ++++++++-------- .../zeppelin/socket/NotebookServerTest.java | 2 +- zeppelin-web/src/app/home/home.controller.js | 10 +- zeppelin-web/src/app/home/home.html | 8 +- .../src/app/jobmanager/jobmanager.controller.js | 22 +- zeppelin-web/src/app/jobmanager/jobmanager.html | 2 +- .../src/app/jobmanager/jobs/job-control.html | 6 +- .../app/jobmanager/jobs/job-progressBar.html | 4 +- zeppelin-web/src/app/jobmanager/jobs/job.html | 20 +- .../src/app/notebook/notebook-actionBar.html | 12 +- .../src/app/notebook/notebook.controller.js | 22 +- .../arrayOrderingSrv/arrayOrdering.service.js | 2 +- .../components/navbar/navbar-noteList-elem.html | 36 +++ .../navbar/navbar-notebookList-elem.html | 36 --- .../src/components/navbar/navbar.controller.js | 16 +- zeppelin-web/src/components/navbar/navbar.html | 8 +- .../noteListDataFactory/noteList.datafactory.js | 69 ++++++ .../noteName-create/notename.controller.js | 10 +- .../notenameImport.controller.js | 2 +- .../notebookList.datafactory.js | 69 ------ .../websocketEvents/websocketEvents.factory.js | 8 +- .../websocketEvents/websocketMsg.service.js | 40 ++-- zeppelin-web/src/index.html | 2 +- zeppelin-web/test/spec/controllers/notebook.js | 4 +- zeppelin-web/test/spec/controllers/notename.js | 8 +- zeppelin-web/test/spec/factory/noteList.js | 79 ++++++ zeppelin-web/test/spec/factory/notebookList.js | 79 ------ .../org/apache/zeppelin/notebook/Notebook.java | 127 +++++----- .../zeppelin/notebook/repo/NotebookRepo.java | 2 +- .../notebook/repo/NotebookRepoSync.java | 42 ++-- .../zeppelin/notebook/socket/Message.java | 14 +- .../apache/zeppelin/search/SearchService.java | 6 +- .../apache/zeppelin/notebook/NotebookTest.java | 4 +- .../zeppelin/search/LuceneSearchTest.java | 51 ++-- 51 files changed, 824 insertions(+), 832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/docs/install/install.md ---------------------------------------------------------------------- diff --git a/docs/install/install.md b/docs/install/install.md index 7ae0d90..e14fc7c 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -311,13 +311,13 @@ You can configure Apache Zeppelin with either **environment variables** in `conf <td>ZEPPELIN_NOTEBOOK_HOMESCREEN</td> <td>zeppelin.notebook.homescreen</td> <td></td> - <td>Display notebook IDs on the Apache Zeppelin homescreen <br />i.e. 2A94M5J1Z</td> + <td>Display note IDs on the Apache Zeppelin homescreen <br />i.e. 2A94M5J1Z</td> </tr> <tr> <td>ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE</td> <td>zeppelin.notebook.homescreen.hide</td> <td>false</td> - <td>Hide the notebook ID set by <code>ZEPPELIN_NOTEBOOK_HOMESCREEN</code> on the Apache Zeppelin homescreen. <br />For the further information, please read <a href="../manual/notebookashomepage.html">Customize your Zeppelin homepage</a>.</td> + <td>Hide the note ID set by <code>ZEPPELIN_NOTEBOOK_HOMESCREEN</code> on the Apache Zeppelin homescreen. <br />For the further information, please read <a href="../manual/notebookashomepage.html">Customize your Zeppelin homepage</a>.</td> </tr> <tr> <td>ZEPPELIN_WAR_TEMPDIR</td> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/docs/install/virtual_machine.md ---------------------------------------------------------------------- diff --git a/docs/install/virtual_machine.md b/docs/install/virtual_machine.md index d30dbb8..6456bc5 100644 --- a/docs/install/virtual_machine.md +++ b/docs/install/virtual_machine.md @@ -163,7 +163,7 @@ import matplotlib.pyplot as plt import numpy as np import StringIO -# clear out any previous plots on this notebook +# clear out any previous plots on this note plt.clf() def show(p): http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/docs/manual/notebookashomepage.md ---------------------------------------------------------------------- diff --git a/docs/manual/notebookashomepage.md b/docs/manual/notebookashomepage.md index 1fadcce..729f324 100644 --- a/docs/manual/notebookashomepage.md +++ b/docs/manual/notebookashomepage.md @@ -1,7 +1,7 @@ --- layout: page title: "Customize Apache Zeppelin homepage" -description: "Apache Zeppelin allows you to use one of the notebooks you create as your Zeppelin Homepage. With that you can brand your Zeppelin installation, adjust the instruction to your users needs and even translate to other languages." +description: "Apache Zeppelin allows you to use one of the notes you create as your Zeppelin Homepage. With that you can brand your Zeppelin installation, adjust the instruction to your users needs and even translate to other languages." group: manual --- <!-- @@ -23,37 +23,37 @@ limitations under the License. <div id="toc"></div> -Apache Zeppelin allows you to use one of the notebooks you create as your Zeppelin Homepage. +Apache Zeppelin allows you to use one of the notes you create as your Zeppelin Homepage. With that you can brand your Zeppelin installation, adjust the instruction to your users needs and even translate to other languages. -## How to set a notebook as your Zeppelin homepage +## How to set a note as your Zeppelin homepage The process for creating your homepage is very simple as shown below: -1. Create a notebook using Zeppelin -2. Set the notebook id in the config file +1. Create a note using Zeppelin +2. Set the note id in the config file 3. Restart Zeppelin -### Create a notebook using Zeppelin -Create a new notebook using Zeppelin, +### Create a note using Zeppelin +Create a new note using Zeppelin, you can use ```%md``` interpreter for markdown content or any other interpreter you like. You can also use the display system to generate [text](../displaysystem/basicdisplaysystem.html#text), [html](../displaysystem/basicdisplaysystem.html#html), [table](../displaysystem/basicdisplaysystem.html#table) or Angular ([backend API](../displaysystem/back-end-angular.html), [frontend API](../displaysystem/front-end-angular.html)). -Run (shift+Enter) the notebook and see the output. Optionally, change the notebook view to report to hide +Run (shift+Enter) the note and see the output. Optionally, change the note view to report to hide the code sections. -### Set the notebook id in the config file -To set the notebook id in the config file, you should copy it from the last word in the notebook url. +### Set the note id in the config file +To set the note id in the config file, you should copy it from the last word in the note url. For example, <img src="/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png" width="400px" /> -Set the notebook id to the ```ZEPPELIN_NOTEBOOK_HOMESCREEN``` environment variable +Set the note id to the ```ZEPPELIN_NOTEBOOK_HOMESCREEN``` environment variable or ```zeppelin.notebook.homescreen``` property. You can also set the ```ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE``` environment variable -or ```zeppelin.notebook.homescreen.hide``` property to hide the new notebook from the notebook list. +or ```zeppelin.notebook.homescreen.hide``` property to hide the new note from the note list. ### Restart Zeppelin Restart your Zeppelin server @@ -89,7 +89,7 @@ println( """) ``` -After running the notebook you will see output similar to this one: +After running the note you will see output similar to this one: <img src="/assets/themes/zeppelin/img/screenshots/homepage_notebook_list.png" /> The main trick here relays in linking the ```<div>``` to the controller: @@ -99,4 +99,4 @@ The main trick here relays in linking the ```<div>``` to the controller: ``` Once we have ```home``` as our controller variable in our ```<div></div>``` -we can use ```home.notes.list``` to get access to the notebook list. +we can use ```home.notes.list``` to get access to the note list. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/docs/rest-api/rest-notebook.md ---------------------------------------------------------------------- diff --git a/docs/rest-api/rest-notebook.md b/docs/rest-api/rest-notebook.md index ed39a4f..f77e710 100644 --- a/docs/rest-api/rest-notebook.md +++ b/docs/rest-api/rest-notebook.md @@ -35,13 +35,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple Notebooks REST API supports the following operations: List, Create, Get, Delete, Clone, Run, Export, Import as detailed in the following tables. -### List of the notebooks +### List of the notes <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method lists the available notebooks on your server. - Notebook JSON contains the ```name``` and ```id``` of all notebooks. + <td>This ```GET``` method lists the available notes on your server. + Notebook JSON contains the ```name``` and ```id``` of all notes. </td> </tr> <tr> @@ -77,13 +77,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br/> -### Create a new notebook +### Create a new note <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method creates a new notebook using the given name or default name if none given. - The body field of the returned JSON contains the new notebook id. + <td>This ```POST``` method creates a new note using the given name or default name if none given. + The body field of the returned JSON contains the new note id. </td> </tr> <tr> @@ -100,13 +100,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </tr> <tr> <td> sample JSON input (without paragraphs) </td> - <td><pre>{"name": "name of new notebook"}</pre></td> + <td><pre>{"name": "name of new note"}</pre></td> </tr> <tr> <td> sample JSON input (with initial paragraphs) </td> <td><pre> { - "name": "name of new notebook", + "name": "name of new note", "paragraphs": [ { "title": "paragraph title1", @@ -131,18 +131,18 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br/> -### Get an existing notebook information +### Get an existing note information <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method retrieves an existing notebook's information using the given id. - The body field of the returned JSON contain information about paragraphs in the notebook. + <td>This ```GET``` method retrieves an existing note's information using the given id. + The body field of the returned JSON contain information about paragraphs in the note. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -228,17 +228,17 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br/> -### Delete a notebook +### Delete a note <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```DELETE``` method deletes a notebook by the given notebook id. + <td>This ```DELETE``` method deletes a note by the given note id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -255,19 +255,19 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br/> -### Clone a notebook +### Clone a note <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method clones a notebook by the given id and create a new notebook using the given name + <td>This ```POST``` method clones a note by the given id and create a new note using the given name or default name if none given. - The body field of the returned JSON contains the new notebook id. + The body field of the returned JSON contains the new note id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -279,7 +279,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </tr> <tr> <td> sample JSON input </td> - <td><pre>{"name": "name of new notebook"}</pre></td> + <td><pre>{"name": "name of new note"}</pre></td> </tr> <tr> <td> sample JSON response </td> @@ -299,14 +299,14 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <tr> <td>Description</td> <td> - This ```POST``` method runs all paragraphs in the given notebook id. <br /> - If you can not find Notebook id 404 returns. + This ```POST``` method runs all paragraphs in the given note id. <br /> + If you can not find Note id 404 returns. If there is a problem with the interpreter returns a 412 error. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -345,12 +345,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```DELETE``` method stops all paragraphs in the given notebook id. + <td>This ```DELETE``` method stops all paragraphs in the given note id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -372,13 +372,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method gets the status of all paragraphs by the given notebook id. + <td>This ```GET``` method gets the status of all paragraphs by the given note id. The body field of the returned JSON contains of the array that compose of the paragraph id, paragraph status, paragraph finish date, paragraph started date. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -418,13 +418,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method gets the status of a single paragraph by the given notebook and paragraph id. + <td>This ```GET``` method gets the status of a single paragraph by the given note and paragraph id. The body field of the returned JSON contains of the array that compose of the paragraph id, paragraph status, paragraph finish date, paragraph started date. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -455,12 +455,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method runs the paragraph asynchronously by given notebook and paragraph id. This API always return SUCCESS even if the execution of the paragraph fails later because the API is asynchronous + <td>This ```POST``` method runs the paragraph asynchronously by given note and paragraph id. This API always return SUCCESS even if the execution of the paragraph fails later because the API is asynchronous </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -474,7 +474,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <td> sample JSON input (optional, only needed when if you want to update dynamic form's value) </td> <td><pre> { - "name": "name of new notebook", + "name": "name of new note", "params": { "formLabel1": "value1", "formLabel2": "value2" @@ -493,12 +493,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td> This ```POST``` method runs the paragraph synchronously by given notebook and paragraph id. This API can return SUCCESS or ERROR depending on the outcome of the paragraph execution + <td> This ```POST``` method runs the paragraph synchronously by given note and paragraph id. This API can return SUCCESS or ERROR depending on the outcome of the paragraph execution </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -512,7 +512,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <td> sample JSON input (optional, only needed when if you want to update dynamic form's value) </td> <td><pre> { - "name": "name of new notebook", + "name": "name of new note", "params": { "formLabel1": "value1", "formLabel2": "value2" @@ -543,12 +543,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```DELETE``` method stops the paragraph by given notebook and paragraph id. + <td>This ```DELETE``` method stops the paragraph by given note and paragraph id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[notebookId]/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/job/[noteId]/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -570,12 +570,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method adds cron job by the given notebook id. + <td>This ```POST``` method adds cron job by the given note id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -587,7 +587,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </tr> <tr> <td> sample JSON input </td> - <td><pre>{"cron": "cron expression of notebook"}</pre></td> + <td><pre>{"cron": "cron expression of note"}</pre></td> </tr> <tr> <td> sample JSON response </td> @@ -602,12 +602,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```DELETE``` method removes cron job by the given notebook id. + <td>This ```DELETE``` method removes cron job by the given note id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -630,13 +630,13 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method gets cron job expression of given notebook id. + <td>This ```GET``` method gets cron job expression of given note id. The body field of the returned JSON contains the cron expression. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/cron/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -653,7 +653,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br /> -### Full text search through the paragraphs in all notebooks +### Full text search through the paragraphs in all notes <table class="table-configuration"> <col width="200"> <tr> @@ -681,7 +681,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple "body": [ { "id": "<noteId>/paragraph/<paragraphId>", - "name":"Notebook Name", + "name":"Note Name", "snippet":"", "text":"" } @@ -702,7 +702,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]/paragraph```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]/paragraph```</td> </tr> <tr> <td>Success code</td> @@ -752,7 +752,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]/paragraph/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]/paragraph/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -814,12 +814,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method moves a paragraph to the specific index (order) from the notebook. + <td>This ```POST``` method moves a paragraph to the specific index (order) from the note. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]/paragraph/[paragraphId]/move/[newIndex]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]/paragraph/[paragraphId]/move/[newIndex]```</td> </tr> <tr> <td>Success code</td> @@ -842,12 +842,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple <col width="200"> <tr> <td>Description</td> - <td>This ```DELETE``` method deletes a paragraph by the given notebook and paragraph id. + <td>This ```DELETE``` method deletes a paragraph by the given note and paragraph id. </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[notebookId]/paragraph/[paragraphId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/[noteId]/paragraph/[paragraphId]```</td> </tr> <tr> <td>Success code</td> @@ -864,17 +864,17 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br /> -### Export a notebook +### Export a note <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```GET``` method exports a notebook by the given id and gernerates a JSON + <td>This ```GET``` method exports a note by the given id and gernerates a JSON </td> </tr> <tr> <td>URL</td> - <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/export/[notebookId]```</td> + <td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/export/[noteId]```</td> </tr> <tr> <td>Success code</td> @@ -914,12 +914,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple </table> <br /> -### Import a notebook +### Import a note <table class="table-configuration"> <col width="200"> <tr> <td>Description</td> - <td>This ```POST``` method imports a notebook from the notebook JSON input + <td>This ```POST``` method imports a note from the note JSON input </td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java ---------------------------------------------------------------------- diff --git a/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java b/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java index 30e1983..d270fcd 100644 --- a/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java +++ b/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java @@ -76,7 +76,7 @@ public class LensInterpreter extends Interpreter { private static Pattern s_queryExecutePattern = Pattern.compile(".*query\\s+execute\\s+(.*)"); private static Map<String, ExecutionDetail> s_paraToQH = - new ConcurrentHashMap<String, ExecutionDetail> (); //tracks paragraphID -> Lens QueryHandle + new ConcurrentHashMap<String, ExecutionDetail> (); //tracks paragraphId -> Lens QueryHandle private static Map<LensClient, Boolean> s_clientMap = new ConcurrentHashMap<LensClient, Boolean>(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/scripts/vagrant/zeppelin-dev/README.md ---------------------------------------------------------------------- diff --git a/scripts/vagrant/zeppelin-dev/README.md b/scripts/vagrant/zeppelin-dev/README.md index 9e5c9c9..fd428d6 100644 --- a/scripts/vagrant/zeppelin-dev/README.md +++ b/scripts/vagrant/zeppelin-dev/README.md @@ -140,7 +140,7 @@ import matplotlib.pyplot as plt import numpy as np import StringIO -# clear out any previous plots on this notebook +# clear out any previous plots on this note plt.clf() def show(p): http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala ---------------------------------------------------------------------- diff --git a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala b/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala index 9ba88ff..53dac43 100644 --- a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala +++ b/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala @@ -71,7 +71,7 @@ object AngularElem { } /** - * Disassociate (remove) all angular object in this notebook + * Disassociate (remove) all angular object in this note */ def disassociate() = { val ic = InterpreterContext.get http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala ---------------------------------------------------------------------- diff --git a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala b/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala index 50bd0ed..bc05017 100644 --- a/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala +++ b/zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala @@ -73,7 +73,7 @@ object AngularElem { } /** - * Disassociate (remove) all angular object in this notebook + * Disassociate (remove) all angular object in this note */ def disassociate() = { val ic = InterpreterContext.get http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java index d581404..d429d08 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java @@ -51,7 +51,7 @@ import org.apache.zeppelin.notebook.NotebookAuthorization; import org.apache.zeppelin.notebook.Paragraph; import org.apache.zeppelin.rest.message.CronRequest; import org.apache.zeppelin.types.InterpreterSettingsList; -import org.apache.zeppelin.rest.message.NewNotebookRequest; +import org.apache.zeppelin.rest.message.NewNoteRequest; import org.apache.zeppelin.rest.message.NewParagraphRequest; import org.apache.zeppelin.rest.message.RunParagraphWithParametersRequest; import org.apache.zeppelin.search.SearchService; @@ -61,7 +61,7 @@ import org.apache.zeppelin.user.AuthenticationInfo; import org.apache.zeppelin.utils.SecurityUtils; /** - * Rest api endpoint for the noteBook. + * Rest api endpoint for the notebook. */ @Path("/notebook") @Produces("application/json") @@ -70,7 +70,7 @@ public class NotebookRestApi { Gson gson = new Gson(); private Notebook notebook; private NotebookServer notebookServer; - private SearchService notebookIndex; + private SearchService noteSearchService; private NotebookAuthorization notebookAuthorization; public NotebookRestApi() { @@ -79,7 +79,7 @@ public class NotebookRestApi { public NotebookRestApi(Notebook notebook, NotebookServer notebookServer, SearchService search) { this.notebook = notebook; this.notebookServer = notebookServer; - this.notebookIndex = search; + this.noteSearchService = search; this.notebookAuthorization = notebook.getNotebookAuthorization(); } @@ -181,7 +181,7 @@ public class NotebookRestApi { } /** - * list binded setting + * list bound setting */ @GET @Path("interpreter/bind/{noteId}") @@ -196,18 +196,18 @@ public class NotebookRestApi { @GET @Path("/") @ZeppelinApi - public Response getNotebookList() throws IOException { + public Response getNoteList() throws IOException { AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); - List<Map<String, String>> notesInfo = notebookServer.generateNotebooksInfo(false, subject, + List<Map<String, String>> notesInfo = notebookServer.generateNotesInfo(false, subject, SecurityUtils.getRoles()); return new JsonResponse<>(Status.OK, "", notesInfo).build(); } @GET - @Path("{notebookId}") + @Path("{noteId}") @ZeppelinApi - public Response getNotebook(@PathParam("notebookId") String notebookId) throws IOException { - Note note = notebook.getNote(notebookId); + public Response getNote(@PathParam("noteId") String noteId) throws IOException { + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -223,9 +223,9 @@ public class NotebookRestApi { * @throws IOException */ @GET - @Path("export/{id}") + @Path("export/{noteId}") @ZeppelinApi - public Response exportNoteBook(@PathParam("id") String noteId) throws IOException { + public Response exportNote(@PathParam("noteId") String noteId) throws IOException { String exportJson = notebook.exportNote(noteId); return new JsonResponse<>(Status.OK, "", exportJson).build(); } @@ -233,14 +233,14 @@ public class NotebookRestApi { /** * import new note REST API * - * @param req - notebook Json + * @param req - note Json * @return JSON with new note ID * @throws IOException */ @POST @Path("import") @ZeppelinApi - public Response importNotebook(String req) throws IOException { + public Response importNote(String req) throws IOException { AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); Note newNote = notebook.importNote(req, null, subject); return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build(); @@ -257,8 +257,8 @@ public class NotebookRestApi { @Path("/") @ZeppelinApi public Response createNote(String message) throws IOException { - LOG.info("Create new notebook by JSON {}", message); - NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class); + LOG.info("Create new note by JSON {}", message); + NewNoteRequest request = gson.fromJson(message, NewNoteRequest.class); AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); Note note = notebook.createNote(subject); List<NewParagraphRequest> initialParagraphs = request.getParagraphs(); @@ -285,20 +285,20 @@ public class NotebookRestApi { /** * Delete note REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException */ @DELETE - @Path("{notebookId}") + @Path("{noteId}") @ZeppelinApi - public Response deleteNote(@PathParam("notebookId") String notebookId) throws IOException { - LOG.info("Delete notebook {} ", notebookId); + public Response deleteNote(@PathParam("noteId") String noteId) throws IOException { + LOG.info("Delete note {} ", noteId); AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); - if (!(notebookId.isEmpty())) { - Note note = notebook.getNote(notebookId); + if (!(noteId.isEmpty())) { + Note note = notebook.getNote(noteId); if (note != null) { - notebook.removeNote(notebookId, subject); + notebook.removeNote(noteId, subject); } } @@ -309,23 +309,23 @@ public class NotebookRestApi { /** * Clone note REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.CREATED * @throws IOException, CloneNotSupportedException, IllegalArgumentException */ @POST - @Path("{notebookId}") + @Path("{noteId}") @ZeppelinApi - public Response cloneNote(@PathParam("notebookId") String notebookId, String message) + public Response cloneNote(@PathParam("noteId") String noteId, String message) throws IOException, CloneNotSupportedException, IllegalArgumentException { - LOG.info("clone notebook by JSON {}", message); - NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class); + LOG.info("clone note by JSON {}", message); + NewNoteRequest request = gson.fromJson(message, NewNoteRequest.class); String newNoteName = null; if (request != null) { newNoteName = request.getName(); } AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); - Note newNote = notebook.cloneNote(notebookId, newNoteName, subject); + Note newNote = notebook.cloneNote(noteId, newNoteName, subject); notebookServer.broadcastNote(newNote); notebookServer.broadcastNoteList(subject, SecurityUtils.getRoles()); return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build(); @@ -339,13 +339,13 @@ public class NotebookRestApi { * @throws IOException */ @POST - @Path("{notebookId}/paragraph") + @Path("{noteId}/paragraph") @ZeppelinApi - public Response insertParagraph(@PathParam("notebookId") String notebookId, String message) + public Response insertParagraph(@PathParam("noteId") String noteId, String message) throws IOException { - LOG.info("insert paragraph {} {}", notebookId, message); + LOG.info("insert paragraph {} {}", noteId, message); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -371,18 +371,18 @@ public class NotebookRestApi { /** * Get paragraph REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with information of the paragraph * @throws IOException */ @GET - @Path("{notebookId}/paragraph/{paragraphId}") + @Path("{noteId}/paragraph/{paragraphId}") @ZeppelinApi - public Response getParagraph(@PathParam("notebookId") String notebookId, + public Response getParagraph(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId) throws IOException { - LOG.info("get paragraph {} {}", notebookId, paragraphId); + LOG.info("get paragraph {} {}", noteId, paragraphId); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse(Status.NOT_FOUND, "note not found.").build(); } @@ -403,14 +403,14 @@ public class NotebookRestApi { * @throws IOException */ @POST - @Path("{notebookId}/paragraph/{paragraphId}/move/{newIndex}") + @Path("{noteId}/paragraph/{paragraphId}/move/{newIndex}") @ZeppelinApi - public Response moveParagraph(@PathParam("notebookId") String notebookId, + public Response moveParagraph(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId, @PathParam("newIndex") String newIndex) throws IOException { - LOG.info("move paragraph {} {} {}", notebookId, paragraphId, newIndex); + LOG.info("move paragraph {} {} {}", noteId, paragraphId, newIndex); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse(Status.NOT_FOUND, "note not found.").build(); } @@ -436,18 +436,18 @@ public class NotebookRestApi { /** * Delete paragraph REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException */ @DELETE - @Path("{notebookId}/paragraph/{paragraphId}") + @Path("{noteId}/paragraph/{paragraphId}") @ZeppelinApi - public Response deleteParagraph(@PathParam("notebookId") String notebookId, + public Response deleteParagraph(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId) throws IOException { - LOG.info("delete paragraph {} {}", notebookId, paragraphId); + LOG.info("delete paragraph {} {}", noteId, paragraphId); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse(Status.NOT_FOUND, "note not found.").build(); } @@ -466,19 +466,19 @@ public class NotebookRestApi { } /** - * Run notebook jobs REST API + * Run note jobs REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @POST - @Path("job/{notebookId}") + @Path("job/{noteId}") @ZeppelinApi - public Response runNoteJobs(@PathParam("notebookId") String notebookId) + public Response runNoteJobs(@PathParam("noteId") String noteId) throws IOException, IllegalArgumentException { - LOG.info("run notebook jobs {} ", notebookId); - Note note = notebook.getNote(notebookId); + LOG.info("run note jobs {} ", noteId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -495,19 +495,19 @@ public class NotebookRestApi { } /** - * Stop(delete) notebook jobs REST API + * Stop(delete) note jobs REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @DELETE - @Path("job/{notebookId}") + @Path("job/{noteId}") @ZeppelinApi - public Response stopNoteJobs(@PathParam("notebookId") String notebookId) + public Response stopNoteJobs(@PathParam("noteId") String noteId) throws IOException, IllegalArgumentException { - LOG.info("stop notebook jobs {} ", notebookId); - Note note = notebook.getNote(notebookId); + LOG.info("stop note jobs {} ", noteId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -521,19 +521,19 @@ public class NotebookRestApi { } /** - * Get notebook job status REST API + * Get note job status REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @GET - @Path("job/{notebookId}") + @Path("job/{noteId}") @ZeppelinApi - public Response getNoteJobStatus(@PathParam("notebookId") String notebookId) + public Response getNoteJobStatus(@PathParam("noteId") String noteId) throws IOException, IllegalArgumentException { - LOG.info("get notebook job status."); - Note note = notebook.getNote(notebookId); + LOG.info("get note job status."); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -542,21 +542,21 @@ public class NotebookRestApi { } /** - * Get notebook paragraph job status REST API + * Get note paragraph job status REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @param paragraphId ID of Paragraph * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @GET - @Path("job/{notebookId}/{paragraphId}") + @Path("job/{noteId}/{paragraphId}") @ZeppelinApi - public Response getNoteParagraphJobStatus(@PathParam("notebookId") String notebookId, + public Response getNoteParagraphJobStatus(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId) throws IOException, IllegalArgumentException { - LOG.info("get notebook paragraph job status."); - Note note = notebook.getNote(notebookId); + LOG.info("get note paragraph job status."); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -579,14 +579,14 @@ public class NotebookRestApi { * @throws IOException, IllegalArgumentException */ @POST - @Path("job/{notebookId}/{paragraphId}") + @Path("job/{noteId}/{paragraphId}") @ZeppelinApi - public Response runParagraph(@PathParam("notebookId") String notebookId, + public Response runParagraph(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId, String message) throws IOException, IllegalArgumentException { - LOG.info("run paragraph job asynchronously {} {} {}", notebookId, paragraphId, message); + LOG.info("run paragraph job asynchronously {} {} {}", noteId, paragraphId, message); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -620,9 +620,9 @@ public class NotebookRestApi { * @throws IOException, IllegalArgumentException */ @POST - @Path("run/{notebookId}/{paragraphId}") + @Path("run/{noteId}/{paragraphId}") @ZeppelinApi - public Response runParagraphSynchronously(@PathParam("notebookId") String noteId, + public Response runParagraphSynchronously(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId, String message) throws IOException, IllegalArgumentException { @@ -659,22 +659,18 @@ public class NotebookRestApi { /** * Stop(delete) paragraph job REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @param paragraphId ID of Paragraph * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @DELETE - @Path("job/{notebookId}/{paragraphId}") + @Path("job/{noteId}/{paragraphId}") @ZeppelinApi - public Response stopParagraph(@PathParam("notebookId") String notebookId, + public Response stopParagraph(@PathParam("noteId") String noteId, @PathParam("paragraphId") String paragraphId) throws IOException, IllegalArgumentException { - /** - * TODO(jl): Fixed notebookId to noteId - * https://issues.apache.org/jira/browse/ZEPPELIN-1163 - */ - LOG.info("stop paragraph job {} ", notebookId); - Note note = notebook.getNote(notebookId); + LOG.info("stop paragraph job {} ", noteId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -695,16 +691,15 @@ public class NotebookRestApi { * @throws IOException, IllegalArgumentException */ @POST - @Path("cron/{notebookId}") + @Path("cron/{noteId}") @ZeppelinApi - public Response registerCronJob(@PathParam("notebookId") String notebookId, String message) + public Response registerCronJob(@PathParam("noteId") String noteId, String message) throws IOException, IllegalArgumentException { - // TODO(jl): Fixed notebookId to noteId - LOG.info("Register cron job note={} request cron msg={}", notebookId, message); + LOG.info("Register cron job note={} request cron msg={}", noteId, message); CronRequest request = gson.fromJson(message, CronRequest.class); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -724,19 +719,18 @@ public class NotebookRestApi { /** * Remove cron job REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @DELETE - @Path("cron/{notebookId}") + @Path("cron/{noteId}") @ZeppelinApi - public Response removeCronJob(@PathParam("notebookId") String notebookId) + public Response removeCronJob(@PathParam("noteId") String noteId) throws IOException, IllegalArgumentException { - // TODO(jl): Fixed notebookId to noteId - LOG.info("Remove cron job note {}", notebookId); + LOG.info("Remove cron job note {}", noteId); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -752,19 +746,18 @@ public class NotebookRestApi { /** * Get cron job REST API * - * @param notebookId ID of Notebook + * @param noteId ID of Note * @return JSON with status.OK * @throws IOException, IllegalArgumentException */ @GET - @Path("cron/{notebookId}") + @Path("cron/{noteId}") @ZeppelinApi - public Response getCronJob(@PathParam("notebookId") String notebookId) + public Response getCronJob(@PathParam("noteId") String noteId) throws IOException, IllegalArgumentException { - // TODO(jl): Fixed notebookId to noteId - LOG.info("Get cron job note {}", notebookId); + LOG.info("Get cron job note {}", noteId); - Note note = notebook.getNote(notebookId); + Note note = notebook.getNote(noteId); if (note == null) { return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build(); } @@ -773,7 +766,7 @@ public class NotebookRestApi { } /** - * Get notebook jobs for job manager + * Get note jobs for job manager * * @return JSON with status.OK * @throws IOException, IllegalArgumentException @@ -781,22 +774,22 @@ public class NotebookRestApi { @GET @Path("jobmanager/") @ZeppelinApi - public Response getJobListforNotebook() throws IOException, IllegalArgumentException { - LOG.info("Get notebook jobs for job manager"); + public Response getJobListforNote() throws IOException, IllegalArgumentException { + LOG.info("Get note jobs for job manager"); AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); - List<Map<String, Object>> notebookJobs = notebook - .getJobListByUnixTime(false, 0, subject); + List<Map<String, Object>> noteJobs = notebook + .getJobListByUnixTime(false, 0, subject); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); - response.put("jobs", notebookJobs); + response.put("jobs", noteJobs); return new JsonResponse<>(Status.OK, response).build(); } /** - * Get updated notebook jobs for job manager + * Get updated note jobs for job manager * * Return the `Note` change information within the post unix timestamp. * @@ -806,18 +799,18 @@ public class NotebookRestApi { @GET @Path("jobmanager/{lastUpdateUnixtime}/") @ZeppelinApi - public Response getUpdatedJobListforNotebook( + public Response getUpdatedJobListforNote( @PathParam("lastUpdateUnixtime") long lastUpdateUnixTime) throws IOException, IllegalArgumentException { - LOG.info("Get updated notebook jobs lastUpdateTime {}", lastUpdateUnixTime); + LOG.info("Get updated note jobs lastUpdateTime {}", lastUpdateUnixTime); - List<Map<String, Object>> notebookJobs; + List<Map<String, Object>> noteJobs; AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal()); - notebookJobs = notebook.getJobListByUnixTime(false, lastUpdateUnixTime, subject); + noteJobs = notebook.getJobListByUnixTime(false, lastUpdateUnixTime, subject); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); - response.put("jobs", notebookJobs); + response.put("jobs", noteJobs); return new JsonResponse<>(Status.OK, response).build(); } @@ -829,25 +822,25 @@ public class NotebookRestApi { @Path("search") @ZeppelinApi public Response search(@QueryParam("q") String queryTerm) { - LOG.info("Searching notebooks for: {}", queryTerm); + LOG.info("Searching notes for: {}", queryTerm); String principal = SecurityUtils.getPrincipal(); HashSet<String> roles = SecurityUtils.getRoles(); HashSet<String> userAndRoles = new HashSet<>(); userAndRoles.add(principal); userAndRoles.addAll(roles); - List<Map<String, String>> notebooksFound = notebookIndex.query(queryTerm); - for (int i = 0; i < notebooksFound.size(); i++) { - String[] Id = notebooksFound.get(i).get("id").split("/", 2); + List<Map<String, String>> notesFound = noteSearchService.query(queryTerm); + for (int i = 0; i < notesFound.size(); i++) { + String[] Id = notesFound.get(i).get("id").split("/", 2); String noteId = Id[0]; if (!notebookAuthorization.isOwner(noteId, userAndRoles) && !notebookAuthorization.isReader(noteId, userAndRoles) && !notebookAuthorization.isWriter(noteId, userAndRoles)) { - notebooksFound.remove(i); + notesFound.remove(i); i--; } } - LOG.info("{} notebooks found", notebooksFound.size()); - return new JsonResponse<>(Status.OK, notebooksFound).build(); + LOG.info("{} notes found", notesFound.size()); + return new JsonResponse<>(Status.OK, notesFound).build(); } @@ -856,7 +849,7 @@ public class NotebookRestApi { // handle params if presented if (!StringUtils.isEmpty(message)) { RunParagraphWithParametersRequest request = - gson.fromJson(message, RunParagraphWithParametersRequest.class); + gson.fromJson(message, RunParagraphWithParametersRequest.class); Map<String, Object> paramsForUpdating = request.getParams(); if (paramsForUpdating != null) { paragraph.settings.getParams().putAll(paramsForUpdating); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNoteRequest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNoteRequest.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNoteRequest.java new file mode 100644 index 0000000..67c1b67 --- /dev/null +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNoteRequest.java @@ -0,0 +1,44 @@ +/* + * 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.rest.message; + +import java.util.List; +import java.util.Map; + +import org.apache.zeppelin.interpreter.InterpreterOption; + +/** + * NewNoteRequest rest api request message + * + */ +public class NewNoteRequest { + String name; + List<NewParagraphRequest> paragraphs; + + public NewNoteRequest (){ + + } + + public String getName() { + return name; + } + + public List<NewParagraphRequest> getParagraphs() { + return paragraphs; + } +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNotebookRequest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNotebookRequest.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNotebookRequest.java deleted file mode 100644 index 61ae657..0000000 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewNotebookRequest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.rest.message; - -import java.util.List; -import java.util.Map; - -import org.apache.zeppelin.interpreter.InterpreterOption; - -/** - * NewNotebookRequest rest api request message - * - */ -public class NewNotebookRequest { - String name; - List<NewParagraphRequest> paragraphs; - - public NewNotebookRequest (){ - - } - - public String getName() { - return name; - } - - public List<NewParagraphRequest> getParagraphs() { - return paragraphs; - } -} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java index de02fe0..162094e 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java @@ -74,7 +74,7 @@ public class ZeppelinServer extends Application { private SchedulerFactory schedulerFactory; private InterpreterFactory replFactory; private NotebookRepo notebookRepo; - private SearchService notebookIndex; + private SearchService noteSearchService; private NotebookAuthorization notebookAuthorization; private Credentials credentials; private DependencyResolver depResolver; @@ -91,12 +91,12 @@ public class ZeppelinServer extends Application { this.replFactory = new InterpreterFactory(conf, notebookWsServer, notebookWsServer, heliumApplicationFactory, depResolver, SecurityUtils.isAuthenticated()); this.notebookRepo = new NotebookRepoSync(conf); - this.notebookIndex = new LuceneSearch(); + this.noteSearchService = new LuceneSearch(); this.notebookAuthorization = NotebookAuthorization.init(conf); this.credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath()); notebook = new Notebook(conf, notebookRepo, schedulerFactory, replFactory, notebookWsServer, - notebookIndex, notebookAuthorization, credentials); + noteSearchService, notebookAuthorization, credentials); // to update notebook from application event from remote process. heliumApplicationFactory.setNotebook(notebook); @@ -304,7 +304,8 @@ public class ZeppelinServer extends Application { ZeppelinRestApi root = new ZeppelinRestApi(); singletons.add(root); - NotebookRestApi notebookApi = new NotebookRestApi(notebook, notebookWsServer, notebookIndex); + NotebookRestApi notebookApi + = new NotebookRestApi(notebook, notebookWsServer, noteSearchService); singletons.add(notebookApi); HeliumRestApi heliumApi = new HeliumRestApi(helium, heliumApplicationFactory, notebook); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java ---------------------------------------------------------------------- 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 2f9faba..a3dff40 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 @@ -235,8 +235,8 @@ public class NotebookServer extends WebSocketServlet implements case LIST_CONFIGURATIONS: sendAllConfigurations(conn, userAndRoles, notebook); break; - case CHECKPOINT_NOTEBOOK: - checkpointNotebook(conn, notebook, messagereceived); + case CHECKPOINT_NOTE: + checkpointNote(conn, notebook, messagereceived); break; case LIST_REVISION_HISTORY: listRevisionHistory(conn, notebook, messagereceived); @@ -244,11 +244,11 @@ public class NotebookServer extends WebSocketServlet implements case NOTE_REVISION: getNoteByRevision(conn, notebook, messagereceived); break; - case LIST_NOTEBOOK_JOBS: - unicastNotebookJobInfo(conn, messagereceived); + case LIST_NOTE_JOBS: + unicastNoteJobInfo(conn, messagereceived); break; - case UNSUBSCRIBE_UPDATE_NOTEBOOK_JOBS: - unsubscribeNotebookJobInfo(conn); + case UNSUBSCRIBE_UPDATE_NOTE_JOBS: + unsubscribeNoteJobInfo(conn); break; case GET_INTERPRETER_BINDINGS: getInterpreterBindings(conn, messagereceived); @@ -430,43 +430,43 @@ public class NotebookServer extends WebSocketServlet implements } } - public void unicastNotebookJobInfo(NotebookSocket conn, Message fromMessage) throws IOException { + public void unicastNoteJobInfo(NotebookSocket conn, Message fromMessage) throws IOException { addConnectionToNote(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), conn); AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal); - List<Map<String, Object>> notebookJobs = notebook() + List<Map<String, Object>> noteJobs = notebook() .getJobListByUnixTime(false, 0, subject); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); - response.put("jobs", notebookJobs); + response.put("jobs", noteJobs); - conn.send(serializeMessage(new Message(OP.LIST_NOTEBOOK_JOBS) - .put("notebookJobs", response))); + conn.send(serializeMessage(new Message(OP.LIST_NOTE_JOBS) + .put("noteJobs", response))); } - public void broadcastUpdateNotebookJobInfo(long lastUpdateUnixTime) throws IOException { - List<Map<String, Object>> notebookJobs = new LinkedList<>(); + public void broadcastUpdateNoteJobInfo(long lastUpdateUnixTime) throws IOException { + List<Map<String, Object>> noteJobs = new LinkedList<>(); Notebook notebookObject = notebook(); List<Map<String, Object>> jobNotes = null; if (notebookObject != null) { jobNotes = notebook().getJobListByUnixTime(false, lastUpdateUnixTime, null); - notebookJobs = jobNotes == null ? notebookJobs : jobNotes; + noteJobs = jobNotes == null ? noteJobs : jobNotes; } Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); - response.put("jobs", notebookJobs != null ? notebookJobs : new LinkedList<>()); + response.put("jobs", noteJobs != null ? noteJobs : new LinkedList<>()); broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } - public void unsubscribeNotebookJobInfo(NotebookSocket conn) { + public void unsubscribeNoteJobInfo(NotebookSocket conn) { removeConnectionFromNote(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), conn); } public void saveInterpreterBindings(NotebookSocket conn, Message fromMessage) { - String noteId = (String) fromMessage.data.get("noteID"); + String noteId = (String) fromMessage.data.get("noteId"); try { List<String> settingIdList = gson.fromJson(String.valueOf( fromMessage.data.get("selectedSettingIds")), new TypeToken<ArrayList<String>>() { @@ -482,20 +482,20 @@ public class NotebookServer extends WebSocketServlet implements public void getInterpreterBindings(NotebookSocket conn, Message fromMessage) throws IOException { - String noteID = (String) fromMessage.data.get("noteID"); + String noteId = (String) fromMessage.data.get("noteId"); List<InterpreterSettingsList> settingList = - InterpreterBindingUtils.getInterpreterBindings(notebook(), noteID); + InterpreterBindingUtils.getInterpreterBindings(notebook(), noteId); conn.send(serializeMessage(new Message(OP.INTERPRETER_BINDINGS) .put("interpreterBindings", settingList))); } - public List<Map<String, String>> generateNotebooksInfo(boolean needsReload, + public List<Map<String, String>> generateNotesInfo(boolean needsReload, AuthenticationInfo subject, HashSet<String> userAndRoles) { Notebook notebook = notebook(); ZeppelinConfiguration conf = notebook.getConf(); - String homescreenNotebookId = conf.getString(ConfVars.ZEPPELIN_NOTEBOOK_HOMESCREEN); + String homescreenNoteId = conf.getString(ConfVars.ZEPPELIN_NOTEBOOK_HOMESCREEN); boolean hideHomeScreenNotebookFromList = conf .getBoolean(ConfVars.ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE); @@ -512,7 +512,7 @@ public class NotebookServer extends WebSocketServlet implements for (Note note : notes) { Map<String, String> info = new HashMap<>(); - if (hideHomeScreenNotebookFromList && note.getId().equals(homescreenNotebookId)) { + if (hideHomeScreenNotebookFromList && note.getId().equals(homescreenNoteId)) { continue; } @@ -539,21 +539,21 @@ public class NotebookServer extends WebSocketServlet implements subject = new AuthenticationInfo(StringUtils.EMPTY); } //send first to requesting user - List<Map<String, String>> notesInfo = generateNotebooksInfo(false, subject, userAndRoles); + List<Map<String, String>> notesInfo = generateNotesInfo(false, subject, userAndRoles); multicastToUser(subject.getUser(), new Message(OP.NOTES_INFO).put("notes", notesInfo)); //to others afterwards for (String user: userConnectedSockets.keySet()) { if (subject.getUser() == user) { continue; } - notesInfo = generateNotebooksInfo(false, new AuthenticationInfo(user), userAndRoles); + notesInfo = generateNotesInfo(false, new AuthenticationInfo(user), userAndRoles); multicastToUser(user, new Message(OP.NOTES_INFO).put("notes", notesInfo)); } } public void unicastNoteList(NotebookSocket conn, AuthenticationInfo subject, HashSet<String> userAndRoles) { - List<Map<String, String>> notesInfo = generateNotebooksInfo(false, subject, userAndRoles); + List<Map<String, String>> notesInfo = generateNotesInfo(false, subject, userAndRoles); unicast(new Message(OP.NOTES_INFO).put("notes", notesInfo), conn); } @@ -562,7 +562,7 @@ public class NotebookServer extends WebSocketServlet implements subject = new AuthenticationInfo(StringUtils.EMPTY); } //reload and reply first to requesting user - List<Map<String, String>> notesInfo = generateNotebooksInfo(true, subject, userAndRoles); + List<Map<String, String>> notesInfo = generateNotesInfo(true, subject, userAndRoles); multicastToUser(subject.getUser(), new Message(OP.NOTES_INFO).put("notes", notesInfo)); //to others afterwards for (String user: userConnectedSockets.keySet()) { @@ -570,7 +570,7 @@ public class NotebookServer extends WebSocketServlet implements continue; } //reloaded already above; parameter - false - notesInfo = generateNotebooksInfo(false, new AuthenticationInfo(user), userAndRoles); + notesInfo = generateNotesInfo(false, new AuthenticationInfo(user), userAndRoles); multicastToUser(user, new Message(OP.NOTES_INFO).put("notes", notesInfo)); } } @@ -785,8 +785,8 @@ public class NotebookServer extends WebSocketServlet implements throws IOException { Note note = null; if (fromMessage != null) { - String noteName = (String) ((Map) fromMessage.get("notebook")).get("name"); - String noteJson = gson.toJson(fromMessage.get("notebook")); + String noteName = (String) ((Map) fromMessage.get("note")).get("name"); + String noteJson = gson.toJson(fromMessage.get("note")); AuthenticationInfo subject = null; if (fromMessage.principal != null) { subject = new AuthenticationInfo(fromMessage.principal); @@ -1096,12 +1096,12 @@ public class NotebookServer extends WebSocketServlet implements final AngularObject removed = registry.remove(varName, noteId, paragraphId); if (removed != null) { this.broadcastExcept( - noteId, - new Message(OP.ANGULAR_OBJECT_REMOVE).put("angularObject", removed) - .put("interpreterGroupId", interpreterGroupId) - .put("noteId", noteId) - .put("paragraphId", paragraphId), - conn); + noteId, + new Message(OP.ANGULAR_OBJECT_REMOVE).put("angularObject", removed) + .put("interpreterGroupId", interpreterGroupId) + .put("noteId", noteId) + .put("paragraphId", paragraphId), + conn); } } @@ -1132,7 +1132,7 @@ public class NotebookServer extends WebSocketServlet implements private void insertParagraph(NotebookSocket conn, HashSet<String> userAndRoles, Notebook notebook, Message fromMessage) throws IOException { final int index = (int) Double.parseDouble(fromMessage.get("index") - .toString()); + .toString()); String noteId = getOpenNoteId(conn); final Note note = notebook.getNote(noteId); NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization(); @@ -1252,7 +1252,7 @@ public class NotebookServer extends WebSocketServlet implements .put("configurations", configurations))); } - private void checkpointNotebook(NotebookSocket conn, Notebook notebook, + private void checkpointNote(NotebookSocket conn, Notebook notebook, Message fromMessage) throws IOException { String noteId = (String) fromMessage.get("noteId"); String commitMessage = (String) fromMessage.get("commitMessage"); @@ -1384,7 +1384,7 @@ public class NotebookServer extends WebSocketServlet implements @Override public void onParagraphRemove(Paragraph p) { try { - notebookServer.broadcastUpdateNotebookJobInfo(System.currentTimeMillis() - 5000); + notebookServer.broadcastUpdateNoteJobInfo(System.currentTimeMillis() - 5000); } catch (IOException ioe) { LOG.error("can not broadcast for job manager {}", ioe.getMessage()); } @@ -1393,14 +1393,14 @@ public class NotebookServer extends WebSocketServlet implements @Override public void onNoteRemove(Note note) { try { - notebookServer.broadcastUpdateNotebookJobInfo(System.currentTimeMillis() - 5000); + notebookServer.broadcastUpdateNoteJobInfo(System.currentTimeMillis() - 5000); } catch (IOException ioe) { LOG.error("can not broadcast for job manager {}", ioe.getMessage()); } List<Map<String, Object>> notesInfo = new LinkedList<>(); Map<String, Object> info = new HashMap<>(); - info.put("notebookId", note.getId()); + info.put("noteId", note.getId()); // set paragraphs List<Map<String, Object>> paragraphsInfo = new LinkedList<>(); @@ -1416,7 +1416,7 @@ public class NotebookServer extends WebSocketServlet implements response.put("jobs", notesInfo); notebookServer.broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } @@ -1424,35 +1424,35 @@ public class NotebookServer extends WebSocketServlet implements public void onParagraphCreate(Paragraph p) { Notebook notebook = notebookServer.notebook(); List<Map<String, Object>> notebookJobs = notebook.getJobListByParagraphId( - p.getId() + p.getId() ); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); response.put("jobs", notebookJobs); notebookServer.broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } @Override public void onNoteCreate(Note note) { Notebook notebook = notebookServer.notebook(); - List<Map<String, Object>> notebookJobs = notebook.getJobListBymNotebookId( - note.getId() + List<Map<String, Object>> notebookJobs = notebook.getJobListByNoteId( + note.getId() ); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); response.put("jobs", notebookJobs); notebookServer.broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } @Override public void onParagraphStatusChange(Paragraph p, Status status) { Notebook notebook = notebookServer.notebook(); List<Map<String, Object>> notebookJobs = notebook.getJobListByParagraphId( - p.getId() + p.getId() ); Map<String, Object> response = new HashMap<>(); @@ -1460,21 +1460,21 @@ public class NotebookServer extends WebSocketServlet implements response.put("jobs", notebookJobs); notebookServer.broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } @Override public void onUnbindInterpreter(Note note, InterpreterSetting setting) { Notebook notebook = notebookServer.notebook(); - List<Map<String, Object>> notebookJobs = notebook.getJobListBymNotebookId( - note.getId() + List<Map<String, Object>> notebookJobs = notebook.getJobListByNoteId( + note.getId() ); Map<String, Object> response = new HashMap<>(); response.put("lastResponseUnixTime", System.currentTimeMillis()); response.put("jobs", notebookJobs); notebookServer.broadcast(JOB_MANAGER_SERVICE.JOB_MANAGER_PAGE.getKey(), - new Message(OP.LIST_UPDATE_NOTEBOOK_JOBS).put("notebookRunningJobs", response)); + new Message(OP.LIST_UPDATE_NOTE_JOBS).put("noteRunningJobs", response)); } } @@ -1523,7 +1523,7 @@ public class NotebookServer extends WebSocketServlet implements notebookServer.broadcastNote(note); try { - notebookServer.broadcastUpdateNotebookJobInfo(System.currentTimeMillis() - 5000); + notebookServer.broadcastUpdateNoteJobInfo(System.currentTimeMillis() - 5000); } catch (IOException e) { LOG.error("can not broadcast for job manager {}", e); } @@ -1538,9 +1538,9 @@ public class NotebookServer extends WebSocketServlet implements @Override public void onOutputAppend(Paragraph paragraph, InterpreterOutput out, String output) { Message msg = new Message(OP.PARAGRAPH_APPEND_OUTPUT) - .put("noteId", paragraph.getNote().getId()) - .put("paragraphId", paragraph.getId()) - .put("data", output); + .put("noteId", paragraph.getNote().getId()) + .put("paragraphId", paragraph.getId()) + .put("data", output); notebookServer.broadcast(paragraph.getNote().getId(), msg); } @@ -1554,9 +1554,9 @@ public class NotebookServer extends WebSocketServlet implements @Override public void onOutputUpdate(Paragraph paragraph, InterpreterOutput out, String output) { Message msg = new Message(OP.PARAGRAPH_UPDATE_OUTPUT) - .put("noteId", paragraph.getNote().getId()) - .put("paragraphId", paragraph.getId()) - .put("data", output); + .put("noteId", paragraph.getNote().getId()) + .put("paragraphId", paragraph.getId()) + .put("data", output); notebookServer.broadcast(paragraph.getNote().getId(), msg); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java index c99bf0a..9ef4af0 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java @@ -122,7 +122,7 @@ abstract public class AbstractZeppelinIT { driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='removeNote(note.id)']")) .sendKeys(Keys.ENTER); ZeppelinITUtils.sleep(1000, true); - driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this notebook')]" + + driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this note')]" + "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); ZeppelinITUtils.sleep(100, true); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index e1a6f9e..fea67d6 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -180,7 +180,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { try { WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), MAX_BROWSER_TIMEOUT_SEC); - collector.checkThat("Check is user has permission to view this notebook link", false, + collector.checkThat("Check is user has permission to view this note link", false, CoreMatchers.equalTo(element.isDisplayed())); } catch (Exception e) { //This should have failed, nothing to worry. @@ -191,7 +191,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { List<WebElement> privilegesModal = driver.findElements( By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" + "//div[contains(.,'Insufficient privileges')]")); - collector.checkThat("Check is user has permission to view this notebook", 1, + collector.checkThat("Check is user has permission to view this note", 1, CoreMatchers.equalTo(privilegesModal.size())); driver.findElement( By.xpath("//div[@class='modal-content'][contains(.,'Insufficient privileges')]" + @@ -202,7 +202,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { try { WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), MAX_BROWSER_TIMEOUT_SEC); - collector.checkThat("Check is user has permission to view this notebook link", true, + collector.checkThat("Check is user has permission to view this note link", true, CoreMatchers.equalTo(element.isDisplayed())); } catch (Exception e) { //This should have failed, nothing to worry. @@ -213,7 +213,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { privilegesModal = driver.findElements( By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" + "//div[contains(.,'Insufficient privileges')]")); - collector.checkThat("Check is user has permission to view this notebook", 0, + collector.checkThat("Check is user has permission to view this note", 0, CoreMatchers.equalTo(privilegesModal.size())); deleteTestNotebook(driver); authenticationIT.logoutUser("finance2"); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java ---------------------------------------------------------------------- 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 b7b8ea2..1d60fce 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 @@ -182,7 +182,7 @@ public class ZeppelinIT extends AbstractZeppelinIT { driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='removeNote(note.id)']")) .sendKeys(Keys.ENTER); ZeppelinITUtils.sleep(1000, true); - driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this notebook')]" + + driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this note')]" + "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); ZeppelinITUtils.sleep(100, true); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4f6a0e34/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java index 9383569..36b0f1c 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java @@ -155,28 +155,28 @@ public class NotebookRestApiTest extends AbstractTestRestApi { } @Test - public void testCloneNotebook() throws IOException { + public void testCloneNote() throws IOException { Note note1 = ZeppelinServer.notebook.createNote(anonymous); PostMethod post = httpPost("/notebook/" + note1.getId(), ""); - LOG.info("testCloneNotebook response\n" + post.getResponseBodyAsString()); + LOG.info("testCloneNote response\n" + post.getResponseBodyAsString()); assertThat(post, isCreated()); Map<String, Object> resp = gson.fromJson(post.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { }.getType()); - String clonedNotebookId = (String) resp.get("body"); + String clonedNoteId = (String) resp.get("body"); post.releaseConnection(); - GetMethod get = httpGet("/notebook/" + clonedNotebookId); + GetMethod get = httpGet("/notebook/" + clonedNoteId); assertThat(get, isAllowed()); Map<String, Object> resp2 = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>() { }.getType()); Map<String, Object> resp2Body = (Map<String, Object>) resp2.get("body"); - assertEquals((String)resp2Body.get("name"), "Note " + clonedNotebookId); + assertEquals((String)resp2Body.get("name"), "Note " + clonedNoteId); get.releaseConnection(); //cleanup ZeppelinServer.notebook.removeNote(note1.getId(), anonymous); - ZeppelinServer.notebook.removeNote(clonedNotebookId, anonymous); + ZeppelinServer.notebook.removeNote(clonedNoteId, anonymous); } }
