Consistent use of "instanceof pattern matching"

Author: sbrannen

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

@@ -177,8 +177,8 @@ public static ExecutionMode toExecutionMode(org.junit.jupiter.api.parallel.Execu
 
 	@Override
 	public Set<ExclusiveResource> getExclusiveResources() {
-		if (this instanceof ResourceLockAware aware) {
-			return aware.determineExclusiveResources().collect(toSet());
+		if (this instanceof ResourceLockAware resourceLockAware) {
+			return resourceLockAware.determineExclusiveResources().collect(toSet());
 		}
 		return emptySet();
 	}

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

@@ -89,9 +89,9 @@ public List<Class<?>> getEnclosingTestClasses() {
 
 	@API(status = INTERNAL, since = "5.12")
 	public static List<Class<?>> getEnclosingTestClasses(@Nullable TestDescriptor parent) {
-		if (parent instanceof TestClassAware parentClassDescriptor) {
-			List<Class<?>> result = new ArrayList<>(parentClassDescriptor.getEnclosingTestClasses());
-			result.add(parentClassDescriptor.getTestClass());
+		if (parent instanceof TestClassAware testClassAwareParent) {
+			List<Class<?>> result = new ArrayList<>(testClassAwareParent.getEnclosingTestClasses());
+			result.add(testClassAwareParent.getTestClass());
 			return result;
 		}
 		return emptyList();

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

@@ -35,8 +35,8 @@ default Stream<ExclusiveResource> determineExclusiveResources() {
 
 		Deque<ResourceLockAware> ancestors = new ArrayDeque<>();
 		TestDescriptor parent = this.getParent().orElse(null);
-		while (parent instanceof ResourceLockAware) {
-			ancestors.addFirst((ResourceLockAware) parent);
+		while (parent instanceof ResourceLockAware resourceLockAwareParent) {
+			ancestors.addFirst(resourceLockAwareParent);
 			parent = parent.getParent().orElse(null);
 		}
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/InterceptingExecutableInvoker.java

@@ -81,8 +81,8 @@ public <T> T invoke(Constructor<T> constructor, Optional<Object> outerInstance,
 	public <T> T invoke(Method method, @Nullable Object target, ExtensionContext extensionContext,
 			ExtensionRegistry extensionRegistry, ReflectiveInterceptorCall<Method, T> interceptorCall) {
 
-		@SuppressWarnings("unchecked")
-		Optional<Object> optionalTarget = (target instanceof Optional ? (Optional<Object>) target
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Optional<Object> optionalTarget = (target instanceof Optional optional ? optional
 				: Optional.ofNullable(target));
 		@Nullable
 		Object[] arguments = resolveParameters(method, optionalTarget, extensionContext, extensionRegistry);

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

@@ -85,8 +85,8 @@ private CollectionUtils() {
 	}
 
 	private static <T extends @Nullable Object> T firstElement(Collection<T> collection) {
-		return collection instanceof List //
-				? ((List<T>) collection).get(0) //
+		return collection instanceof List<T> list //
+				? list.get(0) //
 				: collection.iterator().next();
 	}
 

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

@@ -1930,8 +1930,8 @@ private static boolean isSearchable(@Nullable Class<?> clazz) {
 	 * exception}; otherwise, this method returns the supplied {@code Throwable}.
 	 */
 	static Throwable getUnderlyingCause(Throwable t) {
-		if (t instanceof InvocationTargetException) {
-			return getUnderlyingCause(((InvocationTargetException) t).getTargetException());
+		if (t instanceof InvocationTargetException ite) {
+			return getUnderlyingCause(ite.getTargetException());
 		}
 		return t;
 	}

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeUtils.java

@@ -21,9 +21,9 @@ private NodeUtils() {
 		/* no-op */
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	static <C extends EngineExecutionContext> Node<C> asNode(TestDescriptor testDescriptor) {
-		return (testDescriptor instanceof Node ? (Node<C>) testDescriptor : noOpNode);
+		return (testDescriptor instanceof Node node ? node : noOpNode);
 	}
 
 	@SuppressWarnings("rawtypes")

jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/injection/sample/MapOfStringsParameterResolver.java

@@ -29,10 +29,10 @@ public class MapOfStringsParameterResolver implements ParameterResolver {
 	@Override
 	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Type type = parameterContext.getParameter().getParameterizedType();
-		if (!(type instanceof ParameterizedType)) {
+		if (!(type instanceof ParameterizedType parameterizedType)) {
 			return false;
 		}
-		Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments();
+		Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
 		if (actualTypeArguments.length != 2) {
 			return false;
 		}