enable nullaway on jmh benchmarks

.github/actions/run-gradle/action.yml

@@ -64,19 +64,17 @@ runs:
         fi
         echo "JDK_CI=$JAVA_HOME" >> $GITHUB_ENV
         echo "JDK_EA=${{ inputs.early-access == inputs.java }}" >> $GITHUB_ENV
+        echo "JAVA_TOOL_OPTIONS=-Dorg.gradle.workers.max=$((2 * $(nproc)))" >> $GITHUB_ENV
+        echo "ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download=false" >> $GITHUB_ENV
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
-      env:
-        ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
       with:
         add-job-summary: never
         cache-read-only: false
         gradle-home-cache-strict-match: true
         cache-encryption-key: ${{ inputs.cache-encryption-key }}
     - name: Run ${{ inputs.arguments }}
       if: ${{ inputs.arguments != '' }}
-      env:
-        ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'
       shell: bash
       run: |
         echo "::add-matcher::.github/problem-matcher.json"

.github/workflows/actionlint.yml

@@ -16,7 +16,7 @@ jobs:
             github.com:443
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: actionlint
-        uses: reviewdog/action-actionlint@053981cb135d7a696bbeec6181d9d5fae6e07dae # v1.57.0
+        uses: reviewdog/action-actionlint@08ef4afa963243489a457cca426f705ce4e0d1a5 # v1.60.0
         env:
           SHELLCHECK_OPTS: -e SC2001 -e SC2035 -e SC2046 -e SC2061 -e SC2086 -e SC2156
         with:

.github/workflows/build.yml

@@ -250,7 +250,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         continue-on-error: true
       - name: Publish to Codecov
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
+        uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Publish to Codacy
@@ -343,11 +343,11 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             ${{ env.ALLOWED_ENDPOINTS }}
-            checkerframework.org:443
             docs.oracle.com:443
             errorprone.info:443
-            lightbend.github.io:443
             guava.dev:443
+            jspecify.dev:443
+            lightbend.github.io:443
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Publish Snapshot
         uses: ./.github/actions/run-gradle

.github/workflows/codacy.yml

@@ -47,7 +47,7 @@ jobs:
         if: steps.check_files.outputs.files_exists == 'true'
         run: jq -c '.runs |= unique_by({tool, invocations, results})' < results.sarif > codacy.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         if: steps.check_files.outputs.files_exists == 'true'
         continue-on-error: true
         with:

.github/workflows/codeql.yml

@@ -57,10 +57,10 @@ jobs:
           java: ${{ env.JAVA_VERSION }}
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           languages: java
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6

.github/workflows/dependency-check.yml

@@ -61,7 +61,7 @@ jobs:
         with:
           files: build/reports/dependency-check-report.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         if: steps.check_files.outputs.files_exists == 'true'
         with:
           sarif_file: build/reports/dependency-check-report.sarif

.github/workflows/devskim.yml

@@ -31,6 +31,6 @@ jobs:
       - name: Run DevSkim scanner
         uses: microsoft/DevSkim-Action@914fa647b406c387000300b2f09bb28691be2b6d # v1.0.14
       - name: Upload DevSkim scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: devskim-results.sarif

.github/workflows/qodana.yml

@@ -29,7 +29,6 @@ jobs:
             api.github.com:443
             auth.docker.io:443
             caffeine.gradle-enterprise.cloud:443
-            checkerframework.org:443
             docs.oracle.com:443
             download.jetbrains.com:443
             download-cdn.jetbrains.com:443
@@ -39,6 +38,7 @@ jobs:
             github.com:443
             guava.dev:443
             jcenter.bintray.com:443
+            jspecify.dev:443
             lightbend.github.io:443
             objects.githubusercontent.com:443
             packages.jetbrains.team:443
@@ -70,6 +70,6 @@ jobs:
           upload-result: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

.github/workflows/scorecards-analysis.yml

@@ -58,6 +58,6 @@ jobs:
           path: results.sarif
           retention-days: 5
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif

.github/workflows/semgrep.yml

@@ -34,7 +34,7 @@ jobs:
         if: steps.check_files.outputs.files_exists == 'true'
         run: jq -c '.runs[0].tool.driver.rules |= unique_by(.id)' < results.sarif > semgrep.sarif
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         if: steps.check_files.outputs.files_exists == 'true'
         continue-on-error: true
         with:

.github/workflows/snyk.yml

