Use records

Author: marcphilipp

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java

@@ -198,30 +198,7 @@ private static void failIterablesNotEqual(Object expected, Object actual, Deque<
 				.buildAndThrow();
 	}
 
-	private final static class Pair {
-		private final Object left;
-		private final Object right;
-
-		public Pair(Object left, Object right) {
-			this.left = left;
-			this.right = right;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o)
-				return true;
-			if (o == null || getClass() != o.getClass())
-				return false;
-			Pair that = (Pair) o;
-			return Objects.equals(this.left, that.left) //
-					&& Objects.equals(this.right, that.right);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(left, right);
-		}
+	private record Pair(Object left, Object right) {
 	}
 
 	private enum Status {

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java

@@ -83,19 +83,8 @@ static void assertLinesMatch(List<String> expectedLines, List<String> actualLine
 		new LinesMatcher(expectedLines, actualLines, messageOrSupplier).assertLinesMatch();
 	}
 
-	private static class LinesMatcher {
-
-		private final List<String> expectedLines;
-		private final List<String> actualLines;
-
-		@Nullable
-		private final Object messageOrSupplier;
-
-		LinesMatcher(List<String> expectedLines, List<String> actualLines, @Nullable Object messageOrSupplier) {
-			this.expectedLines = expectedLines;
-			this.actualLines = actualLines;
-			this.messageOrSupplier = messageOrSupplier;
-		}
+	private record LinesMatcher(List<String> expectedLines, List<String> actualLines,
+			@Nullable Object messageOrSupplier) {
 
 		void assertLinesMatch() {
 			int expectedSize = expectedLines.size();

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

@@ -18,13 +18,7 @@
  *
  * @since 5.8
  */
-class DefaultDynamicTestInvocationContext implements DynamicTestInvocationContext {
-
-	private final Executable executable;
-
-	DefaultDynamicTestInvocationContext(Executable executable) {
-		this.executable = executable;
-	}
+record DefaultDynamicTestInvocationContext(Executable executable) implements DynamicTestInvocationContext {
 
 	@Override
 	public Executable getExecutable() {

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

@@ -20,15 +20,8 @@
  *
  * @since 5.3
  */
-class DefaultTestInstanceFactoryContext implements TestInstanceFactoryContext {
-
-	private final Class<?> testClass;
-	private final Optional<Object> outerInstance;
-
-	DefaultTestInstanceFactoryContext(Class<?> testClass, Optional<Object> outerInstance) {
-		this.testClass = testClass;
-		this.outerInstance = outerInstance;
-	}
+record DefaultTestInstanceFactoryContext(Class<?> testClass, Optional<Object> outerInstance)
+		implements TestInstanceFactoryContext {
 
 	@Override
 	public Class<?> getTestClass() {

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

@@ -23,17 +23,12 @@
 /**
  * @since 5.0
  */
-class DefaultParameterContext implements ParameterContext {
+record DefaultParameterContext(Parameter parameter, int index, Optional<Object> target) implements ParameterContext {
 
-	private final Parameter parameter;
-	private final int index;
-	private final Optional<Object> target;
-
-	DefaultParameterContext(Parameter parameter, int index, Optional<Object> target) {
+	DefaultParameterContext {
 		Preconditions.condition(index >= 0, "index must be greater than or equal to zero");
-		this.parameter = Preconditions.notNull(parameter, "parameter must not be null");
-		this.index = index;
-		this.target = Preconditions.notNull(target, "target must not be null");
+		Preconditions.notNull(parameter, "parameter must not be null");
+		Preconditions.notNull(target, "target must not be null");
 	}
 
 	@Override

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

@@ -91,17 +91,8 @@ public interface VoidInterceptorCall {
 
 	}
 
-	private static class InterceptedInvocation<T> implements Invocation<T> {
-
-		private final Invocation<T> invocation;
-		private final InterceptorCall<T> call;
-		private final InvocationInterceptor interceptor;
-
-		InterceptedInvocation(Invocation<T> invocation, InterceptorCall<T> call, InvocationInterceptor interceptor) {
-			this.invocation = invocation;
-			this.call = call;
-			this.interceptor = interceptor;
-		}
+	private record InterceptedInvocation<T>(Invocation<T> invocation, InterceptorCall<T> call,
+			InvocationInterceptor interceptor) implements Invocation<T> {
 
 		@Override
 		public T proceed() throws Throwable {

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

@@ -17,12 +17,10 @@
 /**
  * @since 5.12
  */
-class DefaultPreInterruptContext implements PreInterruptContext {
-	private final Thread threadToInterrupt;
+record DefaultPreInterruptContext(Thread threadToInterrupt) implements PreInterruptContext {
 
-	DefaultPreInterruptContext(Thread threadToInterrupt) {
+	DefaultPreInterruptContext {
 		Preconditions.notNull(threadToInterrupt, "threadToInterrupt must not be null");
-		this.threadToInterrupt = threadToInterrupt;
 	}
 
 	@Override

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

@@ -18,20 +18,8 @@
 /**
  * Default implementation of {@link RepetitionInfo}.
  */
-class DefaultRepetitionInfo implements RepetitionInfo {
-
-	final int currentRepetition;
-	final int totalRepetitions;
-	final AtomicInteger failureCount;
-	final int failureThreshold;
-
-	DefaultRepetitionInfo(int currentRepetition, int totalRepetitions, AtomicInteger failureCount,
-			int failureThreshold) {
-		this.currentRepetition = currentRepetition;
-		this.totalRepetitions = totalRepetitions;
-		this.failureCount = failureCount;
-		this.failureThreshold = failureThreshold;
-	}
+record DefaultRepetitionInfo(int currentRepetition, int totalRepetitions, AtomicInteger failureCount,
+		int failureThreshold) implements RepetitionInfo {
 
 	@Override
 	public int getCurrentRepetition() {

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

@@ -36,7 +36,7 @@ public RepeatedTestInvocationContext(DefaultRepetitionInfo repetitionInfo,
 
 	@Override
 	public String getDisplayName(int invocationIndex) {
-		return this.formatter.format(this.repetitionInfo.currentRepetition, this.repetitionInfo.totalRepetitions);
+		return this.formatter.format(this.repetitionInfo.currentRepetition(), this.repetitionInfo.totalRepetitions());
 	}
 
 	@Override

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

@@ -63,13 +63,13 @@ public RepetitionInfo resolveParameter(ParameterContext parameterContext, Extens
 
 	@Override
 	public void testFailed(ExtensionContext context, @Nullable Throwable cause) {
-		this.repetitionInfo.failureCount.incrementAndGet();
+		this.repetitionInfo.failureCount().incrementAndGet();
 	}
 
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		int failureThreshold = this.repetitionInfo.failureThreshold;
-		if (this.repetitionInfo.failureCount.get() >= failureThreshold) {
+		int failureThreshold = this.repetitionInfo.getFailureThreshold();
+		if (this.repetitionInfo.getFailureCount() >= failureThreshold) {
 			return disabled("Failure threshold [" + failureThreshold + "] exceeded");
 		}
 		return enabled("Failure threshold not exceeded");