Bug fix:

`FilterDuplicatesConfig.andFailNullKeysWith` is being overridden by `failureForNullValidatable`

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

vador/src/main/java/com/salesforce/vador/config/FilterDuplicatesConfig.java

@@ -5,13 +5,6 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  ******************************************************************************/
 
-/*******************************************************************************
- * Copyright (c) 2022, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- ******************************************************************************/
-
 package com.salesforce.vador.config;
 
 import io.vavr.Function1;

vador/src/main/java/com/salesforce/vador/config/IDConfig.java

@@ -5,13 +5,6 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  ******************************************************************************/
 
-/*******************************************************************************
- * Copyright (c) 2022, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- ******************************************************************************/
-
 package com.salesforce.vador.config;
 
 import de.cronn.reflection.util.TypedPropertyGetter;

vador/src/main/java/com/salesforce/vador/execution/strategies/util/Utils.kt

@@ -129,15 +129,13 @@ internal fun <FailureT, ValidatableT> findAndFilterInvalids(
   failureForNullValidatable: FailureT?,
   filterConfigBuilders: Collection<FilterDuplicatesConfigBuilder<ValidatableT, FailureT?>>,
 ): Collection<Either<FailureT?, ValidatableT?>> {
-  val mapNullValidatables: Collection<Pair<ValidatableT?, Either<FailureT?, ValidatableT?>>> =
-    validatables.map {
-      if (it == null) Pair(null, left(failureForNullValidatable)) else Pair(it, right(it))
-    }
   return if (filterConfigBuilders.isEmpty()) {
-    mapNullValidatables.map { it.second }
+    validatables.map { if (it == null) left(failureForNullValidatable) else right(it) }
   } else {
+    val mapValidatables: Collection<Pair<ValidatableT?, Either<FailureT?, ValidatableT?>>> =
+      validatables.map { Pair(it, right(it)) }
     findAndFilterInvalids(
-        mapNullValidatables.withIndex().map {
+        mapValidatables.withIndex().map {
           Triple(Index(it.index), it.value.first, it.value.second)
         },
         filterConfigBuilders.iterator(),

vador/src/test/java/com/salesforce/vador/execution/UtilsTest.java

@@ -153,28 +153,29 @@ void failNullValidatablesAndFilterDuplicates() {
 						.findAndFilterDuplicatesConfig(
 								FilterDuplicatesConfig.<Bean, ValidationFailure>toValidate()
 										.findAndFilterDuplicatesWith(
-												container -> container.getId() == null ? null : container.getId()))
+												container -> container.getId() == null ? null : container.getId())
+										.andFailNullKeysWith(NOTHING_TO_VALIDATE))
 						.prepare();
 		final var results =
-				List.ofAll(
-						findAndFilterInvalids(
-								validatables.toJavaList(),
-								NOTHING_TO_VALIDATE,
-								batchValidationConfig.getFindAndFilterDuplicatesConfigs()));
+				VadorBatch.validateAndFailFastForEach(
+						validatables.toJavaList(),
+						bean -> bean == null ? "nullBean" : bean.getId(),
+						batchValidationConfig);
 
 		Assertions.assertThat(results).hasSize(5);
-		final var failedInvalids = results.take(2);
-		Assertions.assertThat(failedInvalids).allMatch(r -> r.getLeft() == NOTHING_TO_VALIDATE);
+		var vavrResults = List.ofAll(results);
+		final var failedInvalids = vavrResults.take(2);
+		Assertions.assertThat(failedInvalids).allMatch(r -> r.getLeft()._2 == NOTHING_TO_VALIDATE);
 
-		final var valids = results.drop(2);
+		final var valids = vavrResults.drop(2);
 		org.junit.jupiter.api.Assertions.assertTrue(valids.forAll(Either::isRight));
 		valids.forEachWithIndex(
 				(r, i) ->
 						org.junit.jupiter.api.Assertions.assertEquals(String.valueOf(i + 1), r.get().getId()));
 	}
 
 	@DisplayName(
-			"FailForDuplicates NOT configured. FAIL: Null Validatables, FAIL: Null Keys, FILTER_ONLY: Duplicates")
+			"FailForDuplicates NOT configured. FAIL: NullValidatables, FAIL: Null Keys, FILTER_ONLY: Duplicates")
 	@Test
 	void failNullValidatablesAndNullKeysAndFilterDuplicates() {
 		final List<Bean> invalidValidatables = List.of(null, null);