Refactor Gradle buildDir detection to match PR #245 pattern

Co-authored-by: jGauravGupta <15934072+jGauravGupta@users.noreply.github.com>

Author: Copilot

src/main/fish/payara/project/Gradle.ts

@@ -42,8 +42,6 @@ export class Gradle implements Build {
 
     private microPluginReader: GradleMicroPluginReader | undefined;
 
-    private cachedBuildDir: string | undefined;
-
     constructor(public payaraInstance: PayaraInstance | null, public workspaceFolder: WorkspaceFolder) {
         this.readBuildConfig();
     }
@@ -236,37 +234,15 @@ export class Gradle implements Build {
         return gradleExecStr;
     }
 
-    public detectBuildDir(): string {
-        if (this.cachedBuildDir !== undefined) {
-            return this.cachedBuildDir;
-        }
-        const gradleFiles = ['build.gradle', 'build.gradle.kts'];
-        for (const gradleFile of gradleFiles) {
-            const filePath = path.join(this.workspaceFolder.uri.fsPath, gradleFile);
-            if (fs.existsSync(filePath)) {
-                try {
-                    const content = fs.readFileSync(filePath, 'utf8');
-                    const fileMatch = content.match(/buildDir\s*=\s*file\(\s*["']([^"']+)["']\s*\)/);
-                    if (fileMatch) {
-                        this.cachedBuildDir = fileMatch[1];
-                        return this.cachedBuildDir;
-                    }
-                    const stringMatch = content.match(/buildDir\s*=\s*["']([^"']+)["']/);
-                    if (stringMatch) {
-                        this.cachedBuildDir = stringMatch[1];
-                        return this.cachedBuildDir;
-                    }
-                } catch (e) {
-                    // ignore read errors and fall back to default
-                }
+    public getBuildDir(): string {
+        let buildDirValue = 'build';
+        if (this.buildReader instanceof GradleBuildReader) {
+            let customDir = this.buildReader.getBuildDirectory();
+            if (customDir.length > 0) {
+                buildDirValue = customDir;
             }
         }
-        this.cachedBuildDir = 'build';
-        return this.cachedBuildDir;
-    }
-
-    public getBuildDir(): string {
-        let buildDir = path.join(this.workspaceFolder.uri.fsPath, this.detectBuildDir(), 'libs');
+        let buildDir = path.resolve(this.workspaceFolder.uri.fsPath, buildDirValue, 'libs');
         if (!fs.existsSync(buildDir)) {
             throw Error("no build dir found: " + buildDir);
         }

src/main/fish/payara/project/GradleBuildReader.ts

@@ -28,6 +28,7 @@ export class GradleBuildReader implements BuildReader {
     private artifactId: string = '';
     private version: string = '';
     private finalName: string = '';
+    private buildDirectory: string = '';
 
     public constructor(public workspaceFolder: WorkspaceFolder) {
         this.parseBuild();
@@ -45,6 +46,12 @@ export class GradleBuildReader implements BuildReader {
             let build: any = await g2js.parseFile(buildPath);
             reader.groupId = build.group;
             reader.version = build.version;
+            reader.buildDirectory = reader.parseBuildDirectory(buildPath);
+        }
+
+        let buildKtsPath = path.join(this.workspaceFolder.uri.fsPath, 'build.gradle.kts');
+        if (reader.buildDirectory.length < 1 && fs.existsSync(buildKtsPath)) {
+            reader.buildDirectory = reader.parseBuildDirectory(buildKtsPath);
         }
 
         if (fs.existsSync(settingsPath)) {
@@ -57,6 +64,23 @@ export class GradleBuildReader implements BuildReader {
         }
     }
 
+    private parseBuildDirectory(gradleFilePath: string): string {
+        try {
+            const content = fs.readFileSync(gradleFilePath, 'utf8');
+            const fileMatch = content.match(/buildDir\s*=\s*file\(\s*["']([^"']+)["']\s*\)/);
+            if (fileMatch) {
+                return fileMatch[1];
+            }
+            const stringMatch = content.match(/buildDir\s*=\s*["']([^"']+)["']/);
+            if (stringMatch) {
+                return stringMatch[1];
+            }
+        } catch (e) {
+            // ignore read errors and fall back to default
+        }
+        return '';
+    }
+
     public getGroupId(): string {
         return this.groupId;
     }
@@ -73,4 +97,8 @@ export class GradleBuildReader implements BuildReader {
         return this.finalName;
     }
 
+    public getBuildDirectory(): string {
+        return this.buildDirectory;
+    }
+
 }