Rename AnnotationInitialized to AnnotationConsumer

junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverter.java

@@ -27,10 +27,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 
 class JavaTimeArgumentConverter extends SimpleArgumentConverter
-		implements AnnotationInitialized<JavaTimeConversionPattern> {
+		implements AnnotationConsumer<JavaTimeConversionPattern> {
 
 	private static final Map<Class<?>, TemporalQuery<?>> TEMPORAL_QUERIES;
 	static {
@@ -52,7 +52,7 @@ class JavaTimeArgumentConverter extends SimpleArgumentConverter
 	private String pattern;
 
 	@Override
-	public void initialize(JavaTimeConversionPattern annotation) {
+	public void accept(JavaTimeConversionPattern annotation) {
 		pattern = annotation.value();
 	}
 

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

@@ -17,15 +17,15 @@
 import com.univocity.parsers.csv.CsvParserSettings;
 
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 
-class CsvArgumentsProvider implements ArgumentsProvider, AnnotationInitialized<CsvSource> {
+class CsvArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvSource> {
 
 	private String[] lines;
 	private char delimiter;
 
 	@Override
-	public void initialize(CsvSource annotation) {
+	public void accept(CsvSource annotation) {
 		lines = annotation.value();
 		delimiter = annotation.delimiter();
 	}

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

@@ -25,11 +25,11 @@
 import com.univocity.parsers.csv.CsvParserSettings;
 
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.Preconditions;
 
-class CsvFileArgumentsProvider implements ArgumentsProvider, AnnotationInitialized<CsvFileSource> {
+class CsvFileArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<CsvFileSource> {
 
 	private final BiFunction<Class<?>, String, InputStream> inputStreamProvider;
 
@@ -46,7 +46,7 @@ class CsvFileArgumentsProvider implements ArgumentsProvider, AnnotationInitializ
 	}
 
 	@Override
-	public void initialize(CsvFileSource annotation) {
+	public void accept(CsvFileSource annotation) {
 		resources = annotation.resources();
 		charset = Charset.forName(annotation.encoding());
 		settings = new CsvParserSettings();

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

@@ -17,15 +17,15 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 
-class EnumArgumentsProvider implements ArgumentsProvider, AnnotationInitialized<EnumSource> {
+class EnumArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<EnumSource> {
 
 	private Class<? extends Enum<?>> enumClass;
 	private Set<String> names = Collections.emptySet();
 
 	@Override
-	public void initialize(EnumSource annotation) {
+	public void accept(EnumSource annotation) {
 		enumClass = annotation.value();
 		if (annotation.names().length > 0) {
 			names = Stream.of(annotation.names()).collect(Collectors.toSet());

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

@@ -14,17 +14,17 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
-class MethodArgumentsProvider implements ArgumentsProvider, AnnotationInitialized<MethodSource> {
+class MethodArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<MethodSource> {
 
 	private String[] methodNames;
 
 	@Override
-	public void initialize(MethodSource annotation) {
+	public void accept(MethodSource annotation) {
 		methodNames = annotation.names();
 	}
 

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

@@ -19,15 +19,15 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
-import org.junit.jupiter.params.support.AnnotationInitialized;
+import org.junit.jupiter.params.support.AnnotationConsumer;
 import org.junit.platform.commons.util.Preconditions;
 
-class ValueArgumentsProvider implements ArgumentsProvider, AnnotationInitialized<ValueSource> {
+class ValueArgumentsProvider implements ArgumentsProvider, AnnotationConsumer<ValueSource> {
 
 	private Object[] arguments;
 
 	@Override
-	public void initialize(ValueSource source) {
+	public void accept(ValueSource source) {
 		List<Object> arrays = Stream.of(source.strings(), source.ints(), source.longs(), source.doubles()) //
 				.filter(array -> Array.getLength(array) > 0) //
 				.collect(toList());

junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationInitialized.java → junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumer.java

@@ -11,9 +11,7 @@
 package org.junit.jupiter.params.support;
 
 import java.lang.annotation.Annotation;
+import java.util.function.Consumer;
 
-public interface AnnotationInitialized<A extends Annotation> {
-
-	void initialize(A annotation);
-
+public interface AnnotationConsumer<A extends Annotation> extends Consumer<A> {
 }

junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationInitializer.java

@@ -28,8 +28,8 @@ public final class AnnotationInitializer {
 
 	@SuppressWarnings("unchecked")
 	public static <T> T initialize(AnnotatedElement annotatedElement, T instance) {
-		if (instance instanceof AnnotationInitialized) {
-			Predicate<Method> methodPredicate = method -> method.getName().equals("initialize")
+		if (instance instanceof AnnotationConsumer) {
+			Predicate<Method> methodPredicate = method -> method.getName().equals("accept")
 					&& method.getParameterCount() == 1
 					&& Annotation.class.isAssignableFrom(method.getParameterTypes()[0]);
 			Method method = ReflectionUtils.findMethods(instance.getClass(), methodPredicate,
@@ -38,14 +38,14 @@ public static <T> T initialize(AnnotatedElement annotatedElement, T instance) {
 			Annotation annotation = AnnotationUtils.findAnnotation(annotatedElement, annotationType) //
 					.orElseThrow(() -> new JUnitException(instance.getClass().getName() + " needs to be used with a "
 							+ annotationType.getName() + " annotation"));
-			callInitialize((AnnotationInitialized) instance, annotation);
+			callInitialize((AnnotationConsumer) instance, annotation);
 		}
 		return instance;
 	}
 
-	private static <A extends Annotation> void callInitialize(AnnotationInitialized<A> instance, A annotation) {
+	private static <A extends Annotation> void callInitialize(AnnotationConsumer<A> instance, A annotation) {
 		try {
-			instance.initialize(annotation);
+			instance.accept(annotation);
 		}
 		catch (Exception ex) {
 			throw new JUnitException("Failed to initialize instance: " + instance, ex);

junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParamsApiPlayground.java

@@ -30,7 +30,7 @@
 
 class ParamsApiPlayground {
 
-	@ParameterizedTest
+	@ParameterizedTest(name = "{0}")
 	@EnumSource(TimeUnit.class)
 	void testWithParametersFromEnum(TimeUnit unit) {
 	}
@@ -51,8 +51,8 @@ void testWithParametersFromLongArray(long number) {
 	}
 
 	@ParameterizedTest
-	@CsvSource({ "foo, 1", "bar, 2", "'baz, qux', 3" })
-	void testWithParametersFromAnnotation(String parameter, int i) {
+	@CsvSource({ "foo, 1, 3", "bar, 2, 42", "'baz, qux', 3" })
+	void testWithParametersFromAnnotation(String parameter, int i, long j) {
 	}
 
 	@ParameterizedTest

junit-jupiter-params/src/test/java/org/junit/jupiter/params/converter/JavaTimeArgumentConverterTests.java

@@ -112,7 +112,7 @@ private Object convert(Object input, String pattern, Class<?> targetClass) {
 		JavaTimeArgumentConverter converter = new JavaTimeArgumentConverter();
 		JavaTimeConversionPattern annotation = mock(JavaTimeConversionPattern.class);
 		when(annotation.value()).thenReturn(pattern);
-		converter.initialize(annotation);
+		converter.accept(annotation);
 
 		return converter.convert(input, targetClass);
 	}

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java

@@ -61,7 +61,7 @@ private Stream<Object[]> provideArguments(char delimiter, String... value) {
 		when(annotation.delimiter()).thenReturn(delimiter);
 
 		CsvArgumentsProvider provider = new CsvArgumentsProvider();
-		provider.initialize(annotation);
+		provider.accept(annotation);
 		return provider.arguments(null).map(Arguments::get);
 	}
 

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/CsvFileArgumentsProviderTests.java

@@ -113,7 +113,7 @@ private Stream<Object[]> provideArguments(InputStream inputStream, String lineSe
 	}
 
 	private Stream<Object[]> provide(CsvFileArgumentsProvider provider, CsvFileSource annotation) {
-		provider.initialize(annotation);
+		provider.accept(annotation);
 		ContainerExtensionContext context = mock(ContainerExtensionContext.class);
 		when(context.getTestClass()).thenReturn(Optional.of(CsvFileArgumentsProviderTests.class));
 		return provider.arguments(context).map(Arguments::get);

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/EnumArgumentsProviderTests.java

@@ -68,7 +68,7 @@ private Stream<Object[]> provideArguments(Class<? extends Enum<?>> enumClass, St
 		when(annotation.names()).thenAnswer(invocation -> names);
 
 		EnumArgumentsProvider provider = new EnumArgumentsProvider();
-		provider.initialize(annotation);
+		provider.accept(annotation);
 		return provider.arguments(null).map(Arguments::get);
 	}
 

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/MethodArgumentsProviderTests.java

@@ -136,7 +136,7 @@ private Stream<Object[]> provideArguments(Class<?> testClass, String... methodNa
 		when(context.getTestClass()).thenReturn(Optional.ofNullable(testClass));
 
 		MethodArgumentsProvider provider = new MethodArgumentsProvider();
-		provider.initialize(annotation);
+		provider.accept(annotation);
 		return provider.arguments(context).map(Arguments::get);
 	}
 }

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/ValueArgumentsProviderTests.java

@@ -76,7 +76,7 @@ private Stream<Object[]> provideArguments(String[] strings, int[] ints, long[] l
 		when(annotation.doubles()).thenReturn(doubles);
 
 		ValueArgumentsProvider provider = new ValueArgumentsProvider();
-		provider.initialize(annotation);
+		provider.accept(annotation);
 		return provider.arguments(null).map(Arguments::get);
 	}