Delete temporary MethodParameterFactory solution

SPR-14055 introduced first-class support for the Java 8 Parameter API.

This commit therefore replaces the MethodParameterFactory with use of
the new SynthesizingMethodParameter.forParameter(Parameter) factory
method.

Issue: SPR-13575

spring-test/src/main/java/org/springframework/test/context/junit/jupiter/MethodParameterFactory.java

-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.test.context.junit.jupiter;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.core.annotation.SynthesizingMethodParameter;
-import org.springframework.util.Assert;
-
-/**
- * Factory for creating {@link MethodParameter} instances from Java 8
- * {@link Parameter Parameters}.
- *
- * @author Sam Brannen
- * @since 5.0
- * @see ParameterAutowireUtils
- * @see MethodParameter
- * @see SynthesizingMethodParameter
- * @see #createMethodParameter(Parameter)
- * @see #createSynthesizingMethodParameter(Parameter)
- */
-abstract class MethodParameterFactory {
-
-	private MethodParameterFactory() {
-		/* no-op */
-	}
-
-	/**
-	 * Create a standard {@link MethodParameter} from the supplied {@link Parameter}.
-	 * <p>Supports parameters declared in methods and constructors.
-	 * @param parameter the parameter to create a {@code MethodParameter} for;
-	 * never {@code null}
-	 * @return a new {@code MethodParameter}
-	 * @see #createSynthesizingMethodParameter(Parameter)
-	 */
-	static MethodParameter createMethodParameter(Parameter parameter) {
-		Assert.notNull(parameter, "Parameter must not be null");
-		Executable executable = parameter.getDeclaringExecutable();
-		if (executable instanceof Method) {
-			return new MethodParameter((Method) executable, getIndex(parameter));
-		}
-		// else
-		return new MethodParameter((Constructor<?>) executable, getIndex(parameter));
-	}
-
-	/**
-	 * Create a {@link SynthesizingMethodParameter} from the supplied {@link Parameter}.
-	 * <p>Supports parameters declared in methods.
-	 * @param parameter the parameter to create a {@code SynthesizingMethodParameter}
-	 * for; never {@code null}
-	 * @return a new {@code SynthesizingMethodParameter}
-	 * @throws UnsupportedOperationException if the supplied parameter is declared
-	 * in a constructor
-	 * @see #createMethodParameter(Parameter)
-	 */
-	static SynthesizingMethodParameter createSynthesizingMethodParameter(Parameter parameter) {
-		Assert.notNull(parameter, "Parameter must not be null");
-		Executable executable = parameter.getDeclaringExecutable();
-		if (executable instanceof Method) {
-			return new SynthesizingMethodParameter((Method) executable, getIndex(parameter));
-		}
-		// else
-		throw new UnsupportedOperationException(
-			"Cannot create a SynthesizingMethodParameter for a constructor parameter: " + parameter);
-	}
-
-	private static int getIndex(Parameter parameter) {
-		Assert.notNull(parameter, "Parameter must not be null");
-		Executable executable = parameter.getDeclaringExecutable();
-		Parameter[] parameters = executable.getParameters();
-		for (int i = 0; i < parameters.length; i++) {
-			if (parameters[i] == parameter) {
-				return i;
-			}
-		}
-		throw new IllegalStateException(String.format("Failed to resolve index of parameter [%s] in executable [%s]",
-			parameter, executable.toGenericString()));
-	}
-
-}

spring-test/src/main/java/org/springframework/test/context/junit/jupiter/ParameterAutowireUtils.java

@@ -18,7 +18,6 @@ package org.springframework.test.context.junit.jupiter;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.Optional;
 
@@ -31,13 +30,13 @@ import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.SynthesizingMethodParameter;
 
 /**
  * Collection of utilities related to autowiring of individual method parameters.
  *
  * @author Sam Brannen
  * @since 5.0
- * @see MethodParameterFactory
  * @see #isAutowirable(Parameter)
  * @see #resolveDependency(Parameter, Class, ApplicationContext)
  */
@@ -86,25 +85,18 @@ abstract class ParameterAutowireUtils {
 	 * @throws BeansException if dependency resolution failed
 	 * @see #isAutowirable(Parameter)
 	 * @see Autowired#required
-	 * @see MethodParameterFactory#createSynthesizingMethodParameter(Parameter)
+	 * @see SynthesizingMethodParameter#forParameter(Parameter)
 	 * @see AutowireCapableBeanFactory#resolveDependency(DependencyDescriptor, String)
 	 */
-	static Object resolveDependency(Parameter parameter, Class<?> containingClass,
-			ApplicationContext applicationContext) {
-
+	static Object resolveDependency(Parameter parameter, Class<?> containingClass, ApplicationContext applicationContext) {
 		boolean required = findMergedAnnotation(parameter, Autowired.class).map(Autowired::required).orElse(true);
-		MethodParameter methodParameter = (parameter.getDeclaringExecutable() instanceof Method
-				? MethodParameterFactory.createSynthesizingMethodParameter(parameter)
-				: MethodParameterFactory.createMethodParameter(parameter));
+		MethodParameter methodParameter = SynthesizingMethodParameter.forParameter(parameter);
 		DependencyDescriptor descriptor = new DependencyDescriptor(methodParameter, required);
 		descriptor.setContainingClass(containingClass);
-
 		return applicationContext.getAutowireCapableBeanFactory().resolveDependency(descriptor, null);
 	}
 
-	private static <A extends Annotation> Optional<A> findMergedAnnotation(AnnotatedElement element,
-			Class<A> annotationType) {
-
+	private static <A extends Annotation> Optional<A> findMergedAnnotation(AnnotatedElement element, Class<A> annotationType) {
 		return Optional.ofNullable(AnnotatedElementUtils.findMergedAnnotation(element, annotationType));
 	}