Apply configured styles to everything

Author: sambsnyd

plugin/src/main/java/org/openrewrite/gradle/isolated/DefaultProjectParser.java

@@ -19,6 +19,7 @@
 import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.instrument.util.TimeUtils;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
@@ -82,6 +83,7 @@
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Duration;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -653,13 +655,13 @@ public Stream<SourceFile> parse(Project subproject, Set<Path> alreadyParsed, Exe
             List<NamedStyles> styles = getStyles();
             logger.lifecycle("Using active styles {}", styles.stream().map(NamedStyles::getName).collect(toList()));
 
-            if (subproject.getPlugins()
-                        .hasPlugin("org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension") || subproject.getExtensions()
-                                                                                                              .findByName("kotlin") != null && subproject.getExtensions()
-                                                                                                              .getByName("kotlin")
-                                                                                                              .getClass()
-                                                                                                              .getCanonicalName()
-                                                                                                              .startsWith("org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension")) {
+            if (subproject.getPlugins().hasPlugin("org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension")
+                || subproject.getExtensions()
+                           .findByName("kotlin") != null && subproject.getExtensions()
+                           .getByName("kotlin")
+                           .getClass()
+                           .getCanonicalName()
+                           .startsWith("org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension")) {
                 sourceFileStream = sourceFileStream.concat(parseMultiplatformKotlinProject(
                         subproject,
                         exclusions,
@@ -857,7 +859,6 @@ private SourceFileStream parseGradleProjectSourceSets(Project subproject,
 
                     Stream<SourceFile> cus = Stream.of((Supplier<GroovyParser>) () -> GroovyParser.builder()
                             .classpath(dependenciesWithBuildDirs)
-                            .styles(getStyles())
                             .typeCache(javaTypeCache)
                             .logCompilationWarningsAndErrors(false)
                             .build()).map(Supplier::get).flatMap(gp -> gp.parse(groovyPaths, baseDir, ctx)).map(cu -> {
@@ -934,7 +935,6 @@ private Stream<SourceFile> parseJavaFiles(
 
         return Stream.of((Supplier<JavaParser>) () -> JavaParser.fromJavaVersion()
                         .classpath(dependencyPaths)
-                        .styles(getStyles())
                         .typeCache(javaTypeCache)
                         .logCompilationWarningsAndErrors(extension.getLogCompilationWarningsAndErrors())
                         .build())
@@ -958,7 +958,6 @@ private Stream<SourceFile> parseKotlinFiles(List<Path> kotlinPaths,
 
         return Stream.of((Supplier<KotlinParser>) () -> KotlinParser.builder()
                 .classpath(dependencyPaths)
-                .styles(getStyles())
                 .typeCache(javaTypeCache)
                 .logCompilationWarningsAndErrors(extension.getLogCompilationWarningsAndErrors())
                 .build()).map(Supplier::get).flatMap(kp -> kp.parse(kotlinPaths, baseDir, ctx)).map(cu -> {
@@ -998,7 +997,6 @@ private GradleParser gradleParser() {
         return GradleParser.builder()
                 .groovyParser(GroovyParser.builder()
                         .typeCache(new JavaTypeCache())
-                        .styles(getStyles())
                         .logCompilationWarningsAndErrors(false))
                 .buildscriptClasspath(buildscriptClasspath)
                 .settingsClasspath(settingsClasspath)
@@ -1289,7 +1287,6 @@ private SourceFileStream parseMultiplatformKotlinProject(Project subproject, Col
                     JavaTypeCache javaTypeCache = new JavaTypeCache();
                     KotlinParser kp = KotlinParser.builder()
                             .classpath(dependencyPaths)
-                            .styles(getStyles())
                             .typeCache(javaTypeCache)
                             .logCompilationWarningsAndErrors(extension.getLogCompilationWarningsAndErrors())
                             .build();
@@ -1433,6 +1430,9 @@ private <T extends SourceFile> UnaryOperator<T> addProvenance(List<Marker> proje
             for (Marker marker : projectProvenance) {
                 m = m.addIfAbsent(marker);
             }
+            for (NamedStyles style : getStyles()) {
+                m = m.addIfAbsent(style);
+            }
             return s.withMarkers(m);
         };
     }

plugin/src/test/kotlin/org/openrewrite/gradle/RewriteRunTest.kt

@@ -429,7 +429,7 @@ class RewriteRunTest : RewritePluginTest {
                 }
                 
                 rewrite {
-                    activeRecipe("org.openrewrite.staticanalysis.UnnecessaryParentheses")
+                    activeRecipe("org.openrewrite.staticanalysis.EqualsAvoidsNull")
                 }
                 
                 repositories {
@@ -441,7 +441,7 @@ class RewriteRunTest : RewritePluginTest {
                 }
                 
                 dependencies {
-                    rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.0.4")
+                    rewrite("org.openrewrite.recipe:rewrite-static-analysis:latest.release")
                 }
             """)
             sourceSet("main") {
@@ -451,8 +451,8 @@ class RewriteRunTest : RewritePluginTest {
                     public class A {
                         {
                             String s = null;
-                            if((s.equals("test"))) {}
-                            if(s.equalsIgnoreCase(("test"))) {}
+                            if(s.equals("test")) {}
+                            if(s.equalsIgnoreCase("test")) {}
                         }
                     }
                 """)
@@ -471,7 +471,7 @@ class RewriteRunTest : RewritePluginTest {
             public class A {
                 {
                     String s = null;
-                    if(s.equals("test")) {}
+                    if("test".equals(s)) {}
                     if(s.equalsIgnoreCase("test")) {}
                 }
             }
@@ -1454,7 +1454,7 @@ class RewriteRunTest : RewritePluginTest {
                   - org.openrewrite.gradle.UpgradeDependencyVersion:
                       groupId: com.fasterxml.jackson.core
                       artifactId: jackson-databind  
-                      version: 2.17.0-2.17.2
+                      version: 2.18.0
             """)
             buildGradle("""
                 plugins {
@@ -1497,7 +1497,7 @@ class RewriteRunTest : RewritePluginTest {
                     }
                 }
                 dependencies {
-                    implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
+                    implementation("com.fasterxml.jackson.core:jackson-databind:2.18.0")
                 }
             """.trimIndent())
     }