Skip to content

Commit de0b017

Browse files
cushonError Prone Team
authored andcommitted
Add a flag to configure the default nullness annotation
PiperOrigin-RevId: 386953444
1 parent c5218ed commit de0b017

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessFixes.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.errorprone.bugpatterns.nullness;
1818

19+
import com.google.errorprone.ErrorProneFlags;
1920
import com.google.errorprone.VisitorState;
2021
import com.google.errorprone.fixes.SuggestedFix;
2122
import com.google.errorprone.util.FindIdentifiers;
@@ -63,8 +64,14 @@ private static String getQualifiedName(VisitorState state, SuggestedFix.Builder
6364
*/
6465
// TODO(cpovirk): Suggest @NullableDecl if the code uses that.
6566
Symbol sym = FindIdentifiers.findIdent("Nullable", state, KindSelector.VAL_TYP);
67+
ErrorProneFlags flags = state.errorProneOptions().getFlags();
6668
String defaultType =
67-
state.isAndroidCompatible() ? "androidx.annotation.Nullable" : "javax.annotation.Nullable";
69+
flags
70+
.get("Nullness:DefaultNullnessAnnotation")
71+
.orElse(
72+
state.isAndroidCompatible()
73+
? "androidx.annotation.Nullable"
74+
: "javax.annotation.Nullable");
6875
if (sym != null) {
6976
ClassSymbol classSym = (ClassSymbol) sym;
7077
if (classSym.isAnnotationType()) {

0 commit comments

Comments
 (0)