[zeppelin] branch master updated: [ZEPPELIN-5379] LIST_CONFIGURATIONS command cannot return the default…

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 06e7a34  [ZEPPELIN-5379] LIST_CONFIGURATIONS command cannot return the default…
06e7a34 is described below

commit 06e7a341798a8ba152432397efbe3155e53c4f5b
Author: house.zhang <>
AuthorDate: Thu May 20 17:15:33 2021 +0800

    [ZEPPELIN-5379] LIST_CONFIGURATIONS command cannot return the default…
    
    ### What is this PR for?
    
    when download distirbution package ,  run zeppelin server ,do not config zeppelin-site.xml ,i found LIST_CONFIGURATIONS command cannot return the default configuration in the ZeppelinConfiguration class code,so the web  lack some configuration
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    *  [ZEPPELIN-5379] https://issues.apache.org/jira/browse/ZEPPELIN-5379
    
    ### How should this be tested?
    * Ci pass and manually tested
    
    ### Screenshots (if appropriate)
    ![image](https://user-images.githubusercontent.com/7891811/118913595-58a0e000-b95c-11eb-9fd6-4385d9a19d6a.png)
    
    ### Questions:
    * Does the licenses files need update?
    * Is there breaking changes for older versions?
    * Does this needs documentation?
    
    Author: house.zhang <>
    
    Closes #4122 from mnmhouse/fix-config and squashes the following commits:
    
    2d9329d07 [house.zhang] modify:  delete some code ,because envConfig and sysConfig are checked in getString(),
    23f70326d [house.zhang] [ZEPPELIN-5379] LIST_CONFIGURATIONS command cannot return the default configuration in the ZeppelinConfiguration class code
---
 .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 4b4165e..0b990aa 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -864,13 +864,10 @@ public class ZeppelinConfiguration {
    * @return
    */
   public Map<String, String> getCompleteConfiguration() {
-    Map<String, String> completeConfiguration = new HashMap<>(properties);
-    // Is it possible that we overwrite properties
+    Map<String, String> completeConfiguration = new HashMap<>();
     for (ConfVars c : ConfVars.values()) {
-      if (sysConfig.containsKey(c.getVarName())) {
-        completeConfiguration.put(c.getVarName(), sysConfig.getString(c.getVarName()));
-      } else if (envConfig.containsKey(c.name())) {
-        completeConfiguration.put(c.getVarName(), envConfig.getString(c.name()));
+      if (getString(c) != null){
+        completeConfiguration.put(c.getVarName(), getString(c));
       }
     }
     return completeConfiguration;