Brings the Java build in line with other clients.

.pre-commit-config.yaml

@@ -93,6 +93,13 @@ repos:
                 pass_filenames: false
                 files: rust/.*
                 language: rust
+              - id: spotless-fmt
+                name: spotless-fmt
+                entry: mvn --batch-mode --quiet -f java/cuvs-java/pom.xml spotless:apply
+                pass_filenames: false
+                files: ^java/cuvs-java/src/.*\.java$
+                exclude: .*/panama/.*
+                language: system
               - id: clang-format-with-cmake-placeholders
                 name: clang-format-with-cmake-placeholders
                 entry: python3 ci/checks/clang_format_with_cmake_placeholders.py

conda/environments/all_cuda-129_arch-aarch64.yaml

@@ -30,11 +30,13 @@ dependencies:
 - libopenblas<=0.3.30
 - librmm==26.10.*,>=0.0.0a0
 - make
+- maven
 - nccl>=2.19
 - ninja
 - nodejs>=22
 - numpy>=2.0,<3.0
 - openblas
+- openjdk=22.*
 - pre-commit
 - pylibraft==26.10.*,>=0.0.0a0
 - pytest

conda/environments/all_cuda-129_arch-x86_64.yaml

@@ -29,11 +29,13 @@ dependencies:
 - libnvjitlink-dev
 - librmm==26.10.*,>=0.0.0a0
 - make
+- maven
 - nccl>=2.19
 - ninja
 - nodejs>=22
 - numpy>=2.0,<3.0
 - openblas
+- openjdk=22.*
 - pre-commit
 - pylibraft==26.10.*,>=0.0.0a0
 - pytest

conda/environments/all_cuda-133_arch-aarch64.yaml

@@ -30,11 +30,13 @@ dependencies:
 - libopenblas<=0.3.30
 - librmm==26.10.*,>=0.0.0a0
 - make
+- maven
 - nccl>=2.19
 - ninja
 - nodejs>=22
 - numpy>=2.0,<3.0
 - openblas
+- openjdk=22.*
 - pre-commit
 - pylibraft==26.10.*,>=0.0.0a0
 - pytest

conda/environments/all_cuda-133_arch-x86_64.yaml

@@ -29,11 +29,13 @@ dependencies:
 - libnvjitlink-dev
 - librmm==26.10.*,>=0.0.0a0
 - make
+- maven
 - nccl>=2.19
 - ninja
 - nodejs>=22
 - numpy>=2.0,<3.0
 - openblas
+- openjdk=22.*
 - pre-commit
 - pylibraft==26.10.*,>=0.0.0a0
 - pytest

dependencies.yaml

@@ -297,6 +297,11 @@ dependencies:
       - output_types: [conda]
         packages:
           - c-compiler
+      # spotless-fmt pre-commit hook requires Maven and a JDK
+      - output_types: [conda]
+        packages:
+          - maven
+          - openjdk=22.*
   clang:
     common:
       - output_types: conda

java/cuvs-java/pom.xml

@@ -252,14 +252,6 @@ SPDX-License-Identifier: Apache-2.0
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
                 <version>2.44.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>apply</goal>
-                        </goals>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
                 <configuration>
                     <java>
                         <includes>
@@ -268,15 +260,21 @@ SPDX-License-Identifier: Apache-2.0
                         <excludes>
                             <exclude>src/**/panama/*.java</exclude>
                         </excludes>
+                        <!--
+                            TODO: When we have more rules that should go to checkstyle or PMD
+                            (tracking issue: https://github.com/NVIDIA/cuvs/issues/2364)
+                        -->
+                        <replaceRegex>
+                            <name>Use the headers_h facade, not numbered jextract classes</name>
+                            <searchRegex>\bheaders_h_[0-9]+\b</searchRegex>
+                            <replacement>headers_h</replacement>
+                        </replaceRegex>
                         <googleJavaFormat>
                             <version>1.27.0</version>
                             <style>GOOGLE</style>
                             <reflowLongStrings>true</reflowLongStrings>
                             <formatJavadoc>false</formatJavadoc>
                         </googleJavaFormat>
-                        <licenseHeader>
-                            <file>${project.basedir}/../license-header.txt</file>
-                        </licenseHeader>
                     </java>
                 </configuration>
             </plugin>

java/cuvs-java/src/main/java/com/nvidia/cuvs/CuVSAceParams.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs;
@@ -75,8 +75,13 @@ public class CuVSAceParams {
    */
   private final double maxGpuMemoryGb;
 
