Update nullable logic for new encoding

Author: octylFractal

value/src/main/java/com/google/auto/value/processor/AutoValueProcessor.java

@@ -371,10 +371,9 @@ private void defineVarsForType(
   @Override
   Optional<String> nullableAnnotationForMethod(
       ExecutableElement propertyMethod, ImmutableList<AnnotationMirror> methodAnnotations) {
-    OptionalInt nullableAnnotationIndex = nullableAnnotationIndex(methodAnnotations);
-    if (nullableAnnotationIndex.isPresent()) {
-      ImmutableList<String> annotations = annotationStrings(methodAnnotations);
-      return Optional.of(annotations.get(nullableAnnotationIndex.getAsInt()));
+    Optional<String> nullableAnnotationList = nullableAnnotationIfInList(methodAnnotations);
+    if (nullableAnnotationList.isPresent()) {
+      return nullableAnnotationList;
     } else {
       List<? extends AnnotationMirror> typeAnnotations =
           propertyMethod.getReturnType().getAnnotationMirrors();
@@ -385,6 +384,15 @@ Optional<String> nullableAnnotationForMethod(
     }
   }
 
+  public static Optional<String> nullableAnnotationIfInList(ImmutableList<AnnotationMirror> methodAnnotations) {
+    OptionalInt nullableAnnotationIndex = nullableAnnotationIndex(methodAnnotations);
+    if (nullableAnnotationIndex.isPresent()) {
+      ImmutableList<String> annotations = annotationStrings(methodAnnotations);
+      return Optional.of(annotations.get(nullableAnnotationIndex.getAsInt()));
+    }
+    return Optional.empty();
+  }
+
   private static OptionalInt nullableAnnotationIndex(List<? extends AnnotationMirror> annotations) {
     for (int i = 0; i < annotations.size(); i++) {
       if (isNullable(annotations.get(i))) {

value/src/main/java/com/google/auto/value/processor/BuilderSpec.java

@@ -24,6 +24,7 @@
 import com.google.auto.common.MoreTypes;
 import com.google.auto.value.processor.AutoValueOrOneOfProcessor.Property;
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -41,6 +42,7 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
+import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -306,20 +308,16 @@ public PropertySetter(ExecutableElement setter, TypeMirror propertyType) {
         this.nullableAnnotation = "";
       } else {
         String rawTarget = TypeEncoder.encodeRaw(erasedPropertyType);
-        Optionalish optional = Optionalish.createIfOptional(propertyType, rawTarget);
+        Optionalish optional = Optionalish.createIfOptional(propertyType);
         String nullableAnnotation = "";
-        String of = null;
+        String of;
         if (optional != null) {
-          for (AnnotationMirror annotationMirror : parameterElement.getAnnotationMirrors()) {
-            AnnotationOutput annotationOutput = new AnnotationOutput(typeSimplifier);
-            String annotationName = annotationOutput.sourceFormForAnnotation(annotationMirror);
-            if (annotationName.equals("@Nullable") || annotationName.endsWith(".Nullable")) {
-              of = optional.getNullable();
-              nullableAnnotation = annotationName + " ";
-              break;
-            }
-          }
-          if (of == null) {
+          ImmutableList<AnnotationMirror> annotationMirrors = ImmutableList.copyOf(parameterElement.getAnnotationMirrors());
+          Optional<String> nullableAnnotationFromParam = AutoValueProcessor.nullableAnnotationIfInList(annotationMirrors);
+          if (nullableAnnotationFromParam.isPresent()) {
+            of = optional.getNullable();
+            nullableAnnotation = nullableAnnotationFromParam.get() + " ";
+          } else {
             of = "of";
           }
         } else {

value/src/main/java/com/google/auto/value/processor/Optionalish.java

@@ -98,7 +98,8 @@ public String getEmpty() {
 
   /**
    * Returns a string representing the method call to obtain the nullable version of this Optional.
-   * This will be something like {@code "fromNullable()"} or possibly {@code "ofNullable()"}. It does not have a final semicolon.
+   * This will be something like {@code "fromNullable()"} or possibly {@code "ofNullable()"}.
+   * It does not have a final semicolon.
    *
    * <p>This method is public so that it can be referenced as {@code p.optional.nullable} from
    * templates.