From 1ecbd0a699acdae3ced09fe4ea403e5d135d1a61 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Mon, 24 May 2021 16:28:46 -0700
Subject: [PATCH] Migrate uses of `@IncompatibleModifiers` and
 `@RequiredModifiers`

to use `com.google.errorprone.annotations.Modifier`
instead of `javax.lang.model.element.Modifier`.

#2122

Follow-up to https://github.com/google/error-prone/commit/26f1f5498321c9e2c25f5546dc9aa026affde16a

PiperOrigin-RevId: 375582676
---
 .../com/google/errorprone/annotations/ForOverride.java     | 7 ++-----
 .../main/java/com/google/errorprone/annotations/Var.java   | 3 +--
 .../google/errorprone/annotations/concurrent/LazyInit.java | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/annotations/src/main/java/com/google/errorprone/annotations/ForOverride.java b/annotations/src/main/java/com/google/errorprone/annotations/ForOverride.java
index 285e14118e7..346775451d5 100644
--- a/annotations/src/main/java/com/google/errorprone/annotations/ForOverride.java
+++ b/annotations/src/main/java/com/google/errorprone/annotations/ForOverride.java
@@ -18,10 +18,6 @@
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.CLASS;
-import static javax.lang.model.element.Modifier.FINAL;
-import static javax.lang.model.element.Modifier.PRIVATE;
-import static javax.lang.model.element.Modifier.PUBLIC;
-import static javax.lang.model.element.Modifier.STATIC;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -39,7 +35,8 @@
  * protected or package-private visibility, although their effective visibility is actually "none".
  */
 @Documented
-@IncompatibleModifiers({PUBLIC, PRIVATE, STATIC, FINAL})
+@IncompatibleModifiers(
+    modifier = {Modifier.PUBLIC, Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL})
 @Retention(CLASS) // Parent source might not be available while compiling subclass
 @Target(METHOD)
 public @interface ForOverride {}
diff --git a/annotations/src/main/java/com/google/errorprone/annotations/Var.java b/annotations/src/main/java/com/google/errorprone/annotations/Var.java
index a0e2a63f2b4..ebf3b639f42 100644
--- a/annotations/src/main/java/com/google/errorprone/annotations/Var.java
+++ b/annotations/src/main/java/com/google/errorprone/annotations/Var.java
@@ -20,7 +20,6 @@
 import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static javax.lang.model.element.Modifier.FINAL;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -42,5 +41,5 @@
  */
 @Target({FIELD, PARAMETER, LOCAL_VARIABLE})
 @Retention(RUNTIME)
-@IncompatibleModifiers(FINAL)
+@IncompatibleModifiers(modifier = {Modifier.FINAL})
 public @interface Var {}
diff --git a/annotations/src/main/java/com/google/errorprone/annotations/concurrent/LazyInit.java b/annotations/src/main/java/com/google/errorprone/annotations/concurrent/LazyInit.java
index c264e6aa761..380c2d7f54e 100644
--- a/annotations/src/main/java/com/google/errorprone/annotations/concurrent/LazyInit.java
+++ b/annotations/src/main/java/com/google/errorprone/annotations/concurrent/LazyInit.java
@@ -15,9 +15,9 @@
  */
 package com.google.errorprone.annotations.concurrent;
 
-import static javax.lang.model.element.Modifier.FINAL;
 
 import com.google.errorprone.annotations.IncompatibleModifiers;
+import com.google.errorprone.annotations.Modifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -61,7 +61,7 @@
  * unless you really understand this <b>and</b> you really need the performance benefits of
  * introducing the data race, do not use this construct.
  */
-@IncompatibleModifiers({FINAL})
+@IncompatibleModifiers(modifier = {Modifier.FINAL})
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface LazyInit {}