-  private CuVSAceParams(long npartitions, long efConstruction, String buildDir, boolean useDisk,
-                        double maxHostMemoryGb, double maxGpuMemoryGb) {
+  private CuVSAceParams(
+      long npartitions,
+      long efConstruction,
+      String buildDir,
+      boolean useDisk,
+      double maxHostMemoryGb,
+      double maxGpuMemoryGb) {
     this.npartitions = npartitions;
     this.efConstruction = efConstruction;
     this.buildDir = buildDir;
@@ -259,8 +264,8 @@ public Builder withMaxGpuMemoryGb(double maxGpuMemoryGb) {
      * @return an instance of {@link CuVSAceParams}
      */
     public CuVSAceParams build() {
-      return new CuVSAceParams(npartitions, efConstruction, buildDir, useDisk,
-                               maxHostMemoryGb, maxGpuMemoryGb);
+      return new CuVSAceParams(
+          npartitions, efConstruction, buildDir, useDisk, maxHostMemoryGb, maxGpuMemoryGb);
     }
   }
 }

java/cuvs-java/src/main/java/com/nvidia/cuvs/CuVSResources.java

@@ -102,11 +102,9 @@ static CuVSResources create(Path tempDirectory) throws Throwable {
    * @throws LibraryException if the native library cannot be loaded
    */
   static CuVSResources create(
-      Path tempDirectory,
-      Path memoryTrackingCsvPath,
-      Duration memoryTrackingSampleInterval) throws Throwable {
+      Path tempDirectory, Path memoryTrackingCsvPath, Duration memoryTrackingSampleInterval)
+      throws Throwable {
     return CuVSProvider.provider()
-        .newCuVSResources(
-            tempDirectory, memoryTrackingCsvPath, memoryTrackingSampleInterval);
+        .newCuVSResources(tempDirectory, memoryTrackingCsvPath, memoryTrackingSampleInterval);
   }
 }

java/cuvs-java/src/main/java/com/nvidia/cuvs/HnswAceParams.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs;
@@ -21,8 +21,12 @@ public class HnswAceParams {
   private double maxHostMemoryGb;
   private double maxGpuMemoryGb;
 
-  private HnswAceParams(long npartitions, String buildDir, boolean useDisk,
-                        double maxHostMemoryGb, double maxGpuMemoryGb) {
+  private HnswAceParams(
+      long npartitions,
+      String buildDir,
+      boolean useDisk,
+      double maxHostMemoryGb,
+      double maxGpuMemoryGb) {
     this.npartitions = npartitions;
     this.buildDir = buildDir;
     this.useDisk = useDisk;
@@ -188,8 +192,7 @@ public Builder withMaxGpuMemoryGb(double maxGpuMemoryGb) {
      * @return an instance of {@link HnswAceParams}
      */
     public HnswAceParams build() {
-      return new HnswAceParams(npartitions, buildDir, useDisk,
-                               maxHostMemoryGb, maxGpuMemoryGb);
+      return new HnswAceParams(npartitions, buildDir, useDisk, maxHostMemoryGb, maxGpuMemoryGb);
     }
   }
 }

java/cuvs-java/src/main/java/com/nvidia/cuvs/HnswIndexParams.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs;
@@ -283,13 +283,7 @@ public Builder withAceParams(HnswAceParams aceParams) {
      */
     public HnswIndexParams build() {
       return new HnswIndexParams(
-          hierarchy,
-          efConstruction,
-          numThreads,
-          vectorDimension,
-          m,
-          metric,
-          aceParams);
+          hierarchy, efConstruction, numThreads, vectorDimension, m, metric, aceParams);
     }
   }
 }

java/cuvs-java/src/main/java/com/nvidia/cuvs/spi/CuVSProvider.java

@@ -54,9 +54,8 @@ default Path nativeLibraryPath() {
    *                                     CSV samples
    */
   default CuVSResources newCuVSResources(
-      Path tempDirectory,
-      Path memoryTrackingCsvPath,
-      Duration memoryTrackingSampleInterval) throws Throwable {
+      Path tempDirectory, Path memoryTrackingCsvPath, Duration memoryTrackingSampleInterval)
+      throws Throwable {
     throw new UnsupportedOperationException(
         "Memory-tracking resources are not supported by this provider");
   }

java/cuvs-java/src/main/java/com/nvidia/cuvs/spi/UnsupportedProvider.java

@@ -28,9 +28,7 @@ public CuVSResources newCuVSResources(Path tempDirectory) {
 
   @Override
   public CuVSResources newCuVSResources(
-      Path tempDirectory,
-      Path memoryTrackingCsvPath,
-      Duration memoryTrackingSampleInterval) {
+      Path tempDirectory, Path memoryTrackingCsvPath, Duration memoryTrackingSampleInterval) {
     throw new UnsupportedOperationException(reasons);
   }
 

java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/CagraIndexImpl.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs.internal;
@@ -632,8 +632,10 @@ private static void populateNativeIndexParams(
       cuvsAceParams.npartitions(cuvsAceParamsMemorySegment, cuVSAceParams.getNpartitions());
       cuvsAceParams.ef_construction(cuvsAceParamsMemorySegment, cuVSAceParams.getEfConstruction());
       cuvsAceParams.use_disk(cuvsAceParamsMemorySegment, cuVSAceParams.isUseDisk());
-      cuvsAceParams.max_host_memory_gb(cuvsAceParamsMemorySegment, cuVSAceParams.getMaxHostMemoryGb());
-      cuvsAceParams.max_gpu_memory_gb(cuvsAceParamsMemorySegment, cuVSAceParams.getMaxGpuMemoryGb());
+      cuvsAceParams.max_host_memory_gb(
+          cuvsAceParamsMemorySegment, cuVSAceParams.getMaxHostMemoryGb());
+      cuvsAceParams.max_gpu_memory_gb(
+          cuvsAceParamsMemorySegment, cuVSAceParams.getMaxGpuMemoryGb());
 
       String buildDir = cuVSAceParams.getBuildDir();
       if (buildDir != null && !buildDir.isEmpty()) {

java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/CuVSResourcesImpl.java

@@ -6,7 +6,6 @@
 
 import static com.nvidia.cuvs.internal.common.Util.checkCuVSError;
 import static com.nvidia.cuvs.internal.panama.headers_h.*;
-import static com.nvidia.cuvs.internal.panama.headers_h_1.C_INT;
 
 import com.nvidia.cuvs.CuVSResources;
 import com.nvidia.cuvs.DelegatingScopedAccess;
@@ -68,17 +67,13 @@ public CuVSResourcesImpl(Path tempDirectory) {
    *                                     CSV samples
    */
   public CuVSResourcesImpl(
-      Path tempDirectory,
-      Path memoryTrackingCsvPath,
-      Duration memoryTrackingSampleInterval) {
+      Path tempDirectory, Path memoryTrackingCsvPath, Duration memoryTrackingSampleInterval) {
     this.tempDirectory = tempDirectory;
     try (var localArena = Arena.ofConfined()) {
       var resourcesMemorySegment = localArena.allocate(cuvsResources_t);
-      byte[] pathBytes =
-          memoryTrackingCsvPath.toString().getBytes(StandardCharsets.UTF_8);
+      byte[] pathBytes = memoryTrackingCsvPath.toString().getBytes(StandardCharsets.UTF_8);
       var pathSegment = localArena.allocate(pathBytes.length + 1L);
-      MemorySegment.copy(
-          pathBytes, 0, pathSegment, ValueLayout.JAVA_BYTE, 0, pathBytes.length);
+      MemorySegment.copy(pathBytes, 0, pathSegment, ValueLayout.JAVA_BYTE, 0, pathBytes.length);
       pathSegment.set(ValueLayout.JAVA_BYTE, pathBytes.length, (byte) 0);
       long sampleIntervalMs = memoryTrackingSampleInterval.toMillis();
       checkCuVSError(

java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/GPUInfoProviderImpl.java

@@ -1,14 +1,13 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs.internal;
 
 import static com.nvidia.cuvs.internal.common.LinkerHelper.C_INT;
 import static com.nvidia.cuvs.internal.common.Util.checkCudaError;
 import static com.nvidia.cuvs.internal.common.Util.cudaGetDeviceProperties;
-import static com.nvidia.cuvs.internal.panama.headers_h.cudaMemGetInfo;
-import static com.nvidia.cuvs.internal.panama.headers_h_1.*;
+import static com.nvidia.cuvs.internal.panama.headers_h.*;
 
 import com.nvidia.cuvs.CuVSResources;
 import com.nvidia.cuvs.CuVSResourcesInfo;

java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/HnswIndexImpl.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs.internal;
@@ -251,8 +251,8 @@ public static HnswIndex.Builder newBuilder(CuVSResources cuvsResources) {
    * @return A new HNSW index ready for search
    * @throws Throwable if an error occurs during building
    */
-  public static HnswIndex build(CuVSResources resources, HnswIndexParams hnswParams, CuVSMatrix dataset)
-      throws Throwable {
+  public static HnswIndex build(
+      CuVSResources resources, HnswIndexParams hnswParams, CuVSMatrix dataset) throws Throwable {
     Objects.requireNonNull(resources);
     Objects.requireNonNull(hnswParams);
     Objects.requireNonNull(dataset);
@@ -288,7 +288,8 @@ public static HnswIndex build(CuVSResources resources, HnswIndexParams hnswParam
     return new HnswIndexImpl(new IndexReference(hnswIndex), resources, hnswParams);
   }
 
-  private static CloseableHandle createHnswIndexParamsForBuild(Arena arena, HnswIndexParams params) {
+  private static CloseableHandle createHnswIndexParamsForBuild(
+      Arena arena, HnswIndexParams params) {
     var hnswParams = createHnswIndexParams();
     MemorySegment seg = hnswParams.handle();
 
@@ -324,7 +325,7 @@ private static MemorySegment prepareTensorFromMatrix(Arena arena, CuVSMatrix dat
       return prepareTensor(
           arena,
           matrixInternal.memorySegment(),
-          new long[]{dataset.size(), dataset.columns()},
+          new long[] {dataset.size(), dataset.columns()},
           matrixInternal.code(),
           matrixInternal.bits(),
           kDLCPU());

java/cuvs-java/src/main/java22/com/nvidia/cuvs/internal/common/Util.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs.internal.common;
@@ -9,7 +9,6 @@
 import static com.nvidia.cuvs.internal.common.LinkerHelper.C_INT;
 import static com.nvidia.cuvs.internal.common.LinkerHelper.C_LONG;
 import static com.nvidia.cuvs.internal.panama.headers_h.*;
-import static com.nvidia.cuvs.internal.panama.headers_h_1.cudaStream_t;
 
 import com.nvidia.cuvs.CuVSResources;
 import com.nvidia.cuvs.internal.panama.DLDataType;

java/cuvs-java/src/main/java22/com/nvidia/cuvs/spi/JDKProvider.java

@@ -235,9 +235,7 @@ public CuVSResources newCuVSResources(Path tempDirectory) {
 
   @Override
   public CuVSResources newCuVSResources(
-      Path tempDirectory,
-      Path memoryTrackingCsvPath,
-      Duration memoryTrackingSampleInterval) {
+      Path tempDirectory, Path memoryTrackingCsvPath, Duration memoryTrackingSampleInterval) {
     Objects.requireNonNull(tempDirectory);
     Objects.requireNonNull(memoryTrackingCsvPath);
     Objects.requireNonNull(memoryTrackingSampleInterval);

java/cuvs-java/src/test/java/com/nvidia/cuvs/CagraAceBuildAndSearchIT.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.nvidia.cuvs;
@@ -187,7 +187,10 @@ public void testAceDiskBasedBuild() throws Throwable {
         // Convert CAGRA index to HNSW using fromCagra
         // This automatically handles disk-based indices
         HnswIndexParams hnswIndexParams =
-            new HnswIndexParams.Builder().withVectorDimension(2).withHierarchy(HnswHierarchy.GPU).build();
+            new HnswIndexParams.Builder()
+                .withVectorDimension(2)
+                .withHierarchy(HnswHierarchy.GPU)
+                .build();
 
         try (var hnswIndexSerialized = HnswIndex.fromCagra(hnswIndexParams, index)) {
           var hnswIndexSerializedPath = buildDir.resolve("hnsw_index.bin");