Move @Nullable to return type for methods

Author: marcphilipp

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

@@ -164,8 +164,7 @@ public AssertionFailedError build() {
 				: new AssertionFailedError(message, cause);
 	}
 
-	@Nullable
-	private static String nullSafeGet(@Nullable Object messageOrSupplier) {
+	private static @Nullable String nullSafeGet(@Nullable Object messageOrSupplier) {
 		if (messageOrSupplier == null) {
 			return null;
 		}

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

@@ -51,8 +51,7 @@ static void fail(Supplier<@Nullable String> messageSupplier) {
 		throw new AssertionFailedError(nullSafeGet(messageSupplier));
 	}
 
-	@Nullable
-	static String nullSafeGet(@Nullable Supplier<@Nullable String> messageSupplier) {
+	static @Nullable String nullSafeGet(@Nullable Supplier<@Nullable String> messageSupplier) {
 		return (messageSupplier != null ? messageSupplier.get() : null);
 	}
 

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

@@ -501,8 +501,7 @@ private static Optional<IndicativeSentencesGeneration> findIndicativeSentencesGe
 			return findAnnotation(testClass, IndicativeSentencesGeneration.class, enclosingInstanceTypes);
 		}
 
-		@Nullable
-		private static String getSentenceFragment(AnnotatedElement element) {
+		private static @Nullable String getSentenceFragment(AnnotatedElement element) {
 			return findAnnotation(element, SentenceFragment.class) //
 					.map(SentenceFragment::value) //
 					.map(sentenceFragment -> {

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

@@ -68,8 +68,7 @@ protected ConditionEvaluationResult evaluate(DisabledIfEnvironmentVariable annot
 	 * {@link System#getenv(String)}. Can be overridden in a subclass for
 	 * testing purposes.
 	 */
-	@Nullable
-	protected String getEnvironmentVariable(String name) {
+	protected @Nullable String getEnvironmentVariable(String name) {
 		return System.getenv(name);
 	}
 

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

@@ -67,8 +67,7 @@ protected ConditionEvaluationResult evaluate(EnabledIfEnvironmentVariable annota
 	 * {@link System#getenv(String)}. Can be overridden in a subclass for
 	 * testing purposes.
 	 */
-	@Nullable
-	protected String getEnvironmentVariable(String name) {
+	protected @Nullable String getEnvironmentVariable(String name) {
 		return System.getenv(name);
 	}
 

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

@@ -104,18 +104,15 @@ public enum OS {
 	 * @since 5.9
 	 */
 	@API(status = STABLE, since = "5.10")
-	@Nullable
-	public static OS current() {
+	public static @Nullable OS current() {
 		return CURRENT_OS;
 	}
 
-	@Nullable
-	private static OS determineCurrentOs() {
+	private static @Nullable OS determineCurrentOs() {
 		return parse(System.getProperty("os.name"));
 	}
 
-	@Nullable
-	static OS parse(String osName) {
+	static @Nullable OS parse(String osName) {
 		if (StringUtils.isBlank(osName)) {
 			logger.debug(
 				() -> "JVM system property 'os.name' is undefined. It is therefore not possible to detect the current OS.");

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExecutableInvoker.java

@@ -34,8 +34,7 @@ public interface ExecutableInvoker {
 	 * @param method the method to invoke and resolve parameters for
 	 * @see #invoke(Method, Object)
 	 */
-	@Nullable
-	default Object invoke(Method method) {
+	default @Nullable Object invoke(Method method) {
 		return invoke(method, null);
 	}
 

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java

@@ -555,8 +555,7 @@ interface CloseableResource {
 		 * @see #get(Object)
 		 * @see #getOrDefault(Object, Class, Object)
 		 */
-		@Nullable
-		<V> V get(Object key, Class<V> requiredType);
+		<V> @Nullable V get(Object key, Class<V> requiredType);
 
 		/**
 		 * Get the value of the specified required type that is stored under
@@ -653,8 +652,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * @see CloseableResource
 		 * @see AutoCloseable
 		 */
-		@Nullable
-		<K, V> Object getOrComputeIfAbsent(K key, Function<K, @Nullable V> defaultCreator);
+		<K, V> @Nullable Object getOrComputeIfAbsent(K key, Function<K, @Nullable V> defaultCreator);
 
 		/**
 		 * Get the value of the specified required type that is stored under the
@@ -685,8 +683,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * @see CloseableResource
 		 * @see AutoCloseable
 		 */
-		@Nullable
-		<K, V> V getOrComputeIfAbsent(K key, Function<K, @Nullable V> defaultCreator, Class<V> requiredType);
+		<K, V> @Nullable V getOrComputeIfAbsent(K key, Function<K, @Nullable V> defaultCreator, Class<V> requiredType);
 
 		/**
 		 * Store a {@code value} for later retrieval under the supplied {@code key}.
@@ -742,8 +739,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * for the specified key
 		 * @see #remove(Object)
 		 */
-		@Nullable
-		<V> V remove(Object key, Class<V> requiredType);
+		<V> @Nullable V remove(Object key, Class<V> requiredType);
 
 	}
 

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/InvocationInterceptor.java

@@ -143,7 +143,6 @@ default void interceptTestMethod(Invocation<@Nullable Void> invocation,
 	 * @return the result of the invocation; potentially {@code null}
 	 * @throws Throwable in case of failures
 	 */
-	@Nullable
 	default <T extends @Nullable Object> T interceptTestFactoryMethod(Invocation<T> invocation,
 			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
 		return invocation.proceed();

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolver.java

@@ -61,8 +61,7 @@ private Type enclosedTypeOfParameterResolver() {
 		return typeBasedParameterResolverSuperclass.getActualTypeArguments()[0];
 	}
 
-	@Nullable
-	private ParameterizedType findTypeBasedParameterResolverSuperclass(Class<?> clazz) {
+	private @Nullable ParameterizedType findTypeBasedParameterResolverSuperclass(Class<?> clazz) {
 		Class<?> superclass = clazz.getSuperclass();
 
 		// Abort?