Migrate AutoValue to Records

build.gradle

@@ -84,7 +84,7 @@ subprojects { project ->
             "-parameters",
         ]
         options.errorprone {
-            // disable warnings in generated code; AutoValue code fails UnnecessaryParentheses check
+            // disable warnings in generated code; fails UnnecessaryParentheses check
             disableWarningsInGeneratedCode = true
 
             // https://github.com/uber/NullAway/issues/1398

gradle/libs.versions.toml

@@ -4,7 +4,6 @@ check-framework = "3.49.2"
 support = "27.1.1"
 wala = "1.6.12"
 commons-cli = "1.4"
-auto-value = "1.11.1"
 auto-service = "1.1.1"
 google-java-format = "1.30.0"
 android-gradle-plugin = "8.13.0"
@@ -58,8 +57,6 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref
 gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-maven-publish-plugin" }
 
 # --- APT (Annotation Processing) ---
-auto-value = { module = "com.google.auto.value:auto-value", version.ref = "auto-value" }
-auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "auto-value" }
 auto-service = { module = "com.google.auto.service:auto-service", version.ref = "auto-service" }
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "auto-service" }
 jakarta-inject = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }

library-model/library-model-generator/build.gradle

@@ -21,8 +21,5 @@ plugins {
 dependencies {
     implementation libs.guava
 
-    compileOnly libs.auto.value.annotations
-    annotationProcessor libs.auto.value
-
     testImplementation libs.junit4
 }

library-model/library-model-generator/src/main/java/com/uber/nullaway/libmodel/MethodAnnotationsRecord.java

@@ -1,24 +1,22 @@
 package com.uber.nullaway.libmodel;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
-/** A record describing the annotations associated with a java method and its arguments. */
-@AutoValue
-public abstract class MethodAnnotationsRecord {
+/** A record describing the annotations associated with a java method and its arguments.
+ * Generates by Record
+ */
+
+public record MethodAnnotationsRecord(ImmutableSet<String> methodAnnotations,
+                                      ImmutableSet<Integer> typeParamNullableUpperbounds,
+                                      ImmutableMap<Integer, ImmutableSet<String>> argumentAnnotations) {
 
   public static MethodAnnotationsRecord create(
       ImmutableSet<String> methodAnnotations,
       ImmutableSet<Integer> typeParamNullableUpperbounds,
       ImmutableMap<Integer, ImmutableSet<String>> argumentAnnotations) {
-    return new AutoValue_MethodAnnotationsRecord(
+    return new MethodAnnotationsRecord(
         methodAnnotations, typeParamNullableUpperbounds, argumentAnnotations);
   }
 
-  abstract ImmutableSet<String> methodAnnotations();
-
-  abstract ImmutableSet<Integer> typeParamNullableUpperbounds();
-
-  abstract ImmutableMap<Integer, ImmutableSet<String>> argumentAnnotations();
 }

nullaway/build.gradle

@@ -33,8 +33,6 @@ configurations {
 
 dependencies {
     compileOnly project(":annotations")
-    compileOnly libs.auto.value.annotations
-    annotationProcessor libs.auto.value
     compileOnly libs.auto.service.annotations
     annotationProcessor libs.auto.service
     // Using api following the guidance at https://jspecify.dev/docs/using#gradle

nullaway/src/main/java/com/uber/nullaway/ErrorProneCLIFlagsConfig.java

@@ -22,7 +22,6 @@
 
 package com.uber.nullaway;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
@@ -609,11 +608,11 @@ public boolean warnOnGenericInferenceFailure() {
     return warnOnInferenceFailure;
   }
 
-  @AutoValue
-  abstract static class MethodClassAndName {
+  record MethodClassAndName(String enclosingClass,
+                            String methodName) {
 
     static MethodClassAndName create(String enclosingClass, String methodName) {
-      return new AutoValue_ErrorProneCLIFlagsConfig_MethodClassAndName(enclosingClass, methodName);
+      return new MethodClassAndName(enclosingClass, methodName);
     }
 
     static MethodClassAndName fromClassDotMethod(String classDotMethod) {
@@ -623,8 +622,5 @@ static MethodClassAndName fromClassDotMethod(String classDotMethod) {
       return MethodClassAndName.create(className, methodName);
     }
 
-    abstract String enclosingClass();
-
-    abstract String methodName();
   }
 }

nullaway/src/main/java/com/uber/nullaway/LibraryModels.java

@@ -22,7 +22,6 @@
 
 package com.uber.nullaway;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -325,15 +324,12 @@ public String toString() {
   }
 
   /** Representation of a field as a qualified class name + a field name */
-  @AutoValue
-  abstract class FieldRef {
 
-    public abstract String getEnclosingClassName();
-
-    public abstract String getFieldName();
+  record FieldRef(String enclosingClassName,
+                  String fieldName) {
 
     public static FieldRef fieldRef(String enclosingClass, String fieldName) {
-      return new AutoValue_LibraryModels_FieldRef(enclosingClass, fieldName);
+      return new FieldRef(enclosingClass, fieldName);
     }
   }
 }

nullaway/src/main/java/com/uber/nullaway/NullAway.java

@@ -33,7 +33,6 @@
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import com.google.auto.service.AutoService;
-import com.google.auto.value.AutoValue;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
@@ -2817,8 +2816,47 @@ public void setComputedNullness(ExpressionTree e, Nullness nullness) {
     computedNullnessMap.put(e, nullness);
   }
 
-  @AutoValue
-  abstract static class FieldInitEntities {
+  /**
+   * Generates by Record
+   * <p>
+   * Returns symbol for class.
+   * Symbol.ClassSymbol classSymbol()
+   * <p>
+   * Returns <code>@NonNull</code> instance fields that are not directly initialized at declaration.
+   * ImmutableSet<Symbol> nonnullInstanceFields()
+   * <p>
+   * Returns <code>@NonNull</code> static fields that are not directly initialized at declaration.
+   * ImmutableSet<Symbol> nonnullStaticFields();
+   * <p>
+   * Returns the list of instance initializer blocks (e.g. blocks of the form `class X { { //Code
+   * } } ), in the order in which they appear in the class.
+   * ImmutableList<BlockTree> instanceInitializerBlocks();
+   * <p>
+   * Returns the list of static initializer blocks (e.g. blocks of the form `class X { static {
+   * //Code } } ), in the order in which they appear in the class.
+   * ImmutableList<BlockTree> staticInitializerBlocks();
+   * <p>
+   * Returns constructors in the class.
+   * ImmutableSet<MethodTree> constructors();
+   * <p>
+   * Returns the list of non-static (instance) initializer methods. This includes methods
+   * annotated @Initializer, as well as those specified by -XepOpt:NullAway:KnownInitializers or
+   * annotated with annotations passed to -XepOpt:NullAway:CustomInitializerAnnotations.
+   * ImmutableSet<MethodTree> instanceInitializerMethods();
+   * <p>
+   * Returns the list of static initializer methods. This includes static methods
+   * annotated @Initializer, as well as those specified by -XepOpt:NullAway:KnownInitializers or
+   * annotated with annotations passed to -XepOpt:NullAway:CustomInitializerAnnotations.
+   * ImmutableSet<MethodTree> staticInitializerMethods();
+   */
+  record FieldInitEntities(Symbol.ClassSymbol classSymbol,
+                           ImmutableSet<Symbol> nonnullInstanceFields,
+                           ImmutableSet<Symbol> nonnullStaticFields,
+                           ImmutableList<BlockTree> instanceInitializerBlocks,
+                           ImmutableList<BlockTree> staticInitializerBlocks,
+                           ImmutableSet<MethodTree> constructors,
+                           ImmutableSet<MethodTree> instanceInitializerMethods,
+                           ImmutableSet<MethodTree> staticInitializerMethods) {
 
     static FieldInitEntities create(
         Symbol.ClassSymbol classSymbol,
@@ -2829,7 +2867,7 @@ static FieldInitEntities create(
         Set<MethodTree> constructors,
         Set<MethodTree> instanceInitializerMethods,
         Set<MethodTree> staticInitializerMethods) {
-      return new AutoValue_NullAway_FieldInitEntities(
+      return new FieldInitEntities(
           classSymbol,
           ImmutableSet.copyOf(nonnullInstanceFields),
           ImmutableSet.copyOf(nonnullStaticFields),
@@ -2840,47 +2878,5 @@ static FieldInitEntities create(
           ImmutableSet.copyOf(staticInitializerMethods));
     }
 
-    /** Returns symbol for class. */
-    abstract Symbol.ClassSymbol classSymbol();
-
-    /**
-     * Returns <code>@NonNull</code> instance fields that are not directly initialized at
-     * declaration.
-     */
-    abstract ImmutableSet<Symbol> nonnullInstanceFields();
-
-    /**
-     * Returns <code>@NonNull</code> static fields that are not directly initialized at declaration.
-     */
-    abstract ImmutableSet<Symbol> nonnullStaticFields();
-
-    /**
-     * Returns the list of instance initializer blocks (e.g. blocks of the form `class X { { //Code
-     * } } ), in the order in which they appear in the class.
-     */
-    abstract ImmutableList<BlockTree> instanceInitializerBlocks();
-
-    /**
-     * Returns the list of static initializer blocks (e.g. blocks of the form `class X { static {
-     * //Code } } ), in the order in which they appear in the class.
-     */
-    abstract ImmutableList<BlockTree> staticInitializerBlocks();
-
-    /** Returns constructors in the class. */
-    abstract ImmutableSet<MethodTree> constructors();
-
-    /**
-     * Returns the list of non-static (instance) initializer methods. This includes methods
-     * annotated @Initializer, as well as those specified by -XepOpt:NullAway:KnownInitializers or
-     * annotated with annotations passed to -XepOpt:NullAway:CustomInitializerAnnotations.
-     */
-    abstract ImmutableSet<MethodTree> instanceInitializerMethods();
-
-    /**
-     * Returns the list of static initializer methods. This includes static methods
-     * annotated @Initializer, as well as those specified by -XepOpt:NullAway:KnownInitializers or
-     * annotated with annotations passed to -XepOpt:NullAway:CustomInitializerAnnotations.
-     */
-    abstract ImmutableSet<MethodTree> staticInitializerMethods();
   }
 }

nullaway/src/main/java/com/uber/nullaway/dataflow/DataFlow.java

@@ -21,7 +21,6 @@
 import static com.uber.nullaway.NullabilityUtil.castToNonNull;
 import static com.uber.nullaway.NullabilityUtil.findEnclosingMethodOrLambdaOrInitializer;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Verify;
 import com.google.common.cache.CacheBuilder;
@@ -352,13 +351,21 @@ public boolean isRunning(TreePath path, Context context, AccessPathNullnessPropa
     return analysis.isRunning();
   }
 
-  @AutoValue
-  abstract static class CfgParams {
-    // Should not be used for hashCode or equals
+  static final class CfgParams {
+    /**
+     * Records cannot declare extra instance fields (environment).
+     * Used direct replacement approach to migrate from AutoValue
+     */
+    private final TreePath codePath;
+
     private @Nullable ProcessingEnvironment environment;
 
-    private static CfgParams create(TreePath codePath, ProcessingEnvironment environment) {
-      CfgParams cp = new AutoValue_DataFlow_CfgParams(codePath);
+    private CfgParams(TreePath codePath) {
+      this.codePath = codePath;
+    }
+
+    static CfgParams create(TreePath codePath, ProcessingEnvironment environment) {
+      CfgParams cp = new CfgParams(codePath);
       cp.environment = environment;
       return cp;
     }
@@ -367,21 +374,26 @@ ProcessingEnvironment environment() {
       return castToNonNull(environment);
     }
 
-    abstract TreePath codePath();
+    TreePath codePath() {
+      return codePath;
+    }
+    /*
+     * If needed, need to override these methods
+     * @Override
+     * public boolean equals(Object o) { ...codePath... }
+     *
+     * @Override
+     * public int hashCode() { ...codePath... }
+     */
   }
 
-  @AutoValue
-  abstract static class AnalysisParams {
+  record AnalysisParams(ForwardTransferFunction<?, ?> transferFunction, ControlFlowGraph cfg) {
 
     private static AnalysisParams create(
         ForwardTransferFunction<?, ?> transferFunction, ControlFlowGraph cfg) {
-      AnalysisParams ap = new AutoValue_DataFlow_AnalysisParams(transferFunction, cfg);
-      return ap;
+      return new AnalysisParams(transferFunction, cfg);
     }
 
-    abstract ForwardTransferFunction<?, ?> transferFunction();
-
-    abstract ControlFlowGraph cfg();
   }
 
   /** A pair of Analysis and ControlFlowGraph. */

nullaway/src/main/java/com/uber/nullaway/handlers/StreamNullabilityPropagator.java

@@ -24,7 +24,6 @@
 
 import static com.uber.nullaway.NullabilityUtil.castToNonNull;
 
-import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.LinkedHashMultimap;
@@ -128,18 +127,15 @@ class StreamNullabilityPropagator implements Handler {
   private final Map<MethodInvocationTree, Tree> observableCallToInnerMethodOrLambda =
       new LinkedHashMap<>();
 
-  @AutoValue
-  abstract static class CollectRecordAndInnerMethod {
+  record CollectRecordAndInnerMethod(CollectLikeMethodRecord collectlikeMethodRecord,
+                                     Tree innerMethodOrLambda) {
 
     static CollectRecordAndInnerMethod create(
         CollectLikeMethodRecord collectlikeMethodRecord, Tree innerMethodOrLambda) {
-      return new AutoValue_StreamNullabilityPropagator_CollectRecordAndInnerMethod(
+      return new CollectRecordAndInnerMethod(
           collectlikeMethodRecord, innerMethodOrLambda);
     }
 
-    abstract CollectLikeMethodRecord getCollectLikeMethodRecord();
-
-    abstract Tree getInnerMethodOrLambda();
   }
 
   // Maps collect calls in the observable call chain to the relevant (collect record, inner method
@@ -380,9 +376,9 @@ private void handleChainFromFilter(
             collectCallToRecordsAndInnerMethodsOrLambdas.get(castToNonNull(outerCallInChain))) {
           MapOrCollectMethodToFilterInstanceRecord record =
               new MapOrCollectMethodToFilterInstanceRecord(
-                  collectRecordAndInnerMethod.getCollectLikeMethodRecord(), filterMethodOrLambda);
+                  collectRecordAndInnerMethod.collectlikeMethodRecord(), filterMethodOrLambda);
           mapOrCollectRecordToFilterMap.put(
-              collectRecordAndInnerMethod.getInnerMethodOrLambda(), record);
+              collectRecordAndInnerMethod.innerMethodOrLambda(), record);
         }
       }
     } while (outerCallInChain != null