Minimize visibility & reduce overloaded constructors

Author: timtebeek

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpec.java

@@ -23,7 +23,7 @@
 
 import static org.openrewrite.java.migrate.joda.templates.TimeClassNames.JODA_CLASS_PATTERN;
 
-public class JodaTimeFlowSpec extends DataFlowSpec {
+class JodaTimeFlowSpec extends DataFlowSpec {
 
     @Override
     public boolean isSource(@NonNull DataFlowNode srcNode) {

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java

@@ -48,7 +48,7 @@ public JodaTimeScanner getScanner(Accumulator acc) {
 
     @Override
     public JodaTimeVisitor getVisitor(Accumulator acc) {
-        return new JodaTimeVisitor(acc);
+        return new JodaTimeVisitor(acc, true, new LinkedList<>());
     }
 
     @Getter

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java

@@ -19,6 +19,7 @@
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.analysis.dataflow.Dataflow;
@@ -35,21 +36,17 @@
 
 import static org.openrewrite.java.migrate.joda.templates.TimeClassNames.JODA_CLASS_PATTERN;
 
-public class JodaTimeScanner extends ScopeAwareVisitor {
+class JodaTimeScanner extends ScopeAwareVisitor {
 
     @Getter
     private final JodaTimeRecipe.Accumulator acc;
 
     private final Map<NamedVariable, Set<NamedVariable>> varDependencies = new HashMap<>();
     private final Map<JavaType, Set<String>> unsafeVarsByType = new HashMap<>();
 
-    public JodaTimeScanner(JodaTimeRecipe.Accumulator acc, LinkedList<VariablesInScope> scopes) {
-        super(scopes);
-        this.acc = acc;
-    }
-
     public JodaTimeScanner(JodaTimeRecipe.Accumulator acc) {
-        this(acc, new LinkedList<>());
+        super(new LinkedList<>());
+        this.acc = acc;
     }
 
     @Override
@@ -68,7 +65,7 @@ public NamedVariable visitVariable(NamedVariable variable, ExecutionContext ctx)
         if (!variable.getType().isAssignableFrom(JODA_CLASS_PATTERN)) {
             return variable;
         }
-        // TODO: handle class variables && method parameters
+        // TODO: handle class variables
         if (isClassVar(variable)) {
             acc.getUnsafeVars().add(variable);
             return variable;
@@ -93,7 +90,7 @@ public NamedVariable visitVariable(NamedVariable variable, ExecutionContext ctx)
         List<Expression> sinks = findSinks(cursor);
 
         Cursor currentScope = getCurrentScope();
-        new AddSafeCheckMarker(sinks).visit(currentScope.getValue(), ctx, currentScope.getParent());
+        new AddSafeCheckMarker(sinks).visit(currentScope.getValue(), ctx, currentScope.getParentOrThrow());
         processMarkersOnExpression(sinks, variable);
         return variable;
     }
@@ -113,7 +110,7 @@ public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext ct
         NamedVariable variable = mayBeVar.get();
         Cursor varScope = findScope(variable);
         List<Expression> sinks = findSinks(new Cursor(getCursor(), assignment.getAssignment()));
-        new AddSafeCheckMarker(sinks).visit(varScope.getValue(), ctx, varScope.getParent());
+        new AddSafeCheckMarker(sinks).visit(varScope.getValue(), ctx, varScope.getParentOrThrow());
         processMarkersOnExpression(sinks, variable);
         return assignment;
     }
@@ -217,7 +214,7 @@ private SafeCheckMarker getMarker(Expression expr, ExecutionContext ctx) {
             Expression boundaryExpr = boundary.getValue();
             J j = new JodaTimeVisitor(new JodaTimeRecipe.Accumulator(), false, scopes)
                     .visit(boundaryExpr, ctx, boundary.getParentTreeCursor());
-            Set<NamedVariable> referencedVars = new HashSet<>();
+            Set<@Nullable NamedVariable> referencedVars = new HashSet<>();
             new FindVarReferences().visit(expr, referencedVars, getCursor().getParentTreeCursor());
             AtomicBoolean hasJodaType = new AtomicBoolean();
             new HasJodaType().visit(j, hasJodaType);
@@ -257,10 +254,10 @@ private Optional<Cursor> findArgumentExprCursor() {
         }
     }
 
-    private class FindVarReferences extends JavaIsoVisitor<Set<NamedVariable>> {
+    private class FindVarReferences extends JavaIsoVisitor<Set<@Nullable NamedVariable>> {
 
         @Override
-        public J.Identifier visitIdentifier(J.Identifier ident, Set<NamedVariable> vars) {
+        public J.Identifier visitIdentifier(J.Identifier ident, Set<@Nullable NamedVariable> vars) {
             if (!isJodaExpr(ident) || ident.getFieldType() == null) {
                 return ident;
             }

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeVisitor.java

@@ -32,7 +32,7 @@
 
 import static org.openrewrite.java.migrate.joda.templates.TimeClassNames.*;
 
-public class JodaTimeVisitor extends ScopeAwareVisitor {
+class JodaTimeVisitor extends ScopeAwareVisitor {
 
     private final boolean safeMigration;
     private final JodaTimeRecipe.Accumulator acc;
@@ -43,18 +43,6 @@ public JodaTimeVisitor(JodaTimeRecipe.Accumulator acc, boolean safeMigration, Li
         this.safeMigration = safeMigration;
     }
 
-    public JodaTimeVisitor(JodaTimeRecipe.Accumulator acc, boolean safeMigration) {
-        this(acc, safeMigration, new LinkedList<>());
-    }
-
-    public JodaTimeVisitor(JodaTimeRecipe.Accumulator acc) {
-        this(acc, true);
-    }
-
-    public JodaTimeVisitor() {
-        this(new JodaTimeRecipe.Accumulator());
-    }
-
     @Override
     public @NonNull J visitCompilationUnit(@NonNull J.CompilationUnit cu, @NonNull ExecutionContext ctx) {
         maybeRemoveImport(JODA_DATE_TIME);

src/main/java/org/openrewrite/java/migrate/joda/ScopeAwareVisitor.java

@@ -29,7 +29,7 @@
 import java.util.Set;
 
 @AllArgsConstructor
-public class ScopeAwareVisitor extends JavaVisitor<ExecutionContext> {
+class ScopeAwareVisitor extends JavaVisitor<ExecutionContext> {
     protected final LinkedList<VariablesInScope> scopes;
 
     @Override