Merge pull request #1138 from microsoftgraph/andrueastman/fixjavaDocs

fix: resolve javadoc and source locations

Author: andrueastman

.github/workflows/api-level-lint.yml

@@ -17,6 +17,9 @@ jobs:
           distribution: 'temurin'
           java-version: 21
           cache: gradle
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+        shell: pwsh
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3.2.2
       - name: Add execution right to the script

.github/workflows/gradle-build.yml

@@ -25,6 +25,9 @@ jobs:
         run: |
           pip install detect-secrets
           git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+        shell: pwsh
       - name: Grant Execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
@@ -65,6 +68,9 @@ jobs:
           cache: gradle
       - name: Grant Execute permission for gradlew
         run: chmod +x gradlew
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+        shell: pwsh
       - name: Build with Java 8
         working-directory: ./java-8
         run: .././gradlew -Dorg.gradle.jvmargs=-Xmx4g build

.github/workflows/preview-and-release.yml

@@ -41,6 +41,9 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRIBUTION }}
           cache: gradle
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+        shell: pwsh
       - name: Download File
         run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
         shell: pwsh
@@ -76,6 +79,9 @@ jobs:
         run: |
           pip install detect-secrets
           git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
+      - name: Move generated sources to correct package
+        run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+        shell: pwsh
       - name: Download File
         run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
         shell: pwsh
@@ -129,6 +135,9 @@ jobs:
         java-version: ${{ env.JAVA_VERSION }}
         distribution: ${{ env.JAVA_DISTRIBUTION}}
         cache: gradle
+    - name: Move generated sources to correct package
+      run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
+      shell: pwsh
     - name: Download file
       run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
       shell: pwsh

build.gradle

@@ -48,7 +48,14 @@ def pomConfig = {
     }
 }
 
-tasks.withType(Javadoc).all { enabled = false }
+tasks.withType(Javadoc).configureEach {
+    enabled = true
+    options.addStringOption('Xdoclint:-missing', '-quiet')
+}
+
+tasks.withType(Zip).configureEach {
+    zip64 = true
+}
 
 tasks.jar {
     manifest {

scripts/copyFilesOnBuild.ps1

@@ -0,0 +1,30 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<# 
+.Synopsis
+    Copy files to a new location that is the parent of the current directory. 
+.Description 
+    Receives an encoded string value and decodes it using base64. 
+    Write the new decoded string to a local file for later consumption. 
+.Parameter inputPath
+    The encoded string we wish to decode.  
+#>
+
+Param(
+    [Parameter(Mandatory = $true)][string]$inputPath 
+)
+
+$fullPath = (Get-Item $inputPath).FullName
+$parentDirectory = (Get-Item $inputPath).Parent
+Push-Location $inputPath
+
+Get-ChildItem '*' -Filter *.java -recurse | ForEach-Object {
+    $TargetDirectory = $_.DirectoryName.Replace($fullPath, "")
+    $TargetPath = Join-Path -Path $parentDirectory -ChildPath $TargetDirectory 
+    If (!(Test-Path $TargetPath)) {
+        New-Item -Path $TargetPath -Type Directory -Force | out-null
+    }
+    $_ | Move-Item -Destination $TargetPath -Force
+}
+Pop-Location