From 1409a8a279505af750976221486f3d8dd6219020 Mon Sep 17 00:00:00 2001
From: Jaycee Li <jayceeli@google.com>
Date: Wed, 20 May 2026 12:29:41 -0700
Subject: [PATCH] chore: Fix Javadoc generation

PiperOrigin-RevId: 918591840
---
 .github/workflows/publish-javadoc.yml | 25 +++++++++++++++++++++----
 pom.xml                               |  1 -
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-javadoc.yml b/.github/workflows/publish-javadoc.yml
index 7eeb2c6a85f..dffee016359 100644
--- a/.github/workflows/publish-javadoc.yml
+++ b/.github/workflows/publish-javadoc.yml
@@ -4,21 +4,38 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   publish:
+    name: javadoc-generation
     runs-on: ubuntu-latest
     permissions:
       contents: write
 
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      # 1. Validate Javadoc on both PRs and main push (using quiet batch mode to keep logs clean)
+      - name: Validate Javadoc Generation 🛠️
+        run: mvn -B javadoc:javadoc
+
+      # 2. Deploy ONLY when merging/pushing to main
       - name: Deploy JavaDoc 🚀
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: MathieuSoysal/Javadoc-publisher.yml@v3.0.2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           javadoc-branch: gh-pages
           java-version: 17
-          target-folder: javadoc
-          project: maven
-          custom-command: mvn javadoc:javadoc
-          javadoc-source-folder: target/javadoc
\ No newline at end of file
+          target-folder: javadoc
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1a703313e57..bd9e385d3f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,7 +290,6 @@
             <show>public</show>
             <doclint>html</doclint>
             <nohelp>true</nohelp>
-            <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
             <doctitle>Google Gen AI Java SDK</doctitle>
             <source>${maven.compiler.source}</source>
             <encoding>UTF-8</encoding>