diff --git a/beakerx/beakerx/environment.py b/beakerx/beakerx/environment.py index 63a12c8c0c..df568b59f1 100644 --- a/beakerx/beakerx/environment.py +++ b/beakerx/beakerx/environment.py @@ -35,7 +35,7 @@ "use_data_grid": true, "show_catalog": false }, - "spark_profiles": [] + "spark_options":{} } } """ diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUiDefaultsImpl.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUiDefaultsImpl.java index 57fe67da1d..367f8fa276 100644 --- a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUiDefaultsImpl.java +++ b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUiDefaultsImpl.java @@ -68,6 +68,7 @@ public void saveSparkConf(List> profiles) { Map map = beakerxJsonAsMap(path); Map sparkOptions = (Map) map.get(BEAKERX).getOrDefault(SPARK_OPTIONS, new HashMap<>()); sparkOptions.put(SPARK_PROFILES, profiles == null ? new ArrayList<>() : profiles); + map.get(BEAKERX).put(SPARK_OPTIONS, sparkOptions); String content = gson.toJson(map); Files.write(path, content.getBytes(StandardCharsets.UTF_8)); this.profiles = profiles; @@ -136,9 +137,11 @@ public List getProfileNames() { @Override public void saveProfileName(String profileName) { try { - Map beakerxJson = beakerxJsonAsMap(path); - beakerxJson.get(BEAKERX).put(CURRENT_PROFILE, profileName); - String content = gson.toJson(beakerxJson); + Map map = beakerxJsonAsMap(path); + Map sparkOptions = (Map) map.get(BEAKERX).getOrDefault(SPARK_OPTIONS, new HashMap<>()); + sparkOptions.put(CURRENT_PROFILE, profileName); + map.get(BEAKERX).put(SPARK_OPTIONS, sparkOptions); + String content = gson.toJson(map); Files.write(path, content.getBytes(StandardCharsets.UTF_8)); currentProfile = profileName; } catch (IOException e) {