Delete CollectionUtils.toSet

Author: marcphilipp

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvArgumentsProvider.java

@@ -12,7 +12,6 @@
 
 import static java.util.Objects.requireNonNull;
 import static org.junit.jupiter.params.provider.CsvParserFactory.createParserFor;
-import static org.junit.platform.commons.util.CollectionUtils.toSet;
 
 import java.io.StringReader;
 import java.lang.annotation.Annotation;
@@ -43,7 +42,7 @@ class CsvArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
 	@Override
 	protected Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context,
 			CsvSource csvSource) {
-		Set<String> nullValues = toSet(csvSource.nullValues());
+		Set<String> nullValues = Set.of(csvSource.nullValues());
 		CsvParser csvParser = createParserFor(csvSource);
 		final boolean textBlockDeclared = !csvSource.textBlock().isEmpty();
 		Preconditions.condition(csvSource.value().length > 0 ^ textBlockDeclared,
@@ -59,11 +58,11 @@ private Stream<Arguments> parseTextBlock(CsvSource csvSource, CsvParser csvParse
 		List<Arguments> argumentsList = new ArrayList<>();
 
 		try {
-			List<String[]> csvRecords = csvParser.parseAll(new StringReader(textBlock));
+			List<@Nullable String[]> csvRecords = csvParser.parseAll(new StringReader(textBlock));
 			String[] headers = useHeadersInDisplayName ? getHeaders(csvParser) : null;
 
 			AtomicInteger index = new AtomicInteger(0);
-			for (String[] csvRecord : csvRecords) {
+			for (var csvRecord : csvRecords) {
 				index.incrementAndGet();
 				Preconditions.notNull(csvRecord,
 					() -> "Record at index " + index + " contains invalid CSV: \"\"\"\n" + textBlock + "\n\"\"\"");
@@ -116,8 +115,8 @@ static String[] getHeaders(CsvParser csvParser) {
 	 * {@link Named} if necessary (for CSV header support), and returns the
 	 * CSV record wrapped in an {@link Arguments} instance.
 	 */
-	static Arguments processCsvRecord(String[] csvRecord, Set<String> nullValues, boolean useHeadersInDisplayName,
-			String @Nullable [] headers) {
+	static Arguments processCsvRecord(@Nullable String[] csvRecord, Set<String> nullValues,
+			boolean useHeadersInDisplayName, String @Nullable [] headers) {
 
 		// Nothing to process?
 		if (nullValues.isEmpty() && !useHeadersInDisplayName) {
@@ -132,7 +131,7 @@ static Arguments processCsvRecord(String[] csvRecord, Set<String> nullValues, bo
 		Object[] arguments = new Object[csvRecord.length];
 		for (int i = 0; i < csvRecord.length; i++) {
 			Object column = csvRecord[i];
-			if (nullValues.contains(column)) {
+			if (column != null && nullValues.contains(column)) {
 				column = null;
 			}
 			if (useHeadersInDisplayName) {

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvFileArgumentsProvider.java

@@ -18,7 +18,6 @@
 import static org.junit.jupiter.params.provider.CsvArgumentsProvider.handleCsvException;
 import static org.junit.jupiter.params.provider.CsvArgumentsProvider.processCsvRecord;
 import static org.junit.jupiter.params.provider.CsvParserFactory.createParserFor;
-import static org.junit.platform.commons.util.CollectionUtils.toSet;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -125,7 +124,7 @@ private static class CsvParserIterator implements Iterator<Arguments> {
 			this.csvParser = csvParser;
 			this.csvFileSource = csvFileSource;
 			this.useHeadersInDisplayName = csvFileSource.useHeadersInDisplayName();
-			this.nullValues = toSet(csvFileSource.nullValues());
+			this.nullValues = Set.of(csvFileSource.nullValues());
 			advance();
 		}
 

junit-platform-commons/src/main/java/org/junit/platform/commons/util/CollectionUtils.java

@@ -23,12 +23,10 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Optional;
-import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collector;
 import java.util.stream.DoubleStream;
@@ -96,28 +94,6 @@ private CollectionUtils() {
 				: collection.iterator().next();
 	}
 
-	/**
-	 * Convert the supplied array of values to a {@link Set}.
-	 *
-	 * @param values the array of values; never {@code null}
-	 * @return a set of the values
-	 * @throws PreconditionViolationException if the array is {@code null}
-	 * @since 1.6
-	 */
-	@API(status = INTERNAL, since = "1.6")
-	public static <T extends @Nullable Object> Set<T> toSet(T[] values) {
-		Preconditions.notNull(values, "values array must not be null");
-		if (values.length == 0) {
-			return Collections.emptySet();
-		}
-		if (values.length == 1) {
-			return Collections.singleton(values[0]);
-		}
-		var set = new HashSet<T>();
-		Collections.addAll(set, values);
-		return set;
-	}
-
 	/**
 	 * Return a {@code Collector} that accumulates the input elements into a
 	 * new unmodifiable list, in encounter order.