Repository: zeppelin Updated Branches: refs/heads/master 8a7117248 -> 79a53129e
[ZEPPELIN-2320] fixing test + modifying map browsing ### What is this PR for? fixing String comparison and improving map browsing ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? [ZEPPELIN-2320](https://issues.apache.org/jira/browse/ZEPPELIN-2320) ### How should this be tested? build with tests. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Remilito <remy.ga...@gmail.com> Closes #2192 from Remilito/ZEPPELIN-2320 and squashes the following commits: 9ad16bc [Remilito] [ZEPPELIN-2320] fixing test + modifying map browsing Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/79a53129 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/79a53129 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/79a53129 Branch: refs/heads/master Commit: 79a53129e887ac749c5d165b318207c9d8ddbe12 Parents: 8a71172 Author: Remilito <remy.ga...@gmail.com> Authored: Mon Mar 27 10:43:26 2017 +0200 Committer: yoojinfa <astros...@gmail.com> Committed: Wed Apr 5 11:52:32 2017 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java | 5 +++-- .../test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/79a53129/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 8c1075e..bc15bfe 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 @@ -969,9 +969,10 @@ public class NotebookRestApi { throw new BadRequestException("paragraph config cannot be empty"); } Map<String, Object> origConfig = p.getConfig(); - for (String key : newConfig.keySet()) { - origConfig.put(key, newConfig.get(key)); + for ( final Map.Entry<String, Object> entry : newConfig.entrySet()){ + origConfig.put(entry.getKey(), entry.getValue()); } + p.setConfig(origConfig); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/79a53129/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 d53c3b5..3ae38e6 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 @@ -164,7 +164,7 @@ 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() == "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);
