Notebook configurations related changes 1. Made classpath,modulepath and add modules configs as array type on frontend 2. Corresponding changes on backend to process the array 3. Updated notebook configs unit tests

Author: shivam71

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookConfigs.java

@@ -18,6 +18,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -117,13 +118,13 @@ private CompletableFuture<Void> initializeConfigs() {
             return configValues.thenAccept((c) -> {
                 if (c != null) {
                     if (c.get(0) != null) {
-                        classPath = ((JsonPrimitive) c.get(0)).getAsString();
+                        classPath = String.join(File.pathSeparator,((JsonArray) c.get(0)).asList().stream().map((elem) -> elem.getAsString()).toList());
                     }
                     if (c.get(1) != null) {
-                        modulePath = ((JsonPrimitive) c.get(1)).getAsString();
+                        modulePath = String.join(File.pathSeparator,((JsonArray) c.get(1)).asList().stream().map((elem) -> elem.getAsString()).toList());
                     }
                     if (c.get(2) != null) {
-                        addModules = ((JsonPrimitive) c.get(2)).getAsString();
+                        addModules = String.join(",",((JsonArray) c.get(2)).asList().stream().map((elem) -> elem.getAsString()).toList());
                     }
                     if (c.get(3) != null) {
                         enablePreview = ((JsonPrimitive) c.get(3)).getAsBoolean();

nbcode/notebooks/test/unit/src/org/netbeans/modules/nbcode/java/notebook/NotebookConfigsTest.java

@@ -19,6 +19,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonPrimitive;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -38,13 +39,14 @@
 
 /*
 Version 1 21/08/25
+Version 2 25/09/25  Inline with frontend sending arrays for CP,MP,Add modules
 */
 
 /**
  *  Mock LSP Client sending sample configurations
  *  Verifies that the NotebookConfigs class 
  *      parses and handles configurations appropriately 
- *  
+ *
  * @author shimadan
  */
 public class NotebookConfigsTest {
@@ -61,7 +63,7 @@ public class NotebookConfigsTest {
     public NotebookConfigsTest() {
     }
 
-    @Before 
+    @Before
     public void setUp() {
         setConfigObject();
         LanguageClientInstance.getInstance().
@@ -97,7 +99,7 @@ public void testGetClassPath() {
         System.out.println("getClassPath");
         try {
             initialized.get(5, TimeUnit.SECONDS);
-            String expResult = configsObj.get(CLASSPATH_KEY).getAsString();
+            String expResult = String.join(File.pathSeparator, (configsObj.get(CLASSPATH_KEY).getAsJsonArray()).asList().stream().map((elem) -> elem.getAsString()).toList());
             String result = instance.getClassPath();
             assertEquals(expResult, result);
         } catch (Exception ex) {
@@ -114,7 +116,7 @@ public void testGetModulePath() {
 
         try {
             initialized.get(5, TimeUnit.SECONDS);
-            String expResult = configsObj.get(MODULEPATH_KEY).getAsString();
+            String expResult = String.join(File.pathSeparator, (configsObj.get(MODULEPATH_KEY).getAsJsonArray()).asList().stream().map((elem) -> elem.getAsString()).toList());
             String result = instance.getModulePath();
             assertEquals(expResult, result);
         } catch (Exception ex) {
@@ -130,7 +132,7 @@ public void testGetAddModules() {
         System.out.println("getAddModules");
         try {
             initialized.get(5, TimeUnit.SECONDS);
-            String expResult = configsObj.get(ADD_MODULES_KEY).getAsString();
+            String expResult = String.join(",",(configsObj.get(ADD_MODULES_KEY).getAsJsonArray()).asList().stream().map((elem) -> elem.getAsString()).toList());
             String result = instance.getAddModules();
             assertEquals(expResult, result);
         } catch (Exception ex) {
@@ -177,10 +179,18 @@ private void setConfigObject() {
         imports.add(new JsonPrimitive("java.math.*"));
         imports.add(new JsonPrimitive("javafx.scene.control.*"));
         configsObj.add(IMPLICIT_IMPORTS_KEY, imports);
-        configsObj.add(CLASSPATH_KEY, new JsonPrimitive("path/to/javafx-sdk-24.0.1/lib/javafx.base.jar"));
-        configsObj.add(MODULEPATH_KEY, new JsonPrimitive("/path/to/javafx-sdk/lib"));
+        JsonArray classpath = new JsonArray();
+        classpath.add(new JsonPrimitive(
+                "path/to/javafx-sdk-24.0.1/lib/javafx.base.jar"));
+        configsObj.add(CLASSPATH_KEY, classpath);
+        JsonArray modulepath = new JsonArray();
+        modulepath.add(new JsonPrimitive("/path/to/javafx-sdk/lib"));
+        configsObj.add(MODULEPATH_KEY, modulepath);
         configsObj.add(ENABLE_PREVIEW_KEY, new JsonPrimitive(false));
-        configsObj.add(ADD_MODULES_KEY, new JsonPrimitive("javafx.controls,javafx.graphics"));
+        JsonArray addModules = new JsonArray();
+        addModules.add(new JsonPrimitive("javafx.controls"));
+        addModules.add(new JsonPrimitive("javafx.graphics"));
+        configsObj.add(ADD_MODULES_KEY, addModules);
 
     }
 

vscode/package.json

@@ -255,18 +255,27 @@
 					"description": "%jdk.debugger.configuration.completion.warning.time.description%"
 				},
 				"jdk.notebook.classpath": {
-					"type": "string",
-					"default": "",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [],
 					"description": "%jdk.notebook.classpath.description%"
 				},
 				"jdk.notebook.modulepath": {
-					"type": "string",
-					"default": "",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [],
 					"description": "%jdk.notebook.modulepath.description%"
 				},
 				"jdk.notebook.addmodules": {
-					"type": "string",
-					"default": "",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [],
 					"description": "%jdk.notebook.addmodules.description%"
 				},
 				"jdk.notebook.enablePreview": {
@@ -276,6 +285,9 @@
 				},
 				"jdk.notebook.implicitImports": {
 					"type": "array",
+					"items": {
+						"type": "string"
+					},
 					"default": [
 						"java.util.*",
 						"java.io.*",