nullaway/src/main/java/com/uber/nullaway/NullAway.java (1)

301-302: Consider safer initialization pattern for empty constructor

While the comment acknowledges the issue of leaking this, consider a safer pattern to avoid potential issues with subclassing or future modifications. You could use a factory method or builder pattern for initialization.

 public NullAway() {
   config = new DummyOptionsConfig();
   handler = Handlers.buildEmpty();
   nonAnnotatedMethod = this::isMethodUnannotated;
   errorBuilder = new ErrorBuilder(config, "", ImmutableSet.of());
-  // annoying to leak `this` here; we assign the field last to make it as safe as possible
-  genericsChecks = new GenericsChecks(this, config, handler);
+  // Create genericsChecks in a separate initialization step to avoid leaking this
+  genericsChecks = createGenericsChecks();
 }
+
+private GenericsChecks createGenericsChecks() {
+  return new GenericsChecks(this, config, handler);
+}

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

nullaway/src/main/java/com/uber/nullaway/dataflow/AccessPathNullnessPropagation.java (1)

1105-1106: LGTM!

The call to getGenericReturnNullnessAtInvocation correctly uses the updated instance method signature without the Config parameter, which aligns with the refactoring to make GenericsChecks stateful.

nullaway/src/main/java/com/uber/nullaway/generics/CheckIdenticalNullabilityVisitor.java (3)

17-22: LGTM!

The field and constructor changes correctly transition from using Config to using a GenericsChecks instance, which is consistent with the refactoring.

---

65-66: LGTM!

The calls to isNullableAnnotated correctly use the new instance method signature without passing config.

---

96-97: LGTM!

The instance method calls are correctly updated here as well, maintaining consistency with the refactoring.

nullaway/src/main/java/com/uber/nullaway/NullAway.java (11)

283-284: Instance field declaration looks good

The instance field declaration follows Java best practices with the final modifier.

---

318-319: Initialization order is consistent

Good that both constructors follow the same pattern of initializing genericsChecks last to minimize the risk of using a partially constructed object.

---

530-530: Instance method call correctly updated

The call to checkTypeParameterNullnessForAssignability properly uses the instance method without redundant parameters.

---

708-709: Method call signature correctly updated

The call properly uses the new instance method signature with the overridden method parameter included.

---

834-839: Instance method calls properly updated

All generics-related method calls correctly use the instance methods with the simplified signatures.

---

1003-1008: Generic return type checking correctly updated

The instance method calls for generic return type nullness checking are properly updated with the new signatures.

---

1550-1550: Variable initialization checking properly updated

The call correctly uses the instance method for checking type parameter nullability during variable initialization.

---

1787-1787: Conditional expression checking correctly updated

The instance method call for checking type parameter nullability in conditional expressions is properly updated.

---

1935-1936: Generic parameter nullness checking properly updated

The instance method call correctly uses the simplified signature without redundant parameters.

---

1941-1944: Generic method call checking correctly updated

Both method calls properly use the instance methods with simplified signatures.

---

2685-2685: Generic return nullness checking properly updated

The instance method call correctly uses the simplified signature for checking generic return nullness at invocation.

nullaway/src/main/java/com/uber/nullaway/generics/GenericsChecks.java (6)

62-70: LGTM! Well-structured constructor

The constructor properly initializes all instance fields and follows standard Java conventions. The instance-based approach improves encapsulation and reduces method parameter counts throughout the class.

---

79-80: Simplified method signatures improve API clarity

The removal of Config, NullAway, and Handler parameters from public methods significantly simplifies the API surface. All methods now access these dependencies through instance fields, which is a cleaner design.

---

120-121: Private helper method properly refactored

The helper method correctly uses instance fields instead of parameters, maintaining consistency with the overall refactoring approach.

---

587-587: CheckIdenticalNullabilityVisitor instantiation updated correctly

The visitor is properly instantiated with the GenericsChecks instance, allowing it to access the necessary methods without requiring a Config parameter.

---

1275-1279: Method signature properly simplified

The method correctly uses instance fields for config and handler, reducing the parameter count while maintaining the same functionality.

---

1309-1311: New instance method for nullable annotation checking

Good addition of a public instance method for checking nullable annotations, properly using the instance's config field.