Polishing

Closes #1895.

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodSourceSupport.java

@@ -10,12 +10,8 @@
 
 package org.junit.jupiter.engine.descriptor;
 
-import static org.apiguardian.api.API.Status.INTERNAL;
-
 import java.net.URI;
 
-import org.apiguardian.api.API;
-import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
@@ -29,26 +25,24 @@
  * @see MethodSource
  * @see MethodSelector
  */
-@API(status = INTERNAL, since = "5.5")
 class MethodSourceSupport {
 
 	static final String METHOD_SCHEME = "method";
 
 	/**
 	 * Create a new {@code MethodSource} from the supplied {@link URI}.
 	 *
-	 * <p>The supplied {@link URI} should be of the form {@code method:<FQMN>} where FQMN is the fully qualified method name
-	 * see {@link DiscoverySelectors#selectMethod(String)} for the supported formats.
+	 * <p>The supplied {@link URI} should be of the form {@code method:<FQMN>}
+	 * where FQMN is the fully qualified method name. See
+	 * {@link DiscoverySelectors#selectMethod(String)} for the supported formats.
 	 *
-	 * <p></p>The {@link URI#getSchemeSpecificPart() schemeSpecificPart} component of the {@code URI}
-	 * will be used as fully qualified class name. The {@linkplain URI#getFragment() fragment} component of the {@code URI}
+	 * <p></p>The {@link URI#getSchemeSpecificPart() scheme-specific part}
+	 * component of the {@code URI} will be used as fully qualified class name.
+	 * The {@linkplain URI#getFragment() fragment} component of the {@code URI}
 	 * will be used to retrieve the method name and method parameter types.
 	 *
 	 * @param uri the {@code URI} for the method; never {@code null}
 	 * @return a new {@code MethodSource}; never {@code null}
-	 * @throws PreconditionViolationException if the supplied {@code URI} is
-	 * {@code null} or if the scheme of the supplied {@code URI} is not equal to the {@link #METHOD_SCHEME}
-	 * or if {@code URI#getSchemeSpecificPart()} is {@code null} or if {@code URI#getFragment()} is {@code null}
 	 * @since 5.5
 	 * @see #METHOD_SCHEME
 	 * @see DiscoverySelectors#selectMethod(String)
@@ -57,12 +51,14 @@ static MethodSource from(URI uri) {
 		Preconditions.notNull(uri, "URI must not be null");
 		Preconditions.condition(METHOD_SCHEME.equals(uri.getScheme()),
 			() -> "URI [" + uri + "] must have [" + METHOD_SCHEME + "] scheme");
-		String schemeSpecificPart = uri.getSchemeSpecificPart();
-		Preconditions.notNull(schemeSpecificPart,
-			"Invalid method URI. Consult the Javadoc for org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod(String) for details on the supported formats.");
-		String fragment = uri.getFragment();
-		Preconditions.notNull(fragment,
-			"Invalid method URI. Consult the Javadoc for org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod(String) for details on the supported formats.");
+		String schemeSpecificPart = Preconditions.notNull(uri.getSchemeSpecificPart(),
+			() -> "Invalid method URI (scheme-specific part must not be null). Please consult the Javadoc of "
+					+ DiscoverySelectors.class.getName()
+					+ "#selectMethod(String) for details on the supported formats.");
+		String fragment = Preconditions.notNull(uri.getFragment(),
+			() -> "Invalid method URI (fragment must not be null). Please consult the Javadoc of "
+					+ DiscoverySelectors.class.getName()
+					+ "#selectMethod(String) for details on the supported formats.");
 
 		String fullyQualifiedMethodName = schemeSpecificPart + "#" + fragment;
 		String[] methodSpec = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptor.java

@@ -169,7 +169,7 @@ static TestSource fromUri(URI uri) {
 		if (CLASSPATH_SCHEME.equals(uri.getScheme())) {
 			return ClasspathResourceSource.from(uri);
 		}
-		else if (METHOD_SCHEME.equals(uri.getScheme())) {
+		if (METHOD_SCHEME.equals(uri.getScheme())) {
 			return MethodSourceSupport.from(uri);
 		}
 		return UriSource.from(uri);