Skip to content

Commit d52ddac

Browse files
committed
Move @Nullable annotation to type declaration
1 parent 5f3ed21 commit d52ddac

File tree

75 files changed

+110
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+110
-220
lines changed

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,17 @@
3232
@API(status = STABLE, since = "5.9")
3333
public class AssertionFailureBuilder {
3434

35-
@Nullable
36-
private Object message;
35+
private @Nullable Object message;
3736

38-
@Nullable
39-
private Throwable cause;
37+
private @Nullable Throwable cause;
4038

4139
private boolean mismatch;
4240

43-
@Nullable
44-
private Object expected;
41+
private @Nullable Object expected;
4542

46-
@Nullable
47-
private Object actual;
43+
private @Nullable Object actual;
4844

49-
@Nullable
50-
private String reason;
45+
private @Nullable String reason;
5146

5247
private boolean includeValuesInMessage = true;
5348

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public abstract class DynamicNode {
3434
private final String displayName;
3535

3636
/** Custom test source {@link URI} associated with this node; potentially {@code null}. */
37-
@Nullable
38-
private final URI testSourceUri;
37+
private final @Nullable URI testSourceUri;
3938

4039
DynamicNode(String displayName, @Nullable URI testSourceUri) {
4140
this.displayName = Preconditions.notBlank(displayName, "displayName must not be null or blank");

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/OS.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ public enum OS {
9595

9696
private static final Logger logger = LoggerFactory.getLogger(OS.class);
9797

98-
@Nullable
99-
private static final OS CURRENT_OS = determineCurrentOs();
98+
private static final @Nullable OS CURRENT_OS = determineCurrentOs();
10099

101100
/**
102101
* {@return the current operating system, if known; otherwise, {@code null}}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
5555

5656
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractExtensionContext.class);
5757

58-
@Nullable
59-
private final ExtensionContext parent;
58+
private final @Nullable ExtensionContext parent;
6059
private final EngineExecutionListener engineExecutionListener;
6160
private final T testDescriptor;
6261
private final Set<String> tags;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,9 @@ public abstract class ClassBasedTestDescriptor extends JupiterTestDescriptor
9393

9494
protected final ClassInfo classInfo;
9595

96-
@Nullable
97-
private LifecycleMethods lifecycleMethods;
96+
private @Nullable LifecycleMethods lifecycleMethods;
9897

99-
@Nullable
100-
private TestInstanceFactory testInstanceFactory;
98+
private @Nullable TestInstanceFactory testInstanceFactory;
10199

102100
ClassBasedTestDescriptor(UniqueId uniqueId, Class<?> testClass, Supplier<String> displayNameSupplier,
103101
JupiterConfiguration configuration) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ final class ClassExtensionContext extends AbstractExtensionContext<ClassBasedTes
3434

3535
private final ThrowableCollector throwableCollector;
3636

37-
@Nullable
38-
private TestInstances testInstances;
37+
private @Nullable TestInstances testInstances;
3938

4039
ClassExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
4140
ClassBasedTestDescriptor testDescriptor, Lifecycle lifecycle, JupiterConfiguration configuration,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ public class ClassTemplateInvocationTestDescriptor extends JupiterTestDescriptor
4949

5050
private final ClassTemplateTestDescriptor parent;
5151

52-
@Nullable
53-
private ClassTemplateInvocationContext invocationContext;
52+
private @Nullable ClassTemplateInvocationContext invocationContext;
5453

5554
private final int index;
5655

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class DynamicTestTestDescriptor extends DynamicNodeTestDescriptor {
3838

3939
private static final InvocationInterceptorChain interceptorChain = new InvocationInterceptorChain();
4040

41-
@Nullable
42-
private DynamicTest dynamicTest;
41+
private @Nullable DynamicTest dynamicTest;
4342

4443
DynamicTestTestDescriptor(UniqueId uniqueId, int index, DynamicTest dynamicTest, @Nullable TestSource source,
4544
JupiterConfiguration configuration) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ final class MethodExtensionContext extends AbstractExtensionContext<TestMethodTe
3232

3333
private final ThrowableCollector throwableCollector;
3434

35-
@Nullable
36-
private TestInstances testInstances;
35+
private @Nullable TestInstances testInstances;
3736

3837
MethodExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
3938
TestMethodTestDescriptor testDescriptor, JupiterConfiguration configuration,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
*/
3030
final class TestTemplateExtensionContext extends AbstractExtensionContext<TestTemplateTestDescriptor> {
3131

32-
@Nullable
33-
private final TestInstances testInstances;
32+
private final @Nullable TestInstances testInstances;
3433

3534
TestTemplateExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
3635
TestTemplateTestDescriptor testDescriptor, JupiterConfiguration configuration,

0 commit comments

Comments
 (0)