Resolve merge conflicts

Author: KavinduZoysa

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AgentsGenerator.java

@@ -372,8 +372,8 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
                     Property.CONNECTION_KEY, Property.CHECK_ERROR_KEY));
             keys.removeAll(ignoredKeys);
             List<String> paramList = new ArrayList<>();
-            for (String key : keys) {
-                Property property = properties.get(key);
+            for (String k : keys) {
+                Property property = properties.get(k);
                 if (property == null) {
                     continue;
                 }
@@ -385,6 +385,10 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
                         continue;
                     }
                 }
+                String key = k;
+                if (k.startsWith("$")) {
+                    key = "'" + k.substring(1);
+                }
                 if (hasDescription) {
                     sourceBuilder.token().parameterDoc(key, property.metadata().description());
                 }
@@ -465,8 +469,8 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
             keys.removeAll(ignoredKeys);
             List<String> paramList = new ArrayList<>();
             Set<String> pathParams = new HashSet<>();
-            for (String key : keys) {
-                Property property = properties.get(key);
+            for (String k : keys) {
+                Property property = properties.get(k);
                 if (property == null) {
                     continue;
                 }
@@ -481,6 +485,10 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
                         continue;
                     }
                 }
+                String key = k;
+                if (k.startsWith("$")) {
+                    key = "'" + k.substring(1);
+                }
                 if (hasDescription) {
                     sourceBuilder.token().parameterDoc(key, property.metadata().description());
                 }

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/SourceBuilder.java

@@ -446,15 +446,15 @@ public SourceBuilder functionParameters(FlowNode nodeTemplate, Set<String> ignor
                 if (firstParamAdded) {
                     tokenBuilder.keyword(SyntaxKind.COMMA_TOKEN);
                 }
-                tokenBuilder.expression(prop);
+                tokenBuilder.param(prop);
             } else if (kind.equals(ParameterData.Kind.INCLUDED_RECORD.name())) {
                 if (isPropValueEmpty(prop)) {
                     continue;
                 }
                 if (firstParamAdded) {
                     tokenBuilder.keyword(SyntaxKind.COMMA_TOKEN);
                 }
-                tokenBuilder.expression(prop);
+                tokenBuilder.param(prop);
             } else if (kind.equals(ParameterData.Kind.DEFAULTABLE.name())) {
                 if (isPropValueEmpty(prop)) {
                     missedDefaultValue = true;
@@ -470,7 +470,7 @@ public SourceBuilder functionParameters(FlowNode nodeTemplate, Set<String> ignor
                     tokenBuilder.name(prop.codedata().originalName()).whiteSpace()
                             .keyword(SyntaxKind.EQUAL_TOKEN).expression(prop);
                 } else {
-                    tokenBuilder.expression(prop);
+                    tokenBuilder.param(prop);
                 }
             } else if (kind.equals(ParameterData.Kind.INCLUDED_FIELD.name())) {
                 if (isPropValueEmpty(prop)) {
@@ -679,6 +679,15 @@ public TokenBuilder expression(Property property) {
             return this;
         }
 
+        public TokenBuilder param(Property property) {
+            String source = property.toSourceCode();
+            if (source.startsWith("$")) {
+                source = "'" + source.substring(1);
+            }
+            sb.append(source);
+            return this;
+        }
+
         public TokenBuilder expression(String exprAsStr) {
             sb.append(exprAsStr);
             return this;