Resolve windows build failure

ballerina-platform · May 4, 2023 · 202e755 · 202e755
1 parent 4fc52c8
commit 202e755
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -46,4 +46,4 @@ jobs:
           packageUser: ${{ github.actor }}
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
           JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
-        run: ./gradlew :openapi-cli:test --rerun-tasks --no-build-cache --tests "io.ballerina.openapi.generators.client.BallerinaDiagnosticTests" --stacktrace --scan --console=plain --no-daemon
+        run: ./gradlew.bat build --stacktrace --scan --console=plain --no-daemon
diff --git a/...src/main/java/io/ballerina/openapi/core/generators/client/FunctionSignatureGenerator.java b/...src/main/java/io/ballerina/openapi/core/generators/client/FunctionSignatureGenerator.java
@@ -93,7 +93,6 @@
 import static io.ballerina.openapi.core.GeneratorConstants.EMPTY_RECORD;
 import static io.ballerina.openapi.core.GeneratorConstants.HTTP_REQUEST;
 import static io.ballerina.openapi.core.GeneratorConstants.INTEGER;
-import static io.ballerina.openapi.core.GeneratorConstants.LINE_SEPARATOR;
 import static io.ballerina.openapi.core.GeneratorConstants.NILLABLE;
 import static io.ballerina.openapi.core.GeneratorConstants.NUMBER;
 import static io.ballerina.openapi.core.GeneratorConstants.OBJECT;
@@ -546,7 +545,7 @@ private void setRequestBodyParameters(String operationId, RequestBody requestBod
                 if (requestBody.getDescription() != null && !requestBody.getDescription().isBlank()) {
                     MarkdownDocumentationNode paramAPIDoc =
                             DocCommentsGenerator.createAPIParamDocFromSring(escapeIdentifier(paramName),
-                                    requestBody.getDescription().split(LINE_SEPARATOR)[0]);
+                                    requestBody.getDescription().split("\n")[0]);
                     requestBodyDoc.add(paramAPIDoc);
                 }
                 parameterList.add(payload);

diff --git a/...ore/src/main/java/io/ballerina/openapi/core/generators/document/DocCommentsGenerator.java b/...ore/src/main/java/io/ballerina/openapi/core/generators/document/DocCommentsGenerator.java
@@ -26,7 +26,6 @@
 import io.ballerina.compiler.syntax.tree.MarkdownParameterDocumentationLineNode;
 import io.ballerina.compiler.syntax.tree.MetadataNode;
 import io.ballerina.compiler.syntax.tree.ModuleMemberDeclarationNode;
-import io.ballerina.compiler.syntax.tree.ModuleVariableDeclarationNode;
 import io.ballerina.compiler.syntax.tree.Node;
 import io.ballerina.compiler.syntax.tree.NodeParser;
 import io.ballerina.compiler.syntax.tree.SimpleNameReferenceNode;
@@ -174,18 +173,16 @@ public static MarkdownDocumentationNode createAPIParamDocFromSring(String paramN
         String[] paramDescriptionLines = description.split("\n");
         StringBuilder docComment = new StringBuilder("# + " + paramName + " - " +
                 paramDescriptionLines[0] + System.lineSeparator());
-        for (String line : paramDescriptionLines) {
+        for (int i = 1; i < paramDescriptionLines.length; i++) {
 //            String line = paramDescriptionLines[i].replaceAll("[\\r\\n\\t]", "");
+            String line = paramDescriptionLines[i];
             if (!line.isBlank()) {
-                docComment.append("# ").append(line + System.lineSeparator());
+                docComment.append("# ").append(line).append(System.lineSeparator());
             }
         }
         docComment.append(System.lineSeparator()).append("type a A;");
         ModuleMemberDeclarationNode moduleMemberDeclarationNode =
                 NodeParser.parseModuleMemberDeclaration(docComment.toString());
-        if (moduleMemberDeclarationNode instanceof ModuleVariableDeclarationNode) {
-            System.out.println(docComment.toString());
-        }
         TypeDefinitionNode typeDefinitionNode = (TypeDefinitionNode) moduleMemberDeclarationNode;
         MetadataNode metadataNode = typeDefinitionNode.metadata().get();
         return (MarkdownDocumentationNode) metadataNode.children().get(0);