Make config variable optional

ballerina-platform · Jan 28, 2025 · abdd843 · abdd843
1 parent 8cc9dec
commit abdd843
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/...rator-core/src/main/java/io/ballerina/flowmodelgenerator/core/ConfigVariablesManager.java b/...rator-core/src/main/java/io/ballerina/flowmodelgenerator/core/ConfigVariablesManager.java
@@ -22,6 +22,7 @@
 import com.google.gson.JsonElement;
 import io.ballerina.compiler.api.SemanticModel;
 import io.ballerina.compiler.api.symbols.Qualifier;
+import io.ballerina.compiler.syntax.tree.ExpressionNode;
 import io.ballerina.compiler.syntax.tree.ModulePartNode;
 import io.ballerina.compiler.syntax.tree.ModuleVariableDeclarationNode;
 import io.ballerina.compiler.syntax.tree.Node;
@@ -43,6 +44,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Manage the configurable variables.

diff --git a/...-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/FormBuilder.java b/...-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/FormBuilder.java
@@ -581,6 +581,7 @@ public FormBuilder<T> defaultableVariable(ExpressionNode expr) {
                     .stepOut()
                 .value((expr != null && expr.kind() != SyntaxKind.REQUIRED_EXPRESSION) ? expr.toSourceCode() : "")
                 .type(Property.ValueType.EXPRESSION)
+                .optional(true)
                 .editable();
         addProperty(Property.DEFAULTABLE_KEY, expr);
         return this;

diff --git a/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config1.json b/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config1.json
@@ -53,7 +53,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -112,7 +112,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }

diff --git a/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config2.json b/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config2.json
@@ -53,7 +53,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "10",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -112,7 +112,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }

diff --git a/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config3.json b/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config3.json
@@ -53,7 +53,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "10",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -112,7 +112,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "\"new config\"",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }

diff --git a/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config4.json b/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config4.json
@@ -53,7 +53,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "10",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -112,7 +112,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "\"new config\"",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -171,7 +171,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "10",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -230,7 +230,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "\"new config\"",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }

diff --git a/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config5.json b/...odel-generator-ls-extension/src/test/resources/configurable_variables/config/config5.json
@@ -53,7 +53,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "10",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false
         }
@@ -112,7 +112,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "12.4",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false,
           "diagnostics": {
@@ -183,7 +183,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "\"welcome\"",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false,
           "diagnostics": {
@@ -254,7 +254,7 @@
           },
           "valueType": "EXPRESSION",
           "value": "23",
-          "optional": false,
+          "optional": true,
           "editable": true,
           "advanced": false,
           "diagnostics": {