update to junit 5.14; test refactorings

Author: normen662

build/reports/problems/problems-report.html

@@ -322,7 +322,7 @@ public int hashCode() {
     @Override
     @Nonnull
     public String toString() {
-        return "Config[" + ", metric=" + getMetric() + ", numDimensions=" + getNumDimensions() +
+        return "Config[" + "metric=" + getMetric() + ", numDimensions=" + getNumDimensions() +
                 ", isUseInlining=" + isUseInlining() + ", M=" + getM() + ", MMax=" + getMMax() +
                 ", MMax0=" + getMMax0() + ", efConstruction=" + getEfConstruction() +
                 ", isExtendCandidates=" + isExtendCandidates() +

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/Config.java

@@ -26,7 +26,7 @@
 import java.util.List;
 
 /**
- * A container class that pairs a {@link NodeReferenceWithDistance} with its corresponding {@link AbstractNode} object.
+ * A container class that pairs a {@link NodeReference} with its corresponding {@link AbstractNode} object.
  * <p>
  * This is often used during graph traversal or searching, where a reference to a node (along with its distance from a
  * query point) is first identified, and then the complete node data is fetched. This class holds these two related
@@ -70,6 +70,11 @@ public AbstractNode<N> getNode() {
         return node;
     }
 
+    @Override
+    public String toString() {
+        return "NB[" + nodeReference + "," + node + ']';
+    }
+
     /**
      * Helper to extract the references from a given collection of objects of this container class.
      * @param referencesAndNodes an iterable of {@link NodeReferenceAndNode} objects from which to extract the

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/HNSW.java

@@ -62,9 +62,9 @@ public class VectorIndexScanComparisons implements IndexScanParameters {
     @Nonnull
     private final VectorIndexScanOptions vectorIndexScanOptions;
 
-    public VectorIndexScanComparisons(@Nonnull final ScanComparisons prefixScanComparisons,
-                                      @Nonnull final DistanceRankValueComparison distanceRankValueComparison,
-                                      @Nonnull final VectorIndexScanOptions vectorIndexScanOptions) {
+    private VectorIndexScanComparisons(@Nonnull final ScanComparisons prefixScanComparisons,
+                                       @Nonnull final DistanceRankValueComparison distanceRankValueComparison,
+                                       @Nonnull final VectorIndexScanOptions vectorIndexScanOptions) {
         this.prefixScanComparisons = prefixScanComparisons;
         this.distanceRankValueComparison = distanceRankValueComparison;
         this.vectorIndexScanOptions = vectorIndexScanOptions;
@@ -311,14 +311,12 @@ public static VectorIndexScanComparisons fromProto(@Nonnull final PlanSerializat
     }
 
     @Nonnull
-    public static VectorIndexScanComparisons byDistance(@Nullable ScanComparisons prefixScanComparisons,
+    public static VectorIndexScanComparisons byDistance(@Nullable final ScanComparisons prefixScanComparisons,
                                                         @Nonnull final DistanceRankValueComparison distanceRankValueComparison,
-                                                        @Nonnull VectorIndexScanOptions vectorIndexScanOptions) {
-        if (prefixScanComparisons == null) {
-            prefixScanComparisons = ScanComparisons.EMPTY;
-        }
-
-        return new VectorIndexScanComparisons(prefixScanComparisons, distanceRankValueComparison,
+                                                        @Nonnull final VectorIndexScanOptions vectorIndexScanOptions) {
+        return new VectorIndexScanComparisons(
+                prefixScanComparisons == null ? ScanComparisons.EMPTY : prefixScanComparisons,
+                distanceRankValueComparison,
                 vectorIndexScanOptions);
     }
 

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/NodeReferenceAndNode.java

@@ -346,7 +346,7 @@ protected <M extends Message> CompletableFuture<Void> updateIndexKeys(@Nonnull f
             final HNSW hnsw =
                     new HNSW(rtSubspace, getExecutor(), getConfig(), new OnWrite(timer), OnReadListener.NOOP);
             if (remove) {
-                throw new UnsupportedOperationException("not implemented");
+                return hnsw.delete(state.transaction, trimmedPrimaryKey);
             } else {
                 return hnsw.insert(state.transaction, trimmedPrimaryKey,
                         RealVector.fromBytes(vectorBytes));

fdb-extensions/src/test/java/com/apple/foundationdb/async/hnsw/HNSWTest.java

@@ -58,6 +58,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.junit.jupiter.params.support.ParameterDeclarations;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -376,7 +377,8 @@ public void indexGroupingCompatibility() throws Exception {
 
     private static class ArgumentProvider implements ArgumentsProvider {
         @Override
-        public Stream<? extends Arguments> provideArguments(final ExtensionContext context) throws Exception {
+        public Stream<? extends Arguments> provideArguments(final ParameterDeclarations parameterDeclarations,
+                                                            final ExtensionContext context) {
             return Stream.of(Arguments.of("double parameter", 10.10d, 12, 12d),
                     Arguments.of("float parameter", 11.11f, 13.13f),
                     Arguments.of("long parameter", 42L, 44L),

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/provider/foundationdb/VectorIndexScanComparisons.java

@@ -66,7 +66,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER;
+import static org.junit.jupiter.params.ParameterizedInvocationConstants.ARGUMENTS_WITH_NAMES_PLACEHOLDER;
 
 /**
  * A test for the remote fetch index scan wrapper.

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/provider/foundationdb/indexes/VectorIndexMaintainer.java

@@ -45,7 +45,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.params.ParameterizedTest.ARGUMENTS_WITH_NAMES_PLACEHOLDER;
+import static org.junit.jupiter.params.ParameterizedInvocationConstants.ARGUMENTS_WITH_NAMES_PLACEHOLDER;
 
 /**
  * Remote fetch test with a compound primary key.