Clean up warnings and polish

Author: sbrannen

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

@@ -95,7 +95,7 @@ private NamespacedHierarchicalStore.CloseAction<org.junit.platform.engine.suppor
 		return (__, ___, value) -> {
 			boolean isAutoCloseEnabled = this.configuration.isClosingStoredAutoCloseablesEnabled();
 
-			if (value instanceof AutoCloseable closeable && isAutoCloseEnabled) {
+			if (value instanceof @SuppressWarnings("resource") AutoCloseable closeable && isAutoCloseEnabled) {
 				closeable.close();
 				return;
 			}

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

@@ -47,7 +47,7 @@ private JupiterEngineExecutionContext(State state) {
 
 	public void close() throws Exception {
 		ExtensionContext extensionContext = getExtensionContext();
-		if (extensionContext instanceof AutoCloseable closeable) {
+		if (extensionContext instanceof @SuppressWarnings("resource") AutoCloseable closeable) {
 			try {
 				closeable.close();
 			}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/AutoCloseExtension.java

@@ -62,9 +62,10 @@ public void afterAll(ExtensionContext context) {
 
 	private static void closeFields(Class<?> testClass, @Nullable Object testInstance,
 			ThrowableCollector throwableCollector) {
+
 		Predicate<Field> predicate = (testInstance == null ? ModifierSupport::isStatic : ModifierSupport::isNotStatic);
-		AnnotationSupport.findAnnotatedFields(testClass, AutoClose.class, predicate, BOTTOM_UP).forEach(
-			field -> throwableCollector.execute(() -> closeField(field, testInstance)));
+		AnnotationSupport.findAnnotatedFields(testClass, AutoClose.class, predicate, BOTTOM_UP)//
+				.forEach(field -> throwableCollector.execute(() -> closeField(field, testInstance)));
 	}
 
 	private static void closeField(Field field, @Nullable Object testInstance) throws Exception {
@@ -86,16 +87,16 @@ private static void closeField(Field field, @Nullable Object testInstance) throw
 
 	private static void invokeCloseMethod(Field field, Object target, String methodName) throws Exception {
 		// Avoid reflection if we can directly invoke close() via AutoCloseable.
-		if (target instanceof AutoCloseable closeable && "close".equals(methodName)) {
+		if (target instanceof @SuppressWarnings("resource") AutoCloseable closeable && "close".equals(methodName)) {
 			closeable.close();
 			return;
 		}
 
 		Class<?> targetType = target.getClass();
 		Method closeMethod = ReflectionSupport.findMethod(targetType, methodName).orElseThrow(
 			() -> new ExtensionConfigurationException(
-				"Cannot @AutoClose field %s because %s does not define method %s().".formatted(getQualifiedName(field),
-					targetType.getName(), methodName)));
+				"Cannot @AutoClose field %s because %s does not define method %s()."//
+						.formatted(getQualifiedName(field), targetType.getName(), methodName)));
 
 		closeMethod = ReflectionUtils.getInterfaceMethodIfPossible(closeMethod, targetType);
 		ReflectionSupport.invokeMethod(closeMethod, target);

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/PreInterruptThreadDumpPrinter.java

@@ -18,24 +18,23 @@
 import org.junit.jupiter.engine.Constants;
 
 /**
- * The default implementation for {@link PreInterruptCallback},
- * which will print the stacks of all {@link Thread}s to {@code System.out}.
+ * Default implementation of {@link PreInterruptCallback}, which prints the stacks
+ * of all {@link Thread}s to {@code System.out}.
  *
- * <p>Note: This is disabled by default, and must be enabled with
- * {@link Constants#EXTENSIONS_TIMEOUT_THREAD_DUMP_ENABLED_PROPERTY_NAME}
+ * <p>Note: This is disabled by default and must be enabled via
+ * {@link Constants#EXTENSIONS_TIMEOUT_THREAD_DUMP_ENABLED_PROPERTY_NAME}.
  *
  * @since 5.12
  */
 final class PreInterruptThreadDumpPrinter implements PreInterruptCallback {
+
 	private static final String NL = "\n";
 
 	@Override
 	public void beforeThreadInterrupt(PreInterruptContext preInterruptContext, ExtensionContext extensionContext) {
-
 		Map<Thread, StackTraceElement[]> stackTraces = Thread.getAllStackTraces();
 
-		StringBuilder sb = new StringBuilder();
-		sb.append("Thread ");
+		StringBuilder sb = new StringBuilder("Thread ");
 		appendThreadName(sb, preInterruptContext.getThreadToInterrupt());
 		sb.append(" will be interrupted.");
 		sb.append(NL);
@@ -48,10 +47,9 @@ public void beforeThreadInterrupt(PreInterruptContext preInterruptContext, Exten
 				appendThreadName(sb, thread);
 				for (StackTraceElement stackTraceElement : stack) {
 					sb.append(NL);
-					//Do the same prefix as java.lang.Throwable.printStackTrace(java.lang.Throwable.PrintStreamOrWriter)
+					// Use the same prefix as java.lang.Throwable.printStackTrace(PrintStreamOrWriter)
 					sb.append("\tat ");
 					sb.append(stackTraceElement.toString());
-
 				}
 				sb.append(NL);
 			}
@@ -61,23 +59,25 @@ public void beforeThreadInterrupt(PreInterruptContext preInterruptContext, Exten
 	}
 
 	/**
-	 * Appends the {@link Thread} name and ID in a similar fashion as {@code jstack}.
-	 * @param sb the buffer
-	 * @param th the thread to append
+	 * Append the {@link Thread} name and ID in a similar fashion as {@code jstack}.
+	 * @param builder the builder to append to
+	 * @param thread the thread whose information should be appended
 	 */
-	private void appendThreadName(StringBuilder sb, Thread th) {
-		// Use same format as java.lang.management.ThreadInfo.toString
-		sb.append("\"");
-		sb.append(th.getName());
-		sb.append("\"");
-		if (th.isDaemon()) {
-			sb.append(" daemon");
+	@SuppressWarnings("deprecation") // Thread.getId() is deprecated on JDK 19+
+	private static void appendThreadName(StringBuilder builder, Thread thread) {
+		// Use same format as java.lang.management.ThreadInfo.toString()
+		builder.append("\"");
+		builder.append(thread.getName());
+		builder.append("\"");
+		if (thread.isDaemon()) {
+			builder.append(" daemon");
 		}
-		sb.append(" prio=");
-		sb.append(th.getPriority());
-		sb.append(" Id=");
-		sb.append(th.getId());
-		sb.append(" ");
-		sb.append(th.getState());
+		builder.append(" prio=");
+		builder.append(thread.getPriority());
+		builder.append(" Id=");
+		builder.append(thread.getId());
+		builder.append(" ");
+		builder.append(thread.getState());
 	}
+
 }

junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleSupport.java

@@ -147,7 +147,7 @@ private List<TestRuleAnnotatedMember> getRuleAnnotatedMembers(ExtensionContext c
 		Object testInstance = context.getRequiredTestInstance();
 		Namespace namespace = Namespace.create(TestRuleSupport.class, context.getRequiredTestClass());
 		// @formatter:off
-		return new ArrayList<TestRuleAnnotatedMember>(requireNonNull(context.getStore(namespace)
+		return new ArrayList<>(requireNonNull(context.getStore(namespace)
 				.getOrComputeIfAbsent("rule-annotated-members", key -> findRuleAnnotatedMembers(testInstance), List.class)));
 		// @formatter:on
 	}