@@ -42,7 +42,7 @@ jobs:
         with:
           files: snyk.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         if: steps.check_files.outputs.files_exists == 'true'
         with:
           sarif_file: snyk.sarif

.github/workflows/spelling.yml

@@ -16,7 +16,7 @@ jobs:
             github.com:443
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Misspell
-        uses: reviewdog/action-misspell@ef8b22c1cca06c8d306fc6be302c3dab0f6ca12f # v1.23.0
+        uses: reviewdog/action-misspell@18ffb61effb93b47e332f185216be7e49592e7e1 # v1.26.1
         with:
           reporter: github-check
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -34,4 +34,4 @@ jobs:
             objects.githubusercontent.com:443
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Typos
-        uses: crate-ci/typos@b74202f74b4346efdbce7801d187ec57b266bac8 # v1.27.3
+        uses: crate-ci/typos@2872c382bb9668d4baa5eade234dcbc0048ca2cf # v1.28.2

.github/workflows/trivy.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           files: results.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         if: steps.check_files.outputs.files_exists == 'true'
         with:
             sarif_file: results.sarif

build.gradle.kts

@@ -2,12 +2,10 @@ plugins {
   id("root.caffeine")
 }
 
-allprojects {
-  description = "A high performance caching library"
-  group = "com.github.ben-manes.caffeine"
-  version(
-    major = 3, // incompatible API changes
-    minor = 1, // backwards-compatible additions
-    patch = 9, // backwards-compatible bug fixes
-    releaseBuild = rootProject.hasProperty("release"))
-}
+description = "A high performance caching library"
+group = "com.github.ben-manes.caffeine"
+version(
+  major = 3, // incompatible API changes
+  minor = 2, // backwards-compatible additions
+  patch = 0, // backwards-compatible bug fixes
+  releaseBuild = rootProject.hasProperty("release"))

caffeine/build.gradle.kts

