From b15baa5372c4d47b28a7507b29fea81f89cf71c4 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <bas.leijdekkers@jetbrains.com>
Date: Thu, 23 Oct 2025 10:33:30 +0200
Subject: [PATCH] Java: recognize "NullAway.Init" suppression (IDEA-380187)

for "@NotNull field is not initialized" inspection

GitOrigin-RevId: 45348b8b8bdce0e64cd099f24d31a226f94567d8
---
 java/java-impl/resources/META-INF/JavaPlugin.xml |  2 +-
 .../notNullField/SuppressNullAwayInit.java       | 16 ++++++++++++++++
 ...NotNullFieldNotInitializedInspectionTest.java |  7 +++++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 java/java-tests/testData/inspection/notNullField/SuppressNullAwayInit.java

diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index dc2874064c53..35c5d1821a5a 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -2038,7 +2038,7 @@
     <localInspection groupPathKey="group.path.names.probable.bugs" language="JAVA" shortName="NotNullFieldNotInitialized"
                      bundle="messages.JavaBundle" key="inspection.notnull.field.not.initialized.display.name"
                      groupKey="group.names.nullability.problems" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
-                     level="WARNING"
+                     level="WARNING" alternativeId="NullAway.Init"
                      implementationClass="com.intellij.codeInspection.nullable.NotNullFieldNotInitializedInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ParameterCanBeLocal" key="inspection.parameter.can.be.local.display.name"
                      groupKey="group.names.class.structure" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
diff --git a/java/java-tests/testData/inspection/notNullField/SuppressNullAwayInit.java b/java/java-tests/testData/inspection/notNullField/SuppressNullAwayInit.java
new file mode 100644
index 000000000000..98dd67e7e388
--- /dev/null
+++ b/java/java-tests/testData/inspection/notNullField/SuppressNullAwayInit.java
@@ -0,0 +1,16 @@
+import javax.annotation.*;
+
+@NonnullByDefault
+class Test {
+  @SuppressWarnings("NullAway.Init")
+  Object member;
+
+  private void accessMember() {
+    member = new Object();
+  }
+}
+
+
+@Nonnull
+@javax.annotation.meta.TypeQualifierDefault(java.lang.annotation.ElementType.FIELD)
+@interface NonnullByDefault {}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/NotNullFieldNotInitializedInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/NotNullFieldNotInitializedInspectionTest.java
index e6fdc1e610ea..753545bcf3cc 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/NotNullFieldNotInitializedInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/NotNullFieldNotInitializedInspectionTest.java
@@ -1,5 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.java.codeInspection;
 
 import com.intellij.JavaTestUtil;
@@ -22,6 +21,10 @@ public class NotNullFieldNotInitializedInspectionTest extends LightJavaCodeInsig
     DataFlowInspectionTestCase.setupTypeUseAnnotations("typeUse", myFixture);
     doTest();
   }
+  public void testSuppressNullAwayInit() {
+    DataFlowInspectionTest.addJavaxNullabilityAnnotations(myFixture);
+    doTest();
+  }
   public void testNotNullByDefaultFieldNotInitialized() {
     DataFlowInspectionTest.addJavaxNullabilityAnnotations(myFixture);
     doTest();