Skip to content

Commit 235b86b

Browse files
author
Vincent Potucek
committed
Fix false positive null warning
Condition 'formats[i] == null' is always 'false'
1 parent fc1ff19 commit 235b86b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

junit-jupiter-params/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
requires transitive org.junit.jupiter.api;
2222
requires transitive org.junit.platform.commons;
23-
requires annotations;
2423

2524
exports org.junit.jupiter.params;
2625
exports org.junit.jupiter.params.aggregator;

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatter.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,20 +245,21 @@ public synchronized void append(ArgumentsContext context, StringBuffer result) {
245245
this.messageFormat.format(makeReadable(context.consumedArguments), result, new FieldPosition(0));
246246
}
247247

248+
@Nullable
248249
private List<Object> makeReadable(@Nullable Object[] arguments) {
249250
return makeReadable(arguments, messageFormat.getFormatsByArgumentIndex());
250251
}
251252

253+
@Nullable
252254
private List<Object> makeReadable(@Nullable Object[] arguments, Format[] formats) {
253-
return IntStream
254-
.range(0, Math.min(arguments.length, formats.length))
255-
.mapToObj(i -> makeReadable(arguments, i, formats[i]))
256-
.toList();
255+
return IntStream.range(0, Math.min(arguments.length, formats.length)).mapToObj(
256+
i -> makeReadable(arguments, i, formats[i])).toList();
257257
}
258258

259+
@Nullable
259260
private Object makeReadable(@Nullable Object[] arguments, int index, @Nullable Format format) {
260-
return format != null ? arguments == null ? "" : arguments[index] :
261-
truncateIfExceedsMaxLength(StringUtils.nullSafeToString(arguments[index]));
261+
return format != null ? arguments == null ? "" : arguments[index]
262+
: truncateIfExceedsMaxLength(StringUtils.nullSafeToString(arguments[index]));
262263
}
263264

264265
private String truncateIfExceedsMaxLength(String argument) {

0 commit comments

Comments
 (0)