Revert FTP integration improvements from 1.6.x

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/artifactsgenerator/Artifact.java

@@ -103,7 +103,8 @@ public record Artifact(String id, LineRange location, String type, String name,
      */
     private static final Map<String, String[]> moduleAnnotationFields = Map.of(
             "solace", new String[]{"queueName", "topicName"},
-            "mssql", new String[]{"tables"}
+            "mssql", new String[]{"tables"},
+            "ftp", new String[]{"path"}
     );
 
     public static String getCategory(String type) {

architecture-model-generator/modules/architecture-model-generator-core/src/main/java/io/ballerina/designmodelgenerator/core/CommonUtils.java

@@ -364,11 +364,20 @@ public static Optional<String> extractServiceAnnotationField(ServiceDeclarationN
 
                     if (fieldName.equals(currentFieldName)) {
                         Optional<ExpressionNode> valueExpr = specificField.valueExpr();
-                        if (valueExpr.isPresent() && valueExpr.get() instanceof BasicLiteralNode literalNode) {
+                        if (valueExpr.isEmpty()) {
+                            return Optional.empty();
+                        }
+                        ExpressionNode expr = valueExpr.get();
+                        if (expr instanceof BasicLiteralNode literalNode) {
                             String value = literalNode.literalToken().text().trim();
                             // Remove quotes if present
                             return Optional.of(value.replace("\"", ""));
                         }
+                        String value = expr.toSourceCode().trim();
+                        if (!value.isEmpty()) {
+                            return Optional.of(value);
+                        }
+                        return Optional.empty();
                     }
                 }
             }

gradle.properties

@@ -83,6 +83,7 @@ graphqlToolVersion=0.14.0
 
 # Ballerinax Module Versions
 ballerinaFtpVersion=2.16.0
+ballerinaDataCsvVersion=0.8.1
 ballerinaxRedisVersion=3.1.0
 ballerinaxTriggerSalesforceVersion=0.10.0
 ballerinaxGithubVersion=5.1.0

service-model-generator/modules/service-model-generator-ls-extension/build.gradle

@@ -131,6 +131,7 @@ jar {
 }
 
 test.dependsOn rootProject.pullBallerinaModule('ftp', ballerinaFtpVersion, 'ballerina')
+test.dependsOn rootProject.pullBallerinaModule('data.csv', ballerinaDataCsvVersion, 'ballerina')
 
 compileJava {
     doFirst {

service-model-generator/modules/service-model-generator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/util/Utils.java

@@ -93,6 +93,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -769,6 +770,7 @@ public static void updateValue(FunctionReturnType target, FunctionReturnType sou
     public static List<String> getAnnotationEdits(Service service) {
         Map<String, Value> properties = service.getProperties();
         List<String> annots = new ArrayList<>();
+        Map<String, List<String>> serviceAnnotations = new LinkedHashMap<>();
         for (Map.Entry<String, Value> property : properties.entrySet()) {
             Value value = property.getValue();
             if (Objects.nonNull(value.getCodedata()) && Objects.nonNull(value.getCodedata().getType()) &&
@@ -777,8 +779,31 @@ public static List<String> getAnnotationEdits(Service service) {
                         + ":" + value.getCodedata().getOriginalName();
                 String annotTemplate = "@%s%s".formatted(ref, value.getValue());
                 annots.add(annotTemplate);
+            } else if (Objects.nonNull(value.getCodedata()) && Objects.nonNull(value.getCodedata().getType())
+                    && value.getCodedata().getType().equals("SERVICE_ANNOTATION") && value.isEnabledWithValue()) {
+                String annotName = value.getCodedata().getOriginalName();
+                if (annotName == null || annotName.isEmpty()) {
+                    annotName = property.getKey();
+                }
+                String moduleName = value.getCodedata().getModuleName();
+                String ref = "";
+                if (Objects.nonNull(moduleName) && !moduleName.isEmpty()) {
+                    ref = getProtocol(moduleName) + COLON;
+                }
+                ref += annotName;
+                String fieldValue = value.getLiteralValue();
+                if (fieldValue != null) {
+                    serviceAnnotations.computeIfAbsent(ref, key -> new ArrayList<>())
+                            .add(property.getKey() + ": " + fieldValue);
+                }
             }
         }
+        for (Map.Entry<String, List<String>> entry : serviceAnnotations.entrySet()) {
+            String fields = String.join("," + NEW_LINE + "    ", entry.getValue());
+            String annotTemplate = "@%s {%s%s%s}".formatted(entry.getKey(), NEW_LINE,
+                    "    " + fields, NEW_LINE);
+            annots.add(annotTemplate);
+        }
         return annots;
     }
 

service-model-generator/modules/service-model-generator-ls-extension/src/main/resources/services/ftp_init.json

@@ -5,9 +5,9 @@
   "orgName": "ballerina",
   "packageName": "ftp",
   "moduleName": "ftp",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "type": "ftp",
-  "icon": "https://bcentral-packageicons.azureedge.net/images/ballerina_ftp_2.16.0.png",
+  "icon": "https://bcentral-packageicons.azureedge.net/images/ballerina_ftp_2.17.0.png",
   "properties": {
     "designApproach": {
       "metadata": {
@@ -100,36 +100,6 @@
                 "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
               }
             },
-            "folderPath": {
-              "metadata": {
-                "label": "Folder Path",
-                "description": "The folder on the remote server to monitor for file actions (e.g., /uploads or /incoming)"
-              },
-              "enabled": true,
-              "editable": true,
-              "value": "\"/\"",
-              "types": [
-                {
-                  "fieldType": "TEXT",
-                  "ballerinaType": "string",
-                  "selected": true
-                },
-                {
-                  "fieldType": "EXPRESSION",
-                  "ballerinaType": "string",
-                  "selected": false
-                }
-              ],
-              "valueType": "EXPRESSION",
-              "valueTypeConstraint": "string",
-              "isType": false,
-              "placeholder": "/",
-              "optional": false,
-              "advanced": false,
-              "codedata": {
-                "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
-              }
-            },
             "authentication": {
               "metadata": {
                 "label": "Authentication",
@@ -310,36 +280,6 @@
                 "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
               }
             },
-            "folderPath": {
-              "metadata": {
-                "label": "Folder Path",
-                "description": "The folder on the remote server to monitor for file actions (e.g., /uploads or /incoming)"
-              },
-              "enabled": true,
-              "editable": true,
-              "value": "\"/\"",
-              "types": [
-                {
-                  "fieldType": "TEXT",
-                  "ballerinaType": "string",
-                  "selected": true
-                },
-                {
-                  "fieldType": "EXPRESSION",
-                  "ballerinaType": "string",
-                  "selected": false
-                }
-              ],
-              "valueType": "EXPRESSION",
-              "valueTypeConstraint": "string",
-              "isType": false,
-              "placeholder": "/",
-              "optional": false,
-              "advanced": false,
-              "codedata": {
-                "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
-              }
-            },
             "authentication": {
               "metadata": {
                 "label": "Authentication",
@@ -402,7 +342,7 @@
                           "typeMembers": [
                             {
                               "type": "PrivateKey",
-                              "packageInfo": "ballerina:ftp:2.16.0",
+                              "packageInfo": "ballerina:ftp:2.17.0",
                               "packageName": "ftp",
                               "kind": "RECORD_TYPE",
                               "selected": true
@@ -532,36 +472,6 @@
                 "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
               }
             },
-            "folderPath": {
-              "metadata": {
-                "label": "Folder Path",
-                "description": "The folder on the remote server to monitor for file actions (e.g., /uploads or /incoming)"
-              },
-              "enabled": true,
-              "editable": true,
-              "value": "\"/\"",
-              "types": [
-                {
-                  "fieldType": "TEXT",
-                  "ballerinaType": "string",
-                  "selected": true
-                },
-                {
-                  "fieldType": "EXPRESSION",
-                  "ballerinaType": "string",
-                  "selected": false
-                }
-              ],
-              "valueType": "EXPRESSION",
-              "valueTypeConstraint": "string",
-              "isType": false,
-              "placeholder": "/",
-              "optional": false,
-              "advanced": false,
-              "codedata": {
-                "argType": "LISTENER_PARAM_INCLUDED_DEFAULTABLE_FIELD"
-              }
-            },
             "authentication": {
               "metadata": {
                 "label": "Authentication",
@@ -686,7 +596,7 @@
                   "typeMembers": [
                     {
                       "type": "SecureSocket",
-                      "packageInfo": "ballerina:ftp:2.16.0",
+                      "packageInfo": "ballerina:ftp:2.17.0",
                       "packageName": "ftp",
                       "kind": "RECORD_TYPE",
                       "selected": true
@@ -712,6 +622,38 @@
         }
       ]
     },
+    "path": {
+      "metadata": {
+        "label": "Monitoring Path",
+        "description": "The folder on the remote server to monitor for file actions (e.g., /uploads or /incoming)"
+      },
+      "enabled": true,
+      "editable": true,
+      "value": "\"/\"",
+      "types": [
+        {
+          "fieldType": "TEXT",
+          "ballerinaType": "string",
+          "selected": true
+        },
+        {
+          "fieldType": "EXPRESSION",
+          "ballerinaType": "string",
+          "selected": false
+        }
+      ],
+      "valueType": "EXPRESSION",
+      "valueTypeConstraint": "string",
+      "isType": false,
+      "placeholder": "/",
+      "optional": false,
+      "advanced": false,
+      "codedata": {
+        "type": "SERVICE_ANNOTATION",
+        "originalName": "ServiceConfig",
+        "moduleName": "ftp"
+      }
+    },
     "listenerVarName": {
       "metadata": {
         "label": "Listener Name",