Merge pull request #50 from openrewrite/large-repositories

OpenRewrite 8.0 upgrade

src/main/java/org/openrewrite/python/ChangeMethodName.java

@@ -54,7 +54,7 @@ public String getDescription() {
     }
 
     @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new PythonIsoVisitor<ExecutionContext>() {
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {

src/main/java/org/openrewrite/python/PythonIsoVisitor.java

@@ -134,8 +134,8 @@ public Expression visitExpression(Expression expression, P p) {
     }
 
     @Override
-    public JavaSourceFile visitJavaSourceFile(JavaSourceFile cu, P p) {
-        return (JavaSourceFile) super.visitJavaSourceFile(cu, p);
+    public Py.CompilationUnit visitCompilationUnit(Py.CompilationUnit cu, P p) {
+        return (Py.CompilationUnit) super.visitCompilationUnit(cu, p);
     }
 
     @Override

src/main/java/org/openrewrite/python/PythonParser.java

@@ -27,7 +27,6 @@
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.internal.JavaTypeCache;
 import org.openrewrite.python.internal.PsiPythonMapper;
-import org.openrewrite.python.marker.PythonVersion;
 import org.openrewrite.python.tree.Py;
 import org.openrewrite.style.NamedStyles;
 import org.openrewrite.tree.ParsingEventListener;
@@ -40,9 +39,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
-
-import static java.util.stream.Collectors.toList;
+import java.util.stream.Stream;
 
 @SuppressWarnings("unused")
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@@ -53,7 +50,7 @@ public class PythonParser implements Parser<Py.CompilationUnit> {
     private final JavaTypeCache typeCache;
 
     @Override
-    public List<Py.CompilationUnit> parse(String... sources) {
+    public Stream<Py.CompilationUnit> parse(String... sources) {
         List<Input> inputs = new ArrayList<>(sources.length);
         for (int i = 0; i < sources.length; i++) {
             Path path = Paths.get("p" + i + ".py");
@@ -73,7 +70,7 @@ public List<Py.CompilationUnit> parse(String... sources) {
     }
 
     @Override
-    public List<Py.CompilationUnit> parseInputs(Iterable<Input> inputs, @Nullable Path relativeTo, ExecutionContext ctx) {
+    public Stream<Py.CompilationUnit> parseInputs(Iterable<Input> inputs, @Nullable Path relativeTo, ExecutionContext ctx) {
         ParsingExecutionContextView pctx = ParsingExecutionContextView.view(ctx);
         ParsingEventListener parsingListener = pctx.getParsingListener();
 
@@ -97,8 +94,7 @@ public List<Py.CompilationUnit> parseInputs(Iterable<Input> inputs, @Nullable Pa
                         return null;
                     }
                 })
-                .filter(Objects::nonNull)
-                .collect(toList());
+                .filter(Objects::nonNull);
     }
 
     public enum LanguageLevel {

src/main/java/org/openrewrite/python/PythonVisitor.java

@@ -38,11 +38,6 @@ public String getLanguage() {
         return "python";
     }
 
-    @Override
-    public J visitJavaSourceFile(JavaSourceFile cu, P p) {
-        return cu instanceof Py.CompilationUnit ? visitCompilationUnit((Py.CompilationUnit) cu, p) : cu;
-    }
-
     public J visitCompilationUnit(Py.CompilationUnit cu, P p) {
         Py.CompilationUnit c = cu;
         c = c.withPrefix(visitSpace(c.getPrefix(), Space.Location.COMPILATION_UNIT_PREFIX, p));

src/main/java/org/openrewrite/python/format/PythonSpaces.java

@@ -37,7 +37,7 @@ public String getDescription() {
     }
 
     @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new PythonSpacesVisitor<>();
     }
 }

src/main/java/org/openrewrite/python/internal/PythonPrinter.java

@@ -199,8 +199,7 @@ private Space reindentPrefix(Space space) {
     }
 
     @Override
-    public J visitJavaSourceFile(JavaSourceFile sourceFile, PrintOutputCapture<P> p) {
-        Py.CompilationUnit cu = (Py.CompilationUnit) sourceFile;
+    public J visitCompilationUnit(Py.CompilationUnit cu, PrintOutputCapture<P> p) {
         beforeSyntax(cu, Location.COMPILATION_UNIT_PREFIX, p);
         for (JRightPadded<Import> anImport : cu.getPadding().getImports()) {
             visitRightPadded(anImport, PyRightPadded.Location.TOP_LEVEL_STATEMENT_SUFFIX, p);

src/main/java/org/openrewrite/python/search/FindPythonSources.java

@@ -18,6 +18,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.openrewrite.*;
+import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.marker.SearchResult;
 import org.openrewrite.python.marker.PythonVersion;
 import org.openrewrite.python.table.PythonSourceFile;
@@ -41,10 +42,14 @@ public String getDescription() {
     }
 
     @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
             @Override
-            public Tree visitSourceFile(SourceFile sourceFile, ExecutionContext ctx) {
+            public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+                if (!(tree instanceof SourceFile)) {
+                    return tree;
+                }
+                SourceFile sourceFile = (SourceFile) tree;
                 if (sourceFile.getSourcePath().toString().endsWith(".py")) {
                     PythonSourceFile.SourceFileType sourceFileType = null;
                     String languageLevel = "";

src/main/java/org/openrewrite/python/tree/Py.java

@@ -237,7 +237,7 @@ public JavaSourceFile withClasses(List<ClassDeclaration> classes) {
         }
 
         public <P> J acceptPython(PythonVisitor<P> v, P p) {
-            return v.visitJavaSourceFile(this, p);
+            return v.visitCompilationUnit(this, p);
         }
 
         @Override

src/main/resources/META-INF/rewrite/static-analysis-cleanup.yml

@@ -19,74 +19,74 @@ name: org.openrewrite.python.cleanup.CommonStaticAnalysis
 displayName: Common static analysis issues
 description: Resolve common static analysis issues discovered through 3rd party tools.
 recipeList:
-  - org.openrewrite.java.cleanup.AddSerialVersionUidToSerializable
-  - org.openrewrite.java.cleanup.AtomicPrimitiveEqualsUsesGet
-  - org.openrewrite.java.cleanup.BigDecimalRoundingConstantsToEnums
-  - org.openrewrite.java.cleanup.BooleanChecksNotInverted
-  - org.openrewrite.java.cleanup.CaseInsensitiveComparisonsDoNotChangeCase
-  - org.openrewrite.java.cleanup.CatchClauseOnlyRethrows
-  - org.openrewrite.java.cleanup.ChainStringBuilderAppendCalls
-  - org.openrewrite.java.cleanup.CovariantEquals
-  - org.openrewrite.java.cleanup.DefaultComesLast
-  - org.openrewrite.java.cleanup.EmptyBlock
-  - org.openrewrite.java.cleanup.EqualsAvoidsNull
-  - org.openrewrite.java.cleanup.ExplicitInitialization
-  - org.openrewrite.java.cleanup.ExternalizableHasNoArgsConstructor
-  - org.openrewrite.java.cleanup.FinalizePrivateFields
-  - org.openrewrite.java.cleanup.FallThrough
-  - org.openrewrite.java.cleanup.FinalClass
-  - org.openrewrite.java.cleanup.FixStringFormatExpressions
-  - org.openrewrite.java.cleanup.ForLoopIncrementInUpdate
-#  - org.openrewrite.java.cleanup.HideUtilityClassConstructor
-  - org.openrewrite.java.cleanup.IndexOfChecksShouldUseAStartPosition
-  - org.openrewrite.java.cleanup.IndexOfReplaceableByContains
-  - org.openrewrite.java.cleanup.IndexOfShouldNotCompareGreaterThanZero
-  - org.openrewrite.java.cleanup.InlineVariable
-  - org.openrewrite.java.cleanup.IsEmptyCallOnCollections
-  - org.openrewrite.java.cleanup.LambdaBlockToExpression
-  - org.openrewrite.java.cleanup.LowercasePackage
-  - org.openrewrite.java.cleanup.MethodNameCasing
-#  - org.openrewrite.java.cleanup.MinimumSwitchCases
-#  - org.openrewrite.java.cleanup.ModifierOrder
-  - org.openrewrite.java.cleanup.MultipleVariableDeclarations
-  - org.openrewrite.java.cleanup.NeedBraces
-  - org.openrewrite.java.cleanup.NestedEnumsAreNotStatic
-  - org.openrewrite.java.cleanup.NewStringBuilderBufferWithCharArgument
-  - org.openrewrite.java.cleanup.NoDoubleBraceInitialization
-  - org.openrewrite.java.cleanup.NoEmptyCollectionWithRawType
-  - org.openrewrite.java.cleanup.NoEqualityInForCondition
-  - org.openrewrite.java.cleanup.NoFinalizer
-  - org.openrewrite.java.cleanup.NoPrimitiveWrappersForToStringOrCompareTo
-  - org.openrewrite.java.cleanup.NoRedundantJumpStatements
-  - org.openrewrite.java.cleanup.NoToStringOnStringType
-  - org.openrewrite.java.cleanup.NoValueOfOnStringType
-  - org.openrewrite.java.cleanup.ObjectFinalizeCallsSuper
-  - org.openrewrite.java.cleanup.PrimitiveWrapperClassConstructorToValueOf
-  - org.openrewrite.java.cleanup.RedundantFileCreation
-  - org.openrewrite.java.cleanup.RemoveExtraSemicolons
-#  - org.openrewrite.java.cleanup.RemoveRedundantTypeCast
+  - org.openrewrite.staticanalysis.AddSerialVersionUidToSerializable
+  - org.openrewrite.staticanalysis.AtomicPrimitiveEqualsUsesGet
+  - org.openrewrite.staticanalysis.BigDecimalRoundingConstantsToEnums
+  - org.openrewrite.staticanalysis.BooleanChecksNotInverted
+  - org.openrewrite.staticanalysis.CaseInsensitiveComparisonsDoNotChangeCase
+  - org.openrewrite.staticanalysis.CatchClauseOnlyRethrows
+  - org.openrewrite.staticanalysis.ChainStringBuilderAppendCalls
+  - org.openrewrite.staticanalysis.CovariantEquals
+  - org.openrewrite.staticanalysis.DefaultComesLast
+  - org.openrewrite.staticanalysis.EmptyBlock
+  - org.openrewrite.staticanalysis.EqualsAvoidsNull
+  - org.openrewrite.staticanalysis.ExplicitInitialization
+  - org.openrewrite.staticanalysis.ExternalizableHasNoArgsConstructor
+  - org.openrewrite.staticanalysis.FinalizePrivateFields
+  - org.openrewrite.staticanalysis.FallThrough
+  - org.openrewrite.staticanalysis.FinalClass
+  - org.openrewrite.staticanalysis.FixStringFormatExpressions
+  - org.openrewrite.staticanalysis.ForLoopIncrementInUpdate
+#  - org.openrewrite.staticanalysis.HideUtilityClassConstructor
+  - org.openrewrite.staticanalysis.IndexOfChecksShouldUseAStartPosition
+  - org.openrewrite.staticanalysis.IndexOfReplaceableByContains
+  - org.openrewrite.staticanalysis.IndexOfShouldNotCompareGreaterThanZero
+  - org.openrewrite.staticanalysis.InlineVariable
+  - org.openrewrite.staticanalysis.IsEmptyCallOnCollections
+  - org.openrewrite.staticanalysis.LambdaBlockToExpression
+  - org.openrewrite.staticanalysis.LowercasePackage
+  - org.openrewrite.staticanalysis.MethodNameCasing
+#  - org.openrewrite.staticanalysis.MinimumSwitchCases
+#  - org.openrewrite.staticanalysis.ModifierOrder
+  - org.openrewrite.staticanalysis.MultipleVariableDeclarations
+  - org.openrewrite.staticanalysis.NeedBraces
+  - org.openrewrite.staticanalysis.NestedEnumsAreNotStatic
+  - org.openrewrite.staticanalysis.NewStringBuilderBufferWithCharArgument
+  - org.openrewrite.staticanalysis.NoDoubleBraceInitialization
+  - org.openrewrite.staticanalysis.NoEmptyCollectionWithRawType
+  - org.openrewrite.staticanalysis.NoEqualityInForCondition
+  - org.openrewrite.staticanalysis.NoFinalizer
+  - org.openrewrite.staticanalysis.NoPrimitiveWrappersForToStringOrCompareTo
+  - org.openrewrite.staticanalysis.NoRedundantJumpStatements
+  - org.openrewrite.staticanalysis.NoToStringOnStringType
+  - org.openrewrite.staticanalysis.NoValueOfOnStringType
+  - org.openrewrite.staticanalysis.ObjectFinalizeCallsSuper
+  - org.openrewrite.staticanalysis.PrimitiveWrapperClassConstructorToValueOf
+  - org.openrewrite.staticanalysis.RedundantFileCreation
+  - org.openrewrite.staticanalysis.RemoveExtraSemicolons
+#  - org.openrewrite.staticanalysis.RemoveRedundantTypeCast
 #  - org.openrewrite.java.RemoveUnusedImports
-#  - org.openrewrite.java.cleanup.RemoveUnusedLocalVariables
-#  - org.openrewrite.java.cleanup.RemoveUnusedPrivateMethods
-  - org.openrewrite.java.cleanup.RenameLocalVariablesToCamelCase
-  - org.openrewrite.java.cleanup.RenameMethodsNamedHashcodeEqualOrTostring
-  - org.openrewrite.java.cleanup.RenamePrivateFieldsToCamelCase
-  - org.openrewrite.java.cleanup.ReplaceLambdaWithMethodReference
-  - org.openrewrite.java.cleanup.ReplaceStringBuilderWithString
+#  - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
+#  - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
+  - org.openrewrite.staticanalysis.RenameLocalVariablesToCamelCase
+  - org.openrewrite.staticanalysis.RenameMethodsNamedHashcodeEqualOrTostring
+  - org.openrewrite.staticanalysis.RenamePrivateFieldsToCamelCase
+  - org.openrewrite.staticanalysis.ReplaceLambdaWithMethodReference
+  - org.openrewrite.staticanalysis.ReplaceStringBuilderWithString
   - org.openrewrite.java.cleanup.SimplifyBooleanExpression
 #  - org.openrewrite.java.cleanup.SimplifyBooleanReturn
-  - org.openrewrite.java.cleanup.StaticMethodNotFinal
-  - org.openrewrite.java.cleanup.StringLiteralEquality
-  - org.openrewrite.java.cleanup.UnnecessaryCloseInTryWithResources
-  - org.openrewrite.java.cleanup.UnnecessaryExplicitTypeArguments
+  - org.openrewrite.staticanalysis.StaticMethodNotFinal
+  - org.openrewrite.staticanalysis.StringLiteralEquality
+  - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
+  - org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments
 #  - org.openrewrite.java.cleanup.UnnecessaryParentheses
-  - org.openrewrite.java.cleanup.UnnecessaryPrimitiveAnnotations
-  - org.openrewrite.java.cleanup.UpperCaseLiteralSuffixes
-#  - org.openrewrite.java.cleanup.UnnecessaryThrows
-#  - org.openrewrite.java.cleanup.UseCollectionInterfaces
-  - org.openrewrite.java.cleanup.UseDiamondOperator
-  - org.openrewrite.java.cleanup.UseJavaStyleArrayDeclarations
-  - org.openrewrite.java.cleanup.UseLambdaForFunctionalInterface
-#  - org.openrewrite.java.cleanup.UseStringReplace
-  - org.openrewrite.java.cleanup.WhileInsteadOfFor
-  - org.openrewrite.java.cleanup.WriteOctalValuesAsDecimal
+  - org.openrewrite.staticanalysis.UnnecessaryPrimitiveAnnotations
+  - org.openrewrite.staticanalysis.UpperCaseLiteralSuffixes
+#  - org.openrewrite.staticanalysis.UnnecessaryThrows
+#  - org.openrewrite.staticanalysis.UseCollectionInterfaces
+  - org.openrewrite.staticanalysis.UseDiamondOperator
+  - org.openrewrite.staticanalysis.UseJavaStyleArrayDeclarations
+  - org.openrewrite.staticanalysis.UseLambdaForFunctionalInterface
+#  - org.openrewrite.staticanalysis.UseStringReplace
+  - org.openrewrite.staticanalysis.WhileInsteadOfFor
+  - org.openrewrite.staticanalysis.WriteOctalValuesAsDecimal