Merge pull request #7 from Apisapple/feature/nullaway-util

Feature/nullaway util

Author: Apisapple

acceptance-tests/tests/src/acceptanceTest/java/org/hyperledger/besu/tests/acceptance/plugins/OutdatedPluginTest.java

@@ -58,7 +58,7 @@ public void warnOnOutdatedPluginByDefault() throws IOException {
                 line ->
                     line.contains(
                         "is built against Besu version 25.12.0 while current running Besu version is "
-                            + BesuVersionUtils.shortVersion().orElse("unknown"))));
+                            + BesuVersionUtils.shortVersion())));
   }
 
   @Test
@@ -92,6 +92,6 @@ public void failsToStartOnOutdatedPluginIfToldSo() throws IOException {
                 line ->
                     line.contains(
                         "is built against Besu version 25.12.0 while current running Besu version is "
-                            + BesuVersionUtils.shortVersion().orElse("unknown"))));
+                            + BesuVersionUtils.shortVersion())));
   }
 }

gradle/verification-metadata.xml

@@ -1932,14 +1932,6 @@
             <sha256 value="61b4d7c515a0894ffad925fd7052620c1425a86433fd35113b5fab0de890a57f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.uber.nullaway" name="nullaway" version="0.12.4">
-         <artifact name="nullaway-0.12.4.jar">
-            <sha256 value="260fb2d347525c100b9a32a2105557abf04d2961752321457f3c07ece9691718" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="nullaway-0.12.4.module">
-            <sha256 value="5c8c0eb7fb1507873a07794e76e563c74f6c9a1370b73f2b4cb71e97c324ee1a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.uber.nullaway" name="nullaway" version="0.13.1">
          <artifact name="nullaway-0.13.1.jar">
             <sha256 value="be9ad201b92de86c3e493a45b0861b1b3dd955d8e7dcb11f8d80d18d7425d164" origin="Generated by Gradle"/>
@@ -5949,14 +5941,6 @@
             <sha256 value="119d69d41349783cc1ebd392b24b61d6f380860147a80b2885b8f7fca3ab13bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.checkerframework" name="dataflow-nullaway" version="3.48.0">
-         <artifact name="dataflow-nullaway-3.48.0.jar">
-            <sha256 value="8710f503cdc769543ee0fe0fd44c7913d89de62c6238807173346512de7f2e87" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="dataflow-nullaway-3.48.0.pom">
-            <sha256 value="fb53454d1d9c2a4aae6d795be4e37243cbc37e1024a713e629ecd40134da779e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.checkerframework" name="dataflow-nullaway" version="3.53.0">
          <artifact name="dataflow-nullaway-3.53.0.jar">
             <sha256 value="d0bc6e121f27a803e09404ae2f247f0e2b1f6022897f801cd792ebf375edec27" origin="Generated by Gradle"/>

util/build.gradle

@@ -67,6 +67,8 @@ dependencies {
   implementation 'org.bouncycastle:bcpkix-jdk18on'
   implementation 'org.xerial.snappy:snappy-java'
 
+  compileOnly 'org.jspecify:jspecify'
+
   testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'

util/src/main/java/org/hyperledger/besu/util/BesuVersionUtils.java

@@ -79,8 +79,8 @@ private BesuVersionUtils() {}
   /**
    * Generate version-only Besu version
    *
-   * @return Besu version in format such as "v23.1.0" or "v23.1.1-dev-ac23d311", or {@value UNKNOWN}
-   *     if not available
+   * @return Besu version in format such as "v23.1.0" or "v23.1.1-dev-ac23d311", or {@value
+   *     #UNKNOWN} if not available
    */
   public static String shortVersion() {
     return VERSION;
@@ -122,7 +122,7 @@ public static String nodeName(final Optional<String> maybeIdentity) {
   /**
    * Generate the commit hash for this besu version
    *
-   * @return the commit hash for this besu version, or {@value UNKNOWN} if not available
+   * @return the commit hash for this besu version, or {@value #UNKNOWN} if not available
    */
   public static String commit() {
     return COMMIT;

util/src/main/java/org/hyperledger/besu/util/log4j/plugin/StackTraceMatchFilter.java

@@ -73,7 +73,7 @@ public Result filter(final LogEvent event) {
     return filter(event.getThrown());
   }
 
-  private Result filter(final Throwable t) {
+  private Result filter(final @Nullable Throwable t) {
     if (t != null) {
       return (messageEquals == null || Objects.equals(t.getMessage(), messageEquals))
               && Arrays.stream(t.getStackTrace())
@@ -87,7 +87,7 @@ private Result filter(final Throwable t) {
 
   @Override
   public String toString() {
-    return String.valueOf(stackContains);
+    return stackContains;
   }
 
   /**