Enable NullAway static null-safety analysis for util module #10046
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| package org.hyperledger.besu.util; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| /** The Exception utils. */ | ||
| public class ExceptionUtils { | ||
|
|
@@ -25,9 +26,9 @@ private ExceptionUtils() {} | |
| * Returns the root cause of an exception | ||
| * | ||
| * @param throwable the throwable whose root cause we want to find | ||
| * @return The root cause, or {@code null} if the input is {@code null} | ||
| */ | ||
| public static @Nullable Throwable rootCause(final @Nullable Throwable throwable) { | ||
| return throwable != null ? Throwables.getRootCause(throwable) : null; | ||
|
siladu marked this conversation as resolved.
|
||
| } | ||
|
Comment on lines
28
to
33
There was a problem hiding this comment. The Javadoc no longer matches the method contract: the parameter and return value are now nullable. Update the |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,10 @@ | |
|
|
||
| import java.io.Closeable; | ||
| import java.io.DataOutputStream; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.function.BiFunction; | ||
|
|
||
|
|
@@ -51,10 +51,16 @@ public RollingFileWriter( | |
| currentSize = 0; | ||
| fileNumber = 0; | ||
| final Path firstOutputFile = filenameGenerator.apply(fileNumber, compressed); | ||
| final Path parentPath = firstOutputFile.getParent(); | ||
| if (parentPath != null) { | ||
| try { | ||
| Files.createDirectories(parentPath); | ||
| } catch (final IOException e) { | ||
| final FileNotFoundException fnfe = | ||
| new FileNotFoundException("Unable to create directory for rolling file: " + parentPath); | ||
| fnfe.initCause(e); | ||
| throw fnfe; | ||
|
Comment on lines
+58
to
+62
There was a problem hiding this comment. Wrapping a directory-creation |
||
| } | ||
|
siladu marked this conversation as resolved.
siladu marked this conversation as resolved.
|
||
| } | ||
| out = new FileOutputStream(firstOutputFile.toFile()); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |||||||||
| package org.hyperledger.besu.util.log4j.plugin; | ||||||||||
|
|
||||||||||
| import java.util.Arrays; | ||||||||||
| import java.util.Objects; | ||||||||||
|
|
||||||||||
| import org.apache.logging.log4j.Level; | ||||||||||
| import org.apache.logging.log4j.Marker; | ||||||||||
|
|
@@ -25,6 +26,7 @@ | |||||||||
| import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory; | ||||||||||
| import org.apache.logging.log4j.core.filter.AbstractFilter; | ||||||||||
| import org.apache.logging.log4j.message.Message; | ||||||||||
| import org.jspecify.annotations.Nullable; | ||||||||||
|
|
||||||||||
| /** Matches a text in the stack trace */ | ||||||||||
| @Plugin( | ||||||||||
|
|
@@ -34,11 +36,11 @@ | |||||||||
| printObject = true) | ||||||||||
| public class StackTraceMatchFilter extends AbstractFilter { | ||||||||||
| private final String stackContains; | ||||||||||
| private final @Nullable String messageEquals; | ||||||||||
|
|
||||||||||
| private StackTraceMatchFilter( | ||||||||||
| final String stackContains, | ||||||||||
| final @Nullable String messageEquals, | ||||||||||
| final Result onMatch, | ||||||||||
| final Result onMismatch) { | ||||||||||
| super(onMatch, onMismatch); | ||||||||||
|
|
@@ -71,9 +73,9 @@ public Result filter(final LogEvent event) { | |||||||||
| return filter(event.getThrown()); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| private Result filter(final @Nullable Throwable t) { | ||||||||||
| if (t != null) { | ||||||||||
| return (messageEquals == null || Objects.equals(t.getMessage(), messageEquals)) | ||||||||||
| && Arrays.stream(t.getStackTrace()) | ||||||||||
| .map(StackTraceElement::getClassName) | ||||||||||
| .anyMatch(cn -> cn.contains(stackContains)) | ||||||||||
|
siladu marked this conversation as resolved.
|
||||||||||
|
|
@@ -102,8 +104,8 @@ public static StackTraceMatchFilter.Builder newBuilder() { | |||||||||
| public static class Builder extends AbstractFilterBuilder<StackTraceMatchFilter.Builder> | ||||||||||
| implements org.apache.logging.log4j.core.util.Builder<StackTraceMatchFilter> { | ||||||||||
|
|
||||||||||
| @PluginBuilderAttribute private @Nullable String stackContains; | ||||||||||
| @PluginBuilderAttribute private @Nullable String messageEquals; | ||||||||||
|
|
||||||||||
| /** Default constructor */ | ||||||||||
| public Builder() { | ||||||||||
|
|
@@ -116,7 +118,7 @@ public Builder() { | |||||||||
| * @param text the match string | ||||||||||
| * @return this builder | ||||||||||
| */ | ||||||||||
| public StackTraceMatchFilter.Builder setStackContains(final @Nullable String text) { | ||||||||||
| this.stackContains = text; | ||||||||||
|
Comment on lines
+121
to
122
There was a problem hiding this comment. The builder setter
Suggested change
|
||||||||||
| return this; | ||||||||||
| } | ||||||||||
|
|
@@ -127,15 +129,18 @@ public StackTraceMatchFilter.Builder setStackContains(final String text) { | |||||||||
| * @param text the match string | ||||||||||
| * @return this builder | ||||||||||
| */ | ||||||||||
| public StackTraceMatchFilter.Builder setMessageEquals(final @Nullable String text) { | ||||||||||
| this.messageEquals = text; | ||||||||||
| return this; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| @Override | ||||||||||
| public StackTraceMatchFilter build() { | ||||||||||
| final String nonNullStackContains = | ||||||||||
| Objects.requireNonNull(stackContains, "stackContains must be provided"); | ||||||||||
|
siladu marked this conversation as resolved.
Comment on lines
+139
to
+140
There was a problem hiding this comment. The builder setter |
||||||||||
|
|
||||||||||
| return new StackTraceMatchFilter( | ||||||||||
| nonNullStackContains, this.messageEquals, this.getOnMatch(), this.getOnMismatch()); | ||||||||||
| } | ||||||||||
| } | ||||||||||
| } | ||||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be good to add
compileOnly 'org.jspecify:jspecify'in here similar to other modules' build.gradle e.g.
besu/evm/build.gradle
Line 57 in 15082ba