Include resource path for client object resource methods

ballerina-platform · Aug 21, 2023 · b744966 · b744966
1 parent 3faf5bb
commit b744966
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/compiler/ballerina-lang/src/main/java/module-info.java b/compiler/ballerina-lang/src/main/java/module-info.java
@@ -83,4 +83,5 @@
     exports io.ballerina.projects.internal.bala;
     exports io.ballerina.projects.internal.configschema to org.ballerinalang.config.schema.generator,
             io.ballerina.language.server.core;
+    exports io.ballerina.compiler.api.impl.symbols;
 }
diff --git a/misc/docerina/src/main/java/org/ballerinalang/docgen/Generator.java b/misc/docerina/src/main/java/org/ballerinalang/docgen/Generator.java
@@ -513,7 +513,7 @@ private static BObjectType getObjectTypeModel(ObjectTypeDescriptorNode typeDescr
                     String methodName = "";
                     String accessor = "";
                     String resourcePath = "";
-                    if (methodNode.kind() == SyntaxKind.RESOURCE_ACCESSOR_DEFINITION) {
+                    if (methodNode.kind() == SyntaxKind.RESOURCE_ACCESSOR_DECLARATION) {
                         accessor = methodNode.methodName().text();
                         resourcePath = methodNode.relativeResourcePath().stream().
                                 collect(StringBuilder::new, (firstString,

diff --git a/misc/docerina/src/main/java/org/ballerinalang/docgen/generator/model/Type.java b/misc/docerina/src/main/java/org/ballerinalang/docgen/generator/model/Type.java
@@ -18,6 +18,8 @@
 import com.google.gson.annotations.Expose;
 import io.ballerina.compiler.api.ModuleID;
 import io.ballerina.compiler.api.SemanticModel;
+import io.ballerina.compiler.api.impl.symbols.BallerinaArrayTypeSymbol;
+import io.ballerina.compiler.api.impl.symbols.BallerinaResourceMethodSymbol;
 import io.ballerina.compiler.api.symbols.ArrayTypeSymbol;
 import io.ballerina.compiler.api.symbols.ClassSymbol;
 import io.ballerina.compiler.api.symbols.ConstantSymbol;
@@ -37,6 +39,8 @@
 import io.ballerina.compiler.api.symbols.TypeSymbol;
 import io.ballerina.compiler.api.symbols.UnionTypeSymbol;
 import io.ballerina.compiler.api.symbols.VariableSymbol;
+import io.ballerina.compiler.api.symbols.resourcepath.PathRestParam;
+import io.ballerina.compiler.api.symbols.resourcepath.ResourcePath;
 import io.ballerina.compiler.syntax.tree.ArrayTypeDescriptorNode;
 import io.ballerina.compiler.syntax.tree.BuiltinSimpleNameReferenceNode;
 import io.ballerina.compiler.syntax.tree.FunctionSignatureNode;
@@ -404,6 +408,16 @@ public static Type fromSemanticSymbol(Symbol symbol, Optional<Documentation> doc
                 if (methodSymbol.qualifiers().contains(Qualifier.RESOURCE)) {
                     functionType.name = "";
                     functionType.accessor = methodName;
+                    if (((BallerinaResourceMethodSymbol) methodSymbol).resourcePath().kind().
+                            equals(ResourcePath.Kind.PATH_REST_PARAM)) {
+                        Optional<String> paramName = ((PathRestParam) ((BallerinaResourceMethodSymbol) methodSymbol).
+                                resourcePath()).parameter().getName();
+                        Optional<String> paramType = ((BallerinaArrayTypeSymbol) ((PathRestParam)
+                                ((BallerinaResourceMethodSymbol) methodSymbol).resourcePath()).parameter().
+                                typeDescriptor()).memberTypeDescriptor().getName();
+                        functionType.resourcePath = "[" + paramType.orElse("") + " ..." +
+                                paramName.orElse("") + "]";
+                    }
                 } else {
                     functionType.name = methodName;
                     functionType.accessor = "";