@@ -176,7 +176,7 @@ tasks.register<Test>("isolatedTest") {
 tasks.register<Test>("lincheckTest") {
   group = "Verification"
   description = "Tests that assert linearizability"
-  enabled = (System.getenv("JDK_EA") != "true")
+  enabled = !isEarlyAccess()
   useTestNG {
     testLogging.events("started")
     includeGroups("lincheck")

caffeine/src/jmh/java/com/github/benmanes/caffeine/DelegationBenchmark.java

@@ -19,6 +19,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -55,12 +56,12 @@ public static class ThreadState {
   }
 
   @Benchmark
-  public Integer inherit_get(ThreadState threadState) {
+  public @Nullable Integer inherit_get(ThreadState threadState) {
     return inherit.get(threadState.index++ & MASK);
   }
 
   @Benchmark
-  public Integer delegate_get(ThreadState threadState) {
+  public @Nullable Integer delegate_get(ThreadState threadState) {
     return delegate.get(threadState.index++ & MASK);
   }
 
@@ -76,6 +77,7 @@ static final class InheritMap extends ConcurrentHashMap<Integer, Integer> {
   static final class DelegateMap extends ForwardingMap<Integer, Integer> {
     final Map<Integer, Integer> delegate = new ConcurrentHashMap<>();
 
+    @NullUnmarked
     @Override public @Nullable Integer get(Object key) {
       Integer value = delegate.get(key);
       return (value == null) ? null : (value - 1);

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/GetPutBenchmark.java

@@ -17,6 +17,7 @@
 
 import java.util.Random;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Group;
 import org.openjdk.jmh.annotations.GroupThreads;
@@ -94,7 +95,7 @@ public void tearDown() {
   }
 
   @Benchmark @Group("read_only") @GroupThreads(8)
-  public Boolean readOnly(ThreadState threadState) {
+  public @Nullable Boolean readOnly(ThreadState threadState) {
     return cache.get(ints[threadState.index++ & MASK]);
   }
 
@@ -104,7 +105,7 @@ public void writeOnly(ThreadState threadState) {
   }
 
   @Benchmark @Group("readwrite") @GroupThreads(6)
-  public Boolean readwrite_get(ThreadState threadState) {
+  public @Nullable Boolean readwrite_get(ThreadState threadState) {
     return cache.get(ints[threadState.index++ & MASK]);
   }
 

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/TimerWheelBenchmark.java

@@ -112,8 +112,8 @@ public int descending() {
   }
 
   static final class Timer extends Node<Integer, Integer> {
-    Node<Integer, Integer> prev;
-    Node<Integer, Integer> next;
+    @Nullable Node<Integer, Integer> prev;
+    @Nullable Node<Integer, Integer> next;
     long time;
 
     Timer(long time) {
@@ -126,12 +126,14 @@ static final class Timer extends Node<Integer, Integer> {
     @Override public void setVariableTime(long time) {
       this.time = time;
     }
+    @SuppressWarnings("NullAway")
     @Override public Node<Integer, Integer> getPreviousInVariableOrder() {
       return prev;
     }
     @Override public void setPreviousInVariableOrder(@Nullable Node<Integer, Integer> prev) {
       this.prev = prev;
     }
+    @SuppressWarnings("NullAway")
     @Override public Node<Integer, Integer> getNextInVariableOrder() {
       return next;
     }
@@ -143,7 +145,7 @@ static final class Timer extends Node<Integer, Integer> {
     @Override public Object getKeyReference() { throw new UnsupportedOperationException(); }
     @Override public Integer getValue() { throw new UnsupportedOperationException(); }
     @Override public Object getValueReference() { throw new UnsupportedOperationException(); }
-    @Override public void setValue(Integer value, ReferenceQueue<Integer> referenceQueue) {}
+    @Override public void setValue(Integer value, @Nullable ReferenceQueue<Integer> queue) {}
     @Override public boolean containsValue(Object value) { return false; }
     @Override public boolean isAlive() { return false; }
     @Override public boolean isRetired() { return false; }

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/impl/CaffeineCache.java

@@ -15,6 +15,8 @@
  */
 package com.github.benmanes.caffeine.cache.impl;
 
+import org.jspecify.annotations.Nullable;
+
 import com.github.benmanes.caffeine.cache.BasicCache;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -33,7 +35,7 @@ public CaffeineCache(int maximumSize) {
   }
 
   @Override
-  public V get(K key) {
+  public @Nullable V get(K key) {
     return cache.getIfPresent(key);
   }
 

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/impl/CoherenceCache.java

@@ -17,6 +17,8 @@
 
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import com.github.benmanes.caffeine.cache.BasicCache;
 import com.tangosol.net.cache.LocalCache;
 
@@ -34,7 +36,7 @@ public CoherenceCache(int maximumSize, int evictionPolicyType) {
   }
 
   @Override
-  public V get(K key) {
+  public @Nullable V get(K key) {
     return map.get(key);
   }
 

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/impl/ConcurrentMapCache.java

@@ -19,6 +19,8 @@
 
 import java.util.concurrent.ConcurrentMap;
 
+import org.jspecify.annotations.Nullable;
+
 import com.github.benmanes.caffeine.cache.BasicCache;
 
 /**
@@ -32,7 +34,7 @@ public ConcurrentMapCache(ConcurrentMap<K, V> map) {
   }
 
   @Override
-  public V get(K key) {
+  public @Nullable V get(K key) {
     return map.get(key);
   }
 

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/impl/GuavaCache.java

@@ -17,6 +17,8 @@
 
 import static com.github.benmanes.caffeine.cache.CacheType.CONCURRENCY_LEVEL;
 
+import org.jspecify.annotations.Nullable;
+
 import com.github.benmanes.caffeine.cache.BasicCache;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -36,7 +38,7 @@ public GuavaCache(int maximumSize) {
   }
 
   @Override
-  public V get(K key) {
+  public @Nullable V get(K key) {
     return cache.getIfPresent(key);
   }
 

caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/impl/LinkedHashMapCache.java

@@ -18,6 +18,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import com.github.benmanes.caffeine.cache.BasicCache;
 
 /**
@@ -31,7 +33,7 @@ public LinkedHashMapCache(int maximumSize, boolean accessOrder) {
   }
 
   @Override
-  public V get(K key) {
+  public @Nullable V get(K key) {
     synchronized (map) {
       return map.get(key);
     }

caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java

@@ -3961,12 +3961,12 @@ static class BoundedLocalManualCache<K, V> implements LocalManualCache<K, V>, Se
     }
 
     @Override
-    public BoundedLocalCache<K, V> cache() {
+    public final BoundedLocalCache<K, V> cache() {
       return cache;
     }
 
     @Override
-    public Policy<K, V> policy() {
+    public final Policy<K, V> policy() {
       if (policy == null) {
         @SuppressWarnings("NullAway")
         Function<@Nullable V, @Nullable V> identity = identity();