Polishing

Author: marcphilipp

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

@@ -30,6 +30,9 @@
 import org.junit.platform.commons.logging.Logger;
 import org.junit.platform.commons.logging.LoggerFactory;
 
+/**
+ * @since 5.5
+ */
 class TimeoutConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(TimeoutConfiguration.class);

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

@@ -16,6 +16,9 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.platform.commons.util.Preconditions;
 
+/**
+ * @since 5.5
+ */
 class TimeoutDuration {
 
 	static TimeoutDuration from(Timeout timeout) {

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

@@ -29,6 +29,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * @since 5.5
+ */
 class TimeoutDurationParser {
 
 	private static final Pattern PATTERN = Pattern.compile("([1-9]\\d*) ?((?:[nμm]?s)|m|h|d)?",

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

@@ -30,6 +30,9 @@
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
+/**
+ * @since 5.5
+ */
 class TimeoutExtension implements BeforeAllCallback, BeforeEachCallback, InvocationInterceptor {
 
 	private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(Timeout.class);
@@ -102,17 +105,14 @@ private void readAndStoreTimeout(ExtensionContext context) {
 	private void interceptLifecycleMethod(Invocation<Void> invocation,
 			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext,
 			TimeoutProvider defaultTimeoutProvider) throws Throwable {
-		TimeoutDuration timeoutConfiguration = readTimeoutFromAnnotation(
-			Optional.of(invocationContext.getExecutable())).orElse(null);
-		intercept(invocation, invocationContext, extensionContext, timeoutConfiguration, defaultTimeoutProvider);
+		TimeoutDuration timeout = readTimeoutFromAnnotation(Optional.of(invocationContext.getExecutable())).orElse(
+			null);
+		intercept(invocation, invocationContext, extensionContext, timeout, defaultTimeoutProvider);
 	}
 
+	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 	private Optional<TimeoutDuration> readTimeoutFromAnnotation(Optional<AnnotatedElement> executable) {
-		return findTimeoutAnnotation(executable).map(TimeoutDuration::from);
-	}
-
-	private Optional<Timeout> findTimeoutAnnotation(Optional<AnnotatedElement> element) {
-		return AnnotationSupport.findAnnotation(element, Timeout.class);
+		return AnnotationSupport.findAnnotation(executable, Timeout.class).map(TimeoutDuration::from);
 	}
 
 	private <T> T interceptTestableMethod(Invocation<T> invocation,
@@ -168,7 +168,7 @@ private ScheduledExecutorService getExecutor(ExtensionContext extensionContext)
 	private interface TimeoutProvider extends Function<TimeoutConfiguration, Optional<TimeoutDuration>> {
 	}
 
-	static class ExecutorResource implements CloseableResource {
+	private static class ExecutorResource implements CloseableResource {
 
 		private final ScheduledExecutorService executor;
 
@@ -180,7 +180,7 @@ static class ExecutorResource implements CloseableResource {
 			});
 		}
 
-		public ScheduledExecutorService get() {
+		ScheduledExecutorService get() {
 			return executor;
 		}
 

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

@@ -18,6 +18,9 @@
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
 import org.junit.platform.commons.util.BlacklistedExceptions;
 
+/**
+ * @since 5.5
+ */
 class TimeoutInvocation<T> implements Invocation<T> {
 
 	private final Invocation<T> delegate;

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java

@@ -40,6 +40,9 @@
 import org.junit.jupiter.engine.TrackLogRecords;
 import org.junit.platform.commons.logging.LogRecordListener;
 
+/**
+ * @since 5.5
+ */
 class TimeoutConfigurationTests {
 
 	ExtensionContext extensionContext = mock(ExtensionContext.class);

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationParserTests.java

@@ -30,6 +30,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
 
+/**
+ * @since 5.5
+ */
 class TimeoutDurationParserTests {
 
 	private final TimeoutDurationParser parser = new TimeoutDurationParser();

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutDurationTests.java

@@ -16,6 +16,9 @@
 
 import org.junit.jupiter.api.Test;
 
+/**
+ * @since 5.5
+ */
 class TimeoutDurationTests {
 
 	@Test

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutExtensionTests.java

@@ -50,6 +50,9 @@
 import org.junit.platform.testkit.engine.Events;
 import org.junit.platform.testkit.engine.Execution;
 
+/**
+ * @since 5.5
+ */
 @DisplayName("@Timeout")
 class TimeoutExtensionTests extends AbstractJupiterTestEngineTests {
 

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutInvocationTests.java

@@ -25,6 +25,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 
+/**
+ * @since 5.5
+ */
 class TimeoutInvocationTests {
 
 	@Test