Merge with master

ballerina-platform · Aug 2, 2024 · 1f09971 · 1f09971
1 parent 9fbb211
commit 1f09971
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/ServiceToOpenAPIMapper.java b/...-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/ServiceToOpenAPIMapper.java
@@ -358,9 +358,8 @@ private static String extractBasePath(OpenAPI openApiFromServiceContract) {
         return servers.get(0).getUrl().split("\\{server}:\\{port}").length == 2 ? parts[1] : "";
     }
 
-    private static Optional<ModuleID> getServiceModuleId(ServiceDeclarationNode serviceDeclarationNode,
-                                                         SemanticModel semanticModel) {
-        return semanticModel.symbol(serviceDeclarationNode)
+    private static Optional<ModuleID> getServiceModuleId(ServiceNode serviceNode, SemanticModel semanticModel) {
+        return semanticModel.symbol(serviceNode.getInternalNode())
                 .flatMap(symbol -> symbol.getModule().map(ModuleSymbol::id));
     }
 

diff --git a/...o-openapi/src/main/java/io/ballerina/openapi/service/mapper/model/ServiceDeclaration.java b/...o-openapi/src/main/java/io/ballerina/openapi/service/mapper/model/ServiceDeclaration.java
@@ -236,7 +236,7 @@ private Optional<String> getOpenAPISpecFromResources(Package pkg, SemanticModel
                 return Optional.empty();
             }
             OASResult oasResult = generateOasFroServiceNode(pkg.project(), serviceName.get(), semanticModel, null,
-                    serviceContract.get());
+                    serviceContract.get(), false);
             if (oasResult.getDiagnostics().stream()
                     .anyMatch(diagnostic -> diagnostic.getDiagnosticSeverity().equals(DiagnosticSeverity.ERROR))) {
                 diagnostics.add(new ExceptionDiagnostic(DiagnosticMessages.OAS_CONVERTOR_136, serviceName.get()));