Fix build failures

ballerina-platform · Dec 13, 2024 · de437cc · de437cc
1 parent 4cad384
commit de437cc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/...-core/src/main/java/org/ballerinalang/langserver/workspace/BallerinaWorkspaceManager.java b/...-core/src/main/java/org/ballerinalang/langserver/workspace/BallerinaWorkspaceManager.java
@@ -102,6 +102,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -120,7 +121,7 @@ public class BallerinaWorkspaceManager implements WorkspaceManager {
     private static final String USER_DIR = System.getProperty("user.dir");
     private static final String HEAP_DUMP_FLAG = "-XX:+HeapDumpOnOutOfMemoryError";
     private static final String HEAP_DUMP_PATH_FLAG = "-XX:HeapDumpPath=";
-    private static final String DEBUG_SOCKET_CONFIG = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:";
+    private static final String DEBUG_ARGS = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:";
 
     /**
      * Cache mapping of document path to source root.
@@ -670,22 +671,22 @@ private Optional<Process> executeProject(ProjectContext projectContext, RunConte
         }
     }
 
-    private List<String> prepareExecutionCommands(RunContext context, Module executableModule, JarResolver jarResolver) {
+    private List<String> prepareExecutionCommands(RunContext context, Module module, JarResolver jarResolver) {
         List<String> commands = new ArrayList<>();
         commands.add(JAVA_COMMAND);
         commands.add(HEAP_DUMP_FLAG);
         commands.add(HEAP_DUMP_PATH_FLAG + USER_DIR);
         if (context.debugPort() > 0) {
-            commands.add(DEBUG_SOCKET_CONFIG + context.debugPort());
+            commands.add(DEBUG_ARGS + context.debugPort());
         }
 
         commands.add("-cp");
         commands.add(getAllClassPaths(jarResolver));
 
         String initClassName = JarResolver.getQualifiedClassName(
-                executableModule.packageInstance().packageOrg().toString(),
-                executableModule.packageInstance().packageName().toString(),
-                executableModule.packageInstance().packageVersion().toString(),
+                module.packageInstance().packageOrg().toString(),
+                module.packageInstance().packageName().toString(),
+                module.packageInstance().packageVersion().toString(),
                 MODULE_INIT_CLASS_NAME
         );
         commands.add(initClassName);

diff --git a/misc/debug-adapter/modules/debug-adapter-core/spotbugs-exclude.xml b/misc/debug-adapter/modules/debug-adapter-core/spotbugs-exclude.xml
@@ -61,7 +61,16 @@
             </And>
             <And>
                 <Bug pattern="BC_UNCONFIRMED_CAST"/>
-                <Class name="org.ballerinalang.debugadapter.completion.CompletionGenerator"/>
+                <Or>
+                    <Class name="org.ballerinalang.debugadapter.completion.CompletionGenerator"/>
+                    <Class name="org.ballerinalang.debugadapter.JBallerinaDebugServer"/>
+                </Or>
+            </And>
+            <And>
+                <Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE"/>
+                <Or>
+                    <Class name="org.ballerinalang.debugadapter.utils.ServerUtils"/>
+                </Or>
             </And>
         </Or>
     </Match>

diff --git a/...ebug-adapter-core/src/main/java/org/ballerinalang/debugadapter/JBallerinaDebugServer.java b/...ebug-adapter-core/src/main/java/org/ballerinalang/debugadapter/JBallerinaDebugServer.java
@@ -289,8 +289,8 @@ public CompletableFuture<Void> attach(Map<String, Object> args) {
             try {
                 clientConfigHolder = new ClientAttachConfigHolder(args);
                 context.setDebugMode(ExecutionContext.DebugMode.ATTACH);
-                Project sourceProject = context.getProjectCache().getProject(Path.of(clientConfigHolder.getSourcePath()));
-                context.setSourceProject(sourceProject);
+                Project srcProject = context.getProjectCache().getProject(Path.of(clientConfigHolder.getSourcePath()));
+                context.setSourceProject(srcProject);
                 ClientAttachConfigHolder configHolder = (ClientAttachConfigHolder) clientConfigHolder;
 
                 String hostName = configHolder.getHostName().orElse("");