Fully Qualify @Override to avoid name conflicts

RELNOTES=Fully Qualify @Override to avoid name conflicts

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=323461838

5 files changed, 35 insertions, 29 deletions

diff --git a/value/src/main/java/com/google/auto/value/processor/autoannotation.vm b/value/src/main/java/com/google/auto/value/processor/autoannotation.vm
index 1d14d3fb..a953edab 100644
--- a/value/src/main/java/com/google/auto/value/processor/autoannotation.vm
+++ b/value/src/main/java/com/google/auto/value/processor/autoannotation.vm
@@ -108,7 +108,7 @@ final class $className implements $annotationName {
 
 ## annotationType method (defined by the Annotation interface)
 
-  @Override
+  @`java.lang.Override`
   public Class<? extends $annotationName> annotationType() {
     return ${annotationName}.class;
   }
@@ -117,7 +117,7 @@ final class $className implements $annotationName {
 
 #foreach ($m in $members)
 
-  @Override
+  @`java.lang.Override`
   public ${m.type} ${m}() {
 
   #if ($m.kind == "ARRAY")
@@ -162,7 +162,7 @@ final class $className implements $annotationName {
   #end
 #end
 
-  @Override
+  @`java.lang.Override`
   public String toString() {
     StringBuilder sb = new StringBuilder("@$annotationFullName(");
 
@@ -211,7 +211,7 @@ final class $className implements $annotationName {
   #end
 #end
 
-  @Override
+  @`java.lang.Override`
   public boolean equals(Object o) {
     if (o == this) {
       return true;
@@ -269,7 +269,7 @@ final class $className implements $annotationName {
 ## example.) We precompute the invariable part, as an optimization but also in order to avoid
 ## falling afoul of constant-overflow checks in the compiler.
 
-  @Override
+  @`java.lang.Override`
   public int hashCode() {
     return
     ## If the invariable part is 0, we avoid outputting `return 0 + ...` just because it generates
diff --git a/value/src/main/java/com/google/auto/value/processor/autooneof.vm b/value/src/main/java/com/google/auto/value/processor/autooneof.vm
index 04cc1949..0249d9eb 100644
--- a/value/src/main/java/com/google/auto/value/processor/autooneof.vm
+++ b/value/src/main/java/com/google/auto/value/processor/autooneof.vm
@@ -99,7 +99,7 @@ final class $generatedClass {
 
 #foreach ($p in $props)
 
-    @Override
+    @`java.lang.Override`
     $p.access $p.type ${p.getter}() {
       throw new UnsupportedOperationException(${kindGetter}().toString());
     }
@@ -128,7 +128,7 @@ final class $generatedClass {
 
     private Impl_$p() {}
 
-    @Override
+    @`java.lang.Override`
     public void ${p.getter}() {}
 
     #if ($serializable)
@@ -141,7 +141,7 @@ final class $generatedClass {
 
     #if ($toString)
 
-    @Override
+    @`java.lang.Override`
     public String toString() {
       return "${simpleClassName}{$p.name}";
     }
@@ -154,7 +154,7 @@ final class $generatedClass {
 
     #if ($equals)
 
-    @Override
+    @`java.lang.Override`
     public boolean equals($equalsParameterType x) {
       return x == this;
     }
@@ -163,7 +163,7 @@ final class $generatedClass {
 
     #if ($hashCode)
 
-    @Override
+    @`java.lang.Override`
     public int hashCode() {
       return System.identityHashCode(this);
     }
@@ -178,14 +178,14 @@ final class $generatedClass {
       this.$p = $p;
     }
 
-    @Override
+    @`java.lang.Override`
     public $p.type ${p.getter}() {
       return $p;
     }
 
     #if ($toString)
 
-    @Override
+    @`java.lang.Override`
     public String toString() {
       return "${simpleClassName}{$p.name=" ##
           + #if ($p.kind == "ARRAY") `java.util.Arrays`.toString(this.$p) #else this.$p #end
@@ -196,7 +196,7 @@ final class $generatedClass {
 
     #if ($equals)
 
-    @Override
+    @`java.lang.Override`
     public boolean equals($equalsParameterType x) {
       if (x instanceof $origClass) {
         $origClass$wildcardTypes that = ($origClass$wildcardTypes) x;
@@ -211,7 +211,7 @@ final class $generatedClass {
 
     #if ($hashCode)
 
-    @Override
+    @`java.lang.Override`
     public int hashCode() {
       return #hashCodeExpression($p);
     }
@@ -220,7 +220,7 @@ final class $generatedClass {
 
   #end
 
-    @Override
+    @`java.lang.Override`
     public $kindType ${kindGetter}() {
       return ${kindType}.$propertyToKind[$p.name];
     }
diff --git a/value/src/main/java/com/google/auto/value/processor/autovalue.vm b/value/src/main/java/com/google/auto/value/processor/autovalue.vm
index 80ef79ae..6f50e934 100644
--- a/value/src/main/java/com/google/auto/value/processor/autovalue.vm
+++ b/value/src/main/java/com/google/auto/value/processor/autovalue.vm
@@ -101,7 +101,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
   ${a}##
   #end
 
-  @Override
+  @`java.lang.Override`
   ${p.access}${p.type} ${p.getter}() {
     return $p;
   }
@@ -110,7 +110,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
 #if ($toString)
 
-  @Override
+  @`java.lang.Override`
   public `java.lang.String` toString() {
     return "#if ($identifiers)$simpleClassName#end{"
 
@@ -129,7 +129,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
 #if ($equals)
 
-  @Override
+  @`java.lang.Override`
   public boolean equals($equalsParameterType o) {
     if (o == this) {
       return true;
@@ -162,7 +162,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
 #if ($hashCode)
 
-  @Override
+  @`java.lang.Override`
   public int hashCode() {
     int h$ = 1;
 
@@ -185,7 +185,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
   #foreach ($m in $toBuilderMethods)
 
-  @Override
+  @`java.lang.Override`
   ${m.access}${builderTypeName}${builderActualTypes} ${m.name}() {
     return new Builder${builderActualTypes}(this);
   }
@@ -252,7 +252,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
     #foreach ($setter in $builderSetters[$p.name])
 
-    @Override
+    @`java.lang.Override`
     ${setter.access}${builderTypeName}${builderActualTypes} ##
         ${setter.name}(${setter.nullableAnnotation}$setter.parameterType $p) {
 
@@ -290,7 +290,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
     #if ($propertyBuilder)
 
-    @Override
+    @`java.lang.Override`
     ${propertyBuilder.access}$propertyBuilder.builderType ${p.name}Builder() {
       if (${propertyBuilder.name} == null) {
 
@@ -337,7 +337,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
 
     #if ($builderGetters[$p.name])
 
-    @Override
+    @`java.lang.Override`
     ${p.nullableAnnotation}${builderGetters[$p.name].access}$builderGetters[$p.name].type ${p.getter}() {
       #if ($builderGetters[$p.name].optional)
 
@@ -377,7 +377,7 @@ ${modifiers}class $subclass$formalTypes extends $origClass$actualTypes {
     #end
   #end
 
-    @Override
+    @`java.lang.Override`
     ${buildMethod.get().access}${origClass}${actualTypes} ${buildMethod.get().name}() {
 
   #foreach ($p in $props)
diff --git a/value/src/main/java/com/google/auto/value/processor/gwtserializer.vm b/value/src/main/java/com/google/auto/value/processor/gwtserializer.vm
index 04500360..1265aae4 100644
--- a/value/src/main/java/com/google/auto/value/processor/gwtserializer.vm
+++ b/value/src/main/java/com/google/auto/value/processor/gwtserializer.vm
@@ -93,26 +93,26 @@ public final class $serializerClass$formalTypes
   @SuppressWarnings("unused")
   private int dummy_$classHashString;
 
-  @Override
+  @`java.lang.Override`
   public void deserializeInstance(
       `com.google.gwt.user.client.rpc.SerializationStreamReader` streamReader,
       $subclass$actualTypes instance) {
     deserialize(streamReader, instance);
   }
 
-  @Override
+  @`java.lang.Override`
   public boolean hasCustomInstantiateInstance() {
     return true;
   }
 
-  @Override
+  @`java.lang.Override`
   public $subclass$actualTypes instantiateInstance(
       `com.google.gwt.user.client.rpc.SerializationStreamReader` streamReader)
       throws `com.google.gwt.user.client.rpc.SerializationException` {
     return instantiate(streamReader);
   }
 
-  @Override
+  @`java.lang.Override`
   public void serializeInstance(
       `com.google.gwt.user.client.rpc.SerializationStreamWriter` streamWriter,
       $subclass$actualTypes instance)
diff --git a/value/src/test/java/com/google/auto/value/processor/AutoValueCompilationTest.java b/value/src/test/java/com/google/auto/value/processor/AutoValueCompilationTest.java
index 2d4aa7ca..e46c9f51 100644
--- a/value/src/test/java/com/google/auto/value/processor/AutoValueCompilationTest.java
+++ b/value/src/test/java/com/google/auto/value/processor/AutoValueCompilationTest.java
@@ -3189,6 +3189,12 @@ public class AutoValueCompilationTest {
             "package foo.bar;",
             "",
             "public class Thread {}");
+    JavaFileObject override =
+        JavaFileObjects.forSourceLines(
+            "foo.bar.Override", //
+            "package foo.bar;",
+            "",
+            "public class Override {}");
     JavaFileObject test =
         JavaFileObjects.forSourceLines(
             "foo.bar.Test",
@@ -3215,7 +3221,7 @@ public class AutoValueCompilationTest {
         javac()
             .withProcessors(new AutoValueProcessor())
             .withOptions("-Xlint:-processing", "-implicit:none")
-            .compile(object, string, integer, thread, test);
+            .compile(object, string, integer, thread, override, test);
     assertThat(compilation).succeededWithoutWarnings();
   }