Fix base path issue

ballerina-platform · Dec 20, 2024 · 6f9103a · 6f9103a
1 parent 827f2fa
commit 6f9103a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/...erator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/Utils.java b/...erator-ls-extension/src/main/java/io/ballerina/servicemodelgenerator/extension/Utils.java
@@ -810,14 +810,14 @@ public static String getServiceDeclarationNode(Service service) {
         if (Objects.nonNull(service.getServiceType()) && service.getServiceType().isEnabledWithValue()) {
             builder.append(service.getServiceTypeName());
             builder.append(" ");
-            if (Objects.nonNull(service.getBasePath()) && service.getBasePath().isEnabledWithValue()) {
-                builder.append(getValueString(service.getBasePath()));
-                builder.append(" ");
-            }
-        } else if (Objects.nonNull(service.getServiceContractTypeNameValue()) &&
+        }
+        if (Objects.nonNull(service.getServiceContractTypeNameValue()) &&
                 service.getServiceContractTypeNameValue().isEnabledWithValue()) {
             builder.append(service.getServiceContractTypeName());
             builder.append(" ");
+        } else if (Objects.nonNull(service.getBasePath()) && service.getBasePath().isEnabledWithValue()) {
+            builder.append(getValueString(service.getBasePath()));
+            builder.append(" ");
         }
         builder.append("on ");
         if (Objects.nonNull(service.getListener()) && service.getListener().isEnabledWithValue()) {

diff --git a/...erator/modules/service-model-generator-ls-extension/src/main/resources/services/http.json b/...erator/modules/service-model-generator-ls-extension/src/main/resources/services/http.json
@@ -96,40 +96,40 @@
           "optional": false,
           "advanced": false,
           "properties": {
-            "serviceTypeName": {
+            "spec": {
               "metadata": {
-                "label": "Service Type Name",
-                "description": "The name of the service contract type generated from the OpenAPI specification"
+                "label": "OpenAPI Specification",
+                "description": "Provide an OpenAPI specification to generate the resources"
               },
               "enabled": true,
               "editable": true,
               "value": "",
-              "valueType": "EXPRESSION",
+              "valueType": "FILE_SELECT",
               "valueTypeConstraint": "string",
               "isType": false,
               "placeholder": "",
-              "optional": false,
+              "optional": true,
               "advanced": false,
               "codedata": {
-                "type": "SERVICE_BASEPATH"
+                "type": "OPENAPI"
               }
             },
-            "spec": {
+            "serviceTypeName": {
               "metadata": {
-                "label": "OpenAPI Specification",
-                "description": "Provide an OpenAPI specification to generate the resources"
+                "label": "Service Type Name",
+                "description": "The name of the service contract type generated from the OpenAPI specification"
               },
-              "enabled": false,
+              "enabled": true,
               "editable": true,
               "value": "",
-              "valueType": "FILE_SELECT",
+              "valueType": "EXPRESSION",
               "valueTypeConstraint": "string",
               "isType": false,
               "placeholder": "",
-              "optional": true,
+              "optional": false,
               "advanced": false,
               "codedata": {
-                "type": "OPENAPI"
+                "type": "SERVICE_BASEPATH"
               }
             }
           }