From 8cb80366467d2bf318205866601fd454a10146ec Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <jonathan.leitschuh@gmail.com>
Date: Wed, 27 Apr 2022 17:18:10 -0400
Subject: [PATCH] Fix all source file line endings (#1726)

---
 .gitattributes                                |   54 +
 CONTRIBUTORS.md                               |   56 +-
 build-src/build.gradle.kts                    |  118 +-
 .../kotlin/org.openrewrite.base.gradle.kts    |   60 +-
 ...rg.openrewrite.dependency-check.gradle.kts |   48 +-
 .../org.openrewrite.java-base.gradle.kts      |  132 +-
 .../org.openrewrite.java-library.gradle.kts   |   58 +-
 .../kotlin/org.openrewrite.license.gradle.kts |   42 +-
 .../org.openrewrite.maven-publish.gradle.kts  |   64 +-
 .../org.openrewrite.root-project.gradle.kts   |   44 +-
 .../kotlin/org.openrewrite.shadow.gradle.kts  |   30 +-
 gradlew.bat                                   |  178 +-
 lombok.config                                 |   12 +-
 rewrite-bom/build.gradle.kts                  |   40 +-
 .../main/java/org/openrewrite/Incubating.java |   58 +-
 .../src/main/java/org/openrewrite/Parser.java |  372 ++--
 .../org/openrewrite/config/RecipeExample.java |   64 +-
 .../internal/NameCaseConvention.java          |  432 ++--
 .../internal/PropertyPlaceholderHelper.java   |  310 +--
 .../org/openrewrite/internal/StreamUtils.java |   70 +-
 .../org/openrewrite/internal/StringUtils.java | 1116 +++++-----
 .../org/openrewrite/semver/CaretRange.java    |  200 +-
 .../org/openrewrite/semver/ExactVersion.java  |  102 +-
 .../org/openrewrite/semver/HyphenRange.java   |  106 +-
 .../org/openrewrite/semver/LatestPatch.java   |   96 +-
 .../org/openrewrite/semver/LatestRelease.java |  272 +--
 .../java/org/openrewrite/semver/Semver.java   |  154 +-
 .../org/openrewrite/semver/TildeRange.java    |  158 +-
 .../openrewrite/semver/VersionComparator.java |  120 +-
 .../java/org/openrewrite/semver/XRange.java   |  204 +-
 .../java/org/openrewrite/style/Style.java     |   86 +-
 .../org/openrewrite/style/package-info.java   |   38 +-
 .../java/org/openrewrite/text/ChangeText.java |  134 +-
 .../java/org/openrewrite/text/PlainText.java  |  154 +-
 .../java/org/openrewrite/text/TextStyle.java  |   60 +-
 .../internal/NameCaseConventionTest.kt        |  270 +--
 .../openrewrite/internal/StringUtilsTest.kt   |  552 ++---
 .../org/openrewrite/semver/CaretRangeTest.kt  |  208 +-
 .../org/openrewrite/semver/HyphenRangeTest.kt |  142 +-
 .../org/openrewrite/semver/LatestPatchTest.kt |   78 +-
 .../openrewrite/semver/LatestReleaseTest.kt   |  234 +-
 .../org/openrewrite/semver/SemverTest.kt      |   70 +-
 .../org/openrewrite/semver/TildeRangeTest.kt  |  164 +-
 .../org/openrewrite/semver/XRangeTest.kt      |  186 +-
 rewrite-gradle/src/main/resources/gradlew.bat |  210 +-
 .../java/org/openrewrite/hcl/HclStyle.java    |   42 +-
 .../hcl/style/TabsAndIndentsStyle.java        |   80 +-
 .../java/Java11ParserInputFileObject.java     |  240 +--
 .../org/openrewrite/java/Java8Parser.java     |  298 +--
 .../java/Java8ParserInputFileObject.java      |  242 +--
 .../java/ReloadableJava8Parser.java           |  840 ++++----
 .../kotlin/org/openrewrite/java/Java8Test.kt  |   40 +-
 .../java/Java8TreeCompatibilityTest.kt        |   40 +-
 .../openrewrite/java/Java8TreeDebugTest.kt    |  432 ++--
 .../java/Java8VisitorCompatibilityTest.kt     |   40 +-
 .../java/ChangeMethodAccessLevel.java         |  178 +-
 .../java/ChangeMethodAccessLevelVisitor.java  |  258 +--
 .../openrewrite/java/ImplementInterface.java  |  128 +-
 .../java/org/openrewrite/java/JavaParser.java |  522 ++---
 .../java/org/openrewrite/java/JavaStyle.java  |   42 +-
 .../java/RemoveAnnotationVisitor.java         |  274 +--
 .../org/openrewrite/java/UseStaticImport.java |  180 +-
 .../java/cleanup/CatchClauseOnlyRethrows.java |  230 +-
 .../cleanup/ExplicitLambdaArgumentTypes.java  |  292 +--
 .../openrewrite/java/cleanup/FinalClass.java  |  102 +-
 .../java/cleanup/FinalClassVisitor.java       |  142 +-
 .../java/cleanup/MethodParamPad.java          |  226 +-
 .../java/cleanup/OperatorWrap.java            |  838 ++++----
 .../cleanup/PadEmptyForLoopComponents.java    |  214 +-
 .../java/cleanup/TypecastParenPad.java        |  150 +-
 .../openrewrite/java/marker/package-info.java |   38 +-
 .../openrewrite/java/style/Checkstyle.java    |  298 +--
 .../java/style/CheckstyleConfigLoader.java    | 1290 +++++------
 .../style/EmptyForInitializerPadStyle.java    |   74 +-
 .../java/style/EmptyForIteratorPadStyle.java  |   74 +-
 .../HideUtilityClassConstructorStyle.java     |   70 +-
 .../java/style/ImportLayoutStyle.java         | 1894 ++++++++---------
 .../java/style/MethodParamPadStyle.java       |  120 +-
 .../java/style/TabsAndIndentsStyle.java       |   80 +-
 .../META-INF/rewrite/google-java-format.yml   |   54 +-
 .../java/style/CheckstyleConfigLoaderTest.kt  |  682 +++---
 .../org/openrewrite/json/ChangeKeyTest.kt     |  202 +-
 rewrite-maven/build.gradle.kts                |  200 +-
 .../maven/ParentModelResolver.java            |  382 ++--
 .../ChangeDependencyGroupIdAndArtifactId.java |  206 +-
 .../maven/ChangeDependencyScope.java          |  186 +-
 ...ManagedDependencyGroupIdAndArtifactId.java |  208 +-
 .../maven/ChangePropertyValue.java            |  194 +-
 .../maven/MavenTagInsertionComparator.java    |  224 +-
 .../maven/UpgradeParentVersion.java           |  194 +-
 .../internal/MavenDownloadingException.java   |   68 +-
 .../maven/internal/MavenParsingException.java |   68 +-
 .../utilities/PrintMavenAsCycloneDxBom.java   |  448 ++--
 .../org/openrewrite/maven/AddPluginTest.kt    |  510 ++---
 ...hangeDependencyGroupIdAndArtifactIdTest.kt |  586 ++---
 .../maven/ChangeDependencyScopeTest.kt        |  340 +--
 ...nagedDependencyGroupIdAndArtifactIdTest.kt |  132 +-
 .../maven/ChangePropertyValueTest.kt          |  342 +--
 .../openrewrite/maven/RemoveDependencyTest.kt |  460 ++--
 .../openrewrite/maven/RemoveExclusionTest.kt  |  214 +-
 .../maven/RemoveManagedDependencyTest.kt      |  398 ++--
 .../org/openrewrite/maven/RemovePluginTest.kt |  612 +++---
 .../maven/UpgradeParentVersionTest.kt         |  342 +--
 .../utilities/PrintMavenAsCycloneDxBomTest.kt |  190 +-
 rewrite-maven/src/test/resources/logback.xml  |   60 +-
 rewrite-properties/build.gradle.kts           |   28 +-
 .../properties/ChangePropertyKey.java         |  182 +-
 .../properties/ChangePropertyValue.java       |  198 +-
 .../properties/PropertiesParser.java          |  486 ++---
 .../properties/tree/Properties.java           |  298 +--
 .../properties/ChangePropertyKeyTest.kt       |  286 +--
 rewrite-test/build.gradle.kts                 |   98 +-
 .../main/java/org/openrewrite/DebugOnly.java  |   66 +-
 .../src/main/java/org/openrewrite/Issue.java  |   60 +-
 .../openrewrite/java/JavaParserResolver.java  |  148 +-
 .../openrewrite/groovy/GroovyRecipeTest.kt    |  156 +-
 .../org/openrewrite/hcl/HclRecipeTest.kt      |  160 +-
 .../java/ChangeMethodAccessLevelTest.kt       |  720 +++----
 .../java/ImplementInterfaceTest.kt            |  152 +-
 .../java/JavaTreeCompatibilityKit.kt          |  354 +--
 .../openrewrite/java/MethodParamPadTest.kt    |  606 +++---
 .../openrewrite/java/NoStaticImportTest.kt    |   88 +-
 .../org/openrewrite/java/OrderImportsTest.kt  | 1142 +++++-----
 .../java/PadEmptyForLoopComponentsTest.kt     |  348 +--
 .../org/openrewrite/java/TypeValidator.kt     |  200 +-
 .../openrewrite/java/UseStaticImportTest.kt   |  382 ++--
 .../cleanup/CatchClauseOnlyRethrowsTest.kt    |  392 ++--
 .../java/cleanup/FinalClassTest.kt            |  230 +-
 .../java/internal/TypesInUseTest.kt           |  122 +-
 .../org/openrewrite/java/tree/PackageTest.kt  |   62 +-
 .../org/openrewrite/json/JsonRecipeTest.kt    |  160 +-
 .../org/openrewrite/maven/MavenRecipeTest.kt  |  204 +-
 .../properties/PropertiesRecipeTest.kt        |  160 +-
 .../openrewrite/protobuf/ProtoRecipeTest.kt   |  160 +-
 .../org/openrewrite/xml/XmlRecipeTest.kt      |  160 +-
 .../org/openrewrite/yaml/YamlRecipeTest.kt    |  160 +-
 .../text/KotlinDataClassChangeText.kt         |   78 +-
 .../test/resources/META-INF/rewrite/other.yml |   50 +-
 .../resources/META-INF/rewrite/rewrite.yml    |  108 +-
 .../org/openrewrite/xml/XPathMatcher.java     |  192 +-
 .../openrewrite/xml/marker/package-info.java  |   38 +-
 .../org/openrewrite/xml/style/XmlStyle.java   |   42 +-
 rewrite-yaml/build.gradle.kts                 |   58 +-
 .../openrewrite/yaml/ChangePropertyKey.java   |  482 ++---
 .../openrewrite/yaml/CoalesceProperties.java  |   78 +-
 .../yaml/FormatPreservingReader.java          |  182 +-
 .../java/org/openrewrite/yaml/YamlParser.java |  984 ++++-----
 .../yaml/internal/YamlPrinter.java            |  310 +--
 .../java/org/openrewrite/yaml/tree/Yaml.java  |  934 ++++----
 .../org/openrewrite/yaml/ChangeKeyTest.kt     |  284 +--
 .../openrewrite/yaml/ChangePropertyKeyTest.kt |  540 ++---
 .../org/openrewrite/yaml/ChangeValueTest.kt   |  292 +--
 .../yaml/CoalescePropertiesTest.kt            |  456 ++--
 .../org/openrewrite/yaml/DeleteKeyTest.kt     |  412 ++--
 .../yaml/FormatPreservingReaderTest.kt        |  120 +-
 settings.gradle.kts                           |  132 +-
 156 files changed, 19330 insertions(+), 19276 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..d21dc057c39
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,54 @@
+* text eol=lf
+
+#
+# The above will handle all files NOT found below
+# https://help.github.com/articles/dealing-with-line-endings/
+# https://github.com/Danimoth/gitattributes
+
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.bash          text eol=lf
+*.css           text diff=css
+*.htm           text diff=html
+*.html          text diff=html
+*.java          text diff=java
+*.sh            text eol=lf
+
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.a             binary
+*.lib           binary
+*.icns          binary
+*.png           binary
+*.jpg           binary
+*.jpeg          binary
+*.gif           binary
+*.ico           binary
+*.mov           binary
+*.mp4           binary
+*.mp3           binary
+*.flv           binary
+*.fla           binary
+*.swf           binary
+*.gz            binary
+*.zip           binary
+*.jar           binary
+*.tar           binary
+*.tar.gz        binary
+*.7z            binary
+*.ttf           binary
+*.pyc           binary
+*.gpg           binary
+*.bin           binary
+*.exe           binary
+*.dll           binary
+*.so            binary
+*.dylib         binary
+*.class         binary
+*.jar           binary
+*.war           binary
+*.ear           binary
+*.rar           binary
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4382caa96e1..85b031cb803 100755
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,28 +1,28 @@
-# Building & Developing OpenRewrite
-
-We use [Gradle](https://gradle.org/) to build this project.
-The gradle wrapper checked into this project defines the gradle version to use.  
-When building from the command line invoke the wrapper with `./gradlew build` on unix-style terminals and `gradlew build` on windows-style terminals.
-
-NOTE: windows-style users should ensure that they configure `core.autocrlf = false` as Rewrite requires unix-style line endings. This can be done at clone time by using `git clone -c core.autocrlf=false https://github.com/openrewrite/rewrite.git`.
-
-### CLI Environment Configuration:
-
-* [JDK](https://adoptopenjdk.net/) version: 11
-    * JDK language & bytecode level: 1.8
-* [Gradle](https://gradle.org/) version: Defined in wrapper
-* [Kotlin](https://kotlinlang.org/) version: 1.5
-    * Kotlin language level: 1.5
-    * Kotlin JVM bytecode level: 1.8
-
-### IDE Configuration
-
-We use [IntelliJ IDEA](https://www.jetbrains.com/idea/) to develop this project.
-Other IDEs or versions of this IDE can be made to work.
-These are one set of versions we know works:
-
-* IDEA version:  2021.1.3
-
-You must set the `-parameters` compiler flag to run Rewrite tests.
-If your system does not have UTF-8 as its default character encoding (e.g., Windows) you must also add `-encoding utf8`.
-Add these to the "additional command line parameters" field in IntelliJ -> Preferences -> Build, Execution, Deployment -> Compiler -> Java Compiler.
+# Building & Developing OpenRewrite
+
+We use [Gradle](https://gradle.org/) to build this project.
+The gradle wrapper checked into this project defines the gradle version to use.  
+When building from the command line invoke the wrapper with `./gradlew build` on unix-style terminals and `gradlew build` on windows-style terminals.
+
+NOTE: windows-style users should ensure that they configure `core.autocrlf = false` as Rewrite requires unix-style line endings. This can be done at clone time by using `git clone -c core.autocrlf=false https://github.com/openrewrite/rewrite.git`.
+
+### CLI Environment Configuration:
+
+* [JDK](https://adoptopenjdk.net/) version: 11
+    * JDK language & bytecode level: 1.8
+* [Gradle](https://gradle.org/) version: Defined in wrapper
+* [Kotlin](https://kotlinlang.org/) version: 1.5
+    * Kotlin language level: 1.5
+    * Kotlin JVM bytecode level: 1.8
+
+### IDE Configuration
+
+We use [IntelliJ IDEA](https://www.jetbrains.com/idea/) to develop this project.
+Other IDEs or versions of this IDE can be made to work.
+These are one set of versions we know works:
+
+* IDEA version:  2021.1.3
+
+You must set the `-parameters` compiler flag to run Rewrite tests.
+If your system does not have UTF-8 as its default character encoding (e.g., Windows) you must also add `-encoding utf8`.
+Add these to the "additional command line parameters" field in IntelliJ -> Preferences -> Build, Execution, Deployment -> Compiler -> Java Compiler.
diff --git a/build-src/build.gradle.kts b/build-src/build.gradle.kts
index 24300bebead..817f4f6289d 100644
--- a/build-src/build.gradle.kts
+++ b/build-src/build.gradle.kts
@@ -1,59 +1,59 @@
-plugins {
-    `kotlin-dsl`
-}
-
-repositories {
-    gradlePluginPortal()
-}
-
-dependencies {
-    implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-    implementation("com.gradle.enterprise:test-distribution-gradle-plugin:2.3")
-    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.10")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
-    implementation("org.owasp:dependency-check-gradle:7.0.4.1")
-    implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
-    implementation("com.github.jk1:gradle-license-report:2.0")
-    implementation("com.netflix.nebula:gradle-contacts-plugin:6.0.0")
-    implementation("com.netflix.nebula:gradle-info-plugin:11.3.3")
-    implementation("com.netflix.nebula:nebula-release-plugin:16.0.0")
-    implementation("com.netflix.nebula:nebula-publishing-plugin:18.4.0")
-    implementation("com.netflix.nebula:nebula-project-plugin:9.6.3")
-    implementation("io.github.gradle-nexus:publish-plugin:1.0.0")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    implementation("org.openrewrite:plugin:latest.release")
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
-kotlin {
-    jvmToolchain {
-        this as JavaToolchainSpec
-        languageVersion.set(JavaLanguageVersion.of("11"))
-    }
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
-tasks.named<Test>("test").configure {
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
-    useJUnitPlatform()
-    jvmArgs = listOf(
-        "-XX:+UnlockDiagnosticVMOptions",
-        "-XX:+ShowHiddenFrames"
-    )
-    testLogging {
-        showExceptions = true
-        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-        showCauses = true
-        showStackTraces = true
-    }
-}
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
+    implementation("com.gradle.enterprise:test-distribution-gradle-plugin:2.3")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.10")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+    implementation("org.owasp:dependency-check-gradle:7.0.4.1")
+    implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
+    implementation("com.github.jk1:gradle-license-report:2.0")
+    implementation("com.netflix.nebula:gradle-contacts-plugin:6.0.0")
+    implementation("com.netflix.nebula:gradle-info-plugin:11.3.3")
+    implementation("com.netflix.nebula:nebula-release-plugin:16.0.0")
+    implementation("com.netflix.nebula:nebula-publishing-plugin:18.4.0")
+    implementation("com.netflix.nebula:nebula-project-plugin:9.6.3")
+    implementation("io.github.gradle-nexus:publish-plugin:1.0.0")
+    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    implementation("org.openrewrite:plugin:latest.release")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
+kotlin {
+    jvmToolchain {
+        this as JavaToolchainSpec
+        languageVersion.set(JavaLanguageVersion.of("11"))
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+tasks.named<Test>("test").configure {
+    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
+    useJUnitPlatform()
+    jvmArgs = listOf(
+        "-XX:+UnlockDiagnosticVMOptions",
+        "-XX:+ShowHiddenFrames"
+    )
+    testLogging {
+        showExceptions = true
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        showCauses = true
+        showStackTraces = true
+    }
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.base.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.base.gradle.kts
index c65c000ebf2..0ed67678645 100644
--- a/build-src/src/main/kotlin/org.openrewrite.base.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.base.gradle.kts
@@ -1,30 +1,30 @@
-import nebula.plugin.contacts.Contact
-import nebula.plugin.contacts.ContactsExtension
-
-plugins {
-    base
-    id("org.openrewrite.license")
-    id("org.openrewrite.dependency-check")
-    id("nebula.contacts")
-    id("nebula.info")
-}
-
-group = "org.openrewrite"
-description = "Eliminate tech-debt. Automatically."
-
-repositories {
-    if (!project.hasProperty("releasing")) {
-        mavenLocal()
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-    }
-    mavenCentral()
-}
-
-configure<ContactsExtension> {
-    val j = Contact("team@moderne.io")
-    j.moniker("Moderne")
-
-    people["team@moderne.io"] = j
-}
+import nebula.plugin.contacts.Contact
+import nebula.plugin.contacts.ContactsExtension
+
+plugins {
+    base
+    id("org.openrewrite.license")
+    id("org.openrewrite.dependency-check")
+    id("nebula.contacts")
+    id("nebula.info")
+}
+
+group = "org.openrewrite"
+description = "Eliminate tech-debt. Automatically."
+
+repositories {
+    if (!project.hasProperty("releasing")) {
+        mavenLocal()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+    }
+    mavenCentral()
+}
+
+configure<ContactsExtension> {
+    val j = Contact("team@moderne.io")
+    j.moniker("Moderne")
+
+    people["team@moderne.io"] = j
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.dependency-check.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.dependency-check.gradle.kts
index 90aa0ce9bd5..dc24cf88292 100644
--- a/build-src/src/main/kotlin/org.openrewrite.dependency-check.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.dependency-check.gradle.kts
@@ -1,24 +1,24 @@
-plugins {
-    id("org.owasp.dependencycheck")
-}
-
-configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
-    analyzers.assemblyEnabled = false
-    failBuildOnCVSS = 9.0F
-    scanProjects = listOf("rewrite-core",
-                              "rewrite-gradle",
-                              "rewrite-groovy",
-                              "rewrite-hcl",
-                              "rewrite-java",
-                              "rewrite-java-8",
-                              "rewrite-java-11",
-                              "rewrite-json",
-                              "rewrite-maven",
-                              "rewrite-properties",
-                              "rewrite-protobuf",
-                              "rewrite-xml",
-                              "rewrite-yaml",
-                              "rewrite-test",
-                              "rewrite-bom",
-                              "rewrite-benchmarks")
-}
+plugins {
+    id("org.owasp.dependencycheck")
+}
+
+configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
+    analyzers.assemblyEnabled = false
+    failBuildOnCVSS = 9.0F
+    scanProjects = listOf("rewrite-core",
+                              "rewrite-gradle",
+                              "rewrite-groovy",
+                              "rewrite-hcl",
+                              "rewrite-java",
+                              "rewrite-java-8",
+                              "rewrite-java-11",
+                              "rewrite-json",
+                              "rewrite-maven",
+                              "rewrite-properties",
+                              "rewrite-protobuf",
+                              "rewrite-xml",
+                              "rewrite-yaml",
+                              "rewrite-test",
+                              "rewrite-bom",
+                              "rewrite-benchmarks")
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.java-base.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.java-base.gradle.kts
index a9712559476..2ce9e6fd05c 100644
--- a/build-src/src/main/kotlin/org.openrewrite.java-base.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.java-base.gradle.kts
@@ -1,66 +1,66 @@
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.api.tasks.testing.Test
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    `java-base`
-    kotlin("jvm")
-    id("org.openrewrite.base")
-    id("org.gradle.test-retry")
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
-configurations.all {
-    exclude("com.google.errorprone", "*")
-    resolutionStrategy.cacheDynamicVersionsFor(0, "seconds")
-}
-
-if(name != "rewrite-test") {
-    listOf("compileClasspath", "runtimeClasspath")
-        .map(configurations::named)
-        .forEach { it ->
-            it.configure {
-                exclude("org.jetbrains.kotlin")
-            }
-        }
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-tasks.withType<JavaCompile>().configureEach {
-    options.encoding = "UTF-8"
-    options.compilerArgs.add("-parameters")
-    options.isFork = true
-    options.release.set(8)
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
-}
-
-tasks.named<Test>("test").configure {
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
-    useJUnitPlatform {
-        excludeTags("debug")
-    }
-    jvmArgs = listOf(
-        "-XX:+UnlockDiagnosticVMOptions",
-        "-XX:+ShowHiddenFrames"
-    )
-    testLogging {
-        showExceptions = true
-        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-        showCauses = true
-        showStackTraces = true
-    }
-}
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.api.tasks.testing.Test
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `java-base`
+    kotlin("jvm")
+    id("org.openrewrite.base")
+    id("org.gradle.test-retry")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
+configurations.all {
+    exclude("com.google.errorprone", "*")
+    resolutionStrategy.cacheDynamicVersionsFor(0, "seconds")
+}
+
+if(name != "rewrite-test") {
+    listOf("compileClasspath", "runtimeClasspath")
+        .map(configurations::named)
+        .forEach { it ->
+            it.configure {
+                exclude("org.jetbrains.kotlin")
+            }
+        }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-parameters")
+    options.isFork = true
+    options.release.set(8)
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}
+
+tasks.named<Test>("test").configure {
+    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
+    useJUnitPlatform {
+        excludeTags("debug")
+    }
+    jvmArgs = listOf(
+        "-XX:+UnlockDiagnosticVMOptions",
+        "-XX:+ShowHiddenFrames"
+    )
+    testLogging {
+        showExceptions = true
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        showCauses = true
+        showStackTraces = true
+    }
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.java-library.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.java-library.gradle.kts
index a52c8672384..485884a0716 100644
--- a/build-src/src/main/kotlin/org.openrewrite.java-library.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.java-library.gradle.kts
@@ -1,29 +1,29 @@
-plugins {
-    `java-library`
-    id("org.openrewrite.java-base")
-    id("nebula.javadoc-jar")
-    id("nebula.source-jar")
-}
-
-dependencies {
-    implementation("org.jetbrains:annotations:latest.release")
-    compileOnly("com.google.code.findbugs:jsr305:latest.release")
-
-    compileOnly("org.projectlombok:lombok:latest.release")
-    annotationProcessor("org.projectlombok:lombok:latest.release")
-
-    testImplementation(platform("org.junit:junit-bom:latest.release"))
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-
-    testImplementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    testImplementation("org.jetbrains.kotlin:kotlin-reflect")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-common")
-
-    testImplementation("org.assertj:assertj-core:latest.release")
-
-    testRuntimeOnly("ch.qos.logback:logback-classic:1.2.10")
-}
+plugins {
+    `java-library`
+    id("org.openrewrite.java-base")
+    id("nebula.javadoc-jar")
+    id("nebula.source-jar")
+}
+
+dependencies {
+    implementation("org.jetbrains:annotations:latest.release")
+    compileOnly("com.google.code.findbugs:jsr305:latest.release")
+
+    compileOnly("org.projectlombok:lombok:latest.release")
+    annotationProcessor("org.projectlombok:lombok:latest.release")
+
+    testImplementation(platform("org.junit:junit-bom:latest.release"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+
+    testImplementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-common")
+
+    testImplementation("org.assertj:assertj-core:latest.release")
+
+    testRuntimeOnly("ch.qos.logback:logback-classic:1.2.10")
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.license.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.license.gradle.kts
index 387d335a43f..74ae286f8d8 100644
--- a/build-src/src/main/kotlin/org.openrewrite.license.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.license.gradle.kts
@@ -1,21 +1,21 @@
-import com.github.jk1.license.LicenseReportExtension
-import nl.javadude.gradle.plugins.license.LicenseExtension
-import java.util.Calendar
-
-plugins {
-    id("com.github.hierynomus.license")
-    id("com.github.jk1.dependency-license-report")
-}
-
-configure<LicenseReportExtension> {
-    renderers = arrayOf(com.github.jk1.license.render.CsvReportRenderer())
-}
-
-configure<LicenseExtension> {
-    ext.set("year", Calendar.getInstance().get(Calendar.YEAR))
-    skipExistingHeaders = true
-    excludePatterns.addAll(listOf("**/*.tokens", "**/*.config", "**/*.interp", "**/*.txt"))
-    header = project.rootProject.file("gradle/licenseHeader.txt")
-    mapping(mapOf("kt" to "SLASHSTAR_STYLE", "java" to "SLASHSTAR_STYLE"))
-    strictCheck = true
-}
+import com.github.jk1.license.LicenseReportExtension
+import nl.javadude.gradle.plugins.license.LicenseExtension
+import java.util.Calendar
+
+plugins {
+    id("com.github.hierynomus.license")
+    id("com.github.jk1.dependency-license-report")
+}
+
+configure<LicenseReportExtension> {
+    renderers = arrayOf(com.github.jk1.license.render.CsvReportRenderer())
+}
+
+configure<LicenseExtension> {
+    ext.set("year", Calendar.getInstance().get(Calendar.YEAR))
+    skipExistingHeaders = true
+    excludePatterns.addAll(listOf("**/*.tokens", "**/*.config", "**/*.interp", "**/*.txt"))
+    header = project.rootProject.file("gradle/licenseHeader.txt")
+    mapping(mapOf("kt" to "SLASHSTAR_STYLE", "java" to "SLASHSTAR_STYLE"))
+    strictCheck = true
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.maven-publish.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.maven-publish.gradle.kts
index c1eabaeeb91..1eec751632f 100644
--- a/build-src/src/main/kotlin/org.openrewrite.maven-publish.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.maven-publish.gradle.kts
@@ -1,32 +1,32 @@
-import org.gradle.api.tasks.javadoc.Javadoc
-
-plugins {
-    `java-base`
-    signing
-    id("org.openrewrite.base")
-    id("nebula.maven-publish")
-    id("nebula.maven-resolved-dependencies")
-    id("nebula.maven-apache-license")
-}
-
-plugins.withId("com.github.johnrengelman.shadow") {
-    apply(plugin = "nebula.maven-shadow-publish")
-}
-
-tasks.withType<Javadoc>().configureEach {
-    options.encoding = "UTF-8"
-}
-
-tasks.withType<GenerateModuleMetadata>().configureEach {
-    enabled = false
-}
-
-signing {
-    setRequired({
-        !project.version.toString().endsWith("SNAPSHOT") || project.hasProperty("forceSigning")
-    })
-    val signingKey: String? by project
-    val signingPassword: String? by project
-    useInMemoryPgpKeys(signingKey, signingPassword)
-    sign(publishing.publications["nebula"])
-}
+import org.gradle.api.tasks.javadoc.Javadoc
+
+plugins {
+    `java-base`
+    signing
+    id("org.openrewrite.base")
+    id("nebula.maven-publish")
+    id("nebula.maven-resolved-dependencies")
+    id("nebula.maven-apache-license")
+}
+
+plugins.withId("com.github.johnrengelman.shadow") {
+    apply(plugin = "nebula.maven-shadow-publish")
+}
+
+tasks.withType<Javadoc>().configureEach {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType<GenerateModuleMetadata>().configureEach {
+    enabled = false
+}
+
+signing {
+    setRequired({
+        !project.version.toString().endsWith("SNAPSHOT") || project.hasProperty("forceSigning")
+    })
+    val signingKey: String? by project
+    val signingPassword: String? by project
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications["nebula"])
+}
diff --git a/build-src/src/main/kotlin/org.openrewrite.root-project.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.root-project.gradle.kts
index 1bc558a5830..ce3e69ff9e1 100644
--- a/build-src/src/main/kotlin/org.openrewrite.root-project.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.root-project.gradle.kts
@@ -1,22 +1,22 @@
-plugins {
-    id("org.openrewrite.base")
-    id("org.openrewrite.rewrite")
-    id("nebula.release")
-    id("io.github.gradle-nexus.publish-plugin")
-}
-
-nexusPublishing {
-    repositories {
-        sonatype()
-    }
-}
-
-configure<nebula.plugin.release.git.base.ReleasePluginExtension> {
-    defaultVersionStrategy = nebula.plugin.release.NetflixOssStrategies.SNAPSHOT(project)
-}
-
-configure<org.openrewrite.gradle.RewriteExtension> {
-    activeRecipes = listOf("org.openrewrite.java.format.AutoFormat")
-}
-
-defaultTasks("build")
+plugins {
+    id("org.openrewrite.base")
+    id("org.openrewrite.rewrite")
+    id("nebula.release")
+    id("io.github.gradle-nexus.publish-plugin")
+}
+
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}
+
+configure<nebula.plugin.release.git.base.ReleasePluginExtension> {
+    defaultVersionStrategy = nebula.plugin.release.NetflixOssStrategies.SNAPSHOT(project)
+}
+
+configure<org.openrewrite.gradle.RewriteExtension> {
+    activeRecipes = listOf("org.openrewrite.java.format.AutoFormat")
+}
+
+defaultTasks("build")
diff --git a/build-src/src/main/kotlin/org.openrewrite.shadow.gradle.kts b/build-src/src/main/kotlin/org.openrewrite.shadow.gradle.kts
index 2566db928eb..0e5e211484f 100644
--- a/build-src/src/main/kotlin/org.openrewrite.shadow.gradle.kts
+++ b/build-src/src/main/kotlin/org.openrewrite.shadow.gradle.kts
@@ -1,15 +1,15 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-    id("org.openrewrite.java-library")
-    id("com.github.johnrengelman.shadow")
-}
-
-tasks.named<Jar>("jar") {
-    enabled = false
-}
-
-tasks.withType<ShadowJar>() {
-    configurations = listOf(project.configurations.compileClasspath.get())
-    archiveClassifier.set(null as String?)
-}
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    id("org.openrewrite.java-library")
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks.named<Jar>("jar") {
+    enabled = false
+}
+
+tasks.withType<ShadowJar>() {
+    configurations = listOf(project.configurations.compileClasspath.get())
+    archiveClassifier.set(null as String?)
+}
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9382..107acd32c4e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/lombok.config b/lombok.config
index 80b7c559937..fe3b18ad591 100755
--- a/lombok.config
+++ b/lombok.config
@@ -1,6 +1,6 @@
-# https://projectlombok.org/features/configuration
-config.stopBubbling = true
-lombok.copyableAnnotations += org.intellij.lang.annotations.Language
-lombok.addNullAnnotations = CUSTOM:org.openrewrite.internal.lang.NonNull:org.openrewrite.internal.lang.Nullable
-lombok.copyableAnnotations += org.openrewrite.internal.lang.Nullable
-lombok.copyableAnnotations += org.openrewrite.internal.lang.NonNull
+# https://projectlombok.org/features/configuration
+config.stopBubbling = true
+lombok.copyableAnnotations += org.intellij.lang.annotations.Language
+lombok.addNullAnnotations = CUSTOM:org.openrewrite.internal.lang.NonNull:org.openrewrite.internal.lang.Nullable
+lombok.copyableAnnotations += org.openrewrite.internal.lang.Nullable
+lombok.copyableAnnotations += org.openrewrite.internal.lang.NonNull
diff --git a/rewrite-bom/build.gradle.kts b/rewrite-bom/build.gradle.kts
index 2d2641a3f13..002cd35fb89 100644
--- a/rewrite-bom/build.gradle.kts
+++ b/rewrite-bom/build.gradle.kts
@@ -1,20 +1,20 @@
-plugins {
-    `java-platform`
-    id("org.openrewrite.maven-publish")
-}
-
-dependencies {
-    constraints {
-        rootProject.subprojects.filter { it != project && !it.name.contains("benchmark") }.sortedBy { it.name }.forEach {
-            api(it)
-        }
-    }
-}
-
-publishing {
-    publications {
-        named("nebula", MavenPublication::class.java) {
-            from(components["javaPlatform"])
-        }
-    }
-}
+plugins {
+    `java-platform`
+    id("org.openrewrite.maven-publish")
+}
+
+dependencies {
+    constraints {
+        rootProject.subprojects.filter { it != project && !it.name.contains("benchmark") }.sortedBy { it.name }.forEach {
+            api(it)
+        }
+    }
+}
+
+publishing {
+    publications {
+        named("nebula", MavenPublication::class.java) {
+            from(components["javaPlatform"])
+        }
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/Incubating.java b/rewrite-core/src/main/java/org/openrewrite/Incubating.java
index 99d9523359e..ca63edd7727 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Incubating.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Incubating.java
@@ -1,29 +1,29 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * This is a feature that is experimental and may yield a breaking change in a minor release.
- */
-@Documented
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD})
-public @interface Incubating {
-    String since();
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * This is a feature that is experimental and may yield a breaking change in a minor release.
+ */
+@Documented
+@Target({ElementType.METHOD, ElementType.TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD})
+public @interface Incubating {
+    String since();
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/Parser.java b/rewrite-core/src/main/java/org/openrewrite/Parser.java
index 7c789a5c19c..f510405f4e6 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Parser.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Parser.java
@@ -1,186 +1,186 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite;
-
-import org.openrewrite.internal.EncodingDetectingInputStream;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.StreamSupport;
-
-import static java.util.stream.Collectors.toList;
-
-public interface Parser<S extends SourceFile> {
-    default List<S> parse(Iterable<Path> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
-        return parseInputs(StreamSupport
-                        .stream(sourceFiles.spliterator(), false)
-                        .map(sourceFile -> new Input(sourceFile, () -> {
-                                    try {
-                                        return Files.newInputStream(sourceFile);
-                                    } catch (IOException e) {
-                                        throw new UncheckedIOException(e);
-                                    }
-                                })
-                        )
-                        .collect(toList()),
-                relativeTo,
-                ctx
-        );
-    }
-
-    default List<S> parse(String... sources) {
-        return parse(new InMemoryExecutionContext(), sources);
-    }
-
-    default List<S> parse(ExecutionContext ctx, String... sources) {
-        return parseInputs(
-                Arrays.stream(sources).map(source ->
-                        new Input(
-                                sourcePathFromSourceText(Paths.get(Long.toString(System.nanoTime())), source),
-                                () -> new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)),
-                                true
-                        )
-                ).collect(toList()),
-                null,
-                ctx
-        );
-    }
-
-    /**
-     * @param sources    A collection of inputs. At the conclusion of parsing all sources' {@link Input#source}
-     *                   are closed.
-     * @param relativeTo A common relative path for all {@link Input#path}.
-     * @param ctx        The execution context
-     * @return A list of {@link SourceFile}.
-     */
-    List<S> parseInputs(Iterable<Input> sources, @Nullable Path relativeTo, ExecutionContext ctx);
-
-    boolean accept(Path path);
-
-    default boolean accept(Input input) {
-        return input.isSynthetic() || accept(input.getPath());
-    }
-
-    default List<Input> acceptedInputs(Iterable<Input> input) {
-        return StreamSupport.stream(input.spliterator(), false)
-                .filter(this::accept)
-                .collect(toList());
-    }
-
-    default Parser<S> reset() {
-        return this;
-    }
-
-    /**
-     * A source input. {@link Input#path} may be a synthetic path and not
-     * represent a resolvable path on disk, as is the case when parsing sources
-     * from BigQuery (we have a relative path from the original Github repository
-     * and the sources, but don't have these sources on disk).
-     * <p>
-     * Nevertheless, this class is a generalization that applies well enough to
-     * paths that are resolvable on disk, where the file has been pre-read into
-     * memory.
-     */
-    class Input {
-        private final boolean synthetic;
-        private final Path path;
-        private final Supplier<InputStream> source;
-
-        public Input(Path path, Supplier<InputStream> source) {
-            this(path, source, false);
-        }
-
-        public Input(Path path, Supplier<InputStream> source, boolean synthetic) {
-            this.path = path;
-            this.source = source;
-            this.synthetic = synthetic;
-        }
-
-        public static Input fromString(String source) {
-            return fromString(source, StandardCharsets.UTF_8);
-        }
-
-        public static Input fromString(String source, Charset charset) {
-            return new Input(
-                    Paths.get(Long.toString(System.nanoTime())),
-                    () -> new ByteArrayInputStream(source.getBytes(charset)),
-                    true
-            );
-        }
-
-        public static Input fromResource(String resource) {
-            return new Input(
-                    Paths.get(Long.toString(System.nanoTime())),
-                    () -> Input.class.getResourceAsStream(resource),
-                    true
-            );
-        }
-
-        public static List<Input> fromResource(String resource, String delimiter) {
-            return Arrays.stream(StringUtils.readFully(Input.class.getResourceAsStream(resource)).split(delimiter))
-                    .map(source -> new Parser.Input(
-                            Paths.get(Long.toString(System.nanoTime())),
-                            () -> new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)),
-                            true
-                    ))
-                    .collect(toList());
-        }
-
-        public Path getPath() {
-            return path;
-        }
-
-        public Path getRelativePath(@Nullable Path relativeTo) {
-            return relativeTo == null ? path : relativeTo.relativize(path);
-        }
-
-        public EncodingDetectingInputStream getSource() {
-            return new EncodingDetectingInputStream(source.get());
-        }
-
-        public boolean isSynthetic() {
-            return synthetic;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Input input = (Input) o;
-            return Objects.equals(path, input.path);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(path);
-        }
-    }
-
-    Path sourcePathFromSourceText(Path prefix, String sourceCode);
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite;
+
+import org.openrewrite.internal.EncodingDetectingInputStream;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.stream.StreamSupport;
+
+import static java.util.stream.Collectors.toList;
+
+public interface Parser<S extends SourceFile> {
+    default List<S> parse(Iterable<Path> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
+        return parseInputs(StreamSupport
+                        .stream(sourceFiles.spliterator(), false)
+                        .map(sourceFile -> new Input(sourceFile, () -> {
+                                    try {
+                                        return Files.newInputStream(sourceFile);
+                                    } catch (IOException e) {
+                                        throw new UncheckedIOException(e);
+                                    }
+                                })
+                        )
+                        .collect(toList()),
+                relativeTo,
+                ctx
+        );
+    }
+
+    default List<S> parse(String... sources) {
+        return parse(new InMemoryExecutionContext(), sources);
+    }
+
+    default List<S> parse(ExecutionContext ctx, String... sources) {
+        return parseInputs(
+                Arrays.stream(sources).map(source ->
+                        new Input(
+                                sourcePathFromSourceText(Paths.get(Long.toString(System.nanoTime())), source),
+                                () -> new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)),
+                                true
+                        )
+                ).collect(toList()),
+                null,
+                ctx
+        );
+    }
+
+    /**
+     * @param sources    A collection of inputs. At the conclusion of parsing all sources' {@link Input#source}
+     *                   are closed.
+     * @param relativeTo A common relative path for all {@link Input#path}.
+     * @param ctx        The execution context
+     * @return A list of {@link SourceFile}.
+     */
+    List<S> parseInputs(Iterable<Input> sources, @Nullable Path relativeTo, ExecutionContext ctx);
+
+    boolean accept(Path path);
+
+    default boolean accept(Input input) {
+        return input.isSynthetic() || accept(input.getPath());
+    }
+
+    default List<Input> acceptedInputs(Iterable<Input> input) {
+        return StreamSupport.stream(input.spliterator(), false)
+                .filter(this::accept)
+                .collect(toList());
+    }
+
+    default Parser<S> reset() {
+        return this;
+    }
+
+    /**
+     * A source input. {@link Input#path} may be a synthetic path and not
+     * represent a resolvable path on disk, as is the case when parsing sources
+     * from BigQuery (we have a relative path from the original Github repository
+     * and the sources, but don't have these sources on disk).
+     * <p>
+     * Nevertheless, this class is a generalization that applies well enough to
+     * paths that are resolvable on disk, where the file has been pre-read into
+     * memory.
+     */
+    class Input {
+        private final boolean synthetic;
+        private final Path path;
+        private final Supplier<InputStream> source;
+
+        public Input(Path path, Supplier<InputStream> source) {
+            this(path, source, false);
+        }
+
+        public Input(Path path, Supplier<InputStream> source, boolean synthetic) {
+            this.path = path;
+            this.source = source;
+            this.synthetic = synthetic;
+        }
+
+        public static Input fromString(String source) {
+            return fromString(source, StandardCharsets.UTF_8);
+        }
+
+        public static Input fromString(String source, Charset charset) {
+            return new Input(
+                    Paths.get(Long.toString(System.nanoTime())),
+                    () -> new ByteArrayInputStream(source.getBytes(charset)),
+                    true
+            );
+        }
+
+        public static Input fromResource(String resource) {
+            return new Input(
+                    Paths.get(Long.toString(System.nanoTime())),
+                    () -> Input.class.getResourceAsStream(resource),
+                    true
+            );
+        }
+
+        public static List<Input> fromResource(String resource, String delimiter) {
+            return Arrays.stream(StringUtils.readFully(Input.class.getResourceAsStream(resource)).split(delimiter))
+                    .map(source -> new Parser.Input(
+                            Paths.get(Long.toString(System.nanoTime())),
+                            () -> new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8)),
+                            true
+                    ))
+                    .collect(toList());
+        }
+
+        public Path getPath() {
+            return path;
+        }
+
+        public Path getRelativePath(@Nullable Path relativeTo) {
+            return relativeTo == null ? path : relativeTo.relativize(path);
+        }
+
+        public EncodingDetectingInputStream getSource() {
+            return new EncodingDetectingInputStream(source.get());
+        }
+
+        public boolean isSynthetic() {
+            return synthetic;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Input input = (Input) o;
+            return Objects.equals(path, input.path);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(path);
+        }
+    }
+
+    Path sourcePathFromSourceText(Path prefix, String sourceCode);
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/RecipeExample.java b/rewrite-core/src/main/java/org/openrewrite/config/RecipeExample.java
index 8cce207d84a..a36434f3dec 100755
--- a/rewrite-core/src/main/java/org/openrewrite/config/RecipeExample.java
+++ b/rewrite-core/src/main/java/org/openrewrite/config/RecipeExample.java
@@ -1,32 +1,32 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.config;
-
-import lombok.Value;
-import org.openrewrite.internal.lang.Nullable;
-
-@Value
-public class RecipeExample {
-    @Nullable
-    String name;
-
-    @Nullable
-    String description;
-
-    String recipe;
-    String before;
-    String after;
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.config;
+
+import lombok.Value;
+import org.openrewrite.internal.lang.Nullable;
+
+@Value
+public class RecipeExample {
+    @Nullable
+    String name;
+
+    @Nullable
+    String description;
+
+    String recipe;
+    String before;
+    String after;
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java b/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
index 895a2722c53..5d54813a8d2 100755
--- a/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
@@ -1,216 +1,216 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal;
-
-import org.openrewrite.Incubating;
-
-import java.util.regex.Pattern;
-
-/**
- * Utilities for standard name case conventions.
- */
-@Incubating(since = "7.17.0")
-public enum NameCaseConvention {
-    /**
-     * Lowercase and hyphen-separated, e.g., "lower-hyphen".
-     * This is also known as "kebab-case".
-     */
-    LOWER_HYPHEN,
-
-    /**
-     * Lowercase and underscore-separated, e.g., "lower_underscore".
-     * This is also known as "snake_case".
-     */
-    LOWER_UNDERSCORE,
-
-    /**
-     * Camel case with the first letter lowercase, e.g., "lowerCamel".
-     * This is the standard Java variable naming convention.
-     */
-    LOWER_CAMEL,
-
-    /**
-     * Camel case with the first letter uppercase, e.g., "UpperCamel".
-     * This is the standard Java and C++ class naming convention.
-     */
-    UPPER_CAMEL,
-
-    /**
-     * Underscore separated with all letters uppercase, e.g., "UPPER_UNDERSCORE".
-     * This is the standard Java and C++ constant variable naming convention.
-     * This is also known as "SCREAMING_SNAKE_CASE".
-     */
-    UPPER_UNDERSCORE;
-
-    private static final Pattern CAMEL_CASE_SPLIT = Pattern.compile("[\\s_-]");
-
-    /**
-     * Formats the input to the style of this {@link NameCaseConvention}.
-     *
-     * @param str The input string to format.
-     * @return The string formatted to the style of this convention.
-     */
-    public String format(String str) {
-        return format(this, str);
-    }
-
-    public static String format(NameCaseConvention convention, String str) {
-        switch (convention) {
-            case LOWER_HYPHEN:
-                return lowerHyphen(str);
-            case LOWER_UNDERSCORE:
-                return lowerUnderscore(str);
-            case LOWER_CAMEL:
-                return toCamelCase(str, true);
-            case UPPER_CAMEL:
-                return toCamelCase(str, false);
-            case UPPER_UNDERSCORE:
-                return upperUnderscore(str);
-            default:
-                return str;
-        }
-    }
-
-    /**
-     * Whether the input matches the formatting style of this {@link NameCaseConvention}.
-     *
-     * @param str The input string to check.
-     * @return Whether the input matches the formatting style of this convention.
-     */
-    public boolean matches(String str) {
-        return matches(this, str);
-    }
-
-    public static boolean matches(NameCaseConvention convention, String str) {
-        return str.matches(format(convention, str));
-    }
-
-    /**
-     * Check equality between two inputs using "relaxed binding" rules.
-     * The inputs will be converted to {@link NameCaseConvention#LOWER_CAMEL} before being checked using {@link String#equals}.
-     *
-     * @param str0 The first input to compare.
-     * @param str1 The second input to compare.
-     * @return Whether the inputs are equal.
-     * @see <a href="https://docs.micronaut.io/3.1.0/guide/index.html#_property_value_binding">Micronaut Property Value Binding Normalization</a>
-     * @see <a href="https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">Spring Boot Relaxed Binding</a>
-     */
-    public static boolean equalsRelaxedBinding(String str0, String str1) {
-        return LOWER_CAMEL.format(str0).equals(LOWER_CAMEL.format(str1));
-    }
-
-    private static String lowerHyphen(String str) {
-        return nameCaseJoiner(str.replace('_', '-').replace(' ', '-'), true, '-');
-    }
-
-    private static String lowerUnderscore(String str) {
-        return nameCaseJoiner(str.replace('-', '_').replace(' ', '_'), true, '_')
-                .toLowerCase();
-    }
-
-    /**
-     * Returns input formatted using the Java "camelCase" (or "CamelCase") naming convention.
-     *
-     * @param str                  The input string to check.
-     * @param lowerCaseFirstLetter Whether the first letter should be lowerCase or UpperCase.
-     * @return The string formatted as {@link NameCaseConvention#LOWER_CAMEL}.
-     */
-    private static String toCamelCase(String str, boolean lowerCaseFirstLetter) {
-        StringBuilder sb = new StringBuilder(str.length());
-        for (String s : CAMEL_CASE_SPLIT.split(str)) {
-            String capitalize = StringUtils.capitalize(s);
-            sb.append(capitalize);
-        }
-        String result = sb.toString();
-        if (lowerCaseFirstLetter) {
-            return StringUtils.uncapitalize(result);
-        }
-        return result;
-    }
-
-    private static String upperUnderscore(String str) {
-        return nameCaseJoiner(str.replace('-', '_').replace(' ', '_'), false, '_')
-                .toUpperCase();
-    }
-
-    private static String nameCaseJoiner(String str, boolean lowerCaseFirstLetter, char separatorChar) {
-        StringBuilder builder = new StringBuilder();
-        if (lowerCaseFirstLetter) {
-            char[] chars = str.toCharArray();
-            boolean first = true;
-            char last = '0';
-            char secondLast = separatorChar;
-            for (int i = 0; i < chars.length; i++) {
-                char c = chars[i];
-                if (Character.isLowerCase(c) || !Character.isLetter(c)) {
-                    first = false;
-                    if (c != separatorChar) {
-                        if (last == separatorChar) {
-                            builder.append(separatorChar);
-                        }
-                        builder.append(c);
-                    }
-                } else {
-                    char lowerCaseChar = Character.toLowerCase(c);
-                    if (first) {
-                        first = false;
-                        builder.append(lowerCaseChar);
-                    } else if (Character.isUpperCase(last) || last == '.') {
-                        builder.append(lowerCaseChar);
-                    } else if (Character.isDigit(last) && (Character.isUpperCase(secondLast) || secondLast == separatorChar)) {
-                        builder.append(lowerCaseChar);
-                    } else {
-                        builder.append(separatorChar).append(lowerCaseChar);
-                    }
-                }
-                if (i > 1) {
-                    secondLast = last;
-                }
-                last = c;
-            }
-        } else {
-            boolean first = true;
-            char last = '0';
-            for (char c : str.toCharArray()) {
-                if (first) {
-                    builder.append(c);
-                    first = false;
-                } else {
-                    if (Character.isUpperCase(c) && !Character.isUpperCase(last)) {
-                        if (c != separatorChar) {
-                            builder.append(separatorChar);
-                        }
-                        builder.append(c);
-                    } else {
-                        if (c == '.') {
-                            first = true;
-                        }
-                        if (c != separatorChar) {
-                            if (last == separatorChar) {
-                                builder.append(separatorChar);
-                            }
-                            builder.append(c);
-                        }
-                    }
-                }
-                last = c;
-            }
-        }
-
-        return builder.toString();
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal;
+
+import org.openrewrite.Incubating;
+
+import java.util.regex.Pattern;
+
+/**
+ * Utilities for standard name case conventions.
+ */
+@Incubating(since = "7.17.0")
+public enum NameCaseConvention {
+    /**
+     * Lowercase and hyphen-separated, e.g., "lower-hyphen".
+     * This is also known as "kebab-case".
+     */
+    LOWER_HYPHEN,
+
+    /**
+     * Lowercase and underscore-separated, e.g., "lower_underscore".
+     * This is also known as "snake_case".
+     */
+    LOWER_UNDERSCORE,
+
+    /**
+     * Camel case with the first letter lowercase, e.g., "lowerCamel".
+     * This is the standard Java variable naming convention.
+     */
+    LOWER_CAMEL,
+
+    /**
+     * Camel case with the first letter uppercase, e.g., "UpperCamel".
+     * This is the standard Java and C++ class naming convention.
+     */
+    UPPER_CAMEL,
+
+    /**
+     * Underscore separated with all letters uppercase, e.g., "UPPER_UNDERSCORE".
+     * This is the standard Java and C++ constant variable naming convention.
+     * This is also known as "SCREAMING_SNAKE_CASE".
+     */
+    UPPER_UNDERSCORE;
+
+    private static final Pattern CAMEL_CASE_SPLIT = Pattern.compile("[\\s_-]");
+
+    /**
+     * Formats the input to the style of this {@link NameCaseConvention}.
+     *
+     * @param str The input string to format.
+     * @return The string formatted to the style of this convention.
+     */
+    public String format(String str) {
+        return format(this, str);
+    }
+
+    public static String format(NameCaseConvention convention, String str) {
+        switch (convention) {
+            case LOWER_HYPHEN:
+                return lowerHyphen(str);
+            case LOWER_UNDERSCORE:
+                return lowerUnderscore(str);
+            case LOWER_CAMEL:
+                return toCamelCase(str, true);
+            case UPPER_CAMEL:
+                return toCamelCase(str, false);
+            case UPPER_UNDERSCORE:
+                return upperUnderscore(str);
+            default:
+                return str;
+        }
+    }
+
+    /**
+     * Whether the input matches the formatting style of this {@link NameCaseConvention}.
+     *
+     * @param str The input string to check.
+     * @return Whether the input matches the formatting style of this convention.
+     */
+    public boolean matches(String str) {
+        return matches(this, str);
+    }
+
+    public static boolean matches(NameCaseConvention convention, String str) {
+        return str.matches(format(convention, str));
+    }
+
+    /**
+     * Check equality between two inputs using "relaxed binding" rules.
+     * The inputs will be converted to {@link NameCaseConvention#LOWER_CAMEL} before being checked using {@link String#equals}.
+     *
+     * @param str0 The first input to compare.
+     * @param str1 The second input to compare.
+     * @return Whether the inputs are equal.
+     * @see <a href="https://docs.micronaut.io/3.1.0/guide/index.html#_property_value_binding">Micronaut Property Value Binding Normalization</a>
+     * @see <a href="https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">Spring Boot Relaxed Binding</a>
+     */
+    public static boolean equalsRelaxedBinding(String str0, String str1) {
+        return LOWER_CAMEL.format(str0).equals(LOWER_CAMEL.format(str1));
+    }
+
+    private static String lowerHyphen(String str) {
+        return nameCaseJoiner(str.replace('_', '-').replace(' ', '-'), true, '-');
+    }
+
+    private static String lowerUnderscore(String str) {
+        return nameCaseJoiner(str.replace('-', '_').replace(' ', '_'), true, '_')
+                .toLowerCase();
+    }
+
+    /**
+     * Returns input formatted using the Java "camelCase" (or "CamelCase") naming convention.
+     *
+     * @param str                  The input string to check.
+     * @param lowerCaseFirstLetter Whether the first letter should be lowerCase or UpperCase.
+     * @return The string formatted as {@link NameCaseConvention#LOWER_CAMEL}.
+     */
+    private static String toCamelCase(String str, boolean lowerCaseFirstLetter) {
+        StringBuilder sb = new StringBuilder(str.length());
+        for (String s : CAMEL_CASE_SPLIT.split(str)) {
+            String capitalize = StringUtils.capitalize(s);
+            sb.append(capitalize);
+        }
+        String result = sb.toString();
+        if (lowerCaseFirstLetter) {
+            return StringUtils.uncapitalize(result);
+        }
+        return result;
+    }
+
+    private static String upperUnderscore(String str) {
+        return nameCaseJoiner(str.replace('-', '_').replace(' ', '_'), false, '_')
+                .toUpperCase();
+    }
+
+    private static String nameCaseJoiner(String str, boolean lowerCaseFirstLetter, char separatorChar) {
+        StringBuilder builder = new StringBuilder();
+        if (lowerCaseFirstLetter) {
+            char[] chars = str.toCharArray();
+            boolean first = true;
+            char last = '0';
+            char secondLast = separatorChar;
+            for (int i = 0; i < chars.length; i++) {
+                char c = chars[i];
+                if (Character.isLowerCase(c) || !Character.isLetter(c)) {
+                    first = false;
+                    if (c != separatorChar) {
+                        if (last == separatorChar) {
+                            builder.append(separatorChar);
+                        }
+                        builder.append(c);
+                    }
+                } else {
+                    char lowerCaseChar = Character.toLowerCase(c);
+                    if (first) {
+                        first = false;
+                        builder.append(lowerCaseChar);
+                    } else if (Character.isUpperCase(last) || last == '.') {
+                        builder.append(lowerCaseChar);
+                    } else if (Character.isDigit(last) && (Character.isUpperCase(secondLast) || secondLast == separatorChar)) {
+                        builder.append(lowerCaseChar);
+                    } else {
+                        builder.append(separatorChar).append(lowerCaseChar);
+                    }
+                }
+                if (i > 1) {
+                    secondLast = last;
+                }
+                last = c;
+            }
+        } else {
+            boolean first = true;
+            char last = '0';
+            for (char c : str.toCharArray()) {
+                if (first) {
+                    builder.append(c);
+                    first = false;
+                } else {
+                    if (Character.isUpperCase(c) && !Character.isUpperCase(last)) {
+                        if (c != separatorChar) {
+                            builder.append(separatorChar);
+                        }
+                        builder.append(c);
+                    } else {
+                        if (c == '.') {
+                            first = true;
+                        }
+                        if (c != separatorChar) {
+                            if (last == separatorChar) {
+                                builder.append(separatorChar);
+                            }
+                            builder.append(c);
+                        }
+                    }
+                }
+                last = c;
+            }
+        }
+
+        return builder.toString();
+    }
+
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
index 9c439a36ad6..0c7a82081ec 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java
@@ -1,155 +1,155 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal;
-
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.*;
-import java.util.function.Function;
-
-/**
- * Simplified from Spring's PropertyPlaceholderHelper.
- *
- * @author Juergen Hoeller
- * @author Rob Harrop
- */
-public class PropertyPlaceholderHelper {
-    private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4);
-
-    static {
-        wellKnownSimplePrefixes.put("}", "{");
-        wellKnownSimplePrefixes.put("]", "[");
-        wellKnownSimplePrefixes.put(")", "(");
-    }
-
-    private final String placeholderPrefix;
-    private final String placeholderSuffix;
-
-    private final String simplePrefix;
-
-    @Nullable
-    private final String valueSeparator;
-
-    public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
-                                     @Nullable String valueSeparator) {
-        this.placeholderPrefix = placeholderPrefix;
-        this.placeholderSuffix = placeholderSuffix;
-        String simplePrefixForSuffix = wellKnownSimplePrefixes.get(this.placeholderSuffix);
-        if (simplePrefixForSuffix != null && this.placeholderPrefix.endsWith(simplePrefixForSuffix)) {
-            this.simplePrefix = simplePrefixForSuffix;
-        } else {
-            this.simplePrefix = this.placeholderPrefix;
-        }
-        this.valueSeparator = valueSeparator;
-    }
-
-    public String replacePlaceholders(String value, final Properties properties) {
-        return replacePlaceholders(value, properties::getProperty);
-    }
-
-    public String replacePlaceholders(String value, Function<String, String> placeholderResolver) {
-        return parseStringValue(value, placeholderResolver, null);
-    }
-
-    protected String parseStringValue(String value, Function<String, String> placeholderResolver,
-                                      @Nullable Set<String> visitedPlaceholders) {
-        int startIndex = value.indexOf(placeholderPrefix);
-        if (startIndex == -1) {
-            return value;
-        }
-
-        StringBuilder result = new StringBuilder(value);
-        while (startIndex != -1) {
-            int endIndex = findPlaceholderEndIndex(result, startIndex);
-            if (endIndex != -1) {
-                String placeholder = result.substring(startIndex + placeholderPrefix.length(), endIndex);
-                String originalPlaceholder = placeholder;
-                if (visitedPlaceholders == null) {
-                    visitedPlaceholders = new HashSet<>(4);
-                }
-                if (!visitedPlaceholders.add(originalPlaceholder)) {
-                    throw new IllegalArgumentException(
-                            "Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
-                }
-                // Recursive invocation, parsing placeholders contained in the placeholder key.
-                placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders);
-                // Now obtain the value for the fully resolved key...
-                String propVal = placeholderResolver.apply(placeholder);
-                if (propVal == null && valueSeparator != null) {
-                    int separatorIndex = placeholder.indexOf(valueSeparator);
-                    if (separatorIndex != -1) {
-                        String actualPlaceholder = placeholder.substring(0, separatorIndex);
-                        String defaultValue = placeholder.substring(separatorIndex + valueSeparator.length());
-                        propVal = placeholderResolver.apply(actualPlaceholder);
-                        if (propVal == null) {
-                            propVal = defaultValue;
-                        }
-                    }
-                }
-                if (propVal != null) {
-                    // Recursive invocation, parsing placeholders contained in the
-                    // previously resolved placeholder value.
-                    propVal = parseStringValue(propVal, placeholderResolver, visitedPlaceholders);
-                    result.replace(startIndex, endIndex + placeholderSuffix.length(), propVal);
-
-                    if (propVal.length() < endIndex - startIndex + 1) {
-                        endIndex = startIndex + propVal.length();
-                    }
-                }
-
-                // Proceed with unprocessed value.
-                startIndex = result.indexOf(placeholderPrefix, endIndex + placeholderSuffix.length());
-                visitedPlaceholders.remove(originalPlaceholder);
-            } else {
-                startIndex = -1;
-            }
-        }
-        return result.toString();
-    }
-
-    private int findPlaceholderEndIndex(CharSequence buf, int startIndex) {
-        int index = startIndex + placeholderPrefix.length();
-        int withinNestedPlaceholder = 0;
-        while (index < buf.length()) {
-            if (substringMatch(buf, index, placeholderSuffix)) {
-                if (withinNestedPlaceholder > 0) {
-                    withinNestedPlaceholder--;
-                    index = index + placeholderSuffix.length();
-                } else {
-                    return index;
-                }
-            } else if (substringMatch(buf, index, simplePrefix)) {
-                withinNestedPlaceholder++;
-                index = index + simplePrefix.length();
-            } else {
-                index++;
-            }
-        }
-        return -1;
-    }
-
-    private static boolean substringMatch(CharSequence str, int index, CharSequence substring) {
-        if (index + substring.length() > str.length()) {
-            return false;
-        }
-        for (int i = 0; i < substring.length(); i++) {
-            if (str.charAt(index + i) != substring.charAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal;
+
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.*;
+import java.util.function.Function;
+
+/**
+ * Simplified from Spring's PropertyPlaceholderHelper.
+ *
+ * @author Juergen Hoeller
+ * @author Rob Harrop
+ */
+public class PropertyPlaceholderHelper {
+    private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4);
+
+    static {
+        wellKnownSimplePrefixes.put("}", "{");
+        wellKnownSimplePrefixes.put("]", "[");
+        wellKnownSimplePrefixes.put(")", "(");
+    }
+
+    private final String placeholderPrefix;
+    private final String placeholderSuffix;
+
+    private final String simplePrefix;
+
+    @Nullable
+    private final String valueSeparator;
+
+    public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
+                                     @Nullable String valueSeparator) {
+        this.placeholderPrefix = placeholderPrefix;
+        this.placeholderSuffix = placeholderSuffix;
+        String simplePrefixForSuffix = wellKnownSimplePrefixes.get(this.placeholderSuffix);
+        if (simplePrefixForSuffix != null && this.placeholderPrefix.endsWith(simplePrefixForSuffix)) {
+            this.simplePrefix = simplePrefixForSuffix;
+        } else {
+            this.simplePrefix = this.placeholderPrefix;
+        }
+        this.valueSeparator = valueSeparator;
+    }
+
+    public String replacePlaceholders(String value, final Properties properties) {
+        return replacePlaceholders(value, properties::getProperty);
+    }
+
+    public String replacePlaceholders(String value, Function<String, String> placeholderResolver) {
+        return parseStringValue(value, placeholderResolver, null);
+    }
+
+    protected String parseStringValue(String value, Function<String, String> placeholderResolver,
+                                      @Nullable Set<String> visitedPlaceholders) {
+        int startIndex = value.indexOf(placeholderPrefix);
+        if (startIndex == -1) {
+            return value;
+        }
+
+        StringBuilder result = new StringBuilder(value);
+        while (startIndex != -1) {
+            int endIndex = findPlaceholderEndIndex(result, startIndex);
+            if (endIndex != -1) {
+                String placeholder = result.substring(startIndex + placeholderPrefix.length(), endIndex);
+                String originalPlaceholder = placeholder;
+                if (visitedPlaceholders == null) {
+                    visitedPlaceholders = new HashSet<>(4);
+                }
+                if (!visitedPlaceholders.add(originalPlaceholder)) {
+                    throw new IllegalArgumentException(
+                            "Circular placeholder reference '" + originalPlaceholder + "' in property definitions");
+                }
+                // Recursive invocation, parsing placeholders contained in the placeholder key.
+                placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders);
+                // Now obtain the value for the fully resolved key...
+                String propVal = placeholderResolver.apply(placeholder);
+                if (propVal == null && valueSeparator != null) {
+                    int separatorIndex = placeholder.indexOf(valueSeparator);
+                    if (separatorIndex != -1) {
+                        String actualPlaceholder = placeholder.substring(0, separatorIndex);
+                        String defaultValue = placeholder.substring(separatorIndex + valueSeparator.length());
+                        propVal = placeholderResolver.apply(actualPlaceholder);
+                        if (propVal == null) {
+                            propVal = defaultValue;
+                        }
+                    }
+                }
+                if (propVal != null) {
+                    // Recursive invocation, parsing placeholders contained in the
+                    // previously resolved placeholder value.
+                    propVal = parseStringValue(propVal, placeholderResolver, visitedPlaceholders);
+                    result.replace(startIndex, endIndex + placeholderSuffix.length(), propVal);
+
+                    if (propVal.length() < endIndex - startIndex + 1) {
+                        endIndex = startIndex + propVal.length();
+                    }
+                }
+
+                // Proceed with unprocessed value.
+                startIndex = result.indexOf(placeholderPrefix, endIndex + placeholderSuffix.length());
+                visitedPlaceholders.remove(originalPlaceholder);
+            } else {
+                startIndex = -1;
+            }
+        }
+        return result.toString();
+    }
+
+    private int findPlaceholderEndIndex(CharSequence buf, int startIndex) {
+        int index = startIndex + placeholderPrefix.length();
+        int withinNestedPlaceholder = 0;
+        while (index < buf.length()) {
+            if (substringMatch(buf, index, placeholderSuffix)) {
+                if (withinNestedPlaceholder > 0) {
+                    withinNestedPlaceholder--;
+                    index = index + placeholderSuffix.length();
+                } else {
+                    return index;
+                }
+            } else if (substringMatch(buf, index, simplePrefix)) {
+                withinNestedPlaceholder++;
+                index = index + simplePrefix.length();
+            } else {
+                index++;
+            }
+        }
+        return -1;
+    }
+
+    private static boolean substringMatch(CharSequence str, int index, CharSequence substring) {
+        if (index + substring.length() > str.length()) {
+            return false;
+        }
+        for (int i = 0; i < substring.length(); i++) {
+            if (str.charAt(index + i) != substring.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/StreamUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/StreamUtils.java
index 75c0bb0170f..0919e629f58 100755
--- a/rewrite-core/src/main/java/org/openrewrite/internal/StreamUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/StreamUtils.java
@@ -1,35 +1,35 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class StreamUtils {
-    // Returns a predicate suitable for use with stream().filter() that will result in a set filtered to
-    // contain only items that are distinct as evaluated by keyFunc
-    public static <T> Predicate<T> distinctBy(Function<? super T, ?> keyFunc) {
-        Set<Object> seen = new HashSet<>();
-        return t -> {
-            Object it = keyFunc.apply(t);
-            boolean alreadySeen = seen.contains(it);
-            seen.add(it);
-            return !alreadySeen;
-        };
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public class StreamUtils {
+    // Returns a predicate suitable for use with stream().filter() that will result in a set filtered to
+    // contain only items that are distinct as evaluated by keyFunc
+    public static <T> Predicate<T> distinctBy(Function<? super T, ?> keyFunc) {
+        Set<Object> seen = new HashSet<>();
+        return t -> {
+            Object it = keyFunc.apply(t);
+            boolean alreadySeen = seen.contains(it);
+            seen.add(it);
+            return !alreadySeen;
+        };
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
index 8ae66f50aaa..2dec063084a 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
@@ -1,558 +1,558 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal;
-
-import org.openrewrite.internal.lang.NonNull;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import static java.util.Arrays.copyOfRange;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.counting;
-import static java.util.stream.Collectors.groupingBy;
-
-public class StringUtils {
-    private final static FileSystem FS = FileSystems.getDefault();
-
-    private StringUtils() {
-    }
-
-    public static String trimIndentPreserveCRLF(String text) {
-        return trimIndent(text.replace('\r', '⏎'))
-                .replace('⏎', '\r');
-    }
-
-    /**
-     * Detects a common minimal indent of all the input lines and removes the indent from each line.
-     *
-     * This is modeled after Kotlin's trimIndent and is useful for pruning the indent from multi-line text blocks.
-     *
-     * Note: Blank lines do not affect the detected indent level.
-     *
-     * @param text A string that have a common indention
-     * @return A mutated version of the string that removed the common indention.
-     */
-    public static String trimIndent(String text) {
-
-        if (text.isEmpty()) {
-            return text;
-        }
-
-        int indentLevel = minCommonIndentLevel(text);
-
-        // The logic for trimming the start of the string is consistent with the functionality of Kotlin's trimIndent.
-        char startChar = text.charAt(0);
-        int start = 0;
-        if (startChar == '\n' || startChar == '\r') {
-            //If the string starts with a line break, always trim it.
-            int i = 1;
-            for (; i < text.length(); i++) {
-                char c = text.charAt(i);
-                if (!Character.isWhitespace(c)) {
-                    //If there is any non-whitespace on the first line, do not trim the line.
-                    start = 1;
-                    break;
-                } else if (c == '\n' || c == '\r') {
-                    if (i - 1 <= indentLevel) {
-                        //If the first line is only whitespace and the line size is less than indent size, trim it.
-                        start = i;
-                    } else {
-                        //If the line size is equal or greater than indent, do not trim the line.
-                        start = 1;
-                    }
-                    break;
-                }
-            }
-        }
-
-        //If the last line of the string is only whitespace, trim it.
-        int end = text.length() - 1;
-        while (end > start) {
-            char endChar = text.charAt(end);
-            if (!Character.isWhitespace(endChar)) {
-                end = text.length();
-                break;
-            } else if (endChar == '\n' || endChar == '\r') {
-                break;
-            }
-            end--;
-        }
-        if (end == start) {
-            end++;
-        }
-        char[] charArray = text.substring(start, end).toCharArray();
-
-        StringBuilder trimmed = new StringBuilder();
-        for (int i = 0; i < charArray.length; i++) {
-            boolean nonWhitespaceEncountered = false;
-            int j = i;
-            for (; j < charArray.length; j++) {
-                char c = charArray[j];
-                if (j - i >= indentLevel || (nonWhitespaceEncountered |= !Character.isWhitespace(c))) {
-                    trimmed.append(c);
-                }
-                if (c == '\r' || c == '\n') {
-                    if (!nonWhitespaceEncountered && j - 1 < indentLevel) {
-                        trimmed.append(c);
-                    }
-                    break;
-                }
-            }
-            i = j;
-        }
-
-        return trimmed.toString();
-    }
-
-
-    /**
-     * This method will count the number of white space characters that precede any content for each line contained
-     * in string. It will not compute a white space count for a line, if the entire line is blank (only made up of white
-     * space characters).
-     * <P><P>
-     * It will compute the minimum common number of white spaces across all lines and return that minimum.
-     *
-     * @param text A string with zero or more line breaks.
-     * @return The minimum count of white space characters preceding each line of content.
-     */
-    private static int minCommonIndentLevel(String text) {
-        int minIndent = Integer.MAX_VALUE;
-        int whiteSpaceCount = 0;
-        boolean contentEncountered = false;
-        for (char c : text.toCharArray()) {
-            if (c == '\n' || c == '\r') {
-                if (contentEncountered) {
-                    minIndent = Math.min(whiteSpaceCount, minIndent);
-                    if (minIndent == 0) {
-                        break;
-                    }
-                }
-                whiteSpaceCount = 0;
-                contentEncountered = false;
-            } else if (!contentEncountered && Character.isWhitespace(c)) {
-                whiteSpaceCount++;
-            } else {
-                contentEncountered = true;
-            }
-        }
-        if (contentEncountered) {
-            minIndent = Math.min(whiteSpaceCount, minIndent);
-        }
-        return minIndent;
-    }
-
-    static int indentLevel(String text) {
-        Stream<String> lines = Arrays.stream(text.replaceAll("\\s+$", "").split("\\r?\\n")).filter(s -> !isBlank(s));
-
-        AtomicBoolean dropWhile = new AtomicBoolean(false);
-        AtomicBoolean takeWhile = new AtomicBoolean(true);
-        SortedMap<Integer, Long> indentFrequencies = lines
-                .filter(l -> {
-                    dropWhile.set(dropWhile.get() || !l.isEmpty());
-                    return dropWhile.get();
-                })
-                .map(l -> {
-                    takeWhile.set(true);
-                    return (int) l.chars()
-                            .filter(c -> {
-                                takeWhile.set(takeWhile.get() && Character.isWhitespace(c));
-                                return takeWhile.get();
-                            })
-                            .count();
-                })
-                .collect(groupingBy(identity(), TreeMap::new, counting()));
-        return mostCommonIndent(indentFrequencies);
-    }
-
-    public static int mostCommonIndent(SortedMap<Integer, Long> indentFrequencies) {
-        // the frequency with which each indent level is an integral divisor of longer indent levels
-        SortedMap<Integer, Integer> indentFrequencyAsDivisors = new TreeMap<>();
-        for (Map.Entry<Integer, Long> indentFrequency : indentFrequencies.entrySet()) {
-            int indent = indentFrequency.getKey();
-            int freq;
-            switch (indent) {
-                case 0:
-                    freq = indentFrequency.getValue().intValue();
-                    break;
-                case 1:
-                    // gcd(1, N) == 1, so we can avoid the test for this case
-                    freq = (int) indentFrequencies.tailMap(indent).values().stream().mapToLong(l -> l).sum();
-                    break;
-                default:
-                    freq = (int) indentFrequencies.tailMap(indent).entrySet().stream()
-                            .filter(inF -> gcd(inF.getKey(), indent) != 0)
-                            .mapToLong(Map.Entry::getValue)
-                            .sum();
-            }
-
-            indentFrequencyAsDivisors.put(indent, freq);
-        }
-
-        if (indentFrequencies.getOrDefault(0, 0L) > 1) {
-            return 0;
-        }
-
-        return indentFrequencyAsDivisors.entrySet().stream()
-                .max((e1, e2) -> {
-                    int valCompare = e1.getValue().compareTo(e2.getValue());
-                    return valCompare != 0 ?
-                            valCompare :
-                            // take the smallest indent otherwise, unless it would be zero
-                            e1.getKey() == 0 ? -1 : e2.getKey().compareTo(e1.getKey());
-                })
-                .map(Map.Entry::getKey)
-                .orElse(0);
-    }
-
-    static int gcd(int n1, int n2) {
-        return n2 == 0 ? n1 : gcd(n2, n1 % n2);
-    }
-
-    /**
-     * Check if the String is null or has only whitespaces.
-     * <p>
-     * Modified from apache commons lang StringUtils.
-     *
-     * @param string String to check
-     * @return {@code true} if the String is null or has only whitespaces
-     */
-    public static boolean isBlank(@Nullable String string) {
-        if (string == null || string.isEmpty()) {
-            return true;
-        }
-        for (int i = 0; i < string.length(); i++) {
-            if (!Character.isWhitespace(string.charAt(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Check if the String is empty string or null.
-     *
-     * @param string String to check
-     * @return {@code true} if the String is null or empty string
-     */
-    public static boolean isNullOrEmpty(@Nullable String string) {
-        return string == null || string.isEmpty();
-    }
-
-    /**
-     * If the input stream is coming from a stream with an unknown encoding, use
-     * {@link EncodingDetectingInputStream#readFully()} instead.
-     *
-     * @param inputStream An input stream.
-     * @return A UTF-8 encoded string.
-     */
-    public static String readFully(InputStream inputStream) {
-        try (InputStream is = inputStream) {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[4096];
-            int n;
-            while ((n = is.read(buffer)) != -1) {
-                bos.write(buffer, 0, n);
-            }
-
-            byte[] bytes = bos.toByteArray();
-            return new String(bytes, 0, bytes.length, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new UnsupportedOperationException(e);
-        }
-    }
-
-    public static String capitalize(String value) {
-        if (value.isEmpty()) {
-            return value;
-        }
-        return Character.toUpperCase(value.charAt(0)) +
-                value.substring(1);
-    }
-
-    public static String uncapitalize(String value) {
-        if (value.isEmpty()) {
-            return value;
-        }
-        return Character.toLowerCase(value.charAt(0)) + value.substring(1);
-    }
-
-    public static boolean containsOnlyWhitespaceAndComments(String text) {
-        int i = 0;
-        char[] chars = text.toCharArray();
-        boolean inSingleLineComment = false;
-        boolean inMultilineComment = false;
-        while (i < chars.length) {
-            char c = chars[i];
-            if (inSingleLineComment && c == '\n') {
-                inSingleLineComment = false;
-                continue;
-            }
-            if (i < chars.length - 1) {
-                String s = String.valueOf(c) + chars[i + 1];
-                switch (s) {
-                    case "//": {
-                        inSingleLineComment = true;
-                        i += 2;
-                        continue;
-                    }
-                    case "/*": {
-                        inMultilineComment = true;
-                        i += 2;
-                        continue;
-                    }
-                    case "*/": {
-                        inMultilineComment = false;
-                        i += 2;
-                        continue;
-                    }
-                }
-            }
-            if (!inSingleLineComment && !inMultilineComment && !Character.isWhitespace(c)) {
-                return false;
-            }
-            i++;
-        }
-        return true;
-    }
-
-    public static int indexOfNonWhitespace(String text) {
-        return indexOf(text, it -> !(it == ' ' || it == '\t' || it == '\n' || it == '\r'));
-    }
-
-    /**
-     * @param text Text to scan
-     * @param test The predicate to match
-     * @return The index of the first character for which the predicate returns <code>true</code>,
-     * or <code>-1</code> if no character in the string matches the predicate.
-     */
-    public static int indexOf(String text, Predicate<Character> test) {
-        for (int i = 0; i < text.length(); i++) {
-            if (test.test(text.charAt(i))) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Return the number of times a substring occurs within a target string.
-     *
-     * @param text      A target string
-     * @param substring The substring to search for
-     * @return the number of times the substring is found in the target. 0 if no occurances are found.
-     */
-    public static int countOccurrences(@NonNull String text, @NonNull String substring) {
-
-        if (text.isEmpty() || substring.isEmpty()) {
-            return 0;
-        }
-
-        int count = 0;
-        for (int index = text.indexOf(substring); index >= 0; index = text.indexOf(substring, index + substring.length())) {
-            count++;
-        }
-        return count;
-    }
-
-    /**
-     * This method will search and replace the first occurrence of a matching substring. There is a a replaceFirst method
-     * on the String class but that version leverages regular expressions and is a magnitude slower than this simple
-     * replacement.
-     *
-     * @param text        The source string to search
-     * @param match       The substring that is being searched for
-     * @param replacement The replacement.
-     * @return The original string with the first occurrence replaced or the original text if a match is not found.
-     */
-    public static String replaceFirst(@NonNull String text, @NonNull String match, @NonNull String replacement) {
-        int start = text.indexOf(match);
-        if (match.isEmpty() || text.isEmpty() || start == -1) {
-            return text;
-        } else {
-            StringBuilder newValue = new StringBuilder(text.length());
-            newValue.append(text, 0, start);
-            newValue.append(replacement);
-            int end = start + match.length();
-            if (end < text.length()) {
-                newValue.append(text, end, text.length());
-            }
-            return newValue.toString();
-        }
-    }
-
-    public static String repeat(String s, int count) {
-        if (count == 1) {
-            return s;
-        }
-
-        byte[] value = s.getBytes();
-        int len = value.length;
-        if (len == 0 || count == 0) {
-            return "";
-        }
-        if (len == 1) {
-            final byte[] single = new byte[count];
-            Arrays.fill(single, value[0]);
-            return new String(single);
-        }
-        int limit = len * count;
-        byte[] multiple = new byte[limit];
-        System.arraycopy(value, 0, multiple, 0, len);
-        int copied = len;
-        for (; copied < limit - copied; copied <<= 1) {
-            System.arraycopy(multiple, 0, multiple, copied, copied);
-        }
-        System.arraycopy(multiple, 0, multiple, copied, limit - copied);
-        return new String(multiple);
-    }
-
-    public static boolean matchesGlob(@Nullable String value, @Nullable String globPattern) {
-        if ("*".equals(globPattern)) {
-            return true;
-        }
-        if (null == globPattern) {
-            return false;
-        }
-        if (null == value) {
-            value = "";
-        }
-        PathMatcher pm = FS.getPathMatcher("glob:" + globPattern);
-        Path path = Paths.get("");
-        if (value.contains("/")) {
-            String[] parts = value.split("/");
-            if (parts.length > 1) {
-                for (int i = 0, len = parts.length; i < len; i++) {
-                    path = Paths.get("", copyOfRange(parts, i, parts.length));
-                    if (!isBlank(parts[i])) {
-                        break;
-                    }
-                }
-            } else {
-                path = Paths.get(parts[0]);
-            }
-        } else {
-            path = Paths.get(value);
-        }
-        return pm.matches(path);
-    }
-
-    public static String indent(String text) {
-        StringBuilder indent = new StringBuilder();
-        for (char c : text.toCharArray()) {
-            if (c == '\n' || c == '\r') {
-                return indent.toString();
-            } else if (Character.isWhitespace(c)) {
-                indent.append(c);
-            } else {
-                return indent.toString();
-            }
-        }
-        return indent.toString();
-    }
-
-    /**
-     * Locate the greatest common margin of a multi-line string
-     *
-     * @param multiline A string of one or more lines.
-     * @return The greatest common margin consisting only of whitespace characters.
-     */
-    public static String greatestCommonMargin(String multiline) {
-        String gcm = null;
-        StringBuilder margin = new StringBuilder();
-        boolean skipRestOfLine = false;
-        char[] charArray = multiline.toCharArray();
-        for (int i = 0; i < charArray.length; i++) {
-            char c = charArray[i];
-            if (c == '\n') {
-                if (i < charArray.length - 1 && charArray[i + 1] == '\n') {
-                    i++;
-                    continue;
-                } else if (i > 0) {
-                    if (margin.length() == 0) {
-                        return "";
-                    } else {
-                        gcm = commonMargin(gcm, margin);
-                        margin = new StringBuilder();
-                    }
-                }
-                skipRestOfLine = false;
-            } else if (Character.isWhitespace(c) && !skipRestOfLine) {
-                margin.append(c);
-            } else {
-                skipRestOfLine = true;
-            }
-        }
-        return gcm == null ? "" : gcm;
-    }
-
-    public static String commonMargin(@Nullable CharSequence s1, CharSequence s2) {
-        if (s1 == null) {
-            String s = s2.toString();
-            return s.substring(s.lastIndexOf('\n') + 1);
-        }
-        for (int i = 0; i < s1.length() && i < s2.length(); i++) {
-            if (s1.charAt(i) != s2.charAt(i) || !Character.isWhitespace(s1.charAt(i))) {
-                return s1.toString().substring(0, i);
-            }
-        }
-        return s2.length() < s1.length() ? s2.toString() : s1.toString();
-    }
-
-    public static boolean isNumeric(String str) {
-        if (str == null) {
-            return false;
-        }
-        int sz = str.length();
-        for (int i = 0; i < sz; i++) {
-            if (!Character.isDigit(str.charAt(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * See https://eclipse.org/aspectj/doc/next/progguide/semantics-pointcuts.html#type-patterns
-     * <p>
-     * An embedded * in an identifier matches any sequence of characters, but
-     * does not match the package (or inner-type) separator ".".
-     * <p>
-     * The ".." wildcard matches any sequence of characters that start and end with a ".", so it can be used to pick out all
-     * types in any subpackage, or all inner types. e.g. <code>within(com.xerox..*)</code> picks out all join points where
-     * the code is in any declaration of a type whose name begins with "com.xerox.".
-     */
-    public static String aspectjNameToPattern(String name) {
-        return name
-                .replace("$", "\\$")
-                .replace("[", "\\[")
-                .replace("]", "\\]")
-                .replaceAll("([^.]*)\\.([^.]*)", "$1\\.$2")
-                .replace("*", "[^.]*")
-                .replace("..", "\\.(.+\\.)?");
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal;
+
+import org.openrewrite.internal.lang.NonNull;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import static java.util.Arrays.copyOfRange;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+
+public class StringUtils {
+    private final static FileSystem FS = FileSystems.getDefault();
+
+    private StringUtils() {
+    }
+
+    public static String trimIndentPreserveCRLF(String text) {
+        return trimIndent(text.replace('\r', '⏎'))
+                .replace('⏎', '\r');
+    }
+
+    /**
+     * Detects a common minimal indent of all the input lines and removes the indent from each line.
+     *
+     * This is modeled after Kotlin's trimIndent and is useful for pruning the indent from multi-line text blocks.
+     *
+     * Note: Blank lines do not affect the detected indent level.
+     *
+     * @param text A string that have a common indention
+     * @return A mutated version of the string that removed the common indention.
+     */
+    public static String trimIndent(String text) {
+
+        if (text.isEmpty()) {
+            return text;
+        }
+
+        int indentLevel = minCommonIndentLevel(text);
+
+        // The logic for trimming the start of the string is consistent with the functionality of Kotlin's trimIndent.
+        char startChar = text.charAt(0);
+        int start = 0;
+        if (startChar == '\n' || startChar == '\r') {
+            //If the string starts with a line break, always trim it.
+            int i = 1;
+            for (; i < text.length(); i++) {
+                char c = text.charAt(i);
+                if (!Character.isWhitespace(c)) {
+                    //If there is any non-whitespace on the first line, do not trim the line.
+                    start = 1;
+                    break;
+                } else if (c == '\n' || c == '\r') {
+                    if (i - 1 <= indentLevel) {
+                        //If the first line is only whitespace and the line size is less than indent size, trim it.
+                        start = i;
+                    } else {
+                        //If the line size is equal or greater than indent, do not trim the line.
+                        start = 1;
+                    }
+                    break;
+                }
+            }
+        }
+
+        //If the last line of the string is only whitespace, trim it.
+        int end = text.length() - 1;
+        while (end > start) {
+            char endChar = text.charAt(end);
+            if (!Character.isWhitespace(endChar)) {
+                end = text.length();
+                break;
+            } else if (endChar == '\n' || endChar == '\r') {
+                break;
+            }
+            end--;
+        }
+        if (end == start) {
+            end++;
+        }
+        char[] charArray = text.substring(start, end).toCharArray();
+
+        StringBuilder trimmed = new StringBuilder();
+        for (int i = 0; i < charArray.length; i++) {
+            boolean nonWhitespaceEncountered = false;
+            int j = i;
+            for (; j < charArray.length; j++) {
+                char c = charArray[j];
+                if (j - i >= indentLevel || (nonWhitespaceEncountered |= !Character.isWhitespace(c))) {
+                    trimmed.append(c);
+                }
+                if (c == '\r' || c == '\n') {
+                    if (!nonWhitespaceEncountered && j - 1 < indentLevel) {
+                        trimmed.append(c);
+                    }
+                    break;
+                }
+            }
+            i = j;
+        }
+
+        return trimmed.toString();
+    }
+
+
+    /**
+     * This method will count the number of white space characters that precede any content for each line contained
+     * in string. It will not compute a white space count for a line, if the entire line is blank (only made up of white
+     * space characters).
+     * <P><P>
+     * It will compute the minimum common number of white spaces across all lines and return that minimum.
+     *
+     * @param text A string with zero or more line breaks.
+     * @return The minimum count of white space characters preceding each line of content.
+     */
+    private static int minCommonIndentLevel(String text) {
+        int minIndent = Integer.MAX_VALUE;
+        int whiteSpaceCount = 0;
+        boolean contentEncountered = false;
+        for (char c : text.toCharArray()) {
+            if (c == '\n' || c == '\r') {
+                if (contentEncountered) {
+                    minIndent = Math.min(whiteSpaceCount, minIndent);
+                    if (minIndent == 0) {
+                        break;
+                    }
+                }
+                whiteSpaceCount = 0;
+                contentEncountered = false;
+            } else if (!contentEncountered && Character.isWhitespace(c)) {
+                whiteSpaceCount++;
+            } else {
+                contentEncountered = true;
+            }
+        }
+        if (contentEncountered) {
+            minIndent = Math.min(whiteSpaceCount, minIndent);
+        }
+        return minIndent;
+    }
+
+    static int indentLevel(String text) {
+        Stream<String> lines = Arrays.stream(text.replaceAll("\\s+$", "").split("\\r?\\n")).filter(s -> !isBlank(s));
+
+        AtomicBoolean dropWhile = new AtomicBoolean(false);
+        AtomicBoolean takeWhile = new AtomicBoolean(true);
+        SortedMap<Integer, Long> indentFrequencies = lines
+                .filter(l -> {
+                    dropWhile.set(dropWhile.get() || !l.isEmpty());
+                    return dropWhile.get();
+                })
+                .map(l -> {
+                    takeWhile.set(true);
+                    return (int) l.chars()
+                            .filter(c -> {
+                                takeWhile.set(takeWhile.get() && Character.isWhitespace(c));
+                                return takeWhile.get();
+                            })
+                            .count();
+                })
+                .collect(groupingBy(identity(), TreeMap::new, counting()));
+        return mostCommonIndent(indentFrequencies);
+    }
+
+    public static int mostCommonIndent(SortedMap<Integer, Long> indentFrequencies) {
+        // the frequency with which each indent level is an integral divisor of longer indent levels
+        SortedMap<Integer, Integer> indentFrequencyAsDivisors = new TreeMap<>();
+        for (Map.Entry<Integer, Long> indentFrequency : indentFrequencies.entrySet()) {
+            int indent = indentFrequency.getKey();
+            int freq;
+            switch (indent) {
+                case 0:
+                    freq = indentFrequency.getValue().intValue();
+                    break;
+                case 1:
+                    // gcd(1, N) == 1, so we can avoid the test for this case
+                    freq = (int) indentFrequencies.tailMap(indent).values().stream().mapToLong(l -> l).sum();
+                    break;
+                default:
+                    freq = (int) indentFrequencies.tailMap(indent).entrySet().stream()
+                            .filter(inF -> gcd(inF.getKey(), indent) != 0)
+                            .mapToLong(Map.Entry::getValue)
+                            .sum();
+            }
+
+            indentFrequencyAsDivisors.put(indent, freq);
+        }
+
+        if (indentFrequencies.getOrDefault(0, 0L) > 1) {
+            return 0;
+        }
+
+        return indentFrequencyAsDivisors.entrySet().stream()
+                .max((e1, e2) -> {
+                    int valCompare = e1.getValue().compareTo(e2.getValue());
+                    return valCompare != 0 ?
+                            valCompare :
+                            // take the smallest indent otherwise, unless it would be zero
+                            e1.getKey() == 0 ? -1 : e2.getKey().compareTo(e1.getKey());
+                })
+                .map(Map.Entry::getKey)
+                .orElse(0);
+    }
+
+    static int gcd(int n1, int n2) {
+        return n2 == 0 ? n1 : gcd(n2, n1 % n2);
+    }
+
+    /**
+     * Check if the String is null or has only whitespaces.
+     * <p>
+     * Modified from apache commons lang StringUtils.
+     *
+     * @param string String to check
+     * @return {@code true} if the String is null or has only whitespaces
+     */
+    public static boolean isBlank(@Nullable String string) {
+        if (string == null || string.isEmpty()) {
+            return true;
+        }
+        for (int i = 0; i < string.length(); i++) {
+            if (!Character.isWhitespace(string.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if the String is empty string or null.
+     *
+     * @param string String to check
+     * @return {@code true} if the String is null or empty string
+     */
+    public static boolean isNullOrEmpty(@Nullable String string) {
+        return string == null || string.isEmpty();
+    }
+
+    /**
+     * If the input stream is coming from a stream with an unknown encoding, use
+     * {@link EncodingDetectingInputStream#readFully()} instead.
+     *
+     * @param inputStream An input stream.
+     * @return A UTF-8 encoded string.
+     */
+    public static String readFully(InputStream inputStream) {
+        try (InputStream is = inputStream) {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int n;
+            while ((n = is.read(buffer)) != -1) {
+                bos.write(buffer, 0, n);
+            }
+
+            byte[] bytes = bos.toByteArray();
+            return new String(bytes, 0, bytes.length, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new UnsupportedOperationException(e);
+        }
+    }
+
+    public static String capitalize(String value) {
+        if (value.isEmpty()) {
+            return value;
+        }
+        return Character.toUpperCase(value.charAt(0)) +
+                value.substring(1);
+    }
+
+    public static String uncapitalize(String value) {
+        if (value.isEmpty()) {
+            return value;
+        }
+        return Character.toLowerCase(value.charAt(0)) + value.substring(1);
+    }
+
+    public static boolean containsOnlyWhitespaceAndComments(String text) {
+        int i = 0;
+        char[] chars = text.toCharArray();
+        boolean inSingleLineComment = false;
+        boolean inMultilineComment = false;
+        while (i < chars.length) {
+            char c = chars[i];
+            if (inSingleLineComment && c == '\n') {
+                inSingleLineComment = false;
+                continue;
+            }
+            if (i < chars.length - 1) {
+                String s = String.valueOf(c) + chars[i + 1];
+                switch (s) {
+                    case "//": {
+                        inSingleLineComment = true;
+                        i += 2;
+                        continue;
+                    }
+                    case "/*": {
+                        inMultilineComment = true;
+                        i += 2;
+                        continue;
+                    }
+                    case "*/": {
+                        inMultilineComment = false;
+                        i += 2;
+                        continue;
+                    }
+                }
+            }
+            if (!inSingleLineComment && !inMultilineComment && !Character.isWhitespace(c)) {
+                return false;
+            }
+            i++;
+        }
+        return true;
+    }
+
+    public static int indexOfNonWhitespace(String text) {
+        return indexOf(text, it -> !(it == ' ' || it == '\t' || it == '\n' || it == '\r'));
+    }
+
+    /**
+     * @param text Text to scan
+     * @param test The predicate to match
+     * @return The index of the first character for which the predicate returns <code>true</code>,
+     * or <code>-1</code> if no character in the string matches the predicate.
+     */
+    public static int indexOf(String text, Predicate<Character> test) {
+        for (int i = 0; i < text.length(); i++) {
+            if (test.test(text.charAt(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Return the number of times a substring occurs within a target string.
+     *
+     * @param text      A target string
+     * @param substring The substring to search for
+     * @return the number of times the substring is found in the target. 0 if no occurances are found.
+     */
+    public static int countOccurrences(@NonNull String text, @NonNull String substring) {
+
+        if (text.isEmpty() || substring.isEmpty()) {
+            return 0;
+        }
+
+        int count = 0;
+        for (int index = text.indexOf(substring); index >= 0; index = text.indexOf(substring, index + substring.length())) {
+            count++;
+        }
+        return count;
+    }
+
+    /**
+     * This method will search and replace the first occurrence of a matching substring. There is a a replaceFirst method
+     * on the String class but that version leverages regular expressions and is a magnitude slower than this simple
+     * replacement.
+     *
+     * @param text        The source string to search
+     * @param match       The substring that is being searched for
+     * @param replacement The replacement.
+     * @return The original string with the first occurrence replaced or the original text if a match is not found.
+     */
+    public static String replaceFirst(@NonNull String text, @NonNull String match, @NonNull String replacement) {
+        int start = text.indexOf(match);
+        if (match.isEmpty() || text.isEmpty() || start == -1) {
+            return text;
+        } else {
+            StringBuilder newValue = new StringBuilder(text.length());
+            newValue.append(text, 0, start);
+            newValue.append(replacement);
+            int end = start + match.length();
+            if (end < text.length()) {
+                newValue.append(text, end, text.length());
+            }
+            return newValue.toString();
+        }
+    }
+
+    public static String repeat(String s, int count) {
+        if (count == 1) {
+            return s;
+        }
+
+        byte[] value = s.getBytes();
+        int len = value.length;
+        if (len == 0 || count == 0) {
+            return "";
+        }
+        if (len == 1) {
+            final byte[] single = new byte[count];
+            Arrays.fill(single, value[0]);
+            return new String(single);
+        }
+        int limit = len * count;
+        byte[] multiple = new byte[limit];
+        System.arraycopy(value, 0, multiple, 0, len);
+        int copied = len;
+        for (; copied < limit - copied; copied <<= 1) {
+            System.arraycopy(multiple, 0, multiple, copied, copied);
+        }
+        System.arraycopy(multiple, 0, multiple, copied, limit - copied);
+        return new String(multiple);
+    }
+
+    public static boolean matchesGlob(@Nullable String value, @Nullable String globPattern) {
+        if ("*".equals(globPattern)) {
+            return true;
+        }
+        if (null == globPattern) {
+            return false;
+        }
+        if (null == value) {
+            value = "";
+        }
+        PathMatcher pm = FS.getPathMatcher("glob:" + globPattern);
+        Path path = Paths.get("");
+        if (value.contains("/")) {
+            String[] parts = value.split("/");
+            if (parts.length > 1) {
+                for (int i = 0, len = parts.length; i < len; i++) {
+                    path = Paths.get("", copyOfRange(parts, i, parts.length));
+                    if (!isBlank(parts[i])) {
+                        break;
+                    }
+                }
+            } else {
+                path = Paths.get(parts[0]);
+            }
+        } else {
+            path = Paths.get(value);
+        }
+        return pm.matches(path);
+    }
+
+    public static String indent(String text) {
+        StringBuilder indent = new StringBuilder();
+        for (char c : text.toCharArray()) {
+            if (c == '\n' || c == '\r') {
+                return indent.toString();
+            } else if (Character.isWhitespace(c)) {
+                indent.append(c);
+            } else {
+                return indent.toString();
+            }
+        }
+        return indent.toString();
+    }
+
+    /**
+     * Locate the greatest common margin of a multi-line string
+     *
+     * @param multiline A string of one or more lines.
+     * @return The greatest common margin consisting only of whitespace characters.
+     */
+    public static String greatestCommonMargin(String multiline) {
+        String gcm = null;
+        StringBuilder margin = new StringBuilder();
+        boolean skipRestOfLine = false;
+        char[] charArray = multiline.toCharArray();
+        for (int i = 0; i < charArray.length; i++) {
+            char c = charArray[i];
+            if (c == '\n') {
+                if (i < charArray.length - 1 && charArray[i + 1] == '\n') {
+                    i++;
+                    continue;
+                } else if (i > 0) {
+                    if (margin.length() == 0) {
+                        return "";
+                    } else {
+                        gcm = commonMargin(gcm, margin);
+                        margin = new StringBuilder();
+                    }
+                }
+                skipRestOfLine = false;
+            } else if (Character.isWhitespace(c) && !skipRestOfLine) {
+                margin.append(c);
+            } else {
+                skipRestOfLine = true;
+            }
+        }
+        return gcm == null ? "" : gcm;
+    }
+
+    public static String commonMargin(@Nullable CharSequence s1, CharSequence s2) {
+        if (s1 == null) {
+            String s = s2.toString();
+            return s.substring(s.lastIndexOf('\n') + 1);
+        }
+        for (int i = 0; i < s1.length() && i < s2.length(); i++) {
+            if (s1.charAt(i) != s2.charAt(i) || !Character.isWhitespace(s1.charAt(i))) {
+                return s1.toString().substring(0, i);
+            }
+        }
+        return s2.length() < s1.length() ? s2.toString() : s1.toString();
+    }
+
+    public static boolean isNumeric(String str) {
+        if (str == null) {
+            return false;
+        }
+        int sz = str.length();
+        for (int i = 0; i < sz; i++) {
+            if (!Character.isDigit(str.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * See https://eclipse.org/aspectj/doc/next/progguide/semantics-pointcuts.html#type-patterns
+     * <p>
+     * An embedded * in an identifier matches any sequence of characters, but
+     * does not match the package (or inner-type) separator ".".
+     * <p>
+     * The ".." wildcard matches any sequence of characters that start and end with a ".", so it can be used to pick out all
+     * types in any subpackage, or all inner types. e.g. <code>within(com.xerox..*)</code> picks out all join points where
+     * the code is in any declaration of a type whose name begins with "com.xerox.".
+     */
+    public static String aspectjNameToPattern(String name) {
+        return name
+                .replace("$", "\\$")
+                .replace("[", "\\[")
+                .replace("]", "\\]")
+                .replaceAll("([^.]*)\\.([^.]*)", "$1\\.$2")
+                .replace("*", "[^.]*")
+                .replace("..", "\\.(.+\\.)?");
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java b/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
index d252e8d780c..d5282f9f931 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
@@ -1,100 +1,100 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.lang.Integer.parseInt;
-
-/**
- * Allows changes that do not modify the left-most non-zero element in the [major, minor, patch] tuple.
- * <a href="https://github.com/npm/node-semver#caret-ranges-123-025-004">Caret ranges</a>.
- */
-public class CaretRange extends LatestRelease {
-    private static final Pattern CARET_RANGE_PATTERN = Pattern.compile("\\^(\\d+)(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?");
-
-    private final String upperExclusive;
-    private final String lower;
-
-    private CaretRange(String lower, String upperExclusive, @Nullable String metadataPattern) {
-        super(metadataPattern);
-        this.lower = lower;
-        this.upperExclusive = upperExclusive;
-    }
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        return super.isValid(currentVersion, version) &&
-                super.compare(currentVersion, version, upperExclusive) < 0 &&
-                super.compare(currentVersion, version, lower) >= 0;
-    }
-
-    public static Validated build(String pattern, @Nullable String metadataPattern) {
-        Matcher matcher = CARET_RANGE_PATTERN.matcher(pattern);
-        if (!matcher.matches()) {
-            return Validated.invalid("caretRange", pattern, "not a caret range");
-        }
-
-        String major = matcher.group(1);
-        String minor = normalizeWildcard(matcher.group(2));
-        String patch = normalizeWildcard(matcher.group(3));
-        String micro = normalizeWildcard(matcher.group(4));
-
-        if ("*".equals(minor) && (matcher.group(3) != null || matcher.group(4) != null)) {
-            return Validated.invalid("caretRange", pattern, "not a caret range: nothing can follow a wildcard");
-        } else if ("*".equals(patch) && (matcher.group(4) != null)) {
-            return Validated.invalid("caretRange", pattern, "not a caret range: nothing can follow a wildcard");
-        }
-
-        String lower;
-        String upper;
-
-        if (minor == null) {
-            // A missing patch value will desugar to the number 0, but will allow flexibility
-            // within that value, even if the major and minor versions are both 0.
-            lower = major;
-        } else if (patch == null) {
-            // A missing minor and patch values will desugar to zero, but also allow flexibility
-            // within those values, even if the major version is zero.
-            lower = major + "." + minor;
-        } else if (micro == null) {
-            lower = major + "." + minor + "." + patch;
-        } else {
-            lower = major + "." + minor + "." + patch + "." + micro;
-        }
-
-        if (!"0".equals(major) || minor == null) {
-            upper = Integer.toString(parseInt(major) + 1);
-        } else if (!"0".equals(minor) || patch == null) {
-            upper = major + "." + (parseInt(minor) + 1);
-        } else if (!"0".equals(patch) && micro == null) {
-            upper = major + "." + minor + "." + patch;
-        } else {
-            upper = major + "." + minor + "." + patch + "." + micro;
-        }
-
-        return Validated.valid("caretRange", new CaretRange(lower, upper, metadataPattern));
-    }
-
-    @Nullable
-    private static String normalizeWildcard(@Nullable String part) {
-        return "*".equals(part) || "x".equals(part) || "X".equals(part) ? null : part;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.lang.Integer.parseInt;
+
+/**
+ * Allows changes that do not modify the left-most non-zero element in the [major, minor, patch] tuple.
+ * <a href="https://github.com/npm/node-semver#caret-ranges-123-025-004">Caret ranges</a>.
+ */
+public class CaretRange extends LatestRelease {
+    private static final Pattern CARET_RANGE_PATTERN = Pattern.compile("\\^(\\d+)(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?");
+
+    private final String upperExclusive;
+    private final String lower;
+
+    private CaretRange(String lower, String upperExclusive, @Nullable String metadataPattern) {
+        super(metadataPattern);
+        this.lower = lower;
+        this.upperExclusive = upperExclusive;
+    }
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        return super.isValid(currentVersion, version) &&
+                super.compare(currentVersion, version, upperExclusive) < 0 &&
+                super.compare(currentVersion, version, lower) >= 0;
+    }
+
+    public static Validated build(String pattern, @Nullable String metadataPattern) {
+        Matcher matcher = CARET_RANGE_PATTERN.matcher(pattern);
+        if (!matcher.matches()) {
+            return Validated.invalid("caretRange", pattern, "not a caret range");
+        }
+
+        String major = matcher.group(1);
+        String minor = normalizeWildcard(matcher.group(2));
+        String patch = normalizeWildcard(matcher.group(3));
+        String micro = normalizeWildcard(matcher.group(4));
+
+        if ("*".equals(minor) && (matcher.group(3) != null || matcher.group(4) != null)) {
+            return Validated.invalid("caretRange", pattern, "not a caret range: nothing can follow a wildcard");
+        } else if ("*".equals(patch) && (matcher.group(4) != null)) {
+            return Validated.invalid("caretRange", pattern, "not a caret range: nothing can follow a wildcard");
+        }
+
+        String lower;
+        String upper;
+
+        if (minor == null) {
+            // A missing patch value will desugar to the number 0, but will allow flexibility
+            // within that value, even if the major and minor versions are both 0.
+            lower = major;
+        } else if (patch == null) {
+            // A missing minor and patch values will desugar to zero, but also allow flexibility
+            // within those values, even if the major version is zero.
+            lower = major + "." + minor;
+        } else if (micro == null) {
+            lower = major + "." + minor + "." + patch;
+        } else {
+            lower = major + "." + minor + "." + patch + "." + micro;
+        }
+
+        if (!"0".equals(major) || minor == null) {
+            upper = Integer.toString(parseInt(major) + 1);
+        } else if (!"0".equals(minor) || patch == null) {
+            upper = major + "." + (parseInt(minor) + 1);
+        } else if (!"0".equals(patch) && micro == null) {
+            upper = major + "." + minor + "." + patch;
+        } else {
+            upper = major + "." + minor + "." + patch + "." + micro;
+        }
+
+        return Validated.valid("caretRange", new CaretRange(lower, upper, metadataPattern));
+    }
+
+    @Nullable
+    private static String normalizeWildcard(@Nullable String part) {
+        return "*".equals(part) || "x".equals(part) || "X".equals(part) ? null : part;
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/ExactVersion.java b/rewrite-core/src/main/java/org/openrewrite/semver/ExactVersion.java
index 745e91acd13..de3603b742e 100755
--- a/rewrite-core/src/main/java/org/openrewrite/semver/ExactVersion.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/ExactVersion.java
@@ -1,51 +1,51 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-public class ExactVersion extends LatestRelease {
-    String version;
-
-    public ExactVersion(String pattern) {
-        super(pattern);
-        this.version = pattern;
-    }
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        return this.version.equals(version);
-    }
-
-    public static Validated build(String pattern) {
-        String versionOnly;
-        int hyphenIndex = pattern.indexOf('-');
-        if(hyphenIndex == -1) {
-            versionOnly = pattern;
-        } else {
-            versionOnly = pattern.substring(0, hyphenIndex);
-        }
-        if(versionOnly.startsWith("latest") ||
-                versionOnly.contains("x") ||
-                versionOnly.contains("^") ||
-                versionOnly.contains("~") ||
-                versionOnly.contains(" ")) {
-            return Validated.invalid("exactVersion", pattern, "not an exact version number");
-        }
-        return Validated.valid("exactVersion", new ExactVersion(pattern));
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+public class ExactVersion extends LatestRelease {
+    String version;
+
+    public ExactVersion(String pattern) {
+        super(pattern);
+        this.version = pattern;
+    }
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        return this.version.equals(version);
+    }
+
+    public static Validated build(String pattern) {
+        String versionOnly;
+        int hyphenIndex = pattern.indexOf('-');
+        if(hyphenIndex == -1) {
+            versionOnly = pattern;
+        } else {
+            versionOnly = pattern.substring(0, hyphenIndex);
+        }
+        if(versionOnly.startsWith("latest") ||
+                versionOnly.contains("x") ||
+                versionOnly.contains("^") ||
+                versionOnly.contains("~") ||
+                versionOnly.contains(" ")) {
+            return Validated.invalid("exactVersion", pattern, "not an exact version number");
+        }
+        return Validated.valid("exactVersion", new ExactVersion(pattern));
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/HyphenRange.java b/rewrite-core/src/main/java/org/openrewrite/semver/HyphenRange.java
index 10986b0d1c2..4fe08b9c1bc 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/HyphenRange.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/HyphenRange.java
@@ -1,53 +1,53 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * <a href="https://github.com/npm/node-semver#hyphen-ranges-xyz---abc">Hyphen ranges</a>.
- */
-public class HyphenRange extends LatestRelease {
-    private static final Pattern HYPHEN_RANGE_PATTERN = Pattern.compile("(\\d+(\\.\\d+)?(\\.\\d+)?(\\.\\d+)?)\\s*-\\s*(\\d+(\\.\\d+)?(\\.\\d+)?(\\.\\d+)?)");
-
-    private final String upper;
-    private final String lower;
-
-    private HyphenRange(String lower, String upper, @Nullable String metadataPattern) {
-        super(metadataPattern);
-        this.lower = lower;
-        this.upper = upper;
-    }
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        return super.isValid(currentVersion, version) &&
-                super.compare(currentVersion, version, upper) <= 0 &&
-                super.compare(currentVersion, version, lower) >= 0;
-    }
-
-    public static Validated build(String pattern, @Nullable String metadataPattern) {
-        Matcher matcher = HYPHEN_RANGE_PATTERN.matcher(pattern);
-        if (!matcher.matches()) {
-            return Validated.invalid("hyphenRange", pattern, "not a hyphen range");
-        }
-        return Validated.valid("hyphenRange", new HyphenRange(matcher.group(1), matcher.group(5), metadataPattern));
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <a href="https://github.com/npm/node-semver#hyphen-ranges-xyz---abc">Hyphen ranges</a>.
+ */
+public class HyphenRange extends LatestRelease {
+    private static final Pattern HYPHEN_RANGE_PATTERN = Pattern.compile("(\\d+(\\.\\d+)?(\\.\\d+)?(\\.\\d+)?)\\s*-\\s*(\\d+(\\.\\d+)?(\\.\\d+)?(\\.\\d+)?)");
+
+    private final String upper;
+    private final String lower;
+
+    private HyphenRange(String lower, String upper, @Nullable String metadataPattern) {
+        super(metadataPattern);
+        this.lower = lower;
+        this.upper = upper;
+    }
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        return super.isValid(currentVersion, version) &&
+                super.compare(currentVersion, version, upper) <= 0 &&
+                super.compare(currentVersion, version, lower) >= 0;
+    }
+
+    public static Validated build(String pattern, @Nullable String metadataPattern) {
+        Matcher matcher = HYPHEN_RANGE_PATTERN.matcher(pattern);
+        if (!matcher.matches()) {
+            return Validated.invalid("hyphenRange", pattern, "not a hyphen range");
+        }
+        return Validated.valid("hyphenRange", new HyphenRange(matcher.group(1), matcher.group(5), metadataPattern));
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestPatch.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestPatch.java
index f5acb8af4a2..34e34ab358f 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/LatestPatch.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestPatch.java
@@ -1,48 +1,48 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import lombok.Value;
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-@Value
-public class LatestPatch implements VersionComparator {
-    @Nullable
-    String metadataPattern;
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        //noinspection ConstantConditions
-        return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
-                .<VersionComparator>getValue()
-                .isValid(currentVersion, version);
-    }
-
-    @Override
-    public int compare(@Nullable String currentVersion, String v1, String v2) {
-        //noinspection ConstantConditions
-        return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
-                .<VersionComparator>getValue()
-                .compare(currentVersion, v1, v2);
-    }
-
-    public static Validated build(String toVersion, @Nullable String metadataPattern) {
-        return "latest.patch".equalsIgnoreCase(toVersion) ?
-                Validated.valid("latestPatch", new LatestPatch(metadataPattern)) :
-                Validated.invalid("latestPatch", toVersion, "not latest release");
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import lombok.Value;
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+@Value
+public class LatestPatch implements VersionComparator {
+    @Nullable
+    String metadataPattern;
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        //noinspection ConstantConditions
+        return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
+                .<VersionComparator>getValue()
+                .isValid(currentVersion, version);
+    }
+
+    @Override
+    public int compare(@Nullable String currentVersion, String v1, String v2) {
+        //noinspection ConstantConditions
+        return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
+                .<VersionComparator>getValue()
+                .compare(currentVersion, v1, v2);
+    }
+
+    public static Validated build(String toVersion, @Nullable String metadataPattern) {
+        return "latest.patch".equalsIgnoreCase(toVersion) ?
+                Validated.valid("latestPatch", new LatestPatch(metadataPattern)) :
+                Validated.invalid("latestPatch", toVersion, "not latest release");
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
index 1803b7733bb..50b6f059f62 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
@@ -1,136 +1,136 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-
-import static java.lang.Integer.parseInt;
-
-public class LatestRelease implements VersionComparator {
-    @Nullable
-    private final String metadataPattern;
-
-    public LatestRelease(@Nullable String metadataPattern) {
-        this.metadataPattern = metadataPattern;
-    }
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        Matcher matcher = VersionComparator.RELEASE_PATTERN.matcher(normalizeVersion(version));
-        if (!matcher.matches() || PRE_RELEASE_ENDING.matcher(version).find()) {
-            return false;
-        }
-        return metadataPattern == null ||
-                (StringUtils.isBlank(metadataPattern) && matcher.group(5) == null) ||
-                (matcher.group(5) != null && matcher.group(5).matches(metadataPattern));
-    }
-
-    static String normalizeVersion(String version) {
-        if (version.endsWith(".RELEASE")) {
-            return version.substring(0, version.length() - ".RELEASE".length());
-        } else if (version.endsWith(".FINAL") || version.endsWith(".Final")) {
-            return version.substring(0, version.length() - ".FINAL".length());
-        }
-
-        long versionParts = countVersionParts(version);
-
-        if (versionParts < 2) {
-            String[] versionAndMetadata = version.split("(?=[-+])");
-            for (; versionParts < 2; versionParts++) {
-                versionAndMetadata[0] += ".0";
-            }
-            version = versionAndMetadata[0] + (versionAndMetadata.length > 1 ?
-                    versionAndMetadata[1] : "");
-        }
-
-        return version;
-    }
-
-    static long countVersionParts(String version) {
-        AtomicBoolean beforeMetadata = new AtomicBoolean(true);
-        return version.chars()
-                .filter(c -> {
-                    if (c == '-' || c == '+') {
-                        beforeMetadata.set(false);
-                    }
-                    return beforeMetadata.get();
-                })
-                .filter(c -> c == '.')
-                .count();
-    }
-
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    @Override
-    public int compare(@Nullable String currentVersion, String v1, String v2) {
-        StringBuilder nv1 = new StringBuilder(normalizeVersion(v1));
-        StringBuilder nv2 = new StringBuilder(normalizeVersion(v2));
-
-        long vp1 = countVersionParts(nv1.toString());
-        long vp2 = countVersionParts(nv2.toString());
-
-        long abs = Math.abs(vp1 - vp2);
-        if (vp1 > vp2) {
-            for (int i = 1; i <= abs; i++) {
-                nv2.append(".0");
-            }
-        } else if (vp2 > vp1) {
-            for (int i = 1; i <= abs; i++) {
-                nv1.append(".0");
-            }
-        }
-
-        Matcher v1Gav = VersionComparator.RELEASE_PATTERN.matcher(nv1.toString());
-        Matcher v2Gav = VersionComparator.RELEASE_PATTERN.matcher(nv2.toString());
-
-        v1Gav.matches();
-        v2Gav.matches();
-
-        //Remove the metadata pattern from the normalized versions, this only impacts the comparison when all version
-        //parts are the same:
-        //
-        // HyphenRange [25-28] should include "28-jre" and "28-android" as possible candidates.
-        String normalized1 = metadataPattern == null ? nv1.toString() : nv1.toString().replace(metadataPattern, "");
-        String normalized2 = metadataPattern == null ? nv2.toString() : nv1.toString().replace(metadataPattern, "");
-
-        for (int i = 1; i < nv1.length(); i++) {
-            String v1Part = v1Gav.group(i);
-            String v2Part = v2Gav.group(i);
-            if (v1Part == null) {
-                return v2Part == null ? normalized1.compareTo(normalized2) : -1;
-            } else if (v2Part == null) {
-                return 1;
-            }
-
-            int diff = parseInt(v1Part) - parseInt(v2Part);
-            if (diff != 0) {
-                return diff;
-            }
-        }
-
-        return normalized1.compareTo(normalized2);
-    }
-
-    public static Validated build(String toVersion, @Nullable String metadataPattern) {
-        return "latest.release".equalsIgnoreCase(toVersion) ?
-                Validated.valid("latestRelease", new LatestRelease(metadataPattern)) :
-                Validated.invalid("latestRelease", toVersion, "not latest release");
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+
+import static java.lang.Integer.parseInt;
+
+public class LatestRelease implements VersionComparator {
+    @Nullable
+    private final String metadataPattern;
+
+    public LatestRelease(@Nullable String metadataPattern) {
+        this.metadataPattern = metadataPattern;
+    }
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        Matcher matcher = VersionComparator.RELEASE_PATTERN.matcher(normalizeVersion(version));
+        if (!matcher.matches() || PRE_RELEASE_ENDING.matcher(version).find()) {
+            return false;
+        }
+        return metadataPattern == null ||
+                (StringUtils.isBlank(metadataPattern) && matcher.group(5) == null) ||
+                (matcher.group(5) != null && matcher.group(5).matches(metadataPattern));
+    }
+
+    static String normalizeVersion(String version) {
+        if (version.endsWith(".RELEASE")) {
+            return version.substring(0, version.length() - ".RELEASE".length());
+        } else if (version.endsWith(".FINAL") || version.endsWith(".Final")) {
+            return version.substring(0, version.length() - ".FINAL".length());
+        }
+
+        long versionParts = countVersionParts(version);
+
+        if (versionParts < 2) {
+            String[] versionAndMetadata = version.split("(?=[-+])");
+            for (; versionParts < 2; versionParts++) {
+                versionAndMetadata[0] += ".0";
+            }
+            version = versionAndMetadata[0] + (versionAndMetadata.length > 1 ?
+                    versionAndMetadata[1] : "");
+        }
+
+        return version;
+    }
+
+    static long countVersionParts(String version) {
+        AtomicBoolean beforeMetadata = new AtomicBoolean(true);
+        return version.chars()
+                .filter(c -> {
+                    if (c == '-' || c == '+') {
+                        beforeMetadata.set(false);
+                    }
+                    return beforeMetadata.get();
+                })
+                .filter(c -> c == '.')
+                .count();
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    @Override
+    public int compare(@Nullable String currentVersion, String v1, String v2) {
+        StringBuilder nv1 = new StringBuilder(normalizeVersion(v1));
+        StringBuilder nv2 = new StringBuilder(normalizeVersion(v2));
+
+        long vp1 = countVersionParts(nv1.toString());
+        long vp2 = countVersionParts(nv2.toString());
+
+        long abs = Math.abs(vp1 - vp2);
+        if (vp1 > vp2) {
+            for (int i = 1; i <= abs; i++) {
+                nv2.append(".0");
+            }
+        } else if (vp2 > vp1) {
+            for (int i = 1; i <= abs; i++) {
+                nv1.append(".0");
+            }
+        }
+
+        Matcher v1Gav = VersionComparator.RELEASE_PATTERN.matcher(nv1.toString());
+        Matcher v2Gav = VersionComparator.RELEASE_PATTERN.matcher(nv2.toString());
+
+        v1Gav.matches();
+        v2Gav.matches();
+
+        //Remove the metadata pattern from the normalized versions, this only impacts the comparison when all version
+        //parts are the same:
+        //
+        // HyphenRange [25-28] should include "28-jre" and "28-android" as possible candidates.
+        String normalized1 = metadataPattern == null ? nv1.toString() : nv1.toString().replace(metadataPattern, "");
+        String normalized2 = metadataPattern == null ? nv2.toString() : nv1.toString().replace(metadataPattern, "");
+
+        for (int i = 1; i < nv1.length(); i++) {
+            String v1Part = v1Gav.group(i);
+            String v2Part = v2Gav.group(i);
+            if (v1Part == null) {
+                return v2Part == null ? normalized1.compareTo(normalized2) : -1;
+            } else if (v2Part == null) {
+                return 1;
+            }
+
+            int diff = parseInt(v1Part) - parseInt(v2Part);
+            if (diff != 0) {
+                return diff;
+            }
+        }
+
+        return normalized1.compareTo(normalized2);
+    }
+
+    public static Validated build(String toVersion, @Nullable String metadataPattern) {
+        return "latest.release".equalsIgnoreCase(toVersion) ?
+                Validated.valid("latestRelease", new LatestRelease(metadataPattern)) :
+                Validated.invalid("latestRelease", toVersion, "not latest release");
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
index ba5a75c0381..956f7d7341a 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
@@ -1,77 +1,77 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Incubating;
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.Scanner;
-import java.util.regex.Pattern;
-
-import static org.openrewrite.Validated.test;
-
-public class Semver {
-    private Semver() {
-    }
-
-    public static Validated validate(String toVersion, @Nullable String metadataPattern) {
-        return test(
-                "metadataPattern",
-                "must be a valid regular expression",
-                metadataPattern, metadata -> {
-                    try {
-                        if (metadata != null) {
-                            Pattern.compile(metadata);
-                        }
-                        return true;
-                    } catch (Throwable e) {
-                        return false;
-                    }
-                }
-        ).and(LatestRelease.build(toVersion, metadataPattern)
-                .or(LatestPatch.build(toVersion, metadataPattern))
-                .or(HyphenRange.build(toVersion, metadataPattern))
-                .or(XRange.build(toVersion, metadataPattern))
-                .or(TildeRange.build(toVersion, metadataPattern))
-                .or(CaretRange.build(toVersion, metadataPattern))
-                .or(ExactVersion.build(toVersion))
-        );
-    }
-
-    @Incubating(since = "7.16.0")
-    public static String majorVersion(String version) {
-        Scanner scanner = new Scanner(version);
-        scanner.useDelimiter("[.$]");
-        if (scanner.hasNext()) {
-            return scanner.next();
-        }
-        return version;
-    }
-
-    @Incubating(since = "7.16.0")
-    public static String minorVersion(String version) {
-        Scanner scanner = new Scanner(version);
-        scanner.useDelimiter("[.$]");
-        if (scanner.hasNext()) {
-            scanner.next();
-        }
-        if (scanner.hasNext()) {
-            return scanner.next();
-        }
-        return version;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Incubating;
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.Scanner;
+import java.util.regex.Pattern;
+
+import static org.openrewrite.Validated.test;
+
+public class Semver {
+    private Semver() {
+    }
+
+    public static Validated validate(String toVersion, @Nullable String metadataPattern) {
+        return test(
+                "metadataPattern",
+                "must be a valid regular expression",
+                metadataPattern, metadata -> {
+                    try {
+                        if (metadata != null) {
+                            Pattern.compile(metadata);
+                        }
+                        return true;
+                    } catch (Throwable e) {
+                        return false;
+                    }
+                }
+        ).and(LatestRelease.build(toVersion, metadataPattern)
+                .or(LatestPatch.build(toVersion, metadataPattern))
+                .or(HyphenRange.build(toVersion, metadataPattern))
+                .or(XRange.build(toVersion, metadataPattern))
+                .or(TildeRange.build(toVersion, metadataPattern))
+                .or(CaretRange.build(toVersion, metadataPattern))
+                .or(ExactVersion.build(toVersion))
+        );
+    }
+
+    @Incubating(since = "7.16.0")
+    public static String majorVersion(String version) {
+        Scanner scanner = new Scanner(version);
+        scanner.useDelimiter("[.$]");
+        if (scanner.hasNext()) {
+            return scanner.next();
+        }
+        return version;
+    }
+
+    @Incubating(since = "7.16.0")
+    public static String minorVersion(String version) {
+        Scanner scanner = new Scanner(version);
+        scanner.useDelimiter("[.$]");
+        if (scanner.hasNext()) {
+            scanner.next();
+        }
+        if (scanner.hasNext()) {
+            return scanner.next();
+        }
+        return version;
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/TildeRange.java b/rewrite-core/src/main/java/org/openrewrite/semver/TildeRange.java
index 6d4733302cb..f0fa2e52e0b 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/TildeRange.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/TildeRange.java
@@ -1,79 +1,79 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.lang.Integer.parseInt;
-
-/**
- * Allows patch-level changes if a minor version is specified on the comparator. Allows minor-level changes if not.
- * <a href="https://github.com/npm/node-semver#tilde-ranges-123-12-1">Tilde ranges</a>.
- */
-public class TildeRange extends LatestRelease {
-    private static final Pattern TILDE_RANGE_PATTERN = Pattern.compile("~(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.(\\d+))?");
-
-    private final String upperExclusive;
-    private final String lower;
-
-    private TildeRange(String lower, String upperExclusive, @Nullable String metadataPattern) {
-        super(metadataPattern);
-        this.lower = lower;
-        this.upperExclusive = upperExclusive;
-    }
-
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        return super.isValid(currentVersion, version) &&
-                super.compare(currentVersion, version, upperExclusive) < 0 &&
-                super.compare(currentVersion, version, lower) >= 0;
-    }
-
-    public static Validated build(String pattern, @Nullable String metadataPattern) {
-        Matcher matcher = TILDE_RANGE_PATTERN.matcher(pattern);
-        if (!matcher.matches()) {
-            return Validated.invalid("tildeRange", pattern, "not a tilde range");
-        }
-
-        String major = matcher.group(1);
-        String minor = matcher.group(2);
-        String patch = matcher.group(3);
-        String micro = matcher.group(4);
-
-        String lower;
-        String upper;
-
-        if (minor == null) {
-            lower = major;
-            upper = Integer.toString(parseInt(major) + 1);
-        } else if (patch == null) {
-            lower = major + "." + minor;
-            upper = major + "." + (parseInt(minor) + 1);
-        } else if (micro == null) {
-            lower = major + "." + minor + "." + patch;
-            upper = major + "." + (parseInt(minor) + 1);
-        } else {
-            lower = major + "." + minor + "." + patch + "." + micro;
-            upper = major + "." + minor + "." + (parseInt(patch) + 1);
-        }
-
-        return Validated.valid("tildeRange", new TildeRange(lower, upper, metadataPattern));
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.lang.Integer.parseInt;
+
+/**
+ * Allows patch-level changes if a minor version is specified on the comparator. Allows minor-level changes if not.
+ * <a href="https://github.com/npm/node-semver#tilde-ranges-123-12-1">Tilde ranges</a>.
+ */
+public class TildeRange extends LatestRelease {
+    private static final Pattern TILDE_RANGE_PATTERN = Pattern.compile("~(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.(\\d+))?");
+
+    private final String upperExclusive;
+    private final String lower;
+
+    private TildeRange(String lower, String upperExclusive, @Nullable String metadataPattern) {
+        super(metadataPattern);
+        this.lower = lower;
+        this.upperExclusive = upperExclusive;
+    }
+
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        return super.isValid(currentVersion, version) &&
+                super.compare(currentVersion, version, upperExclusive) < 0 &&
+                super.compare(currentVersion, version, lower) >= 0;
+    }
+
+    public static Validated build(String pattern, @Nullable String metadataPattern) {
+        Matcher matcher = TILDE_RANGE_PATTERN.matcher(pattern);
+        if (!matcher.matches()) {
+            return Validated.invalid("tildeRange", pattern, "not a tilde range");
+        }
+
+        String major = matcher.group(1);
+        String minor = matcher.group(2);
+        String patch = matcher.group(3);
+        String micro = matcher.group(4);
+
+        String lower;
+        String upper;
+
+        if (minor == null) {
+            lower = major;
+            upper = Integer.toString(parseInt(major) + 1);
+        } else if (patch == null) {
+            lower = major + "." + minor;
+            upper = major + "." + (parseInt(minor) + 1);
+        } else if (micro == null) {
+            lower = major + "." + minor + "." + patch;
+            upper = major + "." + (parseInt(minor) + 1);
+        } else {
+            lower = major + "." + minor + "." + patch + "." + micro;
+            upper = major + "." + minor + "." + (parseInt(patch) + 1);
+        }
+
+        return Validated.valid("tildeRange", new TildeRange(lower, upper, metadataPattern));
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/VersionComparator.java b/rewrite-core/src/main/java/org/openrewrite/semver/VersionComparator.java
index 52394d1cf79..cb00339fe00 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/VersionComparator.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/VersionComparator.java
@@ -1,60 +1,60 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
-public interface VersionComparator extends Comparator<String> {
-    Pattern RELEASE_PATTERN = Pattern.compile("(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.(\\d+))?([-+].*)?");
-    Pattern PRE_RELEASE_ENDING = Pattern.compile("[.-](SNAPSHOT|RC|rc|M|m|beta|alpha)[.-]?\\d*$");
-
-    @Deprecated
-    default boolean isValid(String version) {
-        return isValid(null, version);
-    }
-
-    boolean isValid(@Nullable String currentVersion, String version);
-
-    @Deprecated
-    @Override
-    default int compare(String v1, String v2) {
-        return compare(null, v1, v2);
-    }
-
-    int compare(@Nullable String currentVersion, String v1, String v2);
-
-    default Optional<String> upgrade(String currentVersion, Collection<String> availableVersions) {
-        boolean seen = false;
-        String best = null;
-        for (String availableVersion : availableVersions) {
-            if (isValid(currentVersion, availableVersion)) {
-                if (compare(currentVersion, currentVersion, availableVersion) <= 0) {
-                    if (!seen || compare(currentVersion, availableVersion, best) > 0) {
-                        seen = true;
-                        best = availableVersion;
-                    }
-                }
-            }
-        }
-        return (seen ? Optional.of(best) : Optional.<String>empty())
-                .filter(v -> !v.equals(currentVersion));
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+public interface VersionComparator extends Comparator<String> {
+    Pattern RELEASE_PATTERN = Pattern.compile("(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.(\\d+))?([-+].*)?");
+    Pattern PRE_RELEASE_ENDING = Pattern.compile("[.-](SNAPSHOT|RC|rc|M|m|beta|alpha)[.-]?\\d*$");
+
+    @Deprecated
+    default boolean isValid(String version) {
+        return isValid(null, version);
+    }
+
+    boolean isValid(@Nullable String currentVersion, String version);
+
+    @Deprecated
+    @Override
+    default int compare(String v1, String v2) {
+        return compare(null, v1, v2);
+    }
+
+    int compare(@Nullable String currentVersion, String v1, String v2);
+
+    default Optional<String> upgrade(String currentVersion, Collection<String> availableVersions) {
+        boolean seen = false;
+        String best = null;
+        for (String availableVersion : availableVersions) {
+            if (isValid(currentVersion, availableVersion)) {
+                if (compare(currentVersion, currentVersion, availableVersion) <= 0) {
+                    if (!seen || compare(currentVersion, availableVersion, best) > 0) {
+                        seen = true;
+                        best = availableVersion;
+                    }
+                }
+            }
+        }
+        return (seen ? Optional.of(best) : Optional.<String>empty())
+                .filter(v -> !v.equals(currentVersion));
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/XRange.java b/rewrite-core/src/main/java/org/openrewrite/semver/XRange.java
index acc79145aa8..04d963b9393 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/XRange.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/XRange.java
@@ -1,102 +1,102 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver;
-
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
- * <a href="https://github.com/npm/node-semver#x-ranges-12x-1x-12-">X-Ranges</a>.
- */
-public class XRange extends LatestRelease {
-    private static final Pattern X_RANGE_PATTERN = Pattern.compile("([*xX]|\\d+)(?:\\.([*xX]|\\d+)(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?)?");
-
-    private final String major;
-    private final String minor;
-    private final String patch;
-    private final String micro;
-
-    XRange(String major, String minor, String patch, String micro, @Nullable String metadataPattern) {
-        super(metadataPattern);
-        this.major = major;
-        this.minor = minor;
-        this.patch = patch;
-        this.micro = micro;
-    }
-
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    @Override
-    public boolean isValid(@Nullable String currentVersion, String version) {
-        if (!super.isValid(currentVersion, version)) {
-            return false;
-        }
-
-        if ("*".equals(major)) {
-            return true;
-        }
-
-        Matcher gav = VersionComparator.RELEASE_PATTERN.matcher(normalizeVersion(version));
-        gav.matches();
-
-        if (!gav.group(1).equals(major)) {
-            return false;
-        }
-
-        if ("*".equals(minor)) {
-            return true;
-        } else if (gav.group(2) == null || !gav.group(2).equals(minor)) {
-            return false;
-        }
-
-        if ("*".equals(patch)) {
-            return true;
-        } else if (gav.group(3) == null || !gav.group(3).equals(patch)) {
-            return false;
-        }
-
-        return gav.group(4) == null || !gav.group(4).equals(micro);
-    }
-
-    public static Validated build(String pattern, @Nullable String metadataPattern) {
-        Matcher matcher = X_RANGE_PATTERN.matcher(pattern);
-        if (!matcher.matches() || !(pattern.contains("x") || pattern.contains("X") || pattern.contains("*"))) {
-            return Validated.invalid("xRange", pattern, "not an x-range");
-        }
-
-        String major = normalizeWildcard(matcher.group(1));
-        String minor = normalizeWildcard(matcher.group(2) == null ? "0" : matcher.group(2));
-        String patch = normalizeWildcard(matcher.group(3) == null ? "0" : matcher.group(3));
-        String micro = normalizeWildcard(matcher.group(4) == null ? "0" : matcher.group(4));
-
-        if ("*".equals(major) && (matcher.group(2) != null || matcher.group(3) != null || matcher.group(4) != null)) {
-            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
-        } else if ("*".equals(minor) && (matcher.group(3) != null || matcher.group(4) != null)) {
-            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
-        } else if ("*".equals(patch) && matcher.group(4) != null) {
-            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
-        }
-
-        return Validated.valid("xRange", new XRange(major, minor, patch, micro, metadataPattern));
-    }
-
-    private static String normalizeWildcard(String part) {
-        return "*".equals(part) || "x".equals(part) || "X".equals(part) ? "*" : part;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
+ * <a href="https://github.com/npm/node-semver#x-ranges-12x-1x-12-">X-Ranges</a>.
+ */
+public class XRange extends LatestRelease {
+    private static final Pattern X_RANGE_PATTERN = Pattern.compile("([*xX]|\\d+)(?:\\.([*xX]|\\d+)(?:\\.([*xX]|\\d+))?(?:\\.([*xX]|\\d+))?)?");
+
+    private final String major;
+    private final String minor;
+    private final String patch;
+    private final String micro;
+
+    XRange(String major, String minor, String patch, String micro, @Nullable String metadataPattern) {
+        super(metadataPattern);
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        this.micro = micro;
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    @Override
+    public boolean isValid(@Nullable String currentVersion, String version) {
+        if (!super.isValid(currentVersion, version)) {
+            return false;
+        }
+
+        if ("*".equals(major)) {
+            return true;
+        }
+
+        Matcher gav = VersionComparator.RELEASE_PATTERN.matcher(normalizeVersion(version));
+        gav.matches();
+
+        if (!gav.group(1).equals(major)) {
+            return false;
+        }
+
+        if ("*".equals(minor)) {
+            return true;
+        } else if (gav.group(2) == null || !gav.group(2).equals(minor)) {
+            return false;
+        }
+
+        if ("*".equals(patch)) {
+            return true;
+        } else if (gav.group(3) == null || !gav.group(3).equals(patch)) {
+            return false;
+        }
+
+        return gav.group(4) == null || !gav.group(4).equals(micro);
+    }
+
+    public static Validated build(String pattern, @Nullable String metadataPattern) {
+        Matcher matcher = X_RANGE_PATTERN.matcher(pattern);
+        if (!matcher.matches() || !(pattern.contains("x") || pattern.contains("X") || pattern.contains("*"))) {
+            return Validated.invalid("xRange", pattern, "not an x-range");
+        }
+
+        String major = normalizeWildcard(matcher.group(1));
+        String minor = normalizeWildcard(matcher.group(2) == null ? "0" : matcher.group(2));
+        String patch = normalizeWildcard(matcher.group(3) == null ? "0" : matcher.group(3));
+        String micro = normalizeWildcard(matcher.group(4) == null ? "0" : matcher.group(4));
+
+        if ("*".equals(major) && (matcher.group(2) != null || matcher.group(3) != null || matcher.group(4) != null)) {
+            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
+        } else if ("*".equals(minor) && (matcher.group(3) != null || matcher.group(4) != null)) {
+            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
+        } else if ("*".equals(patch) && matcher.group(4) != null) {
+            return Validated.invalid("xRange", pattern, "not an x-range: nothing can follow a wildcard");
+        }
+
+        return Validated.valid("xRange", new XRange(major, minor, patch, micro, metadataPattern));
+    }
+
+    private static String normalizeWildcard(String part) {
+        return "*".equals(part) || "x".equals(part) || "X".equals(part) ? "*" : part;
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/style/Style.java b/rewrite-core/src/main/java/org/openrewrite/style/Style.java
index 1485ccfbe4c..4b2614a2280 100644
--- a/rewrite-core/src/main/java/org/openrewrite/style/Style.java
+++ b/rewrite-core/src/main/java/org/openrewrite/style/Style.java
@@ -1,43 +1,43 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.style;
-
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import org.openrewrite.SourceFile;
-
-/**
- * Styles represent project-level standards that each source file is expected to follow, e.g.
- * import ordering. They are provided to parser implementations and expected to be stored on
- * {@link SourceFile} instances so that any modifications to those source files can conform
- * to the source's expected styles.
- */
-@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class, property = "@ref")
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@c")
-public interface Style {
-    @JsonProperty("@c")
-    default String getJacksonPolymorphicTypeTag() {
-        return getClass().getName();
-    }
-
-    default Style merge(Style lowerPrecedence) {
-        return this;
-    }
-
-    default Style applyDefaults() { return this; }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.style;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import org.openrewrite.SourceFile;
+
+/**
+ * Styles represent project-level standards that each source file is expected to follow, e.g.
+ * import ordering. They are provided to parser implementations and expected to be stored on
+ * {@link SourceFile} instances so that any modifications to those source files can conform
+ * to the source's expected styles.
+ */
+@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class, property = "@ref")
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@c")
+public interface Style {
+    @JsonProperty("@c")
+    default String getJacksonPolymorphicTypeTag() {
+        return getClass().getName();
+    }
+
+    default Style merge(Style lowerPrecedence) {
+        return this;
+    }
+
+    default Style applyDefaults() { return this; }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/style/package-info.java b/rewrite-core/src/main/java/org/openrewrite/style/package-info.java
index ff766edd910..8fe368b70ae 100755
--- a/rewrite-core/src/main/java/org/openrewrite/style/package-info.java
+++ b/rewrite-core/src/main/java/org/openrewrite/style/package-info.java
@@ -1,19 +1,19 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@NonNullApi
-package org.openrewrite.style;
-
-import org.openrewrite.internal.lang.NonNullApi;
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package org.openrewrite.style;
+
+import org.openrewrite.internal.lang.NonNullApi;
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/ChangeText.java b/rewrite-core/src/main/java/org/openrewrite/text/ChangeText.java
index 2adfe121e13..c132ddd6d9e 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/ChangeText.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/ChangeText.java
@@ -1,67 +1,67 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.text;
-
-import org.openrewrite.*;
-
-import java.util.Collections;
-import java.util.Set;
-
-import static org.openrewrite.Validated.required;
-
-public class ChangeText extends Recipe {
-
-    @Option(displayName = "Text after change",
-            description = "The text file will have only this text after the change.",
-            example = "Some text.")
-    private final String toText;
-
-    public ChangeText(String toText) {
-        this.toText = toText;
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return Collections.singleton("plain text");
-    }
-
-    @Override
-    public String getDisplayName() {
-        return "Change text";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Completely replaces the contents of the text file with other text.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new ChangeTextVisitor();
-    }
-
-    @Override
-    public Validated validate() {
-        return required("toText", toText);
-    }
-
-    private class ChangeTextVisitor extends PlainTextVisitor<ExecutionContext> {
-        @Override
-        public PlainText preVisit(PlainText tree, ExecutionContext ctx) {
-            return tree.withText(toText);
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.text;
+
+import org.openrewrite.*;
+
+import java.util.Collections;
+import java.util.Set;
+
+import static org.openrewrite.Validated.required;
+
+public class ChangeText extends Recipe {
+
+    @Option(displayName = "Text after change",
+            description = "The text file will have only this text after the change.",
+            example = "Some text.")
+    private final String toText;
+
+    public ChangeText(String toText) {
+        this.toText = toText;
+    }
+
+    @Override
+    public Set<String> getTags() {
+        return Collections.singleton("plain text");
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Change text";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Completely replaces the contents of the text file with other text.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new ChangeTextVisitor();
+    }
+
+    @Override
+    public Validated validate() {
+        return required("toText", toText);
+    }
+
+    private class ChangeTextVisitor extends PlainTextVisitor<ExecutionContext> {
+        @Override
+        public PlainText preVisit(PlainText tree, ExecutionContext ctx) {
+            return tree.withText(toText);
+        }
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java b/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
index c77e46e7d5d..fe17551ae55 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
@@ -1,77 +1,77 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.text;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Value;
-import lombok.With;
-import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.UUID;
-
-/**
- * The simplest of all ASTs representing nothing more than just unstructured text.
- */
-@Value
-@With
-public class PlainText implements SourceFile, Tree {
-    UUID id;
-
-    Path sourcePath;
-
-    @Nullable // for backwards compatibility
-    @With(AccessLevel.PRIVATE)
-    String charsetName;
-
-    @With
-    @Getter
-    boolean charsetBomMarked;
-
-    @Override
-    public Charset getCharset() {
-        return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
-    }
-
-    @Override
-    public SourceFile withCharset(Charset charset) {
-        return withCharsetName(charset.name());
-    }
-
-    Markers markers;
-    String text;
-
-    @Override
-    public <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
-        return v instanceof PlainTextVisitor;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
-        return (R) ((PlainTextVisitor<P>) v).visitText(this, p);
-    }
-
-    @Override
-    public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
-        return new PlainTextPrinter<>();
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.text;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.*;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.UUID;
+
+/**
+ * The simplest of all ASTs representing nothing more than just unstructured text.
+ */
+@Value
+@With
+public class PlainText implements SourceFile, Tree {
+    UUID id;
+
+    Path sourcePath;
+
+    @Nullable // for backwards compatibility
+    @With(AccessLevel.PRIVATE)
+    String charsetName;
+
+    @With
+    @Getter
+    boolean charsetBomMarked;
+
+    @Override
+    public Charset getCharset() {
+        return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
+    }
+
+    @Override
+    public SourceFile withCharset(Charset charset) {
+        return withCharsetName(charset.name());
+    }
+
+    Markers markers;
+    String text;
+
+    @Override
+    public <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
+        return v instanceof PlainTextVisitor;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
+        return (R) ((PlainTextVisitor<P>) v).visitText(this, p);
+    }
+
+    @Override
+    public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
+        return new PlainTextPrinter<>();
+    }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/TextStyle.java b/rewrite-core/src/main/java/org/openrewrite/text/TextStyle.java
index 7b549b3bd1c..aeb02f5e316 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/TextStyle.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/TextStyle.java
@@ -1,30 +1,30 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.text;
-
-import org.openrewrite.style.Style;
-
-public class TextStyle implements Style {
-    private String charset;
-
-    public String getCharset() {
-        return charset;
-    }
-
-    public void setCharset(String charset) {
-        this.charset = charset;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.text;
+
+import org.openrewrite.style.Style;
+
+public class TextStyle implements Style {
+    private String charset;
+
+    public String getCharset() {
+        return charset;
+    }
+
+    public void setCharset(String charset) {
+        this.charset = charset;
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/internal/NameCaseConventionTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/internal/NameCaseConventionTest.kt
index caf4d5c819b..178c6fa8406 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/internal/NameCaseConventionTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/internal/NameCaseConventionTest.kt
@@ -1,135 +1,135 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.CsvSource
-
-@Suppress("SpellCheckingInspection")
-class NameCaseConventionTest {
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "foo.config-client.enabled:foo.config-client.enabled",
-            "com.fooBar.FooBar:com.foo-bar.foo-bar",
-            "foo_bar.bar:foo-bar.bar",
-            "FooBar:foo-bar",
-            "com.bar.FooBar:com.bar.foo-bar",
-            "Foo:foo",
-            "FooBBar:foo-bbar",
-            "fooBBar:foo-bbar",
-            "fooBar:foo-bar",
-            "foo bar:foo-bar",
-            " foo  bar :foo-bar",
-        ], delimiter = ':'
-    )
-    fun lowerHyphen(input: String, expected: String) {
-        assertThat(NameCaseConvention.LOWER_HYPHEN.format(input)).isEqualTo(expected)
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "a:a",
-            "abc:abc",
-            "1:1",
-            "123:123",
-            "1a:1a",
-            "a1:a1",
-            "\$:\$",
-            "\$a:\$a",
-            "a\$:a\$",
-            "a\$a:a\$a",
-            "a_a:a_a",
-            "Foo:foo",
-            "Foo-Bar:foo_bar",
-            "FOO.FOO-BAR:foo.foo_bar",
-            "foo bar:foo_bar",
-            " foo  bar :foo_bar",
-        ], delimiter = ':'
-    )
-    fun lowerUnderscore(input: String, expected: String) {
-        assertThat(NameCaseConvention.LOWER_UNDERSCORE.format(input)).isEqualTo(expected)
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "rename_one:renameOne",
-            "RenameTwo:renameTwo",
-            "__rename__three__:renameThree",
-            "_Rename___Four_:renameFour",
-            "\$a:\$a",
-            "a\$:a\$",
-            "a\$a:a\$a",
-            "a_a:aA",
-            "_a:a",
-            "foo.config-client.enabled:foo.configClient.enabled",
-            "foo-bar:fooBar",
-            "foo bar:fooBar",
-            " foo  bar :fooBar",
-        ], delimiter = ':'
-    )
-    fun lowerCamel(input: String, expected: String) {
-        assertThat(NameCaseConvention.LOWER_CAMEL.format(input)).isEqualTo(expected)
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "rename_one:RenameOne",
-            "RenameTwo:RenameTwo",
-            "__rename__three__:RenameThree",
-            "_Rename__Four:RenameFour",
-            "foo-bar:FooBar",
-            "foo bar:FooBar",
-            " foo  bar :FooBar",
-        ], delimiter = ':'
-    )
-    fun upperCamel(input: String, expected: String) {
-        assertThat(NameCaseConvention.UPPER_CAMEL.format(input)).isEqualTo(expected)
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "foo:FOO",
-            "foo-bar:FOO_BAR",
-            "foo_bar:FOO_BAR",
-            "FooBar:FOO_BAR",
-            "Foo.fooBar:FOO.FOO_BAR",
-            "foo bar:FOO_BAR",
-            " foo  bar :FOO_BAR",
-        ], delimiter = ':'
-    )
-    fun upperUnderscore(input: String, expected: String) {
-        assertThat(NameCaseConvention.UPPER_UNDERSCORE.format(input)).isEqualTo(expected)
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        value = [
-            "foo.fooBar:foo.foo-bar",
-            "foo.foo-bar:foo.fooBar",
-        ], delimiter = ':'
-    )
-    fun equalsRelaxedBinding(input: String, expected: String) {
-        assertThat(NameCaseConvention.equalsRelaxedBinding(input, expected)).isTrue
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+
+@Suppress("SpellCheckingInspection")
+class NameCaseConventionTest {
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "foo.config-client.enabled:foo.config-client.enabled",
+            "com.fooBar.FooBar:com.foo-bar.foo-bar",
+            "foo_bar.bar:foo-bar.bar",
+            "FooBar:foo-bar",
+            "com.bar.FooBar:com.bar.foo-bar",
+            "Foo:foo",
+            "FooBBar:foo-bbar",
+            "fooBBar:foo-bbar",
+            "fooBar:foo-bar",
+            "foo bar:foo-bar",
+            " foo  bar :foo-bar",
+        ], delimiter = ':'
+    )
+    fun lowerHyphen(input: String, expected: String) {
+        assertThat(NameCaseConvention.LOWER_HYPHEN.format(input)).isEqualTo(expected)
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "a:a",
+            "abc:abc",
+            "1:1",
+            "123:123",
+            "1a:1a",
+            "a1:a1",
+            "\$:\$",
+            "\$a:\$a",
+            "a\$:a\$",
+            "a\$a:a\$a",
+            "a_a:a_a",
+            "Foo:foo",
+            "Foo-Bar:foo_bar",
+            "FOO.FOO-BAR:foo.foo_bar",
+            "foo bar:foo_bar",
+            " foo  bar :foo_bar",
+        ], delimiter = ':'
+    )
+    fun lowerUnderscore(input: String, expected: String) {
+        assertThat(NameCaseConvention.LOWER_UNDERSCORE.format(input)).isEqualTo(expected)
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "rename_one:renameOne",
+            "RenameTwo:renameTwo",
+            "__rename__three__:renameThree",
+            "_Rename___Four_:renameFour",
+            "\$a:\$a",
+            "a\$:a\$",
+            "a\$a:a\$a",
+            "a_a:aA",
+            "_a:a",
+            "foo.config-client.enabled:foo.configClient.enabled",
+            "foo-bar:fooBar",
+            "foo bar:fooBar",
+            " foo  bar :fooBar",
+        ], delimiter = ':'
+    )
+    fun lowerCamel(input: String, expected: String) {
+        assertThat(NameCaseConvention.LOWER_CAMEL.format(input)).isEqualTo(expected)
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "rename_one:RenameOne",
+            "RenameTwo:RenameTwo",
+            "__rename__three__:RenameThree",
+            "_Rename__Four:RenameFour",
+            "foo-bar:FooBar",
+            "foo bar:FooBar",
+            " foo  bar :FooBar",
+        ], delimiter = ':'
+    )
+    fun upperCamel(input: String, expected: String) {
+        assertThat(NameCaseConvention.UPPER_CAMEL.format(input)).isEqualTo(expected)
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "foo:FOO",
+            "foo-bar:FOO_BAR",
+            "foo_bar:FOO_BAR",
+            "FooBar:FOO_BAR",
+            "Foo.fooBar:FOO.FOO_BAR",
+            "foo bar:FOO_BAR",
+            " foo  bar :FOO_BAR",
+        ], delimiter = ':'
+    )
+    fun upperUnderscore(input: String, expected: String) {
+        assertThat(NameCaseConvention.UPPER_UNDERSCORE.format(input)).isEqualTo(expected)
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "foo.fooBar:foo.foo-bar",
+            "foo.foo-bar:foo.fooBar",
+        ], delimiter = ':'
+    )
+    fun equalsRelaxedBinding(input: String, expected: String) {
+        assertThat(NameCaseConvention.equalsRelaxedBinding(input, expected)).isTrue
+    }
+
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/internal/StringUtilsTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/internal/StringUtilsTest.kt
index 367ea80ef77..1ef4647bcb7 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/internal/StringUtilsTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/internal/StringUtilsTest.kt
@@ -1,276 +1,276 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.internal
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.internal.StringUtils.*
-
-class StringUtilsTest {
-    @Test
-    fun detectIndentLevel() {
-        assertThat(indentLevel("""
-            |<
-            |   <
-            |   <
-            |   <
-            |<
-        """.trimMargin())).isEqualTo(0)
-
-        assertThat(indentLevel("""
-            |<
-            |   <
-        """.trimMargin())).isEqualTo(3)
-
-        assertThat(indentLevel("""
-            |<
-            |    <
-            |      <
-        """.trimMargin())).isEqualTo(4)
-
-        // ignores the last line if it is all blank
-        assertThat(indentLevel("""
-            class {
-                A field;
-            }
-        """)).isEqualTo(12)
-
-        assertThat(indentLevel("""
-            | <
-            |  <
-            |   <
-            |    <
-        """.trimMargin())).isEqualTo(1)
-
-        assertThat(indentLevel("""
-            | <
-            |  <
-            |    <
-            |    <
-            |      <
-        """.trimMargin())).isEqualTo(1)
-
-        assertThat(indentLevel("""
-            |<
-            |<
-        """.trimMargin())).isEqualTo(0)
-
-        // doesn't consider newlines that occur as the first character on the first line or terminating newlines
-        assertThat(indentLevel("""
-            |
-            |  <
-            |    <
-            |    <
-            |
-        """.trimMargin())).isEqualTo(2)
-    }
-
-    @Test
-    fun trimIndentBlankLines() {
-        val input = """
-  
-            class {
-                
-                A field;
-            }
-            """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentEndLineNonWhitespace() {
-        val input = """
-
-            class {
-                
-                A field;
-            }
-            hello"""
-        System.out.println("Kotlin : '" + input.trimIndent() + "'")
-
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentFirstLineSameAsIndent() {
-        val input = """
-            
-            class {
-                
-                A field;
-            }
-        """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentFirstLineGreaterThanIndent() {
-        val input = """
-                
-            class {
-                
-                A field;
-            }
-        """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentFirstLineEmpty() {
-        val input = """
-
-            class {
-                
-                A field;
-            }
-        """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentNoNewLine() {
-        val input = " a"
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentOneCharacter() {
-        val input = "a"
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentFirstLineNotEmpty() {
-        val input = """
-    fred
-            class {
-                
-                A field;
-            }
-        """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentFirstCharacterNotLineBreak() {
-        val input = """fred
-            class {
-                
-                A field;
-            }
-        """
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentMinimalIndent() {
-        val input = """
-        class {
-                A field;
-            }
-        """
-
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun trimIndentNoIndent() {
-        val input = "class{\n   A field;\n}"
-
-        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
-    }
-
-    @Test
-    fun containsOnlyWhitespaceAndCommentsTest() {
-        assertThat(containsOnlyWhitespaceAndComments("")).isTrue
-        assertThat(containsOnlyWhitespaceAndComments(" \n\r\t")).isTrue
-        assertThat(containsOnlyWhitespaceAndComments(" // hello ")).isTrue
-        assertThat(containsOnlyWhitespaceAndComments("//")).isTrue
-        assertThat(containsOnlyWhitespaceAndComments("/**/")).isTrue
-        assertThat(containsOnlyWhitespaceAndComments("""
-            /**
-            asdf
-            */
-        """)).isTrue
-
-        assertThat(containsOnlyWhitespaceAndComments("a")).isFalse
-        assertThat(containsOnlyWhitespaceAndComments(            """
-            // hello
-            goodbye
-        """)).isFalse
-        assertThat(containsOnlyWhitespaceAndComments("a//")).isFalse
-        assertThat(containsOnlyWhitespaceAndComments(
-            """
-            /*
-            */
-            a
-        """)).isFalse
-    }
-
-    @Test
-    fun replaceFirst() {
-        var result = replaceFirst("#{} Fred #{}", "#{}", "I am")
-        assertThat(result).isEqualTo("I am Fred #{}")
-        result = replaceFirst(result, "#{}", "surely.")
-        assertThat(result).isEqualTo("I am Fred surely.")
-        result = replaceFirst("#{}#{}#{}", "#{}", "yo")
-        assertThat(result).isEqualTo("yo#{}#{}")
-        result = replaceFirst(result, "#{}", "yo")
-        assertThat(result).isEqualTo("yoyo#{}")
-        result = replaceFirst(result, "#{}", "yo")
-        assertThat(result).isEqualTo("yoyoyo")
-        result = replaceFirst("Nothing to see here", "#{}", "nonsense")
-        assertThat(result).isEqualTo("Nothing to see here")
-        result = replaceFirst("Nothing to see here", "", "nonsense")
-        assertThat(result).isEqualTo("Nothing to see here")
-        result = replaceFirst("", "", "nonsense")
-        assertThat(result).isEqualTo("")
-    }
-
-    @Test
-    fun occurrenceCount() {
-        assertThat(countOccurrences("yoyoyoyoyo", "yo")).isEqualTo(5)
-        assertThat(countOccurrences("yoyoyoyoyo", "yoyo")).isEqualTo(2)
-        assertThat(countOccurrences("nonononono", "yo")).isEqualTo(0)
-        assertThat(countOccurrences("", "")).isEqualTo(0)
-    }
-
-    @Test
-    fun globMatching() {
-        assertThat(matchesGlob("expression", "expr*")).isTrue()
-        assertThat(matchesGlob("some/xpath", "some/*")).isTrue()
-        assertThat(matchesGlob("some/xpath/expression", "some/**")).isTrue()
-        assertThat(matchesGlob("//some/xpath/expression", "**/xpath/*")).isTrue()
-    }
-
-    @Test
-    fun greatestCommonMargin() {
-        assertThat(greatestCommonMargin("""
-            |   
-            |  
-            |    
-        """.trimMargin("|"))).isEqualTo("  ")
-
-        assertThat(greatestCommonMargin("""
-            |   
-            |  s 
-            |    
-        """.trimMargin("|"))).isEqualTo("  ")
-
-        assertThat(greatestCommonMargin("")).isEqualTo("")
-        assertThat(greatestCommonMargin("\n\n")).isEqualTo("")
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.internal.StringUtils.*
+
+class StringUtilsTest {
+    @Test
+    fun detectIndentLevel() {
+        assertThat(indentLevel("""
+            |<
+            |   <
+            |   <
+            |   <
+            |<
+        """.trimMargin())).isEqualTo(0)
+
+        assertThat(indentLevel("""
+            |<
+            |   <
+        """.trimMargin())).isEqualTo(3)
+
+        assertThat(indentLevel("""
+            |<
+            |    <
+            |      <
+        """.trimMargin())).isEqualTo(4)
+
+        // ignores the last line if it is all blank
+        assertThat(indentLevel("""
+            class {
+                A field;
+            }
+        """)).isEqualTo(12)
+
+        assertThat(indentLevel("""
+            | <
+            |  <
+            |   <
+            |    <
+        """.trimMargin())).isEqualTo(1)
+
+        assertThat(indentLevel("""
+            | <
+            |  <
+            |    <
+            |    <
+            |      <
+        """.trimMargin())).isEqualTo(1)
+
+        assertThat(indentLevel("""
+            |<
+            |<
+        """.trimMargin())).isEqualTo(0)
+
+        // doesn't consider newlines that occur as the first character on the first line or terminating newlines
+        assertThat(indentLevel("""
+            |
+            |  <
+            |    <
+            |    <
+            |
+        """.trimMargin())).isEqualTo(2)
+    }
+
+    @Test
+    fun trimIndentBlankLines() {
+        val input = """
+  
+            class {
+                
+                A field;
+            }
+            """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentEndLineNonWhitespace() {
+        val input = """
+
+            class {
+                
+                A field;
+            }
+            hello"""
+        System.out.println("Kotlin : '" + input.trimIndent() + "'")
+
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentFirstLineSameAsIndent() {
+        val input = """
+            
+            class {
+                
+                A field;
+            }
+        """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentFirstLineGreaterThanIndent() {
+        val input = """
+                
+            class {
+                
+                A field;
+            }
+        """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentFirstLineEmpty() {
+        val input = """
+
+            class {
+                
+                A field;
+            }
+        """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentNoNewLine() {
+        val input = " a"
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentOneCharacter() {
+        val input = "a"
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentFirstLineNotEmpty() {
+        val input = """
+    fred
+            class {
+                
+                A field;
+            }
+        """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentFirstCharacterNotLineBreak() {
+        val input = """fred
+            class {
+                
+                A field;
+            }
+        """
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentMinimalIndent() {
+        val input = """
+        class {
+                A field;
+            }
+        """
+
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun trimIndentNoIndent() {
+        val input = "class{\n   A field;\n}"
+
+        assertThat(trimIndent(input)).isEqualTo(input.trimIndent())
+    }
+
+    @Test
+    fun containsOnlyWhitespaceAndCommentsTest() {
+        assertThat(containsOnlyWhitespaceAndComments("")).isTrue
+        assertThat(containsOnlyWhitespaceAndComments(" \n\r\t")).isTrue
+        assertThat(containsOnlyWhitespaceAndComments(" // hello ")).isTrue
+        assertThat(containsOnlyWhitespaceAndComments("//")).isTrue
+        assertThat(containsOnlyWhitespaceAndComments("/**/")).isTrue
+        assertThat(containsOnlyWhitespaceAndComments("""
+            /**
+            asdf
+            */
+        """)).isTrue
+
+        assertThat(containsOnlyWhitespaceAndComments("a")).isFalse
+        assertThat(containsOnlyWhitespaceAndComments(            """
+            // hello
+            goodbye
+        """)).isFalse
+        assertThat(containsOnlyWhitespaceAndComments("a//")).isFalse
+        assertThat(containsOnlyWhitespaceAndComments(
+            """
+            /*
+            */
+            a
+        """)).isFalse
+    }
+
+    @Test
+    fun replaceFirst() {
+        var result = replaceFirst("#{} Fred #{}", "#{}", "I am")
+        assertThat(result).isEqualTo("I am Fred #{}")
+        result = replaceFirst(result, "#{}", "surely.")
+        assertThat(result).isEqualTo("I am Fred surely.")
+        result = replaceFirst("#{}#{}#{}", "#{}", "yo")
+        assertThat(result).isEqualTo("yo#{}#{}")
+        result = replaceFirst(result, "#{}", "yo")
+        assertThat(result).isEqualTo("yoyo#{}")
+        result = replaceFirst(result, "#{}", "yo")
+        assertThat(result).isEqualTo("yoyoyo")
+        result = replaceFirst("Nothing to see here", "#{}", "nonsense")
+        assertThat(result).isEqualTo("Nothing to see here")
+        result = replaceFirst("Nothing to see here", "", "nonsense")
+        assertThat(result).isEqualTo("Nothing to see here")
+        result = replaceFirst("", "", "nonsense")
+        assertThat(result).isEqualTo("")
+    }
+
+    @Test
+    fun occurrenceCount() {
+        assertThat(countOccurrences("yoyoyoyoyo", "yo")).isEqualTo(5)
+        assertThat(countOccurrences("yoyoyoyoyo", "yoyo")).isEqualTo(2)
+        assertThat(countOccurrences("nonononono", "yo")).isEqualTo(0)
+        assertThat(countOccurrences("", "")).isEqualTo(0)
+    }
+
+    @Test
+    fun globMatching() {
+        assertThat(matchesGlob("expression", "expr*")).isTrue()
+        assertThat(matchesGlob("some/xpath", "some/*")).isTrue()
+        assertThat(matchesGlob("some/xpath/expression", "some/**")).isTrue()
+        assertThat(matchesGlob("//some/xpath/expression", "**/xpath/*")).isTrue()
+    }
+
+    @Test
+    fun greatestCommonMargin() {
+        assertThat(greatestCommonMargin("""
+            |   
+            |  
+            |    
+        """.trimMargin("|"))).isEqualTo("  ")
+
+        assertThat(greatestCommonMargin("""
+            |   
+            |  s 
+            |    
+        """.trimMargin("|"))).isEqualTo("  ")
+
+        assertThat(greatestCommonMargin("")).isEqualTo("")
+        assertThat(greatestCommonMargin("\n\n")).isEqualTo("")
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/CaretRangeTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/CaretRangeTest.kt
index 2cfee0290a5..a0acc87ac10 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/CaretRangeTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/CaretRangeTest.kt
@@ -1,104 +1,104 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class CaretRangeTest {
-    @Test
-    fun pattern() {
-        assertThat(CaretRange.build("^1", null).isValid).isTrue
-        assertThat(CaretRange.build("^1.2", null).isValid).isTrue
-        assertThat(CaretRange.build("^1.2.3", null).isValid).isTrue
-        assertThat(CaretRange.build("^1.2.3.4", null).isValid).isTrue
-        assertThat(CaretRange.build("^1.2.3.4.5", null).isValid).isFalse
-    }
-
-    @Test
-    fun updateMicro() {
-        val caretRange: CaretRange = CaretRange.build("^1.2.3.4", null).getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "1.2.3.4")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.3.4.RELEASE")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.3.5")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.4")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.9.0")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.3.3")).isFalse
-        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
-    }
-
-    /**
-     * ^1.2.3 := >=1.2.3 <2.0.0
-     */
-    @Test
-    fun updateMinorAndPatch() {
-        val caretRange: CaretRange = CaretRange.build("^1.2.3", null).getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "1.2.3")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.2.4")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.9.0")).isTrue
-        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
-    }
-
-    /**
-     * ^0.2.3 := >=0.2.3 <0.3.0
-     */
-    @Test
-    fun updatePatch() {
-        val caretRange: CaretRange = CaretRange.build("^0.2.3", null).getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "0.2.3")).isTrue
-        assertThat(caretRange.isValid("1.0", "0.2.4")).isTrue
-        assertThat(caretRange.isValid("1.0", "0.3.0")).isFalse
-    }
-
-    @Test
-    fun updateNothing() {
-        val caretRange: CaretRange = CaretRange
-            .build("^0.0.3", null)
-            .getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "0.0.3")).isFalse
-        assertThat(caretRange.isValid("1.0", "0.0.4")).isFalse
-    }
-
-    /**
-     * ^1.x := >=1.0.0 <2.0.0
-     */
-    @Test
-    fun desugarMinorWildcard() {
-        val caretRange: CaretRange = CaretRange.build("^1.x", null).getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "1.0.0")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.0.1")).isTrue
-        assertThat(caretRange.isValid("1.0", "1.1.0")).isTrue
-        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
-    }
-
-    /**
-     * ^0.0.x := >=0.0.0 <0.1.0
-     */
-    @Test
-    fun desugarPatchWildcard() {
-        val caretRange: CaretRange = CaretRange.build("^0.0.x", null).getValue()!!
-
-        assertThat(caretRange.isValid("1.0", "0.0.0")).isTrue
-        assertThat(caretRange.isValid("1.0", "0.0.1")).isTrue
-        assertThat(caretRange.isValid("1.0", "0.1.0")).isFalse
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class CaretRangeTest {
+    @Test
+    fun pattern() {
+        assertThat(CaretRange.build("^1", null).isValid).isTrue
+        assertThat(CaretRange.build("^1.2", null).isValid).isTrue
+        assertThat(CaretRange.build("^1.2.3", null).isValid).isTrue
+        assertThat(CaretRange.build("^1.2.3.4", null).isValid).isTrue
+        assertThat(CaretRange.build("^1.2.3.4.5", null).isValid).isFalse
+    }
+
+    @Test
+    fun updateMicro() {
+        val caretRange: CaretRange = CaretRange.build("^1.2.3.4", null).getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "1.2.3.4")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.3.4.RELEASE")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.3.5")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.4")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.9.0")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.3.3")).isFalse
+        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
+    }
+
+    /**
+     * ^1.2.3 := >=1.2.3 <2.0.0
+     */
+    @Test
+    fun updateMinorAndPatch() {
+        val caretRange: CaretRange = CaretRange.build("^1.2.3", null).getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "1.2.3")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.2.4")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.9.0")).isTrue
+        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
+    }
+
+    /**
+     * ^0.2.3 := >=0.2.3 <0.3.0
+     */
+    @Test
+    fun updatePatch() {
+        val caretRange: CaretRange = CaretRange.build("^0.2.3", null).getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "0.2.3")).isTrue
+        assertThat(caretRange.isValid("1.0", "0.2.4")).isTrue
+        assertThat(caretRange.isValid("1.0", "0.3.0")).isFalse
+    }
+
+    @Test
+    fun updateNothing() {
+        val caretRange: CaretRange = CaretRange
+            .build("^0.0.3", null)
+            .getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "0.0.3")).isFalse
+        assertThat(caretRange.isValid("1.0", "0.0.4")).isFalse
+    }
+
+    /**
+     * ^1.x := >=1.0.0 <2.0.0
+     */
+    @Test
+    fun desugarMinorWildcard() {
+        val caretRange: CaretRange = CaretRange.build("^1.x", null).getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "1.0.0")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.0.1")).isTrue
+        assertThat(caretRange.isValid("1.0", "1.1.0")).isTrue
+        assertThat(caretRange.isValid("1.0", "2.0.0")).isFalse
+    }
+
+    /**
+     * ^0.0.x := >=0.0.0 <0.1.0
+     */
+    @Test
+    fun desugarPatchWildcard() {
+        val caretRange: CaretRange = CaretRange.build("^0.0.x", null).getValue()!!
+
+        assertThat(caretRange.isValid("1.0", "0.0.0")).isTrue
+        assertThat(caretRange.isValid("1.0", "0.0.1")).isTrue
+        assertThat(caretRange.isValid("1.0", "0.1.0")).isFalse
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/HyphenRangeTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/HyphenRangeTest.kt
index c37d0b2afec..32003d910e5 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/HyphenRangeTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/HyphenRangeTest.kt
@@ -1,71 +1,71 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class HyphenRangeTest {
-    @Test
-    fun pattern() {
-        assertThat(HyphenRange.build("1 - 2", null).isValid).isTrue
-        assertThat(HyphenRange.build("1.0.0.0 - 2", null).isValid).isTrue
-        assertThat(HyphenRange.build("1 - 2.0.0.0", null).isValid).isTrue
-        assertThat(HyphenRange.build("1.0.0.0 - 2.0.0.0", null).isValid).isTrue
-        assertThat(HyphenRange.build("1", null).isValid).isFalse
-        assertThat(HyphenRange.build("1 - 2.x", null).isValid).isFalse
-        assertThat(HyphenRange.build("1.0.0.0.0 - 2", null).isValid).isFalse
-    }
-
-    /**
-     * 1.2.3 - 2.3.4 := >=1.2.3 <=2.3.4
-     */
-    @Test
-    fun inclusiveSet() {
-        val hyphenRange: HyphenRange = HyphenRange.build("1.2.3 - 2.3.4", null).getValue()!!
-
-        assertThat(hyphenRange.isValid("1.0", "1.2.2")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "1.2.2.0")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.3.0.RELEASE")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.3")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.3.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.3.0.0")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "2.3.4")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "2.3.4.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "2.3.4.1")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "2.3.5")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "2.3.5.0")).isFalse
-    }
-
-    /**
-     * 1.2 - 2 := >=1.2.0 <=2.0.0
-     */
-    @Test
-    fun partialVersion() {
-        val hyphenRange: HyphenRange = HyphenRange.build("1.2 - 2", null).getValue()!!
-
-        assertThat(hyphenRange.isValid("1.0", "1.1.9")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "1.1.9.9")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "1.2.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.0.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "1.2.0.0.0")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "2.0.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "2.0.0.0")).isTrue
-        assertThat(hyphenRange.isValid("1.0", "2.0.1")).isFalse
-        assertThat(hyphenRange.isValid("1.0", "2.0.0.1")).isFalse
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class HyphenRangeTest {
+    @Test
+    fun pattern() {
+        assertThat(HyphenRange.build("1 - 2", null).isValid).isTrue
+        assertThat(HyphenRange.build("1.0.0.0 - 2", null).isValid).isTrue
+        assertThat(HyphenRange.build("1 - 2.0.0.0", null).isValid).isTrue
+        assertThat(HyphenRange.build("1.0.0.0 - 2.0.0.0", null).isValid).isTrue
+        assertThat(HyphenRange.build("1", null).isValid).isFalse
+        assertThat(HyphenRange.build("1 - 2.x", null).isValid).isFalse
+        assertThat(HyphenRange.build("1.0.0.0.0 - 2", null).isValid).isFalse
+    }
+
+    /**
+     * 1.2.3 - 2.3.4 := >=1.2.3 <=2.3.4
+     */
+    @Test
+    fun inclusiveSet() {
+        val hyphenRange: HyphenRange = HyphenRange.build("1.2.3 - 2.3.4", null).getValue()!!
+
+        assertThat(hyphenRange.isValid("1.0", "1.2.2")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "1.2.2.0")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.3.0.RELEASE")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.3")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.3.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.3.0.0")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "2.3.4")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "2.3.4.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "2.3.4.1")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "2.3.5")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "2.3.5.0")).isFalse
+    }
+
+    /**
+     * 1.2 - 2 := >=1.2.0 <=2.0.0
+     */
+    @Test
+    fun partialVersion() {
+        val hyphenRange: HyphenRange = HyphenRange.build("1.2 - 2", null).getValue()!!
+
+        assertThat(hyphenRange.isValid("1.0", "1.1.9")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "1.1.9.9")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "1.2.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.0.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "1.2.0.0.0")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "2.0.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "2.0.0.0")).isTrue
+        assertThat(hyphenRange.isValid("1.0", "2.0.1")).isFalse
+        assertThat(hyphenRange.isValid("1.0", "2.0.0.1")).isFalse
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestPatchTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestPatchTest.kt
index 1052960c2e7..4ce1aae253f 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestPatchTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestPatchTest.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class LatestPatchTest {
-    private val latestPatch = LatestPatch(null)
-
-    @Test
-    fun isValid() {
-        assertThat(latestPatch.isValid("1.0.0", "1.0.0")).isTrue
-        assertThat(latestPatch.isValid("1.0.0", "1.0.0.1")).isTrue
-        assertThat(latestPatch.isValid("1.0.0", "1.0.1")).isTrue
-        assertThat(latestPatch.isValid("1.0", "1.0.1")).isTrue
-        assertThat(latestPatch.isValid("1.0.0", "1.1.0")).isFalse
-        assertThat(latestPatch.isValid("1.0.0", "2.0.0")).isFalse
-    }
-
-    @Test
-    fun compare() {
-        assertThat(latestPatch.compare("1.0", "1.0.1", "1.0.2")).isLessThan(0)
-        assertThat(latestPatch.compare("1.0", "1.0.0.1", "1.0.1")).isLessThan(0)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class LatestPatchTest {
+    private val latestPatch = LatestPatch(null)
+
+    @Test
+    fun isValid() {
+        assertThat(latestPatch.isValid("1.0.0", "1.0.0")).isTrue
+        assertThat(latestPatch.isValid("1.0.0", "1.0.0.1")).isTrue
+        assertThat(latestPatch.isValid("1.0.0", "1.0.1")).isTrue
+        assertThat(latestPatch.isValid("1.0", "1.0.1")).isTrue
+        assertThat(latestPatch.isValid("1.0.0", "1.1.0")).isFalse
+        assertThat(latestPatch.isValid("1.0.0", "2.0.0")).isFalse
+    }
+
+    @Test
+    fun compare() {
+        assertThat(latestPatch.compare("1.0", "1.0.1", "1.0.2")).isLessThan(0)
+        assertThat(latestPatch.compare("1.0", "1.0.0.1", "1.0.1")).isLessThan(0)
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestReleaseTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestReleaseTest.kt
index 2d6988aa7a4..f57228b0001 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestReleaseTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/LatestReleaseTest.kt
@@ -1,117 +1,117 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertAll
-
-class LatestReleaseTest {
-    private val latestRelease = LatestRelease(null)
-
-    @Test
-    fun onlyNumericPartsValid() {
-        assertAll(
-            { assertThat(latestRelease.isValid("1.0", "1.1.1.1")).isTrue },
-            { assertThat(latestRelease.isValid("1.0", "1.1.1")).isTrue },
-            { assertThat(latestRelease.isValid("1.0", "1.1")).isTrue },
-            { assertThat(latestRelease.isValid("1.0", "1")).isTrue },
-            { assertThat(latestRelease.isValid("1.0", "1.1.a")).isFalse },
-            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.a")).isFalse },
-            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.1")).isFalse },
-            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.1-SNAPSHOT")).isFalse },
-            { assertThat(latestRelease.isValid("1.0", "1.1.0-SNAPSHOT")).isFalse }
-        )
-    }
-
-    @Test
-    fun differentMicroVersions() {
-        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.1.1.2")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1", "1.1.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1.1.1", "2")).isLessThan(0)
-    }
-
-    @Test
-    fun differentPatchVersions() {
-        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.1.2.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1.1", "1.1.2")).isLessThan(0)
-    }
-
-    @Test
-    fun differentMinorVersions() {
-        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.2.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1.1", "1.2.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1", "1.2")).isLessThan(0)
-    }
-
-    @Test
-    fun differentMajorVersions() {
-        assertThat(latestRelease.compare("1.0", "1.1.1.1", "2.1.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1.1", "2.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1", "2.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1", "2")).isLessThan(0)
-    }
-
-    @Test
-    fun differentNumberOfParts() {
-        assertThat(latestRelease.compare("1.0", "1.1.1", "1.1.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1.1", "1.1.1")).isLessThan(0)
-        assertThat(latestRelease.compare("1.0", "1", "1.1")).isLessThan(0)
-    }
-
-    @Test
-    fun guavaVariants() {
-        assertThat(latestRelease.compare("1.0", "25.0-jre", "29.0-jre")).isLessThan(0)
-    }
-
-    @Test
-    @Disabled("https://github.com/openrewrite/rewrite/issues/1204")
-    // feel free to move this under "guavaVariants", todo
-    fun guavaVariantsMetadataBoundaries() {
-        assertThat(latestRelease.compare("1.0", "25", "25.0-jre")).isEqualTo(0)
-    }
-
-    @Test
-    fun matchMetadata() {
-        assertThat(LatestRelease("-jre").isValid("1.0", "29.0.0.0-jre")).isTrue
-        assertThat(LatestRelease("-jre").isValid("1.0", "29.0-jre")).isTrue
-        assertThat(LatestRelease("-jre").isValid("1.0", "29.0")).isFalse
-        assertThat(LatestRelease("-jre").isValid("1.0", "29.0-android")).isFalse
-        assertThat(LatestRelease("").isValid("1.0", "29.0")).isTrue
-    }
-
-    @Test
-    fun normalizeVersionStripReleaseSuffix() {
-        assertThat(LatestRelease.normalizeVersion("1.5.1.2.RELEASE")).isEqualTo("1.5.1.2")
-        assertThat(LatestRelease.normalizeVersion("1.5.1.RELEASE")).isEqualTo("1.5.1")
-        assertThat(LatestRelease.normalizeVersion("1.5.1.FINAL")).isEqualTo("1.5.1")
-        assertThat(LatestRelease.normalizeVersion("1.5.1.Final")).isEqualTo("1.5.1")
-    }
-
-    @Test
-    fun normalizeVersionToHaveMajorMinorPatch() {
-        assertThat(LatestRelease.normalizeVersion("29.0")).isEqualTo("29.0.0")
-        assertThat(LatestRelease.normalizeVersion("29.0-jre")).isEqualTo("29.0.0-jre")
-        assertThat(LatestRelease.normalizeVersion("29-jre")).isEqualTo("29.0.0-jre")
-    }
-
-    @Test
-    fun datedSnapshotVersions() {
-        assertThat(latestRelease.compare(null, "7.17.0-20211102.000501-28",
-            "7.17.0-20211102.012229-29")).isLessThan(0)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertAll
+
+class LatestReleaseTest {
+    private val latestRelease = LatestRelease(null)
+
+    @Test
+    fun onlyNumericPartsValid() {
+        assertAll(
+            { assertThat(latestRelease.isValid("1.0", "1.1.1.1")).isTrue },
+            { assertThat(latestRelease.isValid("1.0", "1.1.1")).isTrue },
+            { assertThat(latestRelease.isValid("1.0", "1.1")).isTrue },
+            { assertThat(latestRelease.isValid("1.0", "1")).isTrue },
+            { assertThat(latestRelease.isValid("1.0", "1.1.a")).isFalse },
+            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.a")).isFalse },
+            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.1")).isFalse },
+            { assertThat(latestRelease.isValid("1.0", "1.1.1.1.1-SNAPSHOT")).isFalse },
+            { assertThat(latestRelease.isValid("1.0", "1.1.0-SNAPSHOT")).isFalse }
+        )
+    }
+
+    @Test
+    fun differentMicroVersions() {
+        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.1.1.2")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1", "1.1.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1.1.1", "2")).isLessThan(0)
+    }
+
+    @Test
+    fun differentPatchVersions() {
+        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.1.2.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1.1", "1.1.2")).isLessThan(0)
+    }
+
+    @Test
+    fun differentMinorVersions() {
+        assertThat(latestRelease.compare("1.0", "1.1.1.1", "1.2.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1.1", "1.2.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1", "1.2")).isLessThan(0)
+    }
+
+    @Test
+    fun differentMajorVersions() {
+        assertThat(latestRelease.compare("1.0", "1.1.1.1", "2.1.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1.1", "2.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1", "2.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1", "2")).isLessThan(0)
+    }
+
+    @Test
+    fun differentNumberOfParts() {
+        assertThat(latestRelease.compare("1.0", "1.1.1", "1.1.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1.1", "1.1.1")).isLessThan(0)
+        assertThat(latestRelease.compare("1.0", "1", "1.1")).isLessThan(0)
+    }
+
+    @Test
+    fun guavaVariants() {
+        assertThat(latestRelease.compare("1.0", "25.0-jre", "29.0-jre")).isLessThan(0)
+    }
+
+    @Test
+    @Disabled("https://github.com/openrewrite/rewrite/issues/1204")
+    // feel free to move this under "guavaVariants", todo
+    fun guavaVariantsMetadataBoundaries() {
+        assertThat(latestRelease.compare("1.0", "25", "25.0-jre")).isEqualTo(0)
+    }
+
+    @Test
+    fun matchMetadata() {
+        assertThat(LatestRelease("-jre").isValid("1.0", "29.0.0.0-jre")).isTrue
+        assertThat(LatestRelease("-jre").isValid("1.0", "29.0-jre")).isTrue
+        assertThat(LatestRelease("-jre").isValid("1.0", "29.0")).isFalse
+        assertThat(LatestRelease("-jre").isValid("1.0", "29.0-android")).isFalse
+        assertThat(LatestRelease("").isValid("1.0", "29.0")).isTrue
+    }
+
+    @Test
+    fun normalizeVersionStripReleaseSuffix() {
+        assertThat(LatestRelease.normalizeVersion("1.5.1.2.RELEASE")).isEqualTo("1.5.1.2")
+        assertThat(LatestRelease.normalizeVersion("1.5.1.RELEASE")).isEqualTo("1.5.1")
+        assertThat(LatestRelease.normalizeVersion("1.5.1.FINAL")).isEqualTo("1.5.1")
+        assertThat(LatestRelease.normalizeVersion("1.5.1.Final")).isEqualTo("1.5.1")
+    }
+
+    @Test
+    fun normalizeVersionToHaveMajorMinorPatch() {
+        assertThat(LatestRelease.normalizeVersion("29.0")).isEqualTo("29.0.0")
+        assertThat(LatestRelease.normalizeVersion("29.0-jre")).isEqualTo("29.0.0-jre")
+        assertThat(LatestRelease.normalizeVersion("29-jre")).isEqualTo("29.0.0-jre")
+    }
+
+    @Test
+    fun datedSnapshotVersions() {
+        assertThat(latestRelease.compare(null, "7.17.0-20211102.000501-28",
+            "7.17.0-20211102.012229-29")).isLessThan(0)
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/SemverTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/SemverTest.kt
index ac602a4a969..7a6d2f665d6 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/SemverTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/SemverTest.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class SemverTest {
-    @Test
-    fun validToVersion() {
-        assertThat(Semver.validate("latest.release", null).getValue<VersionComparator>())
-            .isInstanceOf(LatestRelease::class.java)
-        assertThat(Semver.validate("1.5 - 2", null).getValue<VersionComparator>())
-            .isInstanceOf(HyphenRange::class.java)
-        assertThat(Semver.validate("1.x", null).getValue<VersionComparator>())
-            .isInstanceOf(XRange::class.java)
-        assertThat(Semver.validate("~1.5", null).getValue<VersionComparator>())
-            .isInstanceOf(TildeRange::class.java)
-        assertThat(Semver.validate("^1.5", null).getValue<VersionComparator>())
-            .isInstanceOf(CaretRange::class.java)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class SemverTest {
+    @Test
+    fun validToVersion() {
+        assertThat(Semver.validate("latest.release", null).getValue<VersionComparator>())
+            .isInstanceOf(LatestRelease::class.java)
+        assertThat(Semver.validate("1.5 - 2", null).getValue<VersionComparator>())
+            .isInstanceOf(HyphenRange::class.java)
+        assertThat(Semver.validate("1.x", null).getValue<VersionComparator>())
+            .isInstanceOf(XRange::class.java)
+        assertThat(Semver.validate("~1.5", null).getValue<VersionComparator>())
+            .isInstanceOf(TildeRange::class.java)
+        assertThat(Semver.validate("^1.5", null).getValue<VersionComparator>())
+            .isInstanceOf(CaretRange::class.java)
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/TildeRangeTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/TildeRangeTest.kt
index 90ec9a61cdc..ccfc323f8e3 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/TildeRangeTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/TildeRangeTest.kt
@@ -1,82 +1,82 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class TildeRangeTest {
-    @Test
-    fun pattern() {
-        assertThat(TildeRange.build("~1", null).isValid).isTrue
-        assertThat(TildeRange.build("~1.2", null).isValid).isTrue
-        assertThat(TildeRange.build("~1.2.3", null).isValid).isTrue
-        assertThat(TildeRange.build("~1.2.3.4", null).isValid).isTrue
-        assertThat(TildeRange.build("~1.2.3.4.5", null).isValid).isFalse
-    }
-
-    /**
-     * ~1.2.3 := >=1.2.3 <1.(2+1).0 := >=1.2.3 <1.3.0
-     */
-    @Test
-    fun updatePatch() {
-        val tildeRange: TildeRange = TildeRange.build("~1.2.3", null).getValue()!!
-
-        assertThat(tildeRange.isValid("1.0", "1.2.3.0")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.3.1")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.3")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.4")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
-    }
-
-    @Test
-    fun updateMicro() {
-        val tildeRange: TildeRange = TildeRange.build("~1.2.3.4", null).getValue()!!
-
-        assertThat(tildeRange.isValid("1.0", "1.2.3.5")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.3.0")).isFalse
-        assertThat(tildeRange.isValid("1.0", "1.2.3.5.0")).isFalse
-        assertThat(tildeRange.isValid("1.0", "1.2.3")).isFalse
-        assertThat(tildeRange.isValid("1.0", "1.2.4")).isFalse
-        assertThat(tildeRange.isValid("1.0", "1.2.4.0")).isFalse
-        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
-    }
-
-    /**
-     * ~1.2 := >=1.2.0 <1.(2+1).0 := >=1.2.0 <1.3.0-0 (Same as 1.2.x)
-     */
-    @Test
-    fun updatePatchImplicitZeroPatch() {
-        val tildeRange: TildeRange = TildeRange.build("~1.2", null).getValue()!!
-
-        assertThat(tildeRange.isValid("1.0", "1.2.0")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.2.4")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
-    }
-
-    /**
-     * ~1 := >=1.0.0 <(1+1).0.0 := >=1.0.0 <2.0.0-0 (Same as 1.x)
-     */
-    @Test
-    fun updateMajor() {
-        val tildeRange: TildeRange = TildeRange.build("~1", null).getValue()!!
-
-        assertThat(tildeRange.isValid("1.0", "1.0.1")).isTrue
-        assertThat(tildeRange.isValid("1.0", "1.9.9")).isTrue
-        assertThat(tildeRange.isValid("1.0", "2.0.0")).isFalse
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class TildeRangeTest {
+    @Test
+    fun pattern() {
+        assertThat(TildeRange.build("~1", null).isValid).isTrue
+        assertThat(TildeRange.build("~1.2", null).isValid).isTrue
+        assertThat(TildeRange.build("~1.2.3", null).isValid).isTrue
+        assertThat(TildeRange.build("~1.2.3.4", null).isValid).isTrue
+        assertThat(TildeRange.build("~1.2.3.4.5", null).isValid).isFalse
+    }
+
+    /**
+     * ~1.2.3 := >=1.2.3 <1.(2+1).0 := >=1.2.3 <1.3.0
+     */
+    @Test
+    fun updatePatch() {
+        val tildeRange: TildeRange = TildeRange.build("~1.2.3", null).getValue()!!
+
+        assertThat(tildeRange.isValid("1.0", "1.2.3.0")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.3.1")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.3")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.4")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
+    }
+
+    @Test
+    fun updateMicro() {
+        val tildeRange: TildeRange = TildeRange.build("~1.2.3.4", null).getValue()!!
+
+        assertThat(tildeRange.isValid("1.0", "1.2.3.5")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.3.0")).isFalse
+        assertThat(tildeRange.isValid("1.0", "1.2.3.5.0")).isFalse
+        assertThat(tildeRange.isValid("1.0", "1.2.3")).isFalse
+        assertThat(tildeRange.isValid("1.0", "1.2.4")).isFalse
+        assertThat(tildeRange.isValid("1.0", "1.2.4.0")).isFalse
+        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
+    }
+
+    /**
+     * ~1.2 := >=1.2.0 <1.(2+1).0 := >=1.2.0 <1.3.0-0 (Same as 1.2.x)
+     */
+    @Test
+    fun updatePatchImplicitZeroPatch() {
+        val tildeRange: TildeRange = TildeRange.build("~1.2", null).getValue()!!
+
+        assertThat(tildeRange.isValid("1.0", "1.2.0")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.2.4")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.3.0")).isFalse
+    }
+
+    /**
+     * ~1 := >=1.0.0 <(1+1).0.0 := >=1.0.0 <2.0.0-0 (Same as 1.x)
+     */
+    @Test
+    fun updateMajor() {
+        val tildeRange: TildeRange = TildeRange.build("~1", null).getValue()!!
+
+        assertThat(tildeRange.isValid("1.0", "1.0.1")).isTrue
+        assertThat(tildeRange.isValid("1.0", "1.9.9")).isTrue
+        assertThat(tildeRange.isValid("1.0", "2.0.0")).isFalse
+    }
+}
diff --git a/rewrite-core/src/test/kotlin/org/openrewrite/semver/XRangeTest.kt b/rewrite-core/src/test/kotlin/org/openrewrite/semver/XRangeTest.kt
index b7731ade32b..c8d9bc595c9 100644
--- a/rewrite-core/src/test/kotlin/org/openrewrite/semver/XRangeTest.kt
+++ b/rewrite-core/src/test/kotlin/org/openrewrite/semver/XRangeTest.kt
@@ -1,93 +1,93 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.semver
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class XRangeTest {
-    @Test
-    fun pattern() {
-        assertThat(XRange.build("*", null).isValid).isTrue
-        assertThat(XRange.build("*.0.0", null).isValid).isFalse
-        assertThat(XRange.build("1.x", null).isValid).isTrue
-        assertThat(XRange.build("1.x.0", null).isValid).isFalse
-        assertThat(XRange.build("1.1.X", null).isValid).isTrue
-        assertThat(XRange.build("1.1.1.X", null).isValid).isTrue
-        assertThat(XRange.build("1.1.1.1.X", null).isValid).isFalse
-        assertThat(XRange.build("1.1.x.1", null).isValid).isFalse
-        assertThat(XRange.build("a", null).isValid).isFalse
-    }
-
-    @Test
-    fun doesNotMatchFixedVersion() {
-        assertThat(XRange.build("5.3.0", null).isValid).isFalse
-    }
-
-    /**
-     * X := >=0.0.0
-     */
-    @Test
-    fun anyVersion() {
-        val xRange: XRange = XRange.build("X", null).getValue()!!
-
-        assertThat(xRange.isValid("1.0", "0.0.0.0")).isTrue
-        assertThat(xRange.isValid("1.0", "0.0.0")).isTrue
-    }
-
-    /**
-     * 1.* := >=1.0.0 <2.0.0-0
-     */
-    @Test
-    fun matchingMajorVersion() {
-        val xRange: XRange = XRange.build("1.*", null).getValue()!!
-
-        assertThat(xRange.isValid("1.0", "1.0.0")).isTrue
-        assertThat(xRange.isValid("1.0", "1.0.0.1")).isTrue
-        assertThat(xRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
-        assertThat(xRange.isValid("1.0", "1.9.9")).isTrue
-        assertThat(xRange.isValid("1.0", "2.0.0")).isFalse
-    }
-
-    /**
-     * 1.2.X := >=1.2.0 <1.3.1
-     */
-    @Test
-    fun matchingMajorAndMinorVersions() {
-        val xRange: XRange = XRange.build("1.2.X", null).getValue()!!
-
-        assertThat(xRange.isValid("1.0", "1.2.0")).isTrue
-        assertThat(xRange.isValid("1.0", "1.3.0")).isFalse
-    }
-
-    @Test
-    fun matchingMicroVersions() {
-        val xRange: XRange = XRange.build("1.2.3.X", null).getValue()!!
-
-        assertThat(xRange.isValid("1.0", "1.2.3.0")).isTrue
-        assertThat(xRange.isValid("1.0", "1.2.3")).isTrue
-        assertThat(xRange.isValid("1.0", "1.2.4.0")).isFalse
-        assertThat(xRange.isValid("1.0", "1.2.4")).isFalse
-    }
-
-    @Test
-    fun matchingJavaxValidation() {
-        val xRange: XRange = XRange.build("2.X", null).getValue()!!
-
-        // The version pattern of javax.validation:validation-api
-        assertThat(xRange.isValid("1.0", "2.0.1.Final")).isTrue
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class XRangeTest {
+    @Test
+    fun pattern() {
+        assertThat(XRange.build("*", null).isValid).isTrue
+        assertThat(XRange.build("*.0.0", null).isValid).isFalse
+        assertThat(XRange.build("1.x", null).isValid).isTrue
+        assertThat(XRange.build("1.x.0", null).isValid).isFalse
+        assertThat(XRange.build("1.1.X", null).isValid).isTrue
+        assertThat(XRange.build("1.1.1.X", null).isValid).isTrue
+        assertThat(XRange.build("1.1.1.1.X", null).isValid).isFalse
+        assertThat(XRange.build("1.1.x.1", null).isValid).isFalse
+        assertThat(XRange.build("a", null).isValid).isFalse
+    }
+
+    @Test
+    fun doesNotMatchFixedVersion() {
+        assertThat(XRange.build("5.3.0", null).isValid).isFalse
+    }
+
+    /**
+     * X := >=0.0.0
+     */
+    @Test
+    fun anyVersion() {
+        val xRange: XRange = XRange.build("X", null).getValue()!!
+
+        assertThat(xRange.isValid("1.0", "0.0.0.0")).isTrue
+        assertThat(xRange.isValid("1.0", "0.0.0")).isTrue
+    }
+
+    /**
+     * 1.* := >=1.0.0 <2.0.0-0
+     */
+    @Test
+    fun matchingMajorVersion() {
+        val xRange: XRange = XRange.build("1.*", null).getValue()!!
+
+        assertThat(xRange.isValid("1.0", "1.0.0")).isTrue
+        assertThat(xRange.isValid("1.0", "1.0.0.1")).isTrue
+        assertThat(xRange.isValid("1.0", "1.2.3.RELEASE")).isTrue
+        assertThat(xRange.isValid("1.0", "1.9.9")).isTrue
+        assertThat(xRange.isValid("1.0", "2.0.0")).isFalse
+    }
+
+    /**
+     * 1.2.X := >=1.2.0 <1.3.1
+     */
+    @Test
+    fun matchingMajorAndMinorVersions() {
+        val xRange: XRange = XRange.build("1.2.X", null).getValue()!!
+
+        assertThat(xRange.isValid("1.0", "1.2.0")).isTrue
+        assertThat(xRange.isValid("1.0", "1.3.0")).isFalse
+    }
+
+    @Test
+    fun matchingMicroVersions() {
+        val xRange: XRange = XRange.build("1.2.3.X", null).getValue()!!
+
+        assertThat(xRange.isValid("1.0", "1.2.3.0")).isTrue
+        assertThat(xRange.isValid("1.0", "1.2.3")).isTrue
+        assertThat(xRange.isValid("1.0", "1.2.4.0")).isFalse
+        assertThat(xRange.isValid("1.0", "1.2.4")).isFalse
+    }
+
+    @Test
+    fun matchingJavaxValidation() {
+        val xRange: XRange = XRange.build("2.X", null).getValue()!!
+
+        // The version pattern of javax.validation:validation-api
+        assertThat(xRange.isValid("1.0", "2.0.1.Final")).isTrue
+    }
+}
diff --git a/rewrite-gradle/src/main/resources/gradlew.bat b/rewrite-gradle/src/main/resources/gradlew.bat
index 3b93aca1ecf..8dae1dee5ae 100755
--- a/rewrite-gradle/src/main/resources/gradlew.bat
+++ b/rewrite-gradle/src/main/resources/gradlew.bat
@@ -1,105 +1,105 @@
-@REM
-@REM Copyright 2022 the original author or authors.
-@REM <p>
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM <p>
-@REM https://www.apache.org/licenses/LICENSE-2.0
-@REM <p>
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@REM
+@REM Copyright 2022 the original author or authors.
+@REM <p>
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM <p>
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM <p>
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.
+@REM
+
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclStyle.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclStyle.java
index d1913b211dc..09b3527d8cf 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclStyle.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclStyle.java
@@ -1,21 +1,21 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.hcl;
-
-import org.openrewrite.style.Style;
-
-public interface HclStyle extends Style {
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.hcl;
+
+import org.openrewrite.style.Style;
+
+public interface HclStyle extends Style {
+}
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/style/TabsAndIndentsStyle.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/style/TabsAndIndentsStyle.java
index 48d82f36a99..d61584a1081 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/style/TabsAndIndentsStyle.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/style/TabsAndIndentsStyle.java
@@ -1,40 +1,40 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.hcl.style;
-
-import lombok.AccessLevel;
-import lombok.Value;
-import lombok.With;
-import lombok.experimental.FieldDefaults;
-import org.openrewrite.hcl.HclStyle;
-import org.openrewrite.style.Style;
-import org.openrewrite.style.StyleHelper;
-
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@Value
-@With
-public class TabsAndIndentsStyle implements HclStyle {
-    public static final TabsAndIndentsStyle DEFAULT = new TabsAndIndentsStyle(false, 2, 2);
-
-    Boolean useTabCharacter;
-    Integer tabSize;
-    Integer indentSize;
-
-    @Override
-    public Style applyDefaults() {
-        return StyleHelper.merge(DEFAULT, this);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.hcl.style;
+
+import lombok.AccessLevel;
+import lombok.Value;
+import lombok.With;
+import lombok.experimental.FieldDefaults;
+import org.openrewrite.hcl.HclStyle;
+import org.openrewrite.style.Style;
+import org.openrewrite.style.StyleHelper;
+
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@Value
+@With
+public class TabsAndIndentsStyle implements HclStyle {
+    public static final TabsAndIndentsStyle DEFAULT = new TabsAndIndentsStyle(false, 2, 2);
+
+    Boolean useTabCharacter;
+    Integer tabSize;
+    Integer indentSize;
+
+    @Override
+    public Style applyDefaults() {
+        return StyleHelper.merge(DEFAULT, this);
+    }
+}
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/Java11ParserInputFileObject.java b/rewrite-java-11/src/main/java/org/openrewrite/java/Java11ParserInputFileObject.java
index 0f95973d5a3..352822ab6b8 100644
--- a/rewrite-java-11/src/main/java/org/openrewrite/java/Java11ParserInputFileObject.java
+++ b/rewrite-java-11/src/main/java/org/openrewrite/java/Java11ParserInputFileObject.java
@@ -1,120 +1,120 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.openrewrite.Parser;
-import org.openrewrite.internal.lang.Nullable;
-
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.NestingKind;
-import javax.tools.JavaFileObject;
-import java.io.*;
-import java.net.URI;
-import java.nio.file.Path;
-
-/**
- * So that {@link JavaParser} can ingest source files from {@link InputStream} sources
- * other than a file on disk.
- */
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Java11ParserInputFileObject implements JavaFileObject {
-    @EqualsAndHashCode.Include
-    @Nullable
-    private final Path path;
-
-    @Getter
-    private final Parser.Input input;
-
-    public Java11ParserInputFileObject(Parser.Input input) {
-        this.input = input;
-        this.path = input.getPath();
-    }
-
-    @Override
-    public URI toUri() {
-        if (path == null) {
-            //noinspection ConstantConditions
-            return null;
-        }
-        return path.toUri();
-    }
-
-    @Override
-    public String getName() {
-        if (path == null) {
-            //noinspection ConstantConditions
-            return null;
-        }
-        return path.toString();
-    }
-
-    @Override
-    public InputStream openInputStream() {
-        return input.getSource();
-    }
-
-    @Override
-    public OutputStream openOutputStream() {
-        throw new UnsupportedOperationException("Should be no need to write output to this file");
-    }
-
-    @Override
-    public Reader openReader(boolean ignoreEncodingErrors) {
-        return new InputStreamReader(input.getSource());
-    }
-
-    @Override
-    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-        return input.getSource().readFully();
-    }
-
-    @Override
-    public Writer openWriter() {
-        throw new UnsupportedOperationException("Should be no need to write output to this file");
-    }
-
-    @Override
-    public long getLastModified() {
-        return 0;
-    }
-
-    @Override
-    public boolean delete() {
-        return false;
-    }
-
-    @Override
-    public Kind getKind() {
-        return Kind.SOURCE;
-    }
-
-    @Override
-    public boolean isNameCompatible(String simpleName, Kind kind) {
-        return true;
-    }
-
-    @Override
-    public NestingKind getNestingKind() {
-        return NestingKind.TOP_LEVEL;
-    }
-
-    @Override
-    public Modifier getAccessLevel() {
-        return Modifier.PUBLIC;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.openrewrite.Parser;
+import org.openrewrite.internal.lang.Nullable;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
+import javax.tools.JavaFileObject;
+import java.io.*;
+import java.net.URI;
+import java.nio.file.Path;
+
+/**
+ * So that {@link JavaParser} can ingest source files from {@link InputStream} sources
+ * other than a file on disk.
+ */
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class Java11ParserInputFileObject implements JavaFileObject {
+    @EqualsAndHashCode.Include
+    @Nullable
+    private final Path path;
+
+    @Getter
+    private final Parser.Input input;
+
+    public Java11ParserInputFileObject(Parser.Input input) {
+        this.input = input;
+        this.path = input.getPath();
+    }
+
+    @Override
+    public URI toUri() {
+        if (path == null) {
+            //noinspection ConstantConditions
+            return null;
+        }
+        return path.toUri();
+    }
+
+    @Override
+    public String getName() {
+        if (path == null) {
+            //noinspection ConstantConditions
+            return null;
+        }
+        return path.toString();
+    }
+
+    @Override
+    public InputStream openInputStream() {
+        return input.getSource();
+    }
+
+    @Override
+    public OutputStream openOutputStream() {
+        throw new UnsupportedOperationException("Should be no need to write output to this file");
+    }
+
+    @Override
+    public Reader openReader(boolean ignoreEncodingErrors) {
+        return new InputStreamReader(input.getSource());
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return input.getSource().readFully();
+    }
+
+    @Override
+    public Writer openWriter() {
+        throw new UnsupportedOperationException("Should be no need to write output to this file");
+    }
+
+    @Override
+    public long getLastModified() {
+        return 0;
+    }
+
+    @Override
+    public boolean delete() {
+        return false;
+    }
+
+    @Override
+    public Kind getKind() {
+        return Kind.SOURCE;
+    }
+
+    @Override
+    public boolean isNameCompatible(String simpleName, Kind kind) {
+        return true;
+    }
+
+    @Override
+    public NestingKind getNestingKind() {
+        return NestingKind.TOP_LEVEL;
+    }
+
+    @Override
+    public Modifier getAccessLevel() {
+        return Modifier.PUBLIC;
+    }
+}
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/Java8Parser.java b/rewrite-java-8/src/main/java/org/openrewrite/java/Java8Parser.java
index 5395dba090d..13260e3e366 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/Java8Parser.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/Java8Parser.java
@@ -1,149 +1,149 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.internal.JavaTypeCache;
-import org.openrewrite.java.marker.JavaSourceSet;
-import org.openrewrite.java.tree.J;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collection;
-import java.util.List;
-
-public class Java8Parser implements JavaParser {
-    private final JavaParser delegate;
-
-    Java8Parser(JavaParser delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
-        return delegate.parseInputs(sourceFiles, relativeTo, ctx);
-    }
-
-    @Override
-    public JavaParser reset() {
-        return delegate.reset();
-    }
-
-    @Override
-    public void setClasspath(Collection<Path> classpath) {
-        delegate.setClasspath(classpath);
-    }
-
-    @Override
-    public void setSourceSet(String sourceSet) {
-        delegate.setSourceSet(sourceSet);
-    }
-
-    @Override
-    public JavaSourceSet getSourceSet(ExecutionContext ctx) {
-        return delegate.getSourceSet(ctx);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder extends JavaParser.Builder<Java8Parser, Builder> {
-
-        @Nullable
-        private static ClassLoader toolsClassLoader;
-
-        @Nullable
-        private static ClassLoader toolsAwareClassLoader;
-
-        static synchronized void lazyInitClassLoaders() {
-            if (toolsClassLoader != null && toolsAwareClassLoader != null) {
-                return;
-            }
-
-            try {
-                File tools = Paths.get(System.getProperty("java.home")).resolve("../lib/tools.jar").toFile();
-                if (!tools.exists()) {
-                    throw new IllegalStateException("To use Java8Parser, you must run the process with a JDK and not a JRE.");
-                }
-
-                toolsClassLoader = new URLClassLoader(new URL[]{tools.toURI().toURL()}, Java8Parser.class.getClassLoader());
-                URLClassLoader appClassLoader = (URLClassLoader) Java8Parser.class.getClassLoader();
-
-                toolsAwareClassLoader = new URLClassLoader(appClassLoader.getURLs(), toolsClassLoader) {
-                    @Override
-                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                        if (!name.contains("ReloadableJava8") &&
-                                !name.startsWith("com.sun.tools") &&
-                                !name.startsWith("com.sun.source") &&
-                                !name.contains("ReloadableTypeMapping")) {
-                            return toolsClassLoader.loadClass(name);
-                        }
-
-                        Class<?> loadedClass = findLoadedClass(name);
-
-                        if (loadedClass == null) {
-                            try {
-                                loadedClass = findClass(name);
-                            } catch (ClassNotFoundException e) {
-                                loadedClass = super.loadClass(name, resolve);
-                            }
-                        }
-
-                        if (resolve) {
-                            resolveClass(loadedClass);
-                        }
-
-                        return loadedClass;
-                    }
-                };
-            } catch (MalformedURLException e) {
-                throw new IllegalStateException("To use Java8Parser, you must run the process with a JDK and not a JRE.", e);
-            }
-        }
-
-        @Override
-        public Java8Parser build() {
-            lazyInitClassLoaders();
-
-            try {
-                // need to reverse this parent/child relationship
-                Class<?> reloadableParser = Class.forName("org.openrewrite.java.ReloadableJava8Parser", true,
-                        toolsAwareClassLoader);
-
-                Constructor<?> delegateParserConstructor = reloadableParser
-                        .getDeclaredConstructor(Collection.class, Collection.class, Collection.class, Charset.class,
-                                Boolean.TYPE, Collection.class, JavaTypeCache.class);
-
-                delegateParserConstructor.setAccessible(true);
-
-                JavaParser delegate = (JavaParser) delegateParserConstructor
-                        .newInstance(classpath, classBytesClasspath, dependsOn, charset, logCompilationWarningsAndErrors, styles, javaTypeCache);
-
-                return new Java8Parser(delegate);
-            } catch (Exception e) {
-                throw new IllegalStateException("Unable to construct Java8Parser.", e);
-            }
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.internal.JavaTypeCache;
+import org.openrewrite.java.marker.JavaSourceSet;
+import org.openrewrite.java.tree.J;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.List;
+
+public class Java8Parser implements JavaParser {
+    private final JavaParser delegate;
+
+    Java8Parser(JavaParser delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
+        return delegate.parseInputs(sourceFiles, relativeTo, ctx);
+    }
+
+    @Override
+    public JavaParser reset() {
+        return delegate.reset();
+    }
+
+    @Override
+    public void setClasspath(Collection<Path> classpath) {
+        delegate.setClasspath(classpath);
+    }
+
+    @Override
+    public void setSourceSet(String sourceSet) {
+        delegate.setSourceSet(sourceSet);
+    }
+
+    @Override
+    public JavaSourceSet getSourceSet(ExecutionContext ctx) {
+        return delegate.getSourceSet(ctx);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder extends JavaParser.Builder<Java8Parser, Builder> {
+
+        @Nullable
+        private static ClassLoader toolsClassLoader;
+
+        @Nullable
+        private static ClassLoader toolsAwareClassLoader;
+
+        static synchronized void lazyInitClassLoaders() {
+            if (toolsClassLoader != null && toolsAwareClassLoader != null) {
+                return;
+            }
+
+            try {
+                File tools = Paths.get(System.getProperty("java.home")).resolve("../lib/tools.jar").toFile();
+                if (!tools.exists()) {
+                    throw new IllegalStateException("To use Java8Parser, you must run the process with a JDK and not a JRE.");
+                }
+
+                toolsClassLoader = new URLClassLoader(new URL[]{tools.toURI().toURL()}, Java8Parser.class.getClassLoader());
+                URLClassLoader appClassLoader = (URLClassLoader) Java8Parser.class.getClassLoader();
+
+                toolsAwareClassLoader = new URLClassLoader(appClassLoader.getURLs(), toolsClassLoader) {
+                    @Override
+                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                        if (!name.contains("ReloadableJava8") &&
+                                !name.startsWith("com.sun.tools") &&
+                                !name.startsWith("com.sun.source") &&
+                                !name.contains("ReloadableTypeMapping")) {
+                            return toolsClassLoader.loadClass(name);
+                        }
+
+                        Class<?> loadedClass = findLoadedClass(name);
+
+                        if (loadedClass == null) {
+                            try {
+                                loadedClass = findClass(name);
+                            } catch (ClassNotFoundException e) {
+                                loadedClass = super.loadClass(name, resolve);
+                            }
+                        }
+
+                        if (resolve) {
+                            resolveClass(loadedClass);
+                        }
+
+                        return loadedClass;
+                    }
+                };
+            } catch (MalformedURLException e) {
+                throw new IllegalStateException("To use Java8Parser, you must run the process with a JDK and not a JRE.", e);
+            }
+        }
+
+        @Override
+        public Java8Parser build() {
+            lazyInitClassLoaders();
+
+            try {
+                // need to reverse this parent/child relationship
+                Class<?> reloadableParser = Class.forName("org.openrewrite.java.ReloadableJava8Parser", true,
+                        toolsAwareClassLoader);
+
+                Constructor<?> delegateParserConstructor = reloadableParser
+                        .getDeclaredConstructor(Collection.class, Collection.class, Collection.class, Charset.class,
+                                Boolean.TYPE, Collection.class, JavaTypeCache.class);
+
+                delegateParserConstructor.setAccessible(true);
+
+                JavaParser delegate = (JavaParser) delegateParserConstructor
+                        .newInstance(classpath, classBytesClasspath, dependsOn, charset, logCompilationWarningsAndErrors, styles, javaTypeCache);
+
+                return new Java8Parser(delegate);
+            } catch (Exception e) {
+                throw new IllegalStateException("Unable to construct Java8Parser.", e);
+            }
+        }
+    }
+}
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/Java8ParserInputFileObject.java b/rewrite-java-8/src/main/java/org/openrewrite/java/Java8ParserInputFileObject.java
index a911ec3bfef..5a519634871 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/Java8ParserInputFileObject.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/Java8ParserInputFileObject.java
@@ -1,121 +1,121 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.openrewrite.Parser;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.NestingKind;
-import javax.tools.JavaFileObject;
-import java.io.*;
-import java.net.URI;
-import java.nio.file.Path;
-
-/**
- * So that {@link JavaParser} can ingest source files from {@link InputStream} sources
- * other than a file on disk.
- */
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Java8ParserInputFileObject implements JavaFileObject {
-    @EqualsAndHashCode.Include
-    @Nullable
-    private final Path path;
-
-    @Getter
-    private final Parser.Input input;
-
-    public Java8ParserInputFileObject(Parser.Input input) {
-        this.input = input;
-        this.path = input.getPath();
-    }
-
-    @Override
-    public URI toUri() {
-        if (path == null) {
-            //noinspection ConstantConditions
-            return null;
-        }
-        return path.toUri();
-    }
-
-    @Override
-    public String getName() {
-        if (path == null) {
-            //noinspection ConstantConditions
-            return null;
-        }
-        return path.toString();
-    }
-
-    @Override
-    public InputStream openInputStream() {
-        return input.getSource();
-    }
-
-    @Override
-    public OutputStream openOutputStream() {
-        throw new UnsupportedOperationException("Should be no need to write output to this file");
-    }
-
-    @Override
-    public Reader openReader(boolean ignoreEncodingErrors) {
-        return new InputStreamReader(input.getSource());
-    }
-
-    @Override
-    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-        return input.getSource().readFully();
-    }
-
-    @Override
-    public Writer openWriter() {
-        throw new UnsupportedOperationException("Should be no need to write output to this file");
-    }
-
-    @Override
-    public long getLastModified() {
-        return 0;
-    }
-
-    @Override
-    public boolean delete() {
-        return false;
-    }
-
-    @Override
-    public Kind getKind() {
-        return Kind.SOURCE;
-    }
-
-    @Override
-    public boolean isNameCompatible(String simpleName, Kind kind) {
-        return true;
-    }
-
-    @Override
-    public NestingKind getNestingKind() {
-        return NestingKind.TOP_LEVEL;
-    }
-
-    @Override
-    public Modifier getAccessLevel() {
-        return Modifier.PUBLIC;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.openrewrite.Parser;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
+import javax.tools.JavaFileObject;
+import java.io.*;
+import java.net.URI;
+import java.nio.file.Path;
+
+/**
+ * So that {@link JavaParser} can ingest source files from {@link InputStream} sources
+ * other than a file on disk.
+ */
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class Java8ParserInputFileObject implements JavaFileObject {
+    @EqualsAndHashCode.Include
+    @Nullable
+    private final Path path;
+
+    @Getter
+    private final Parser.Input input;
+
+    public Java8ParserInputFileObject(Parser.Input input) {
+        this.input = input;
+        this.path = input.getPath();
+    }
+
+    @Override
+    public URI toUri() {
+        if (path == null) {
+            //noinspection ConstantConditions
+            return null;
+        }
+        return path.toUri();
+    }
+
+    @Override
+    public String getName() {
+        if (path == null) {
+            //noinspection ConstantConditions
+            return null;
+        }
+        return path.toString();
+    }
+
+    @Override
+    public InputStream openInputStream() {
+        return input.getSource();
+    }
+
+    @Override
+    public OutputStream openOutputStream() {
+        throw new UnsupportedOperationException("Should be no need to write output to this file");
+    }
+
+    @Override
+    public Reader openReader(boolean ignoreEncodingErrors) {
+        return new InputStreamReader(input.getSource());
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return input.getSource().readFully();
+    }
+
+    @Override
+    public Writer openWriter() {
+        throw new UnsupportedOperationException("Should be no need to write output to this file");
+    }
+
+    @Override
+    public long getLastModified() {
+        return 0;
+    }
+
+    @Override
+    public boolean delete() {
+        return false;
+    }
+
+    @Override
+    public Kind getKind() {
+        return Kind.SOURCE;
+    }
+
+    @Override
+    public boolean isNameCompatible(String simpleName, Kind kind) {
+        return true;
+    }
+
+    @Override
+    public NestingKind getNestingKind() {
+        return NestingKind.TOP_LEVEL;
+    }
+
+    @Override
+    public Modifier getAccessLevel() {
+        return Modifier.PUBLIC;
+    }
+}
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
index 6588e7aa3d9..a50245ca871 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
@@ -1,420 +1,420 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import com.sun.tools.javac.comp.*;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Options;
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.Tree;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.MetricsHelper;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.internal.JavaTypeCache;
-import org.openrewrite.java.marker.JavaSourceSet;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.style.NamedStyles;
-import org.openrewrite.tree.ParsingEventListener;
-import org.openrewrite.tree.ParsingExecutionContextView;
-
-import javax.tools.*;
-import java.io.*;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
-
-class ReloadableJava8Parser implements JavaParser {
-    private String sourceSet = "main";
-    private final JavaTypeCache typeCache;
-
-    @Nullable
-    private transient JavaSourceSet sourceSetProvenance;
-
-    @Nullable
-    private Collection<Path> classpath;
-
-    @Nullable
-    private final Collection<Input> dependsOn;
-
-    private final JavacFileManager pfm;
-
-    private final Context context;
-    private final JavaCompiler compiler;
-    private final ResettableLog compilerLog;
-    private final Collection<NamedStyles> styles;
-
-    ReloadableJava8Parser(@Nullable Collection<Path> classpath,
-                          Collection<byte[]> classBytesClasspath,
-                          @Nullable Collection<Input> dependsOn,
-                          Charset charset,
-                          boolean logCompilationWarningsAndErrors,
-                          Collection<NamedStyles> styles,
-                          JavaTypeCache typeCache) {
-        this.classpath = classpath;
-        this.dependsOn = dependsOn;
-        this.styles = styles;
-        this.typeCache = typeCache;
-
-        this.context = new Context();
-        this.compilerLog = new ResettableLog(context);
-        this.pfm = new ByteArrayCapableJavacFileManager(context, true, charset, classBytesClasspath);
-        context.put(JavaFileManager.class, this.pfm);
-
-        // otherwise, consecutive string literals in binary expressions are concatenated by the parser, losing the original
-        // structure of the expression!
-        Options.instance(context).put("allowStringFolding", "false");
-        Options.instance(context).put("compilePolicy", "attr");
-
-        // JavaCompiler line 452 (call to ImplicitSourcePolicy.decode(..))
-        Options.instance(context).put("-implicit", "none");
-
-        // https://docs.oracle.com/en/java/javacard/3.1/guide/setting-java-compiler-options.html
-        Options.instance(context).put("-g", "-g");
-        Options.instance(context).put("-proc", "none");
-
-        // MUST be created (registered with the context) after pfm and compilerLog
-        compiler = new JavaCompiler(context);
-
-        // otherwise, the JavacParser will use EmptyEndPosTable, effectively setting -1 as the end position
-        // for every tree element
-        compiler.genEndPos = true;
-
-        compiler.keepComments = true;
-
-        // we don't need this, so as a minor performance improvement, omit these compiler features
-        compiler.lineDebugInfo = false;
-
-        compilerLog.setWriters(new PrintWriter(new Writer() {
-            @Override
-            public void write(char[] cbuf, int off, int len) {
-                if (logCompilationWarningsAndErrors) {
-                    String log = new String(Arrays.copyOfRange(cbuf, off, len));
-                    if (!StringUtils.isBlank(log) && !log.contains("warning: a package-info.java file has already")) {
-                        org.slf4j.LoggerFactory.getLogger(ReloadableJava8Parser.class).warn(log);
-                    }
-                }
-            }
-
-            @Override
-            public void flush() {
-            }
-
-            @Override
-            public void close() {
-            }
-        }));
-
-        compileDependencies();
-    }
-
-    @Override
-    public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
-        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
-
-        if (classpath != null) { // override classpath
-            if (context.get(JavaFileManager.class) != pfm) {
-                throw new IllegalStateException("JavaFileManager has been forked unexpectedly");
-            }
-
-            try {
-                pfm.setLocation(StandardLocation.CLASS_PATH, classpath.stream().map(Path::toFile).collect(toList()));
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        }
-
-        @SuppressWarnings("ConstantConditions") LinkedHashMap<Input, JCTree.JCCompilationUnit> cus = acceptedInputs(sourceFiles).stream()
-                .collect(Collectors.toMap(
-                        Function.identity(),
-                        input -> MetricsHelper.successTags(
-                                        Timer.builder("rewrite.parse")
-                                                .description("The time spent by the JDK in parsing and tokenizing the source file")
-                                                .tag("file.type", "Java")
-                                                .tag("step", "(1) JDK parsing"))
-                                .register(Metrics.globalRegistry)
-                                .record(() -> {
-                                    try {
-                                        return compiler.parse(new Java8ParserInputFileObject(input));
-                                    } catch (IllegalStateException e) {
-                                        if ("endPosTable already set".equals(e.getMessage())) {
-                                            throw new IllegalStateException("Call reset() on JavaParser before parsing another" +
-                                                    "set of source files that have some of the same fully qualified names", e);
-                                        }
-                                        throw e;
-                                    }
-                                }),
-                        (e2, e1) -> e1, LinkedHashMap::new));
-
-        try {
-            enterAll(cus.values());
-            compiler.attribute(new TimedTodo(compiler.todo));
-        } catch (Throwable t) {
-            // when symbol entering fails on problems like missing types, attribution can often times proceed
-            // unhindered, but it sometimes cannot (so attribution is always a BEST EFFORT in the presence of errors)
-            ctx.getOnError().accept(new JavaParsingException("Failed symbol entering or attribution", t));
-        }
-
-        List<J.CompilationUnit> mappedCus = cus.entrySet().stream()
-                .map(cuByPath -> {
-                    Timer.Sample sample = Timer.start();
-                    Input input = cuByPath.getKey();
-                    try {
-                        ReloadableJava8ParserVisitor parser = new ReloadableJava8ParserVisitor(
-                                input.getRelativePath(relativeTo),
-                                input.getSource(),
-                                styles,
-                                typeCache,
-                                ctx,
-                                context);
-                        J.CompilationUnit cu = (J.CompilationUnit) parser.scan(cuByPath.getValue(), Space.EMPTY);
-                        sample.stop(MetricsHelper.successTags(
-                                        Timer.builder("rewrite.parse")
-                                                .description("The time spent mapping the OpenJDK AST to Rewrite's AST")
-                                                .tag("file.type", "Java")
-                                                .tag("step", "(3) Map to Rewrite AST"))
-                                .register(Metrics.globalRegistry));
-                        parsingListener.parsed(input, cu);
-                        return cu;
-                    } catch (Throwable t) {
-                        sample.stop(MetricsHelper.errorTags(
-                                        Timer.builder("rewrite.parse")
-                                                .description("The time spent mapping the OpenJDK AST to Rewrite's AST")
-                                                .tag("file.type", "Java")
-                                                .tag("step", "(3) Map to Rewrite AST"), t)
-                                .register(Metrics.globalRegistry));
-
-                        ctx.getOnError().accept(t);
-                        return null;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .collect(toList());
-
-        JavaSourceSet sourceSet = getSourceSet(ctx);
-        if (!ctx.getMessage(SKIP_SOURCE_SET_TYPE_GENERATION, false)) {
-            List<JavaType.FullyQualified> classpath = sourceSet.getClasspath();
-            for (J.CompilationUnit cu : mappedCus) {
-                for (JavaType type : cu.getTypesInUse().getTypesInUse()) {
-                    if (type instanceof JavaType.FullyQualified) {
-                        classpath.add((JavaType.FullyQualified) type);
-                    }
-                }
-            }
-            sourceSetProvenance = sourceSet.withClasspath(classpath);
-        }
-
-        assert sourceSetProvenance != null;
-        return ListUtils.map(mappedCus, cu -> cu.withMarkers(cu.getMarkers().add(sourceSetProvenance)));
-    }
-
-    @Override
-    public ReloadableJava8Parser reset() {
-        typeCache.clear();
-        compilerLog.reset();
-        pfm.flush();
-        compileDependencies();
-        return this;
-    }
-
-    @Override
-    public void setClasspath(Collection<Path> classpath) {
-        this.classpath = classpath;
-    }
-
-    @Override
-    public void setSourceSet(String sourceSet) {
-        this.sourceSetProvenance = null;
-        this.sourceSet = sourceSet;
-    }
-
-    @Override
-    public JavaSourceSet getSourceSet(ExecutionContext ctx) {
-        if (sourceSetProvenance == null) {
-            if (ctx.getMessage(SKIP_SOURCE_SET_TYPE_GENERATION, false)) {
-                sourceSetProvenance = new JavaSourceSet(Tree.randomId(), sourceSet, emptyList());
-            } else {
-                sourceSetProvenance = JavaSourceSet.build(sourceSet, classpath == null ? emptyList() : classpath,
-                        typeCache, false);
-            }
-        }
-        return sourceSetProvenance;
-    }
-
-    private void compileDependencies() {
-        if (dependsOn != null) {
-            InMemoryExecutionContext ctx = new InMemoryExecutionContext();
-            ctx.putMessage("org.openrewrite.java.skipSourceSetMarker", true);
-            parseInputs(dependsOn, null, ctx);
-        }
-        Check.instance(context).compiled.clear();
-    }
-
-    /**
-     * Enter symbol definitions into each compilation unit's scope
-     */
-    private void enterAll(Collection<JCTree.JCCompilationUnit> cus) {
-        Enter enter = Enter.instance(context);
-        com.sun.tools.javac.util.List<JCTree.JCCompilationUnit> compilationUnits = com.sun.tools.javac.util.List.from(
-                cus.toArray(new JCTree.JCCompilationUnit[0]));
-        enter.main(compilationUnits);
-    }
-
-    private static class ResettableLog extends Log {
-        protected ResettableLog(Context context) {
-            super(context);
-        }
-
-        public void reset() {
-            sourceMap.clear();
-        }
-    }
-
-    private static class TimedTodo extends Todo {
-        private final Todo todo;
-        private @Nullable Timer.Sample sample;
-
-        private TimedTodo(Todo todo) {
-            super(new Context());
-            this.todo = todo;
-        }
-
-        @Override
-        public boolean isEmpty() {
-            if (sample != null) {
-                sample.stop(MetricsHelper.successTags(
-                                Timer.builder("rewrite.parse")
-                                        .description("The time spent by the JDK in type attributing the source file")
-                                        .tag("file.type", "Java")
-                                        .tag("step", "(2) Type attribution"))
-                        .register(Metrics.globalRegistry));
-            }
-            return todo.isEmpty();
-        }
-
-        @Override
-        public Env<AttrContext> remove() {
-            this.sample = Timer.start();
-            return todo.remove();
-        }
-    }
-
-    private static class ByteArrayCapableJavacFileManager extends JavacFileManager {
-        private final List<PackageAwareJavaFileObject> classByteClasspath;
-
-        public ByteArrayCapableJavacFileManager(Context context,
-                                                boolean register,
-                                                Charset charset,
-                                                Collection<byte[]> classByteClasspath) {
-            super(context, register, charset);
-            this.classByteClasspath = classByteClasspath.stream()
-                    .map(PackageAwareJavaFileObject::new)
-                    .collect(toList());
-        }
-
-        @Override
-        public boolean isSameFile(FileObject fileObject, FileObject fileObject1) {
-            return fileObject.equals(fileObject1);
-        }
-
-        @Override
-        public String inferBinaryName(Location location, JavaFileObject file) {
-            if (file instanceof PackageAwareJavaFileObject) {
-                return ((PackageAwareJavaFileObject) file).getClassName();
-            }
-            return super.inferBinaryName(location, file);
-        }
-
-        @Override
-        public Iterable<JavaFileObject> list(Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse) throws IOException {
-            if (StandardLocation.CLASS_PATH.equals(location)) {
-                Iterable<JavaFileObject> listed = super.list(location, packageName, kinds, recurse);
-                return Stream.concat(
-                        classByteClasspath.stream()
-                                .filter(jfo -> jfo.getPackage().equals(packageName)),
-                        StreamSupport.stream(listed.spliterator(), false)
-                ).collect(toList());
-            }
-            return super.list(location, packageName, kinds, recurse);
-        }
-    }
-
-    private static class PackageAwareJavaFileObject extends SimpleJavaFileObject {
-        private final String pkg;
-        private final String className;
-        private final byte[] classBytes;
-
-        private PackageAwareJavaFileObject(byte[] classBytes) {
-            super(URI.create("file:///.byteArray"), Kind.CLASS);
-
-            AtomicReference<String> pkgRef = new AtomicReference<>();
-            AtomicReference<String> nameRef = new AtomicReference<>();
-
-            ClassReader classReader = new ClassReader(classBytes);
-            classReader.accept(new ClassVisitor(Opcodes.ASM9) {
-                @Override
-                public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-                    if (name.contains("/")) {
-                        pkgRef.set(name.substring(0, name.lastIndexOf('/'))
-                                .replace('/', '.'));
-                        nameRef.set(name.substring(name.lastIndexOf('/') + 1));
-                    } else {
-                        pkgRef.set(name);
-                        nameRef.set(name);
-                    }
-                }
-            }, ClassReader.SKIP_DEBUG | ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
-
-            this.pkg = pkgRef.get();
-            this.className = nameRef.get();
-            this.classBytes = classBytes;
-        }
-
-        public String getPackage() {
-            return pkg;
-        }
-
-        public String getClassName() {
-            return className;
-        }
-
-        @Override
-        public InputStream openInputStream() {
-            return new ByteArrayInputStream(classBytes);
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import com.sun.tools.javac.comp.*;
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Options;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Tree;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.MetricsHelper;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.internal.JavaTypeCache;
+import org.openrewrite.java.marker.JavaSourceSet;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.style.NamedStyles;
+import org.openrewrite.tree.ParsingEventListener;
+import org.openrewrite.tree.ParsingExecutionContextView;
+
+import javax.tools.*;
+import java.io.*;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+
+class ReloadableJava8Parser implements JavaParser {
+    private String sourceSet = "main";
+    private final JavaTypeCache typeCache;
+
+    @Nullable
+    private transient JavaSourceSet sourceSetProvenance;
+
+    @Nullable
+    private Collection<Path> classpath;
+
+    @Nullable
+    private final Collection<Input> dependsOn;
+
+    private final JavacFileManager pfm;
+
+    private final Context context;
+    private final JavaCompiler compiler;
+    private final ResettableLog compilerLog;
+    private final Collection<NamedStyles> styles;
+
+    ReloadableJava8Parser(@Nullable Collection<Path> classpath,
+                          Collection<byte[]> classBytesClasspath,
+                          @Nullable Collection<Input> dependsOn,
+                          Charset charset,
+                          boolean logCompilationWarningsAndErrors,
+                          Collection<NamedStyles> styles,
+                          JavaTypeCache typeCache) {
+        this.classpath = classpath;
+        this.dependsOn = dependsOn;
+        this.styles = styles;
+        this.typeCache = typeCache;
+
+        this.context = new Context();
+        this.compilerLog = new ResettableLog(context);
+        this.pfm = new ByteArrayCapableJavacFileManager(context, true, charset, classBytesClasspath);
+        context.put(JavaFileManager.class, this.pfm);
+
+        // otherwise, consecutive string literals in binary expressions are concatenated by the parser, losing the original
+        // structure of the expression!
+        Options.instance(context).put("allowStringFolding", "false");
+        Options.instance(context).put("compilePolicy", "attr");
+
+        // JavaCompiler line 452 (call to ImplicitSourcePolicy.decode(..))
+        Options.instance(context).put("-implicit", "none");
+
+        // https://docs.oracle.com/en/java/javacard/3.1/guide/setting-java-compiler-options.html
+        Options.instance(context).put("-g", "-g");
+        Options.instance(context).put("-proc", "none");
+
+        // MUST be created (registered with the context) after pfm and compilerLog
+        compiler = new JavaCompiler(context);
+
+        // otherwise, the JavacParser will use EmptyEndPosTable, effectively setting -1 as the end position
+        // for every tree element
+        compiler.genEndPos = true;
+
+        compiler.keepComments = true;
+
+        // we don't need this, so as a minor performance improvement, omit these compiler features
+        compiler.lineDebugInfo = false;
+
+        compilerLog.setWriters(new PrintWriter(new Writer() {
+            @Override
+            public void write(char[] cbuf, int off, int len) {
+                if (logCompilationWarningsAndErrors) {
+                    String log = new String(Arrays.copyOfRange(cbuf, off, len));
+                    if (!StringUtils.isBlank(log) && !log.contains("warning: a package-info.java file has already")) {
+                        org.slf4j.LoggerFactory.getLogger(ReloadableJava8Parser.class).warn(log);
+                    }
+                }
+            }
+
+            @Override
+            public void flush() {
+            }
+
+            @Override
+            public void close() {
+            }
+        }));
+
+        compileDependencies();
+    }
+
+    @Override
+    public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
+        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
+
+        if (classpath != null) { // override classpath
+            if (context.get(JavaFileManager.class) != pfm) {
+                throw new IllegalStateException("JavaFileManager has been forked unexpectedly");
+            }
+
+            try {
+                pfm.setLocation(StandardLocation.CLASS_PATH, classpath.stream().map(Path::toFile).collect(toList()));
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        @SuppressWarnings("ConstantConditions") LinkedHashMap<Input, JCTree.JCCompilationUnit> cus = acceptedInputs(sourceFiles).stream()
+                .collect(Collectors.toMap(
+                        Function.identity(),
+                        input -> MetricsHelper.successTags(
+                                        Timer.builder("rewrite.parse")
+                                                .description("The time spent by the JDK in parsing and tokenizing the source file")
+                                                .tag("file.type", "Java")
+                                                .tag("step", "(1) JDK parsing"))
+                                .register(Metrics.globalRegistry)
+                                .record(() -> {
+                                    try {
+                                        return compiler.parse(new Java8ParserInputFileObject(input));
+                                    } catch (IllegalStateException e) {
+                                        if ("endPosTable already set".equals(e.getMessage())) {
+                                            throw new IllegalStateException("Call reset() on JavaParser before parsing another" +
+                                                    "set of source files that have some of the same fully qualified names", e);
+                                        }
+                                        throw e;
+                                    }
+                                }),
+                        (e2, e1) -> e1, LinkedHashMap::new));
+
+        try {
+            enterAll(cus.values());
+            compiler.attribute(new TimedTodo(compiler.todo));
+        } catch (Throwable t) {
+            // when symbol entering fails on problems like missing types, attribution can often times proceed
+            // unhindered, but it sometimes cannot (so attribution is always a BEST EFFORT in the presence of errors)
+            ctx.getOnError().accept(new JavaParsingException("Failed symbol entering or attribution", t));
+        }
+
+        List<J.CompilationUnit> mappedCus = cus.entrySet().stream()
+                .map(cuByPath -> {
+                    Timer.Sample sample = Timer.start();
+                    Input input = cuByPath.getKey();
+                    try {
+                        ReloadableJava8ParserVisitor parser = new ReloadableJava8ParserVisitor(
+                                input.getRelativePath(relativeTo),
+                                input.getSource(),
+                                styles,
+                                typeCache,
+                                ctx,
+                                context);
+                        J.CompilationUnit cu = (J.CompilationUnit) parser.scan(cuByPath.getValue(), Space.EMPTY);
+                        sample.stop(MetricsHelper.successTags(
+                                        Timer.builder("rewrite.parse")
+                                                .description("The time spent mapping the OpenJDK AST to Rewrite's AST")
+                                                .tag("file.type", "Java")
+                                                .tag("step", "(3) Map to Rewrite AST"))
+                                .register(Metrics.globalRegistry));
+                        parsingListener.parsed(input, cu);
+                        return cu;
+                    } catch (Throwable t) {
+                        sample.stop(MetricsHelper.errorTags(
+                                        Timer.builder("rewrite.parse")
+                                                .description("The time spent mapping the OpenJDK AST to Rewrite's AST")
+                                                .tag("file.type", "Java")
+                                                .tag("step", "(3) Map to Rewrite AST"), t)
+                                .register(Metrics.globalRegistry));
+
+                        ctx.getOnError().accept(t);
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(toList());
+
+        JavaSourceSet sourceSet = getSourceSet(ctx);
+        if (!ctx.getMessage(SKIP_SOURCE_SET_TYPE_GENERATION, false)) {
+            List<JavaType.FullyQualified> classpath = sourceSet.getClasspath();
+            for (J.CompilationUnit cu : mappedCus) {
+                for (JavaType type : cu.getTypesInUse().getTypesInUse()) {
+                    if (type instanceof JavaType.FullyQualified) {
+                        classpath.add((JavaType.FullyQualified) type);
+                    }
+                }
+            }
+            sourceSetProvenance = sourceSet.withClasspath(classpath);
+        }
+
+        assert sourceSetProvenance != null;
+        return ListUtils.map(mappedCus, cu -> cu.withMarkers(cu.getMarkers().add(sourceSetProvenance)));
+    }
+
+    @Override
+    public ReloadableJava8Parser reset() {
+        typeCache.clear();
+        compilerLog.reset();
+        pfm.flush();
+        compileDependencies();
+        return this;
+    }
+
+    @Override
+    public void setClasspath(Collection<Path> classpath) {
+        this.classpath = classpath;
+    }
+
+    @Override
+    public void setSourceSet(String sourceSet) {
+        this.sourceSetProvenance = null;
+        this.sourceSet = sourceSet;
+    }
+
+    @Override
+    public JavaSourceSet getSourceSet(ExecutionContext ctx) {
+        if (sourceSetProvenance == null) {
+            if (ctx.getMessage(SKIP_SOURCE_SET_TYPE_GENERATION, false)) {
+                sourceSetProvenance = new JavaSourceSet(Tree.randomId(), sourceSet, emptyList());
+            } else {
+                sourceSetProvenance = JavaSourceSet.build(sourceSet, classpath == null ? emptyList() : classpath,
+                        typeCache, false);
+            }
+        }
+        return sourceSetProvenance;
+    }
+
+    private void compileDependencies() {
+        if (dependsOn != null) {
+            InMemoryExecutionContext ctx = new InMemoryExecutionContext();
+            ctx.putMessage("org.openrewrite.java.skipSourceSetMarker", true);
+            parseInputs(dependsOn, null, ctx);
+        }
+        Check.instance(context).compiled.clear();
+    }
+
+    /**
+     * Enter symbol definitions into each compilation unit's scope
+     */
+    private void enterAll(Collection<JCTree.JCCompilationUnit> cus) {
+        Enter enter = Enter.instance(context);
+        com.sun.tools.javac.util.List<JCTree.JCCompilationUnit> compilationUnits = com.sun.tools.javac.util.List.from(
+                cus.toArray(new JCTree.JCCompilationUnit[0]));
+        enter.main(compilationUnits);
+    }
+
+    private static class ResettableLog extends Log {
+        protected ResettableLog(Context context) {
+            super(context);
+        }
+
+        public void reset() {
+            sourceMap.clear();
+        }
+    }
+
+    private static class TimedTodo extends Todo {
+        private final Todo todo;
+        private @Nullable Timer.Sample sample;
+
+        private TimedTodo(Todo todo) {
+            super(new Context());
+            this.todo = todo;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            if (sample != null) {
+                sample.stop(MetricsHelper.successTags(
+                                Timer.builder("rewrite.parse")
+                                        .description("The time spent by the JDK in type attributing the source file")
+                                        .tag("file.type", "Java")
+                                        .tag("step", "(2) Type attribution"))
+                        .register(Metrics.globalRegistry));
+            }
+            return todo.isEmpty();
+        }
+
+        @Override
+        public Env<AttrContext> remove() {
+            this.sample = Timer.start();
+            return todo.remove();
+        }
+    }
+
+    private static class ByteArrayCapableJavacFileManager extends JavacFileManager {
+        private final List<PackageAwareJavaFileObject> classByteClasspath;
+
+        public ByteArrayCapableJavacFileManager(Context context,
+                                                boolean register,
+                                                Charset charset,
+                                                Collection<byte[]> classByteClasspath) {
+            super(context, register, charset);
+            this.classByteClasspath = classByteClasspath.stream()
+                    .map(PackageAwareJavaFileObject::new)
+                    .collect(toList());
+        }
+
+        @Override
+        public boolean isSameFile(FileObject fileObject, FileObject fileObject1) {
+            return fileObject.equals(fileObject1);
+        }
+
+        @Override
+        public String inferBinaryName(Location location, JavaFileObject file) {
+            if (file instanceof PackageAwareJavaFileObject) {
+                return ((PackageAwareJavaFileObject) file).getClassName();
+            }
+            return super.inferBinaryName(location, file);
+        }
+
+        @Override
+        public Iterable<JavaFileObject> list(Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse) throws IOException {
+            if (StandardLocation.CLASS_PATH.equals(location)) {
+                Iterable<JavaFileObject> listed = super.list(location, packageName, kinds, recurse);
+                return Stream.concat(
+                        classByteClasspath.stream()
+                                .filter(jfo -> jfo.getPackage().equals(packageName)),
+                        StreamSupport.stream(listed.spliterator(), false)
+                ).collect(toList());
+            }
+            return super.list(location, packageName, kinds, recurse);
+        }
+    }
+
+    private static class PackageAwareJavaFileObject extends SimpleJavaFileObject {
+        private final String pkg;
+        private final String className;
+        private final byte[] classBytes;
+
+        private PackageAwareJavaFileObject(byte[] classBytes) {
+            super(URI.create("file:///.byteArray"), Kind.CLASS);
+
+            AtomicReference<String> pkgRef = new AtomicReference<>();
+            AtomicReference<String> nameRef = new AtomicReference<>();
+
+            ClassReader classReader = new ClassReader(classBytes);
+            classReader.accept(new ClassVisitor(Opcodes.ASM9) {
+                @Override
+                public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+                    if (name.contains("/")) {
+                        pkgRef.set(name.substring(0, name.lastIndexOf('/'))
+                                .replace('/', '.'));
+                        nameRef.set(name.substring(name.lastIndexOf('/') + 1));
+                    } else {
+                        pkgRef.set(name);
+                        nameRef.set(name);
+                    }
+                }
+            }, ClassReader.SKIP_DEBUG | ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);
+
+            this.pkg = pkgRef.get();
+            this.className = nameRef.get();
+            this.classBytes = classBytes;
+        }
+
+        public String getPackage() {
+            return pkg;
+        }
+
+        public String getClassName() {
+            return className;
+        }
+
+        @Override
+        public InputStream openInputStream() {
+            return new ByteArrayInputStream(classBytes);
+        }
+    }
+}
diff --git a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8Test.kt b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8Test.kt
index ae527298947..cfdc513ca95 100644
--- a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8Test.kt
+++ b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8Test.kt
@@ -1,20 +1,20 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-interface Java8Test {
-    fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+interface Java8Test {
+    fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
+}
diff --git a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeCompatibilityTest.kt b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeCompatibilityTest.kt
index 82dbd96c7ac..c4283879ba0 100644
--- a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeCompatibilityTest.kt
+++ b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeCompatibilityTest.kt
@@ -1,20 +1,20 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-class Java8TreeCompatibilityTest: JavaTreeCompatibilityKit() {
-    override fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+class Java8TreeCompatibilityTest: JavaTreeCompatibilityKit() {
+    override fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
+}
diff --git a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeDebugTest.kt b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeDebugTest.kt
index 4cb552bbebf..36d39db9907 100755
--- a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeDebugTest.kt
+++ b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8TreeDebugTest.kt
@@ -1,216 +1,216 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.extension.ExtendWith
-import org.openrewrite.DebugOnly
-import org.openrewrite.java.tree.*
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8AnnotationTest: Java8Test, AnnotationTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ArrayAccessTest: Java8Test, ArrayAccessTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ArrayTypeTest: Java8Test, ArrayTypeTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8AssertTest: Java8Test, AssertTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8AssignmentOperationTest: Java8Test, AssignmentOperationTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8AssignmentTest: Java8Test, AssignmentTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8BinaryTest: Java8Test, BinaryTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8BlockTest: Java8Test, BlockTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8BreakTest: Java8Test, BreakTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ClassDeclarationTest: Java8Test, ClassDeclarationTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8CommentTest: Java8Test, CommentTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8CompilationUnitTest: Java8Test, CompilationUnitTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ContinueTest: Java8Test, ContinueTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8DoWhileLoopTest: Java8Test, DoWhileLoopTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8EmptyTest: Java8Test, EmptyTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8EnumTest: Java8Test, EnumTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8FieldAccessTest: Java8Test, FieldAccessTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ForLoopTest: Java8Test, ForLoopTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ForEachLoopTest: Java8Test, ForEachLoopTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8IdentifierTest: Java8Test, IdentifierTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8IfTest: Java8Test, IfTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ImportTest: Java8Test, ImportTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8InstanceOfTest: Java8Test, InstanceOfTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8JavadocTest: Java8Test, JavadocTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8JavaParserTest: Java8Test, JavaParserTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8LabelTest: Java8Test, LabelTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8LambdaTest: Java8Test, LambdaTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8LiteralTest: Java8Test, LiteralTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8MemberReferenceTest: Java8Test, MemberReferenceTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8MethodDeclarationTest: Java8Test, MethodDeclarationTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8MethodInvocationTest: Java8Test, MethodInvocationTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8MethodMatcherTest: Java8Test, MethodMatcherTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8MethodParamPadTest: Java8Test, MethodParamPadTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8NewArrayTest: Java8Test, NewArrayTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8NewClassTest: Java8Test, NewClassTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8PackageTest: Java8Test, PackageTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ParenthesesTest: Java8Test, ParenthesesTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8PrimitiveTest: Java8Test, PrimitiveTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ReturnTest: Java8Test, ReturnTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8SwitchTest: Java8Test, SwitchTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8SynchronizedTest: Java8Test, SynchronizedTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8TernaryTest: Java8Test, TernaryTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8ThrowTest: Java8Test, ThrowTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8TryCatchTest: Java8Test, TryCatchTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8TypeCastTest: Java8Test, TypeCastTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8TypeParameterAndWildcardTest: Java8Test, TypeParameterAndWildcardTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8UnaryTest: Java8Test, UnaryTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8VariableDeclarationsTest: Java8Test, VariableDeclarationsTest
-
-@DebugOnly
-@ExtendWith(JavaParserResolver::class)
-class Java8WhileLoopTest: Java8Test, WhileLoopTest
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.extension.ExtendWith
+import org.openrewrite.DebugOnly
+import org.openrewrite.java.tree.*
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8AnnotationTest: Java8Test, AnnotationTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ArrayAccessTest: Java8Test, ArrayAccessTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ArrayTypeTest: Java8Test, ArrayTypeTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8AssertTest: Java8Test, AssertTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8AssignmentOperationTest: Java8Test, AssignmentOperationTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8AssignmentTest: Java8Test, AssignmentTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8BinaryTest: Java8Test, BinaryTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8BlockTest: Java8Test, BlockTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8BreakTest: Java8Test, BreakTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ClassDeclarationTest: Java8Test, ClassDeclarationTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8CommentTest: Java8Test, CommentTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8CompilationUnitTest: Java8Test, CompilationUnitTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ContinueTest: Java8Test, ContinueTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8DoWhileLoopTest: Java8Test, DoWhileLoopTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8EmptyTest: Java8Test, EmptyTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8EnumTest: Java8Test, EnumTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8FieldAccessTest: Java8Test, FieldAccessTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ForLoopTest: Java8Test, ForLoopTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ForEachLoopTest: Java8Test, ForEachLoopTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8IdentifierTest: Java8Test, IdentifierTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8IfTest: Java8Test, IfTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ImportTest: Java8Test, ImportTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8InstanceOfTest: Java8Test, InstanceOfTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8JavadocTest: Java8Test, JavadocTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8JavaParserTest: Java8Test, JavaParserTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8LabelTest: Java8Test, LabelTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8LambdaTest: Java8Test, LambdaTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8LiteralTest: Java8Test, LiteralTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8MemberReferenceTest: Java8Test, MemberReferenceTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8MethodDeclarationTest: Java8Test, MethodDeclarationTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8MethodInvocationTest: Java8Test, MethodInvocationTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8MethodMatcherTest: Java8Test, MethodMatcherTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8MethodParamPadTest: Java8Test, MethodParamPadTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8NewArrayTest: Java8Test, NewArrayTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8NewClassTest: Java8Test, NewClassTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8PackageTest: Java8Test, PackageTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ParenthesesTest: Java8Test, ParenthesesTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8PrimitiveTest: Java8Test, PrimitiveTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ReturnTest: Java8Test, ReturnTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8SwitchTest: Java8Test, SwitchTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8SynchronizedTest: Java8Test, SynchronizedTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8TernaryTest: Java8Test, TernaryTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8ThrowTest: Java8Test, ThrowTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8TryCatchTest: Java8Test, TryCatchTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8TypeCastTest: Java8Test, TypeCastTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8TypeParameterAndWildcardTest: Java8Test, TypeParameterAndWildcardTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8UnaryTest: Java8Test, UnaryTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8VariableDeclarationsTest: Java8Test, VariableDeclarationsTest
+
+@DebugOnly
+@ExtendWith(JavaParserResolver::class)
+class Java8WhileLoopTest: Java8Test, WhileLoopTest
diff --git a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8VisitorCompatibilityTest.kt b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8VisitorCompatibilityTest.kt
index 604d8dd70db..739a418445b 100755
--- a/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8VisitorCompatibilityTest.kt
+++ b/rewrite-java-8/src/test/kotlin/org/openrewrite/java/Java8VisitorCompatibilityTest.kt
@@ -1,20 +1,20 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-class Java8VisitorCompatibilityTest: JavaVisitorCompatibilityKit() {
-    override fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+class Java8VisitorCompatibilityTest: JavaVisitorCompatibilityKit() {
+    override fun javaParser(): Java8Parser.Builder = Java8Parser.builder()
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevel.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevel.java
index c5e046a3e89..ae04d32e390 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevel.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevel.java
@@ -1,89 +1,89 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.search.DeclaresMethod;
-import org.openrewrite.java.tree.J;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangeMethodAccessLevel extends Recipe {
-
-    @Option(displayName = "Method pattern",
-            description = "A method pattern that is used to find matching method declarations/invocations.",
-            example = "org.mockito.Matchers anyVararg()")
-    String methodPattern;
-
-    @Option(displayName = "New access level",
-            description = "New method access level to apply to the method.",
-            example = "public",
-            valid = {"private", "protected", "package", "public"})
-    String newAccessLevel;
-
-    @Option(displayName = "Match on overrides",
-            description = "When enabled, find methods that are overrides of the method pattern.",
-            required = false)
-    @Nullable
-    Boolean matchOverrides;
-
-    @Override
-    public String getDisplayName() {
-        return "Change method access level";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change the access level (public, protected, private, package private) of a method.";
-    }
-
-    @Override
-    public Validated validate() {
-        return super.validate().and(Validated.test("newAccessLevel", "Must be one of 'private', 'protected', 'package', 'public'",
-                newAccessLevel, level -> "private".equals(level) || "protected".equals(level) || "package".equals(level) || "public".equals(level)));
-    }
-
-    @Override
-    protected JavaVisitor<ExecutionContext> getSingleSourceApplicableTest() {
-        return new DeclaresMethod<>(methodPattern, matchOverrides);
-    }
-
-    @Override
-    public JavaVisitor<ExecutionContext> getVisitor() {
-        J.Modifier.Type type;
-        switch (newAccessLevel) {
-            case "public":
-                type = J.Modifier.Type.Public;
-                break;
-            case "protected":
-                type = J.Modifier.Type.Protected;
-                break;
-            case "private":
-                type = J.Modifier.Type.Private;
-                break;
-            default:
-                type = null;
-        }
-
-        return new ChangeMethodAccessLevelVisitor<>(new MethodMatcher(methodPattern, matchOverrides), type);
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.search.DeclaresMethod;
+import org.openrewrite.java.tree.J;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangeMethodAccessLevel extends Recipe {
+
+    @Option(displayName = "Method pattern",
+            description = "A method pattern that is used to find matching method declarations/invocations.",
+            example = "org.mockito.Matchers anyVararg()")
+    String methodPattern;
+
+    @Option(displayName = "New access level",
+            description = "New method access level to apply to the method.",
+            example = "public",
+            valid = {"private", "protected", "package", "public"})
+    String newAccessLevel;
+
+    @Option(displayName = "Match on overrides",
+            description = "When enabled, find methods that are overrides of the method pattern.",
+            required = false)
+    @Nullable
+    Boolean matchOverrides;
+
+    @Override
+    public String getDisplayName() {
+        return "Change method access level";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change the access level (public, protected, private, package private) of a method.";
+    }
+
+    @Override
+    public Validated validate() {
+        return super.validate().and(Validated.test("newAccessLevel", "Must be one of 'private', 'protected', 'package', 'public'",
+                newAccessLevel, level -> "private".equals(level) || "protected".equals(level) || "package".equals(level) || "public".equals(level)));
+    }
+
+    @Override
+    protected JavaVisitor<ExecutionContext> getSingleSourceApplicableTest() {
+        return new DeclaresMethod<>(methodPattern, matchOverrides);
+    }
+
+    @Override
+    public JavaVisitor<ExecutionContext> getVisitor() {
+        J.Modifier.Type type;
+        switch (newAccessLevel) {
+            case "public":
+                type = J.Modifier.Type.Public;
+                break;
+            case "protected":
+                type = J.Modifier.Type.Protected;
+                break;
+            case "private":
+                type = J.Modifier.Type.Private;
+                break;
+            default:
+                type = null;
+        }
+
+        return new ChangeMethodAccessLevelVisitor<>(new MethodMatcher(methodPattern, matchOverrides), type);
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevelVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevelVisitor.java
index a2ec4f74c22..7372d098c06 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevelVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodAccessLevelVisitor.java
@@ -1,129 +1,129 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.Tree;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.tree.Comment;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.TypeTree;
-import org.openrewrite.marker.Markers;
-
-import java.util.*;
-
-import static java.util.Collections.emptyList;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangeMethodAccessLevelVisitor<P> extends JavaIsoVisitor<P> {
-    private static final Collection<J.Modifier.Type> EXPLICIT_ACCESS_LEVELS = Arrays.asList(J.Modifier.Type.Public,
-            J.Modifier.Type.Private, J.Modifier.Type.Protected);
-
-    MethodMatcher methodMatcher;
-
-    @Nullable
-    J.Modifier.Type newAccessLevel;
-
-    @Override
-    public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, P p) {
-        J.MethodDeclaration m = super.visitMethodDeclaration(method, p);
-        J.ClassDeclaration classDecl = getCursor().firstEnclosingOrThrow(J.ClassDeclaration.class);
-        if (methodMatcher.matches(method, classDecl)) {
-            J.Modifier.Type currentMethodAccessLevel = m.getModifiers().stream()
-                    .map(J.Modifier::getType)
-                    .filter(EXPLICIT_ACCESS_LEVELS::contains)
-                    .findAny()
-                    .orElse(null);
-
-            if (currentMethodAccessLevel == newAccessLevel) {
-                // No changes required
-                return m;
-            }
-
-            // Replace former modifier by new modifier if package-private is not involved
-            if (EXPLICIT_ACCESS_LEVELS.contains(currentMethodAccessLevel) && EXPLICIT_ACCESS_LEVELS.contains(newAccessLevel)) {
-                m = m.withModifiers(
-                        ListUtils.map(m.getModifiers(), mod -> mod.getType() == currentMethodAccessLevel ?
-                                mod.withType(newAccessLevel) : mod)
-                );
-            }
-
-            // If current access level is package-private (no modifier), add the new modifier
-            else if (currentMethodAccessLevel == null) {
-                J.Modifier mod = new J.Modifier(Tree.randomId(), Space.build(" ", emptyList()), Markers.EMPTY, newAccessLevel, Collections.emptyList());
-                m = m.withModifiers(ListUtils.concat(mod, m.getModifiers()));
-
-                if(method.getModifiers().isEmpty()) {
-                    J.TypeParameters typeParams = m.getPadding().getTypeParameters();
-                    if(typeParams == null) {
-                        TypeTree returnExpr = m.getReturnTypeExpression();
-                        if(returnExpr == null) {
-                            m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), m.getName().getPrefix()));
-                            m = m.withName(m.getName().withPrefix(Space.format(" ")));
-                        } else {
-                            m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), returnExpr.getPrefix()));
-                            m = m.withReturnTypeExpression(returnExpr.withPrefix(Space.format(" ")));
-                        }
-                    } else {
-                        m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), typeParams.getPrefix()));
-                        m = m.getPadding().withTypeParameters(typeParams.withPrefix(Space.format(" ")));
-                    }
-                }
-                else {
-                    m = m.withModifiers(ListUtils.map(m.getModifiers(), (i, mod2) -> {
-                        if (i == 0) {
-                            return mod2.withPrefix(method.getModifiers().get(0).getPrefix());
-                        } else if (i == 1) {
-                            return mod2.withPrefix(Space.format(" "));
-                        }
-                        return mod2;
-                    }));
-                }
-            }
-
-            // If target access level is package-private (no modifier), remove the current access level modifier
-            // and copy any associated comments
-            else if (newAccessLevel == null) {
-                final List<Comment> modifierComments = new ArrayList<>();
-                List<J.Modifier> modifiers = ListUtils.map(m.getModifiers(), mod -> {
-                    if (mod.getType() == currentMethodAccessLevel) {
-                        modifierComments.addAll(mod.getComments());
-                        return null;
-                    }
-
-                    // copy access level modifier comment to next modifier if it exists
-                    if (!modifierComments.isEmpty()) {
-                        J.Modifier nextModifier = mod.withComments(ListUtils.concatAll(new ArrayList<>(modifierComments), mod.getComments()));
-                        modifierComments.clear();
-                        return nextModifier;
-                    }
-                    return mod;
-                });
-
-                // if no following modifier exists, add comments to method itself
-                if (!modifierComments.isEmpty()) {
-                    m = m.withComments(ListUtils.concatAll(m.getComments(), modifierComments));
-                }
-                m = maybeAutoFormat(m, m.withModifiers(modifiers), p, getCursor().dropParentUntil(J.class::isInstance));
-            }
-        }
-        return m;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.Tree;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.tree.Comment;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.TypeTree;
+import org.openrewrite.marker.Markers;
+
+import java.util.*;
+
+import static java.util.Collections.emptyList;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangeMethodAccessLevelVisitor<P> extends JavaIsoVisitor<P> {
+    private static final Collection<J.Modifier.Type> EXPLICIT_ACCESS_LEVELS = Arrays.asList(J.Modifier.Type.Public,
+            J.Modifier.Type.Private, J.Modifier.Type.Protected);
+
+    MethodMatcher methodMatcher;
+
+    @Nullable
+    J.Modifier.Type newAccessLevel;
+
+    @Override
+    public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, P p) {
+        J.MethodDeclaration m = super.visitMethodDeclaration(method, p);
+        J.ClassDeclaration classDecl = getCursor().firstEnclosingOrThrow(J.ClassDeclaration.class);
+        if (methodMatcher.matches(method, classDecl)) {
+            J.Modifier.Type currentMethodAccessLevel = m.getModifiers().stream()
+                    .map(J.Modifier::getType)
+                    .filter(EXPLICIT_ACCESS_LEVELS::contains)
+                    .findAny()
+                    .orElse(null);
+
+            if (currentMethodAccessLevel == newAccessLevel) {
+                // No changes required
+                return m;
+            }
+
+            // Replace former modifier by new modifier if package-private is not involved
+            if (EXPLICIT_ACCESS_LEVELS.contains(currentMethodAccessLevel) && EXPLICIT_ACCESS_LEVELS.contains(newAccessLevel)) {
+                m = m.withModifiers(
+                        ListUtils.map(m.getModifiers(), mod -> mod.getType() == currentMethodAccessLevel ?
+                                mod.withType(newAccessLevel) : mod)
+                );
+            }
+
+            // If current access level is package-private (no modifier), add the new modifier
+            else if (currentMethodAccessLevel == null) {
+                J.Modifier mod = new J.Modifier(Tree.randomId(), Space.build(" ", emptyList()), Markers.EMPTY, newAccessLevel, Collections.emptyList());
+                m = m.withModifiers(ListUtils.concat(mod, m.getModifiers()));
+
+                if(method.getModifiers().isEmpty()) {
+                    J.TypeParameters typeParams = m.getPadding().getTypeParameters();
+                    if(typeParams == null) {
+                        TypeTree returnExpr = m.getReturnTypeExpression();
+                        if(returnExpr == null) {
+                            m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), m.getName().getPrefix()));
+                            m = m.withName(m.getName().withPrefix(Space.format(" ")));
+                        } else {
+                            m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), returnExpr.getPrefix()));
+                            m = m.withReturnTypeExpression(returnExpr.withPrefix(Space.format(" ")));
+                        }
+                    } else {
+                        m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), typeParams.getPrefix()));
+                        m = m.getPadding().withTypeParameters(typeParams.withPrefix(Space.format(" ")));
+                    }
+                }
+                else {
+                    m = m.withModifiers(ListUtils.map(m.getModifiers(), (i, mod2) -> {
+                        if (i == 0) {
+                            return mod2.withPrefix(method.getModifiers().get(0).getPrefix());
+                        } else if (i == 1) {
+                            return mod2.withPrefix(Space.format(" "));
+                        }
+                        return mod2;
+                    }));
+                }
+            }
+
+            // If target access level is package-private (no modifier), remove the current access level modifier
+            // and copy any associated comments
+            else if (newAccessLevel == null) {
+                final List<Comment> modifierComments = new ArrayList<>();
+                List<J.Modifier> modifiers = ListUtils.map(m.getModifiers(), mod -> {
+                    if (mod.getType() == currentMethodAccessLevel) {
+                        modifierComments.addAll(mod.getComments());
+                        return null;
+                    }
+
+                    // copy access level modifier comment to next modifier if it exists
+                    if (!modifierComments.isEmpty()) {
+                        J.Modifier nextModifier = mod.withComments(ListUtils.concatAll(new ArrayList<>(modifierComments), mod.getComments()));
+                        modifierComments.clear();
+                        return nextModifier;
+                    }
+                    return mod;
+                });
+
+                // if no following modifier exists, add comments to method itself
+                if (!modifierComments.isEmpty()) {
+                    m = m.withComments(ListUtils.concatAll(m.getComments(), modifierComments));
+                }
+                m = maybeAutoFormat(m, m.withModifiers(modifiers), p, getCursor().dropParentUntil(J.class::isInstance));
+            }
+        }
+        return m;
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ImplementInterface.java b/rewrite-java/src/main/java/org/openrewrite/java/ImplementInterface.java
index cbfd256e731..62e0c340916 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ImplementInterface.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ImplementInterface.java
@@ -1,64 +1,64 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.tree.*;
-import org.openrewrite.marker.Markers;
-
-import static org.openrewrite.Tree.randomId;
-import static org.openrewrite.java.tree.Space.format;
-
-public class ImplementInterface<P> extends JavaIsoVisitor<P> {
-    private final J.ClassDeclaration scope;
-    private final JavaType.FullyQualified interfaceType;
-
-    public ImplementInterface(J.ClassDeclaration scope, JavaType.FullyQualified interfaceType) {
-        this.scope = scope;
-        this.interfaceType = interfaceType;
-    }
-
-    public ImplementInterface(J.ClassDeclaration scope, String interfaze) {
-        this(scope, JavaType.ShallowClass.build(interfaze));
-    }
-
-    @Override
-    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, P p) {
-        J.ClassDeclaration c = super.visitClassDeclaration(classDecl, p);
-        if (c.isScope(scope) && (c.getImplements() == null || c.getImplements().stream()
-                .noneMatch(f -> TypeUtils.isAssignableTo(f.getType(), interfaceType)))) {
-
-            if(!classDecl.getSimpleName().equals(interfaceType.getClassName())) {
-                maybeAddImport(interfaceType);
-            }
-
-            TypeTree impl = TypeTree.build(classDecl.getSimpleName().equals(interfaceType.getClassName()) ?
-                            interfaceType.getFullyQualifiedName() : interfaceType.getClassName())
-                    .withType(interfaceType)
-                    .withPrefix(format(" "));
-
-            c = c.withImplements(ListUtils.concat(c.getImplements(), impl));
-
-            JContainer<TypeTree> anImplements = c.getPadding().getImplements();
-            assert anImplements != null;
-            if (anImplements.getBefore().getWhitespace().isEmpty()) {
-                c = c.getPadding().withImplements(anImplements.withBefore(Space.format(" ")));
-            }
-        }
-
-        return c;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.tree.*;
+import org.openrewrite.marker.Markers;
+
+import static org.openrewrite.Tree.randomId;
+import static org.openrewrite.java.tree.Space.format;
+
+public class ImplementInterface<P> extends JavaIsoVisitor<P> {
+    private final J.ClassDeclaration scope;
+    private final JavaType.FullyQualified interfaceType;
+
+    public ImplementInterface(J.ClassDeclaration scope, JavaType.FullyQualified interfaceType) {
+        this.scope = scope;
+        this.interfaceType = interfaceType;
+    }
+
+    public ImplementInterface(J.ClassDeclaration scope, String interfaze) {
+        this(scope, JavaType.ShallowClass.build(interfaze));
+    }
+
+    @Override
+    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, P p) {
+        J.ClassDeclaration c = super.visitClassDeclaration(classDecl, p);
+        if (c.isScope(scope) && (c.getImplements() == null || c.getImplements().stream()
+                .noneMatch(f -> TypeUtils.isAssignableTo(f.getType(), interfaceType)))) {
+
+            if(!classDecl.getSimpleName().equals(interfaceType.getClassName())) {
+                maybeAddImport(interfaceType);
+            }
+
+            TypeTree impl = TypeTree.build(classDecl.getSimpleName().equals(interfaceType.getClassName()) ?
+                            interfaceType.getFullyQualifiedName() : interfaceType.getClassName())
+                    .withType(interfaceType)
+                    .withPrefix(format(" "));
+
+            c = c.withImplements(ListUtils.concat(c.getImplements(), impl));
+
+            JContainer<TypeTree> anImplements = c.getPadding().getImplements();
+            assert anImplements != null;
+            if (anImplements.getBefore().getWhitespace().isEmpty()) {
+                c = c.getPadding().withImplements(anImplements.withBefore(Space.format(" ")));
+            }
+        }
+
+        return c;
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
index 84051343234..1a8f2e7b4cd 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
@@ -1,261 +1,261 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import io.github.classgraph.ClassGraph;
-import org.intellij.lang.annotations.Language;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.Parser;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.internal.JavaTypeCache;
-import org.openrewrite.java.marker.JavaSourceSet;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.style.NamedStyles;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.util.stream.Collectors.*;
-
-public interface JavaParser extends Parser<J.CompilationUnit> {
-    /**
-     * Set to <code>true</code> on an {@link ExecutionContext} supplied to parsing to skip generation of
-     * type attribution from the class in {@link JavaSourceSet} marker.
-     */
-    String SKIP_SOURCE_SET_TYPE_GENERATION = "org.openrewrite.java.skipSourceSetTypeGeneration";
-
-    /**
-     * @deprecated Won't work in isolated classloaders.
-     */
-    @Deprecated
-    List<Path> runtimeClasspath = Collections.unmodifiableList(Arrays.stream(System.getProperty("java.class.path").split("\\Q" + System.getProperty("path.separator") + "\\E"))
-            .map(cpEntry -> new File(cpEntry).toPath())
-            .collect(toList()));
-
-    static List<Path> runtimeClasspath() {
-        return new ClassGraph()
-                .disableNestedJarScanning()
-                .getClasspathURIs().stream()
-                .map(Paths::get).collect(toList());
-    }
-
-    /**
-     * Convenience utility for constructing a parser with binary dependencies on the runtime classpath of the process
-     * constructing the parser.
-     *
-     * @param artifactNames The "artifact name" of the dependency to look for. Artifact name is the artifact portion of
-     *                      group:artifact:version coordinates. For example, for Google's Guava (com.google.guava:guava:VERSION),
-     *                      the artifact name is "guava".
-     * @return A set of paths of jars on the runtime classpath matching the provided artifact names, to the extent such
-     * matching jars can be found.
-     */
-    static List<Path> dependenciesFromClasspath(String... artifactNames) {
-        Map<String, Pattern> artifactNamePatterns = Arrays.stream(artifactNames)
-                .collect(toMap(Function.identity(), name -> Pattern.compile(name + "-.*?\\.jar$")));
-
-        Set<String> foundArtifacts = new HashSet<>();
-        List<Path> artifacts = new ArrayList<>();
-        List<URI> runtimeClasspath = new ClassGraph().getClasspathURIs();
-        for (URI cpEntry : runtimeClasspath) {
-            for (Map.Entry<String, Pattern> artifactNamePattern : artifactNamePatterns.entrySet()) {
-                if (artifactNamePattern.getValue().matcher(cpEntry.toString()).find()) {
-                    artifacts.add(Paths.get(cpEntry));
-                    foundArtifacts.add(artifactNamePattern.getKey());
-                }
-            }
-        }
-
-        for (String foundArtifact : foundArtifacts) {
-            artifactNamePatterns.remove(foundArtifact);
-        }
-
-        if (!artifactNamePatterns.isEmpty()) {
-            throw new IllegalArgumentException("Unable to find runtime dependencies beginning with: " +
-                    artifactNamePatterns.keySet().stream().map(a -> "'" + a + "'").sorted().collect(joining(", ")));
-        }
-
-        return artifacts;
-    }
-
-    /**
-     * Builds a Java parser with a language level equal to that of the JDK running this JVM process.
-     */
-    static JavaParser.Builder<? extends JavaParser, ?> fromJavaVersion() {
-        JavaParser.Builder<? extends JavaParser, ?> javaParser;
-        try {
-            if (System.getProperty("java.version").startsWith("1.8")) {
-                javaParser = (JavaParser.Builder<? extends JavaParser, ?>) Class
-                        .forName("org.openrewrite.java.Java8Parser")
-                        .getDeclaredMethod("builder")
-                        .invoke(null);
-            } else {
-                javaParser = (JavaParser.Builder<? extends JavaParser, ?>) Class
-                        .forName("org.openrewrite.java.Java11Parser")
-                        .getDeclaredMethod("builder")
-                        .invoke(null);
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException("Unable to create a Java parser instance. " +
-                    "`rewrite-java-8` or `rewrite-java-11` must be on the classpath.", e);
-        }
-
-        return javaParser;
-    }
-
-    @Override
-    default List<J.CompilationUnit> parse(ExecutionContext ctx, @Language("java") String... sources) {
-        return parseInputs(
-                Arrays.stream(sources)
-                        .map(sourceFile -> new Input(
-                                sourcePathFromSourceText(Paths.get(""), sourceFile),
-                                () -> new ByteArrayInputStream(sourceFile.getBytes(StandardCharsets.UTF_8))
-                        ))
-                        .collect(toList()),
-                null,
-                ctx
-        );
-    }
-
-    @Override
-    default List<J.CompilationUnit> parse(@Language("java") String... sources) {
-        InMemoryExecutionContext ctx = new InMemoryExecutionContext();
-        return parse(ctx, sources);
-    }
-
-    @Override
-    default boolean accept(Path path) {
-        return path.toString().endsWith(".java");
-    }
-
-    /**
-     * Clear any in-memory parser caches that may prevent re-parsing of classes with the same fully qualified name in
-     * different rounds
-     */
-    JavaParser reset();
-
-    /**
-     * Changes the classpath on the parser. Intended for use in multiple pass parsing, where we want to keep the
-     * compiler symbol table intact for type attribution on later parses, i.e. for maven multi-module projects.
-     *
-     * @param classpath new classpath to use
-     */
-    void setClasspath(Collection<Path> classpath);
-
-    /**
-     * Changes the source set on the parser. Intended for use in multiple pass parsing, where we want to keep the
-     * compiler symbol table intact for type attribution on later parses, i.e. for maven multi-module projects.
-     *
-     * @param sourceSet source set used to set {@link org.openrewrite.java.marker.JavaSourceSet} markers on
-     *                  subsequently parsed {@link J.CompilationUnit}
-     */
-    void setSourceSet(String sourceSet);
-
-    JavaSourceSet getSourceSet(ExecutionContext ctx);
-
-    @SuppressWarnings("unchecked")
-    abstract class Builder<P extends JavaParser, B extends Builder<P, B>> {
-        protected Collection<Path> classpath = Collections.emptyList();
-        protected Collection<byte[]> classBytesClasspath = Collections.emptyList();
-        protected JavaTypeCache javaTypeCache = new JavaTypeCache();
-
-        @Nullable
-        protected Collection<Input> dependsOn;
-
-        protected Charset charset = Charset.defaultCharset();
-        protected boolean logCompilationWarningsAndErrors = false;
-        protected final List<NamedStyles> styles = new ArrayList<>();
-
-        public B logCompilationWarningsAndErrors(boolean logCompilationWarningsAndErrors) {
-            this.logCompilationWarningsAndErrors = logCompilationWarningsAndErrors;
-            return (B) this;
-        }
-
-        public B typeCache(JavaTypeCache javaTypeCache) {
-            this.javaTypeCache = javaTypeCache;
-            return (B) this;
-        }
-
-        public B charset(Charset charset) {
-            this.charset = charset;
-            return (B) this;
-        }
-
-        public B dependsOn(Collection<Input> inputs) {
-            this.dependsOn = inputs;
-            return (B) this;
-        }
-
-        public B dependsOn(@Language("java") String... inputsAsStrings) {
-            this.dependsOn = Arrays.stream(inputsAsStrings)
-                    .map(Input::fromString)
-                    .collect(toList());
-            return (B) this;
-        }
-
-        public B classpath(Collection<Path> classpath) {
-            this.classpath = classpath;
-            return (B) this;
-        }
-
-        public B classpath(String... classpath) {
-            this.classpath = dependenciesFromClasspath(classpath);
-            return (B) this;
-        }
-
-        public B classpath(byte[]... classpath) {
-            this.classBytesClasspath = Arrays.asList(classpath);
-            return (B) this;
-        }
-
-        public B styles(Iterable<? extends NamedStyles> styles) {
-            for (NamedStyles style : styles) {
-                this.styles.add(style);
-            }
-            return (B) this;
-        }
-
-        public abstract P build();
-    }
-
-    @Override
-    default Path sourcePathFromSourceText(Path prefix, String sourceCode) {
-        Pattern packagePattern = Pattern.compile("^package\\s+([^;]+);");
-        Pattern classPattern = Pattern.compile("(class|interface|enum)\\s*(<[^>]*>)?\\s+(\\w+)");
-
-        Function<String, String> simpleName = sourceStr -> {
-            Matcher classMatcher = classPattern.matcher(sourceStr);
-            return classMatcher.find() ? classMatcher.group(3) : null;
-        };
-
-        Matcher packageMatcher = packagePattern.matcher(sourceCode);
-        String pkg = packageMatcher.find() ? packageMatcher.group(1).replace('.', '/') + "/" : "";
-
-        String className = Optional.ofNullable(simpleName.apply(sourceCode))
-                .orElse(Long.toString(System.nanoTime())) + ".java";
-
-        return prefix.resolve(Paths.get(pkg + className));
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import io.github.classgraph.ClassGraph;
+import org.intellij.lang.annotations.Language;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Parser;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.internal.JavaTypeCache;
+import org.openrewrite.java.marker.JavaSourceSet;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.style.NamedStyles;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.stream.Collectors.*;
+
+public interface JavaParser extends Parser<J.CompilationUnit> {
+    /**
+     * Set to <code>true</code> on an {@link ExecutionContext} supplied to parsing to skip generation of
+     * type attribution from the class in {@link JavaSourceSet} marker.
+     */
+    String SKIP_SOURCE_SET_TYPE_GENERATION = "org.openrewrite.java.skipSourceSetTypeGeneration";
+
+    /**
+     * @deprecated Won't work in isolated classloaders.
+     */
+    @Deprecated
+    List<Path> runtimeClasspath = Collections.unmodifiableList(Arrays.stream(System.getProperty("java.class.path").split("\\Q" + System.getProperty("path.separator") + "\\E"))
+            .map(cpEntry -> new File(cpEntry).toPath())
+            .collect(toList()));
+
+    static List<Path> runtimeClasspath() {
+        return new ClassGraph()
+                .disableNestedJarScanning()
+                .getClasspathURIs().stream()
+                .map(Paths::get).collect(toList());
+    }
+
+    /**
+     * Convenience utility for constructing a parser with binary dependencies on the runtime classpath of the process
+     * constructing the parser.
+     *
+     * @param artifactNames The "artifact name" of the dependency to look for. Artifact name is the artifact portion of
+     *                      group:artifact:version coordinates. For example, for Google's Guava (com.google.guava:guava:VERSION),
+     *                      the artifact name is "guava".
+     * @return A set of paths of jars on the runtime classpath matching the provided artifact names, to the extent such
+     * matching jars can be found.
+     */
+    static List<Path> dependenciesFromClasspath(String... artifactNames) {
+        Map<String, Pattern> artifactNamePatterns = Arrays.stream(artifactNames)
+                .collect(toMap(Function.identity(), name -> Pattern.compile(name + "-.*?\\.jar$")));
+
+        Set<String> foundArtifacts = new HashSet<>();
+        List<Path> artifacts = new ArrayList<>();
+        List<URI> runtimeClasspath = new ClassGraph().getClasspathURIs();
+        for (URI cpEntry : runtimeClasspath) {
+            for (Map.Entry<String, Pattern> artifactNamePattern : artifactNamePatterns.entrySet()) {
+                if (artifactNamePattern.getValue().matcher(cpEntry.toString()).find()) {
+                    artifacts.add(Paths.get(cpEntry));
+                    foundArtifacts.add(artifactNamePattern.getKey());
+                }
+            }
+        }
+
+        for (String foundArtifact : foundArtifacts) {
+            artifactNamePatterns.remove(foundArtifact);
+        }
+
+        if (!artifactNamePatterns.isEmpty()) {
+            throw new IllegalArgumentException("Unable to find runtime dependencies beginning with: " +
+                    artifactNamePatterns.keySet().stream().map(a -> "'" + a + "'").sorted().collect(joining(", ")));
+        }
+
+        return artifacts;
+    }
+
+    /**
+     * Builds a Java parser with a language level equal to that of the JDK running this JVM process.
+     */
+    static JavaParser.Builder<? extends JavaParser, ?> fromJavaVersion() {
+        JavaParser.Builder<? extends JavaParser, ?> javaParser;
+        try {
+            if (System.getProperty("java.version").startsWith("1.8")) {
+                javaParser = (JavaParser.Builder<? extends JavaParser, ?>) Class
+                        .forName("org.openrewrite.java.Java8Parser")
+                        .getDeclaredMethod("builder")
+                        .invoke(null);
+            } else {
+                javaParser = (JavaParser.Builder<? extends JavaParser, ?>) Class
+                        .forName("org.openrewrite.java.Java11Parser")
+                        .getDeclaredMethod("builder")
+                        .invoke(null);
+            }
+        } catch (Exception e) {
+            throw new IllegalStateException("Unable to create a Java parser instance. " +
+                    "`rewrite-java-8` or `rewrite-java-11` must be on the classpath.", e);
+        }
+
+        return javaParser;
+    }
+
+    @Override
+    default List<J.CompilationUnit> parse(ExecutionContext ctx, @Language("java") String... sources) {
+        return parseInputs(
+                Arrays.stream(sources)
+                        .map(sourceFile -> new Input(
+                                sourcePathFromSourceText(Paths.get(""), sourceFile),
+                                () -> new ByteArrayInputStream(sourceFile.getBytes(StandardCharsets.UTF_8))
+                        ))
+                        .collect(toList()),
+                null,
+                ctx
+        );
+    }
+
+    @Override
+    default List<J.CompilationUnit> parse(@Language("java") String... sources) {
+        InMemoryExecutionContext ctx = new InMemoryExecutionContext();
+        return parse(ctx, sources);
+    }
+
+    @Override
+    default boolean accept(Path path) {
+        return path.toString().endsWith(".java");
+    }
+
+    /**
+     * Clear any in-memory parser caches that may prevent re-parsing of classes with the same fully qualified name in
+     * different rounds
+     */
+    JavaParser reset();
+
+    /**
+     * Changes the classpath on the parser. Intended for use in multiple pass parsing, where we want to keep the
+     * compiler symbol table intact for type attribution on later parses, i.e. for maven multi-module projects.
+     *
+     * @param classpath new classpath to use
+     */
+    void setClasspath(Collection<Path> classpath);
+
+    /**
+     * Changes the source set on the parser. Intended for use in multiple pass parsing, where we want to keep the
+     * compiler symbol table intact for type attribution on later parses, i.e. for maven multi-module projects.
+     *
+     * @param sourceSet source set used to set {@link org.openrewrite.java.marker.JavaSourceSet} markers on
+     *                  subsequently parsed {@link J.CompilationUnit}
+     */
+    void setSourceSet(String sourceSet);
+
+    JavaSourceSet getSourceSet(ExecutionContext ctx);
+
+    @SuppressWarnings("unchecked")
+    abstract class Builder<P extends JavaParser, B extends Builder<P, B>> {
+        protected Collection<Path> classpath = Collections.emptyList();
+        protected Collection<byte[]> classBytesClasspath = Collections.emptyList();
+        protected JavaTypeCache javaTypeCache = new JavaTypeCache();
+
+        @Nullable
+        protected Collection<Input> dependsOn;
+
+        protected Charset charset = Charset.defaultCharset();
+        protected boolean logCompilationWarningsAndErrors = false;
+        protected final List<NamedStyles> styles = new ArrayList<>();
+
+        public B logCompilationWarningsAndErrors(boolean logCompilationWarningsAndErrors) {
+            this.logCompilationWarningsAndErrors = logCompilationWarningsAndErrors;
+            return (B) this;
+        }
+
+        public B typeCache(JavaTypeCache javaTypeCache) {
+            this.javaTypeCache = javaTypeCache;
+            return (B) this;
+        }
+
+        public B charset(Charset charset) {
+            this.charset = charset;
+            return (B) this;
+        }
+
+        public B dependsOn(Collection<Input> inputs) {
+            this.dependsOn = inputs;
+            return (B) this;
+        }
+
+        public B dependsOn(@Language("java") String... inputsAsStrings) {
+            this.dependsOn = Arrays.stream(inputsAsStrings)
+                    .map(Input::fromString)
+                    .collect(toList());
+            return (B) this;
+        }
+
+        public B classpath(Collection<Path> classpath) {
+            this.classpath = classpath;
+            return (B) this;
+        }
+
+        public B classpath(String... classpath) {
+            this.classpath = dependenciesFromClasspath(classpath);
+            return (B) this;
+        }
+
+        public B classpath(byte[]... classpath) {
+            this.classBytesClasspath = Arrays.asList(classpath);
+            return (B) this;
+        }
+
+        public B styles(Iterable<? extends NamedStyles> styles) {
+            for (NamedStyles style : styles) {
+                this.styles.add(style);
+            }
+            return (B) this;
+        }
+
+        public abstract P build();
+    }
+
+    @Override
+    default Path sourcePathFromSourceText(Path prefix, String sourceCode) {
+        Pattern packagePattern = Pattern.compile("^package\\s+([^;]+);");
+        Pattern classPattern = Pattern.compile("(class|interface|enum)\\s*(<[^>]*>)?\\s+(\\w+)");
+
+        Function<String, String> simpleName = sourceStr -> {
+            Matcher classMatcher = classPattern.matcher(sourceStr);
+            return classMatcher.find() ? classMatcher.group(3) : null;
+        };
+
+        Matcher packageMatcher = packagePattern.matcher(sourceCode);
+        String pkg = packageMatcher.find() ? packageMatcher.group(1).replace('.', '/') + "/" : "";
+
+        String className = Optional.ofNullable(simpleName.apply(sourceCode))
+                .orElse(Long.toString(System.nanoTime())) + ".java";
+
+        return prefix.resolve(Paths.get(pkg + className));
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaStyle.java
index 6f0051e0375..efca1cd4a09 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaStyle.java
@@ -1,21 +1,21 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import org.openrewrite.style.Style;
-
-public interface JavaStyle extends Style {
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import org.openrewrite.style.Style;
+
+public interface JavaStyle extends Style {
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
index 4cf6d012492..93dfb9335b4 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
@@ -1,137 +1,137 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.TypeUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class RemoveAnnotationVisitor extends JavaIsoVisitor<ExecutionContext> {
-    AnnotationMatcher annotationMatcher;
-
-    @Override
-    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
-        J.ClassDeclaration c = super.visitClassDeclaration(classDecl, ctx);
-        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
-
-        List<J.Annotation> leadingAnnotations = classDecl.getLeadingAnnotations();
-        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
-            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
-                if (!c.getModifiers().isEmpty()) {
-                    c = c.withModifiers(Space.formatFirstPrefix(c.getModifiers(), Space.firstPrefix(c.getModifiers()).withWhitespace("")));
-                } else if (c.getPadding().getTypeParameters() != null) {
-                    c = c.getPadding().withTypeParameters(c.getPadding().getTypeParameters().withBefore(c.getPadding().getTypeParameters().getBefore().withWhitespace("")));
-                } else {
-                    c = c.getAnnotations().withKind(c.getAnnotations().getKind().withPrefix(c.getAnnotations().getKind().getPrefix().withWhitespace("")));
-                }
-            } else {
-                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
-                if (!newLeadingAnnotations.isEmpty()) {
-                    c = c.withLeadingAnnotations(newLeadingAnnotations);
-                }
-            }
-        }
-        return c;
-    }
-
-    @Override
-    public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
-        J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
-        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
-
-        List<J.Annotation> leadingAnnotations = method.getLeadingAnnotations();
-        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
-            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
-                if (!m.getModifiers().isEmpty()) {
-                    m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), Space.firstPrefix(m.getModifiers()).withWhitespace("")));
-                } else if (m.getPadding().getTypeParameters() != null) {
-                    m = m.getPadding().withTypeParameters(m.getPadding().getTypeParameters().withPrefix(m.getPadding().getTypeParameters().getPrefix().withWhitespace("")));
-                } else if (m.getReturnTypeExpression() != null) {
-                    m = m.withReturnTypeExpression(m.getReturnTypeExpression().withPrefix(m.getReturnTypeExpression().getPrefix().withWhitespace("")));
-                } else {
-                    m = m.withName(m.getName().withPrefix(m.getName().getPrefix().withWhitespace("")));
-                }
-            } else {
-                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
-                if (!newLeadingAnnotations.isEmpty()) {
-                    m = m.withLeadingAnnotations(newLeadingAnnotations);
-                }
-            }
-        }
-        return m;
-    }
-
-    @Override
-    public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
-        J.VariableDeclarations v = super.visitVariableDeclarations(multiVariable, ctx);
-        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
-
-        List<J.Annotation> leadingAnnotations = multiVariable.getLeadingAnnotations();
-        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
-            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
-                if (!v.getModifiers().isEmpty()) {
-                    v = v.withModifiers(Space.formatFirstPrefix(v.getModifiers(), Space.firstPrefix(v.getModifiers()).withWhitespace("")));
-                } else if (v.getTypeExpression() != null) {
-                    v = v.withTypeExpression(v.getTypeExpression().withPrefix(v.getTypeExpression().getPrefix().withWhitespace("")));
-                }
-            } else {
-                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
-                if (!newLeadingAnnotations.isEmpty()) {
-                    v = v.withLeadingAnnotations(newLeadingAnnotations);
-                }
-            }
-        }
-
-        return v;
-    }
-
-    @Override
-    public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
-        if (annotationMatcher.matches(annotation)) {
-            getCursor().getParentOrThrow().putMessage("annotationRemoved", annotation);
-            maybeRemoveImport(TypeUtils.asFullyQualified(annotation.getType()));
-            //noinspection ConstantConditions
-            return null;
-        }
-        return super.visitAnnotation(annotation, ctx);
-    }
-
-    /* Returns a list of leading annotations with the target removed or an empty list if no changes are necessary.
-     * A prefix only needs to change if the index == 0 and the prefixes of the target annotation and next annotation are not equal.
-     */
-    private List<J.Annotation> removeAnnotationOrEmpty(List<J.Annotation> leadingAnnotations, J.Annotation targetAnnotation) {
-        int index = leadingAnnotations.indexOf(targetAnnotation);
-        List<J.Annotation> newLeadingAnnotations = new ArrayList<>();
-        if (index == 0) {
-            J.Annotation nextAnnotation = leadingAnnotations.get(1);
-            if (!nextAnnotation.getPrefix().equals(targetAnnotation.getPrefix())) {
-                newLeadingAnnotations.add(nextAnnotation.withPrefix(targetAnnotation.getPrefix()));
-                for (int i = 2; i < leadingAnnotations.size(); ++i) {
-                    newLeadingAnnotations.add(leadingAnnotations.get(i));
-                }
-            }
-        }
-        return newLeadingAnnotations;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.TypeUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class RemoveAnnotationVisitor extends JavaIsoVisitor<ExecutionContext> {
+    AnnotationMatcher annotationMatcher;
+
+    @Override
+    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+        J.ClassDeclaration c = super.visitClassDeclaration(classDecl, ctx);
+        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
+
+        List<J.Annotation> leadingAnnotations = classDecl.getLeadingAnnotations();
+        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
+            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
+                if (!c.getModifiers().isEmpty()) {
+                    c = c.withModifiers(Space.formatFirstPrefix(c.getModifiers(), Space.firstPrefix(c.getModifiers()).withWhitespace("")));
+                } else if (c.getPadding().getTypeParameters() != null) {
+                    c = c.getPadding().withTypeParameters(c.getPadding().getTypeParameters().withBefore(c.getPadding().getTypeParameters().getBefore().withWhitespace("")));
+                } else {
+                    c = c.getAnnotations().withKind(c.getAnnotations().getKind().withPrefix(c.getAnnotations().getKind().getPrefix().withWhitespace("")));
+                }
+            } else {
+                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
+                if (!newLeadingAnnotations.isEmpty()) {
+                    c = c.withLeadingAnnotations(newLeadingAnnotations);
+                }
+            }
+        }
+        return c;
+    }
+
+    @Override
+    public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
+        J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
+        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
+
+        List<J.Annotation> leadingAnnotations = method.getLeadingAnnotations();
+        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
+            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
+                if (!m.getModifiers().isEmpty()) {
+                    m = m.withModifiers(Space.formatFirstPrefix(m.getModifiers(), Space.firstPrefix(m.getModifiers()).withWhitespace("")));
+                } else if (m.getPadding().getTypeParameters() != null) {
+                    m = m.getPadding().withTypeParameters(m.getPadding().getTypeParameters().withPrefix(m.getPadding().getTypeParameters().getPrefix().withWhitespace("")));
+                } else if (m.getReturnTypeExpression() != null) {
+                    m = m.withReturnTypeExpression(m.getReturnTypeExpression().withPrefix(m.getReturnTypeExpression().getPrefix().withWhitespace("")));
+                } else {
+                    m = m.withName(m.getName().withPrefix(m.getName().getPrefix().withWhitespace("")));
+                }
+            } else {
+                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
+                if (!newLeadingAnnotations.isEmpty()) {
+                    m = m.withLeadingAnnotations(newLeadingAnnotations);
+                }
+            }
+        }
+        return m;
+    }
+
+    @Override
+    public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
+        J.VariableDeclarations v = super.visitVariableDeclarations(multiVariable, ctx);
+        J.Annotation annotationRemoved = getCursor().pollMessage("annotationRemoved");
+
+        List<J.Annotation> leadingAnnotations = multiVariable.getLeadingAnnotations();
+        if (annotationRemoved != null && !leadingAnnotations.isEmpty()) {
+            if (leadingAnnotations.get(0) == annotationRemoved && leadingAnnotations.size() == 1) {
+                if (!v.getModifiers().isEmpty()) {
+                    v = v.withModifiers(Space.formatFirstPrefix(v.getModifiers(), Space.firstPrefix(v.getModifiers()).withWhitespace("")));
+                } else if (v.getTypeExpression() != null) {
+                    v = v.withTypeExpression(v.getTypeExpression().withPrefix(v.getTypeExpression().getPrefix().withWhitespace("")));
+                }
+            } else {
+                List<J.Annotation> newLeadingAnnotations = removeAnnotationOrEmpty(leadingAnnotations, annotationRemoved);
+                if (!newLeadingAnnotations.isEmpty()) {
+                    v = v.withLeadingAnnotations(newLeadingAnnotations);
+                }
+            }
+        }
+
+        return v;
+    }
+
+    @Override
+    public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
+        if (annotationMatcher.matches(annotation)) {
+            getCursor().getParentOrThrow().putMessage("annotationRemoved", annotation);
+            maybeRemoveImport(TypeUtils.asFullyQualified(annotation.getType()));
+            //noinspection ConstantConditions
+            return null;
+        }
+        return super.visitAnnotation(annotation, ctx);
+    }
+
+    /* Returns a list of leading annotations with the target removed or an empty list if no changes are necessary.
+     * A prefix only needs to change if the index == 0 and the prefixes of the target annotation and next annotation are not equal.
+     */
+    private List<J.Annotation> removeAnnotationOrEmpty(List<J.Annotation> leadingAnnotations, J.Annotation targetAnnotation) {
+        int index = leadingAnnotations.indexOf(targetAnnotation);
+        List<J.Annotation> newLeadingAnnotations = new ArrayList<>();
+        if (index == 0) {
+            J.Annotation nextAnnotation = leadingAnnotations.get(1);
+            if (!nextAnnotation.getPrefix().equals(targetAnnotation.getPrefix())) {
+                newLeadingAnnotations.add(nextAnnotation.withPrefix(targetAnnotation.getPrefix()));
+                for (int i = 2; i < leadingAnnotations.size(); ++i) {
+                    newLeadingAnnotations.add(leadingAnnotations.get(i));
+                }
+            }
+        }
+        return newLeadingAnnotations;
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java b/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java
index 76a3520731f..da2d12f28d7 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/UseStaticImport.java
@@ -1,90 +1,90 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import lombok.*;
-import lombok.experimental.FieldDefaults;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.java.search.UsesMethod;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-
-@ToString
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@Getter
-@RequiredArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class UseStaticImport extends Recipe {
-
-    /**
-     * A method pattern that is used to find matching method invocations.
-     * See {@link  MethodMatcher} for details on the expression's syntax.
-     */
-    @Option(displayName = "Method pattern",
-            description = "A method pattern that is used to find matching method invocations.",
-            example = "java.util.Collections emptyList()")
-    String methodPattern;
-
-    @Override
-    public String getDisplayName() {
-        return "Use static import";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Removes unnecessary receiver types from static method invocations. For example, `Collections.emptyList()` becomes `emptyList()`.";
-    }
-
-    @Override
-    protected JavaVisitor<ExecutionContext> getSingleSourceApplicableTest() {
-        return new UsesMethod<>(methodPattern);
-    }
-
-    @Override
-    public JavaVisitor<ExecutionContext> getVisitor() {
-        return new UseStaticImportVisitor();
-    }
-
-    private class UseStaticImportVisitor extends JavaIsoVisitor<ExecutionContext> {
-        @Override
-        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-            MethodMatcher methodMatcher = new MethodMatcher(methodPattern);
-            J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
-            if (methodMatcher.matches(m)) {
-                if (m.getMethodType() != null) {
-                    JavaType.FullyQualified receiverType = m.getMethodType().getDeclaringType();
-                    maybeRemoveImport(receiverType);
-
-                    AddImport<ExecutionContext> addStatic = new AddImport<>(
-                            receiverType.getFullyQualifiedName(),
-                            m.getSimpleName(),
-                            false);
-
-                    if (!getAfterVisit().contains(addStatic)) {
-                        doAfterVisit(addStatic);
-                    }
-                }
-
-                if (m.getSelect() != null) {
-                    m = m.withSelect(null).withName(m.getName().withPrefix(m.getSelect().getPrefix()));
-                }
-            }
-            return m;
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.java.search.UsesMethod;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+
+@ToString
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@Getter
+@RequiredArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class UseStaticImport extends Recipe {
+
+    /**
+     * A method pattern that is used to find matching method invocations.
+     * See {@link  MethodMatcher} for details on the expression's syntax.
+     */
+    @Option(displayName = "Method pattern",
+            description = "A method pattern that is used to find matching method invocations.",
+            example = "java.util.Collections emptyList()")
+    String methodPattern;
+
+    @Override
+    public String getDisplayName() {
+        return "Use static import";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Removes unnecessary receiver types from static method invocations. For example, `Collections.emptyList()` becomes `emptyList()`.";
+    }
+
+    @Override
+    protected JavaVisitor<ExecutionContext> getSingleSourceApplicableTest() {
+        return new UsesMethod<>(methodPattern);
+    }
+
+    @Override
+    public JavaVisitor<ExecutionContext> getVisitor() {
+        return new UseStaticImportVisitor();
+    }
+
+    private class UseStaticImportVisitor extends JavaIsoVisitor<ExecutionContext> {
+        @Override
+        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+            MethodMatcher methodMatcher = new MethodMatcher(methodPattern);
+            J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+            if (methodMatcher.matches(m)) {
+                if (m.getMethodType() != null) {
+                    JavaType.FullyQualified receiverType = m.getMethodType().getDeclaringType();
+                    maybeRemoveImport(receiverType);
+
+                    AddImport<ExecutionContext> addStatic = new AddImport<>(
+                            receiverType.getFullyQualifiedName(),
+                            m.getSimpleName(),
+                            false);
+
+                    if (!getAfterVisit().contains(addStatic)) {
+                        doAfterVisit(addStatic);
+                    }
+                }
+
+                if (m.getSelect() != null) {
+                    m = m.withSelect(null).withName(m.getName().withPrefix(m.getSelect().getPrefix()));
+                }
+            }
+            return m;
+        }
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/CatchClauseOnlyRethrows.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/CatchClauseOnlyRethrows.java
index 41756f6ae3d..9c3b5af58c9 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/CatchClauseOnlyRethrows.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/CatchClauseOnlyRethrows.java
@@ -1,115 +1,115 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.tree.Expression;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.J.Try.Catch;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.TypeUtils;
-
-import java.time.Duration;
-import java.util.Set;
-
-import static java.util.Collections.singleton;
-
-public class CatchClauseOnlyRethrows extends Recipe {
-
-    @Override
-    public String getDisplayName() {
-        return "Catch clause should do more than just rethrow";
-    }
-
-    @Override
-    public String getDescription() {
-        return "A `catch` clause that only rethrows the caught exception is unnecessary. " +
-                "Letting the exception bubble up as normal achieves the same result with less code.";
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return singleton("RSPEC-2737");
-    }
-
-    @Override
-    public Duration getEstimatedEffortPerOccurrence() {
-        return Duration.ofMinutes(5);
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new JavaIsoVisitor<ExecutionContext>() {
-
-            @Override
-            public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
-                J.Block b = super.visitBlock(block, ctx);
-                return b.withStatements(ListUtils.flatMap(b.getStatements(), statement -> {
-                    if (statement instanceof J.Try) {
-                        // if a try has no catches, no finally, and no resources get rid of it and merge its statements into the current block
-                        J.Try aTry = (J.Try) statement;
-                        if (aTry.getCatches().isEmpty() && aTry.getResources() == null && aTry.getFinally() == null) {
-                            return ListUtils.map(aTry.getBody().getStatements(), tryStat -> autoFormat(tryStat, ctx, getCursor()));
-                        }
-                    }
-                    return statement;
-                }));
-            }
-
-            @Override
-            public J.Try visitTry(J.Try tryable, ExecutionContext executionContext) {
-                J.Try t = super.visitTry(tryable, executionContext);
-                return t.withCatches(ListUtils.map(t.getCatches(), (i, aCatch) -> {
-                    if (onlyRethrows(aCatch)) {
-                        // if a subsequent catch is a wider exception type and doesn't rethrow, we should
-                        // keep this one
-                        for (int j = i + 1; j < tryable.getCatches().size(); j++) {
-                            Catch next = tryable.getCatches().get(j);
-                            if (!onlyRethrows(next) && TypeUtils.isAssignableTo(next.getParameter().getType(),
-                                    aCatch.getParameter().getType())) {
-                                return aCatch;
-                            }
-                        }
-                        return null;
-                    }
-                    return aCatch;
-                }));
-            }
-
-            private boolean onlyRethrows(Catch aCatch) {
-                if (aCatch.getBody().getStatements().size() != 1 ||
-                        !(aCatch.getBody().getStatements().get(0) instanceof J.Throw)) {
-                    return false;
-                }
-
-                Expression exception = ((J.Throw) aCatch.getBody().getStatements().get(0)).getException();
-                JavaType.FullyQualified catchType = TypeUtils.asFullyQualified(aCatch.getParameter().getType());
-                if (catchType == null || !catchType.equals(exception.getType())) {
-                    return false;
-                }
-
-                if (exception instanceof J.Identifier) {
-                    return ((J.Identifier) exception).getSimpleName().equals(aCatch.getParameter().getTree().getVariables().get(0).getSimpleName());
-                }
-
-                return false;
-            }
-        };
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.J.Try.Catch;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.TypeUtils;
+
+import java.time.Duration;
+import java.util.Set;
+
+import static java.util.Collections.singleton;
+
+public class CatchClauseOnlyRethrows extends Recipe {
+
+    @Override
+    public String getDisplayName() {
+        return "Catch clause should do more than just rethrow";
+    }
+
+    @Override
+    public String getDescription() {
+        return "A `catch` clause that only rethrows the caught exception is unnecessary. " +
+                "Letting the exception bubble up as normal achieves the same result with less code.";
+    }
+
+    @Override
+    public Set<String> getTags() {
+        return singleton("RSPEC-2737");
+    }
+
+    @Override
+    public Duration getEstimatedEffortPerOccurrence() {
+        return Duration.ofMinutes(5);
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new JavaIsoVisitor<ExecutionContext>() {
+
+            @Override
+            public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
+                J.Block b = super.visitBlock(block, ctx);
+                return b.withStatements(ListUtils.flatMap(b.getStatements(), statement -> {
+                    if (statement instanceof J.Try) {
+                        // if a try has no catches, no finally, and no resources get rid of it and merge its statements into the current block
+                        J.Try aTry = (J.Try) statement;
+                        if (aTry.getCatches().isEmpty() && aTry.getResources() == null && aTry.getFinally() == null) {
+                            return ListUtils.map(aTry.getBody().getStatements(), tryStat -> autoFormat(tryStat, ctx, getCursor()));
+                        }
+                    }
+                    return statement;
+                }));
+            }
+
+            @Override
+            public J.Try visitTry(J.Try tryable, ExecutionContext executionContext) {
+                J.Try t = super.visitTry(tryable, executionContext);
+                return t.withCatches(ListUtils.map(t.getCatches(), (i, aCatch) -> {
+                    if (onlyRethrows(aCatch)) {
+                        // if a subsequent catch is a wider exception type and doesn't rethrow, we should
+                        // keep this one
+                        for (int j = i + 1; j < tryable.getCatches().size(); j++) {
+                            Catch next = tryable.getCatches().get(j);
+                            if (!onlyRethrows(next) && TypeUtils.isAssignableTo(next.getParameter().getType(),
+                                    aCatch.getParameter().getType())) {
+                                return aCatch;
+                            }
+                        }
+                        return null;
+                    }
+                    return aCatch;
+                }));
+            }
+
+            private boolean onlyRethrows(Catch aCatch) {
+                if (aCatch.getBody().getStatements().size() != 1 ||
+                        !(aCatch.getBody().getStatements().get(0) instanceof J.Throw)) {
+                    return false;
+                }
+
+                Expression exception = ((J.Throw) aCatch.getBody().getStatements().get(0)).getException();
+                JavaType.FullyQualified catchType = TypeUtils.asFullyQualified(aCatch.getParameter().getType());
+                if (catchType == null || !catchType.equals(exception.getType())) {
+                    return false;
+                }
+
+                if (exception instanceof J.Identifier) {
+                    return ((J.Identifier) exception).getSimpleName().equals(aCatch.getParameter().getTree().getVariables().get(0).getSimpleName());
+                }
+
+                return false;
+            }
+        };
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/ExplicitLambdaArgumentTypes.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/ExplicitLambdaArgumentTypes.java
index 6aa47ccd98c..e909141730d 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/ExplicitLambdaArgumentTypes.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/ExplicitLambdaArgumentTypes.java
@@ -1,146 +1,146 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.TypeUtils;
-import org.openrewrite.marker.Markers;
-
-import java.time.Duration;
-import java.util.Collections;
-import java.util.Set;
-
-public class ExplicitLambdaArgumentTypes extends Recipe {
-    @Override
-    public String getDisplayName() {
-        return "Use explicit types on lambda arguments";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Adds explicit types on lambda arguments, which are otherwise optional. This can make the code clearer and easier to read. " +
-                "This does not add explicit types on arguments when the lambda has one or two parameters and does not have a block body, as things are considered more readable in those cases. " +
-                "For example, `stream.map((a, b) -> a.length);` will not have explicit types added.";
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return Collections.singleton("RSPEC-2211");
-    }
-
-    @Override
-    public Duration getEstimatedEffortPerOccurrence() {
-        return Duration.ofMinutes(5);
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new ExplicitLambdaArgumentTypesVisitor();
-    }
-
-    private static class ExplicitLambdaArgumentTypesVisitor extends JavaIsoVisitor<ExecutionContext> {
-        private static final String ADDED_EXPLICIT_TYPE_KEY = "ADDED_EXPLICIT_TYPE";
-
-        @Nullable
-        private static String buildName(@Nullable JavaType type) {
-            if (type != null) {
-                if (type instanceof JavaType.FullyQualified && type != JavaType.Unknown.getInstance()) {
-                    JavaType.FullyQualified asFQN = TypeUtils.asFullyQualified(type);
-                    assert asFQN != null;
-                    return asFQN.getClassName();
-                } else if (type instanceof JavaType.Primitive) {
-                    JavaType.Primitive asPrimitive = TypeUtils.asPrimitive(type);
-                    assert asPrimitive != null;
-                    return asPrimitive.getKeyword();
-                } else if (type instanceof JavaType.Array) {
-                    JavaType.Array arrayType = TypeUtils.asArray(type);
-                    assert arrayType != null;
-                    StringBuilder typeAsString = new StringBuilder();
-                    JavaType elemType = arrayType.getElemType();
-                    if (elemType instanceof JavaType.Primitive) {
-                        typeAsString.append(buildName(elemType));
-                    } else if (elemType instanceof JavaType.FullyQualified) {
-                        typeAsString.append(buildName(elemType));
-                    } else if (elemType instanceof JavaType.Array) {
-                        JavaType typeOfArray = ((JavaType.Array) elemType).getElemType();
-                        typeAsString.append(buildName(typeOfArray));
-                        for (; arrayType.getElemType() instanceof JavaType.Array; arrayType = (JavaType.Array) arrayType.getElemType()) {
-                            typeAsString.append("[]");
-                        }
-                    }
-                    typeAsString.append("[]");
-                    return typeAsString.toString();
-                } else if(type instanceof JavaType.Variable) {
-                    return buildName(((JavaType.Variable) type).getType());
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
-            // if the type expression is null, it implies the types on the lambda arguments are implicit.
-            if (multiVariable.getTypeExpression() == null && getCursor().dropParentUntil(J.class::isInstance).getValue() instanceof J.Lambda) {
-                J.VariableDeclarations.NamedVariable nv = multiVariable.getVariables().get(0);
-                String name = nv.getType() instanceof JavaType.GenericTypeVariable ?
-                        ((JavaType.GenericTypeVariable) nv.getType()).getName() : buildName(nv.getType());
-                if (name != null) {
-                    multiVariable = multiVariable.withTypeExpression(
-                            new J.Identifier(Tree.randomId(),
-                                    Space.EMPTY,
-                                    Markers.EMPTY,
-                                    name,
-                                    nv.getType(),
-                                    null
-                            )
-                    );
-                    maybeAddImport(TypeUtils.asFullyQualified(nv.getType()));
-                    getCursor().dropParentUntil(J.Lambda.class::isInstance).putMessage(ADDED_EXPLICIT_TYPE_KEY, true);
-                }
-            }
-            return super.visitVariableDeclarations(multiVariable, ctx);
-        }
-
-        @Override
-        public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext ctx) {
-            J.VariableDeclarations.NamedVariable nv = super.visitVariable(variable, ctx);
-            Cursor c = getCursor().dropParentUntil(J.class::isInstance).dropParentUntil(J.class::isInstance);
-            if (c.getValue() instanceof J.Lambda && c.getMessage(ADDED_EXPLICIT_TYPE_KEY) != null) {
-                nv = nv.withPrefix(nv.getPrefix().withWhitespace(" "));
-            }
-            return nv;
-        }
-
-        @Override
-        public J.Lambda visitLambda(J.Lambda lambda, ExecutionContext ctx) {
-            if (lambda.getParameters().getParameters().size() <= 2 && !(lambda.getBody() instanceof J.Block)) {
-                return lambda;
-            }
-            J.Lambda l = super.visitLambda(lambda, ctx);
-            if (getCursor().getMessage(ADDED_EXPLICIT_TYPE_KEY) != null) {
-                l = l.withParameters(l.getParameters().withParenthesized(true));
-            }
-            return l;
-        }
-
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.*;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.TypeUtils;
+import org.openrewrite.marker.Markers;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Set;
+
+public class ExplicitLambdaArgumentTypes extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Use explicit types on lambda arguments";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Adds explicit types on lambda arguments, which are otherwise optional. This can make the code clearer and easier to read. " +
+                "This does not add explicit types on arguments when the lambda has one or two parameters and does not have a block body, as things are considered more readable in those cases. " +
+                "For example, `stream.map((a, b) -> a.length);` will not have explicit types added.";
+    }
+
+    @Override
+    public Set<String> getTags() {
+        return Collections.singleton("RSPEC-2211");
+    }
+
+    @Override
+    public Duration getEstimatedEffortPerOccurrence() {
+        return Duration.ofMinutes(5);
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new ExplicitLambdaArgumentTypesVisitor();
+    }
+
+    private static class ExplicitLambdaArgumentTypesVisitor extends JavaIsoVisitor<ExecutionContext> {
+        private static final String ADDED_EXPLICIT_TYPE_KEY = "ADDED_EXPLICIT_TYPE";
+
+        @Nullable
+        private static String buildName(@Nullable JavaType type) {
+            if (type != null) {
+                if (type instanceof JavaType.FullyQualified && type != JavaType.Unknown.getInstance()) {
+                    JavaType.FullyQualified asFQN = TypeUtils.asFullyQualified(type);
+                    assert asFQN != null;
+                    return asFQN.getClassName();
+                } else if (type instanceof JavaType.Primitive) {
+                    JavaType.Primitive asPrimitive = TypeUtils.asPrimitive(type);
+                    assert asPrimitive != null;
+                    return asPrimitive.getKeyword();
+                } else if (type instanceof JavaType.Array) {
+                    JavaType.Array arrayType = TypeUtils.asArray(type);
+                    assert arrayType != null;
+                    StringBuilder typeAsString = new StringBuilder();
+                    JavaType elemType = arrayType.getElemType();
+                    if (elemType instanceof JavaType.Primitive) {
+                        typeAsString.append(buildName(elemType));
+                    } else if (elemType instanceof JavaType.FullyQualified) {
+                        typeAsString.append(buildName(elemType));
+                    } else if (elemType instanceof JavaType.Array) {
+                        JavaType typeOfArray = ((JavaType.Array) elemType).getElemType();
+                        typeAsString.append(buildName(typeOfArray));
+                        for (; arrayType.getElemType() instanceof JavaType.Array; arrayType = (JavaType.Array) arrayType.getElemType()) {
+                            typeAsString.append("[]");
+                        }
+                    }
+                    typeAsString.append("[]");
+                    return typeAsString.toString();
+                } else if(type instanceof JavaType.Variable) {
+                    return buildName(((JavaType.Variable) type).getType());
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
+            // if the type expression is null, it implies the types on the lambda arguments are implicit.
+            if (multiVariable.getTypeExpression() == null && getCursor().dropParentUntil(J.class::isInstance).getValue() instanceof J.Lambda) {
+                J.VariableDeclarations.NamedVariable nv = multiVariable.getVariables().get(0);
+                String name = nv.getType() instanceof JavaType.GenericTypeVariable ?
+                        ((JavaType.GenericTypeVariable) nv.getType()).getName() : buildName(nv.getType());
+                if (name != null) {
+                    multiVariable = multiVariable.withTypeExpression(
+                            new J.Identifier(Tree.randomId(),
+                                    Space.EMPTY,
+                                    Markers.EMPTY,
+                                    name,
+                                    nv.getType(),
+                                    null
+                            )
+                    );
+                    maybeAddImport(TypeUtils.asFullyQualified(nv.getType()));
+                    getCursor().dropParentUntil(J.Lambda.class::isInstance).putMessage(ADDED_EXPLICIT_TYPE_KEY, true);
+                }
+            }
+            return super.visitVariableDeclarations(multiVariable, ctx);
+        }
+
+        @Override
+        public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext ctx) {
+            J.VariableDeclarations.NamedVariable nv = super.visitVariable(variable, ctx);
+            Cursor c = getCursor().dropParentUntil(J.class::isInstance).dropParentUntil(J.class::isInstance);
+            if (c.getValue() instanceof J.Lambda && c.getMessage(ADDED_EXPLICIT_TYPE_KEY) != null) {
+                nv = nv.withPrefix(nv.getPrefix().withWhitespace(" "));
+            }
+            return nv;
+        }
+
+        @Override
+        public J.Lambda visitLambda(J.Lambda lambda, ExecutionContext ctx) {
+            if (lambda.getParameters().getParameters().size() <= 2 && !(lambda.getBody() instanceof J.Block)) {
+                return lambda;
+            }
+            J.Lambda l = super.visitLambda(lambda, ctx);
+            if (getCursor().getMessage(ADDED_EXPLICIT_TYPE_KEY) != null) {
+                l = l.withParameters(l.getParameters().withParenthesized(true));
+            }
+            return l;
+        }
+
+    }
+
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClass.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClass.java
index e42bb650fda..261876a5272 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClass.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClass.java
@@ -1,51 +1,51 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.java.JavaIsoVisitor;
-
-import java.time.Duration;
-import java.util.Collections;
-import java.util.Set;
-
-public class FinalClass extends Recipe {
-    @Override
-    public String getDisplayName() {
-        return "Finalize classes with private constructors";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Adds the `final` modifier to classes that expose no public or package-private constructors.";
-    }
-
-    @Override
-    public Set<String> getTags() {
-        return Collections.singleton("RSPEC-2974");
-    }
-
-    @Override
-    public Duration getEstimatedEffortPerOccurrence() {
-        return Duration.ofMinutes(5);
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new FinalClassVisitor();
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.java.JavaIsoVisitor;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Set;
+
+public class FinalClass extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Finalize classes with private constructors";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Adds the `final` modifier to classes that expose no public or package-private constructors.";
+    }
+
+    @Override
+    public Set<String> getTags() {
+        return Collections.singleton("RSPEC-2974");
+    }
+
+    @Override
+    public Duration getEstimatedEffortPerOccurrence() {
+        return Duration.ofMinutes(5);
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new FinalClassVisitor();
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClassVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClassVisitor.java
index 0232e4d847f..fe6d67b2525 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClassVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/FinalClassVisitor.java
@@ -1,71 +1,71 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.Statement;
-import org.openrewrite.marker.Markers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.util.Collections.emptyList;
-import static org.openrewrite.Tree.randomId;
-import static org.openrewrite.java.cleanup.ModifierOrder.sortModifiers;
-import static org.openrewrite.java.tree.J.ClassDeclaration.Kind.Type.Interface;
-
-public class FinalClassVisitor extends JavaIsoVisitor<ExecutionContext> {
-    @Override
-    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDeclaration, ExecutionContext executionContext) {
-        if(classDeclaration.getKind() == Interface || classDeclaration.hasModifier(J.Modifier.Type.Abstract)) {
-            return classDeclaration;
-        }
-        J.ClassDeclaration cd = super.visitClassDeclaration(classDeclaration, executionContext);
-
-        if(cd.hasModifier(J.Modifier.Type.Final) || cd.getKind() != J.ClassDeclaration.Kind.Type.Class) {
-            return cd;
-        }
-
-        boolean allPrivate = true;
-        int constructorCount = 0;
-        for(Statement s : cd.getBody().getStatements()) {
-            if(s instanceof J.MethodDeclaration && ((J.MethodDeclaration)s).isConstructor()) {
-                J.MethodDeclaration constructor = (J.MethodDeclaration)s;
-                constructorCount++;
-                if(!constructor.hasModifier(J.Modifier.Type.Private)) {
-                    allPrivate = false;
-                }
-            }
-            if(constructorCount > 0 && !allPrivate) {
-                return cd;
-            }
-        }
-
-        if(constructorCount > 0) {
-            List<J.Modifier> modifiers = new ArrayList<>(cd.getModifiers());
-            modifiers.add(new J.Modifier(randomId(), Space.EMPTY, Markers.EMPTY,  J.Modifier.Type.Final, emptyList()));
-            modifiers = sortModifiers(modifiers);
-            cd = cd.withModifiers(modifiers);
-
-            assert getCursor().getParent() != null;
-            cd = autoFormat(cd, cd.getName(), executionContext, getCursor().getParent());
-        }
-        return cd;
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.Statement;
+import org.openrewrite.marker.Markers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Collections.emptyList;
+import static org.openrewrite.Tree.randomId;
+import static org.openrewrite.java.cleanup.ModifierOrder.sortModifiers;
+import static org.openrewrite.java.tree.J.ClassDeclaration.Kind.Type.Interface;
+
+public class FinalClassVisitor extends JavaIsoVisitor<ExecutionContext> {
+    @Override
+    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDeclaration, ExecutionContext executionContext) {
+        if(classDeclaration.getKind() == Interface || classDeclaration.hasModifier(J.Modifier.Type.Abstract)) {
+            return classDeclaration;
+        }
+        J.ClassDeclaration cd = super.visitClassDeclaration(classDeclaration, executionContext);
+
+        if(cd.hasModifier(J.Modifier.Type.Final) || cd.getKind() != J.ClassDeclaration.Kind.Type.Class) {
+            return cd;
+        }
+
+        boolean allPrivate = true;
+        int constructorCount = 0;
+        for(Statement s : cd.getBody().getStatements()) {
+            if(s instanceof J.MethodDeclaration && ((J.MethodDeclaration)s).isConstructor()) {
+                J.MethodDeclaration constructor = (J.MethodDeclaration)s;
+                constructorCount++;
+                if(!constructor.hasModifier(J.Modifier.Type.Private)) {
+                    allPrivate = false;
+                }
+            }
+            if(constructorCount > 0 && !allPrivate) {
+                return cd;
+            }
+        }
+
+        if(constructorCount > 0) {
+            List<J.Modifier> modifiers = new ArrayList<>(cd.getModifiers());
+            modifiers.add(new J.Modifier(randomId(), Space.EMPTY, Markers.EMPTY,  J.Modifier.Type.Final, emptyList()));
+            modifiers = sortModifiers(modifiers);
+            cd = cd.withModifiers(modifiers);
+
+            assert getCursor().getParent() != null;
+            cd = autoFormat(cd, cd.getName(), executionContext, getCursor().getParent());
+        }
+        return cd;
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/MethodParamPad.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/MethodParamPad.java
index 2ac83e4565b..f4f41510af2 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/MethodParamPad.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/MethodParamPad.java
@@ -1,113 +1,113 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.SourceFile;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.format.SpacesVisitor;
-import org.openrewrite.java.style.*;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaSourceFile;
-
-public class MethodParamPad extends Recipe {
-    @Override
-    public String getDisplayName() {
-        return "Method parameter padding";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Fixes whitespace padding between the identifier of a method definition or method invocation and the left parenthesis of the parameter list. " +
-                "For example, when configured to remove spacing, `someMethodInvocation (x);` becomes `someMethodInvocation(x)`.";
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new MethodParamPadVisitor();
-    }
-
-    private static class MethodParamPadVisitor extends JavaIsoVisitor<ExecutionContext> {
-        SpacesStyle spacesStyle;
-        MethodParamPadStyle methodParamPadStyle;
-
-        @Nullable
-        EmptyForInitializerPadStyle emptyForInitializerPadStyle;
-
-        @Nullable
-        EmptyForIteratorPadStyle emptyForIteratorPadStyle;
-
-        @Override
-        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
-            SourceFile cu = (SourceFile)javaSourceFile;
-            spacesStyle = cu.getStyle(SpacesStyle.class) == null ? IntelliJ.spaces() : cu.getStyle(SpacesStyle.class);
-            methodParamPadStyle = cu.getStyle(MethodParamPadStyle.class) == null ? Checkstyle.methodParamPadStyle() : cu.getStyle(MethodParamPadStyle.class);
-            emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
-            emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
-
-            spacesStyle = spacesStyle.withBeforeParentheses(
-                    spacesStyle.getBeforeParentheses()
-                            .withMethodDeclaration(methodParamPadStyle.getSpace())
-                            .withMethodCall(methodParamPadStyle.getSpace())
-            );
-            return super.visitJavaSourceFile((JavaSourceFile) cu, ctx);
-        }
-
-        @Override
-        public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
-            J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
-            if (!methodParamPadStyle.getAllowLineBreaks() && md.getPadding().getParameters().getBefore().getWhitespace().contains("\n")) {
-                md = md.getPadding().withParameters(
-                        md.getPadding().getParameters().withBefore(
-                                md.getPadding().getParameters().getBefore().withWhitespace("")
-                        )
-                );
-            }
-            md = (J.MethodDeclaration)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, md).visitNonNull(md, ctx);
-            return md;
-        }
-
-        @Override
-        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-            J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
-            if (!methodParamPadStyle.getAllowLineBreaks() && mi.getPadding().getArguments().getBefore().getWhitespace().contains("\n")) {
-                mi = mi.getPadding().withArguments(
-                        mi.getPadding().getArguments().withBefore(
-                                mi.getPadding().getArguments().getBefore().withWhitespace("")
-                        )
-                );
-            }
-            mi = (J.MethodInvocation)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, mi).visitNonNull(mi, ctx);
-            return mi;
-        }
-
-        @Override
-        public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
-            J.NewClass nc = super.visitNewClass(newClass, ctx);
-            if (!methodParamPadStyle.getAllowLineBreaks() && nc.getPadding().getArguments() != null && nc.getPadding().getArguments().getBefore().getWhitespace().contains("\n")) {
-                nc = nc.getPadding().withArguments(
-                        nc.getPadding().getArguments().withBefore(
-                                nc.getPadding().getArguments().getBefore().withWhitespace("")
-                        )
-                );
-            }
-            nc = (J.NewClass)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, nc).visitNonNull(nc, ctx);
-            return nc;
-        }
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.SourceFile;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.format.SpacesVisitor;
+import org.openrewrite.java.style.*;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaSourceFile;
+
+public class MethodParamPad extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Method parameter padding";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Fixes whitespace padding between the identifier of a method definition or method invocation and the left parenthesis of the parameter list. " +
+                "For example, when configured to remove spacing, `someMethodInvocation (x);` becomes `someMethodInvocation(x)`.";
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new MethodParamPadVisitor();
+    }
+
+    private static class MethodParamPadVisitor extends JavaIsoVisitor<ExecutionContext> {
+        SpacesStyle spacesStyle;
+        MethodParamPadStyle methodParamPadStyle;
+
+        @Nullable
+        EmptyForInitializerPadStyle emptyForInitializerPadStyle;
+
+        @Nullable
+        EmptyForIteratorPadStyle emptyForIteratorPadStyle;
+
+        @Override
+        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
+            SourceFile cu = (SourceFile)javaSourceFile;
+            spacesStyle = cu.getStyle(SpacesStyle.class) == null ? IntelliJ.spaces() : cu.getStyle(SpacesStyle.class);
+            methodParamPadStyle = cu.getStyle(MethodParamPadStyle.class) == null ? Checkstyle.methodParamPadStyle() : cu.getStyle(MethodParamPadStyle.class);
+            emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
+            emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
+
+            spacesStyle = spacesStyle.withBeforeParentheses(
+                    spacesStyle.getBeforeParentheses()
+                            .withMethodDeclaration(methodParamPadStyle.getSpace())
+                            .withMethodCall(methodParamPadStyle.getSpace())
+            );
+            return super.visitJavaSourceFile((JavaSourceFile) cu, ctx);
+        }
+
+        @Override
+        public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
+            J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
+            if (!methodParamPadStyle.getAllowLineBreaks() && md.getPadding().getParameters().getBefore().getWhitespace().contains("\n")) {
+                md = md.getPadding().withParameters(
+                        md.getPadding().getParameters().withBefore(
+                                md.getPadding().getParameters().getBefore().withWhitespace("")
+                        )
+                );
+            }
+            md = (J.MethodDeclaration)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, md).visitNonNull(md, ctx);
+            return md;
+        }
+
+        @Override
+        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+            J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
+            if (!methodParamPadStyle.getAllowLineBreaks() && mi.getPadding().getArguments().getBefore().getWhitespace().contains("\n")) {
+                mi = mi.getPadding().withArguments(
+                        mi.getPadding().getArguments().withBefore(
+                                mi.getPadding().getArguments().getBefore().withWhitespace("")
+                        )
+                );
+            }
+            mi = (J.MethodInvocation)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, mi).visitNonNull(mi, ctx);
+            return mi;
+        }
+
+        @Override
+        public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
+            J.NewClass nc = super.visitNewClass(newClass, ctx);
+            if (!methodParamPadStyle.getAllowLineBreaks() && nc.getPadding().getArguments() != null && nc.getPadding().getArguments().getBefore().getWhitespace().contains("\n")) {
+                nc = nc.getPadding().withArguments(
+                        nc.getPadding().getArguments().withBefore(
+                                nc.getPadding().getArguments().getBefore().withWhitespace("")
+                        )
+                );
+            }
+            nc = (J.NewClass)new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, nc).visitNonNull(nc, ctx);
+            return nc;
+        }
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/OperatorWrap.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/OperatorWrap.java
index 78add753d00..76f80e9f04e 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/OperatorWrap.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/OperatorWrap.java
@@ -1,419 +1,419 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.SourceFile;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.style.Checkstyle;
-import org.openrewrite.java.style.OperatorWrapStyle;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JRightPadded;
-import org.openrewrite.java.tree.JavaSourceFile;
-import org.openrewrite.java.tree.TypeTree;
-
-public class OperatorWrap extends Recipe {
-    @Override
-    public String getDisplayName() {
-        return "Operator wrapping";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Fixes line wrapping policies on operators.";
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new OperatorWrapVisitor();
-    }
-
-    private static class OperatorWrapVisitor extends JavaIsoVisitor<ExecutionContext> {
-        OperatorWrapStyle operatorWrapStyle;
-
-        @Override
-        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
-            SourceFile cu = (SourceFile)javaSourceFile;
-            operatorWrapStyle = cu.getStyle(OperatorWrapStyle.class) == null ? Checkstyle.operatorWrapStyle() : cu.getStyle(OperatorWrapStyle.class);
-            return super.visitJavaSourceFile((JavaSourceFile) cu, ctx);
-        }
-
-        @Override
-        public J.Binary visitBinary(J.Binary binary, ExecutionContext ctx) {
-            J.Binary b = super.visitBinary(binary, ctx);
-            J.Binary.Type op = b.getOperator();
-            if ((Boolean.TRUE.equals(operatorWrapStyle.getDiv()) && op == J.Binary.Type.Division) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getStar()) && op == J.Binary.Type.Multiplication) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getPlus()) && op == J.Binary.Type.Addition) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getMinus()) && op == J.Binary.Type.Subtraction) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getMod()) && op == J.Binary.Type.Modulo) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getSr()) && op == J.Binary.Type.RightShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getSl()) && op == J.Binary.Type.LeftShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBsr()) && op == J.Binary.Type.UnsignedRightShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getEqual()) && op == J.Binary.Type.Equal) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getNotEqual()) && op == J.Binary.Type.NotEqual) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getGt()) && op == J.Binary.Type.GreaterThan) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getGe()) && op == J.Binary.Type.GreaterThanOrEqual) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getLt()) && op == J.Binary.Type.LessThan) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getLe()) && op == J.Binary.Type.LessThanOrEqual) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBand()) && op == J.Binary.Type.BitAnd) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBxor()) && op == J.Binary.Type.BitXor) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBor()) && op == J.Binary.Type.BitOr) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getLand()) && op == J.Binary.Type.And) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getLor()) && op == J.Binary.Type.Or)) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (b.getRight().getPrefix().getWhitespace().contains("\n")) {
-                        b = b.getPadding().withOperator(
-                                b.getPadding().getOperator().withBefore(
-                                        b.getRight().getPrefix()
-                                )
-                        );
-                        b = b.withRight(
-                                b.getRight().withPrefix(
-                                        b.getRight().getPrefix().withWhitespace(" ")
-                                )
-                        );
-                    }
-                } else if (b.getPadding().getOperator().getBefore().getWhitespace().contains("\n")) {
-                    b = b.withRight(
-                            b.getRight().withPrefix(
-                                    b.getPadding().getOperator().getBefore()
-                            )
-                    );
-                    b = b.getPadding().withOperator(
-                            b.getPadding().getOperator().withBefore(
-                                    b.getRight().getPrefix().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            return b;
-        }
-
-        @Override
-        public J.TypeParameter visitTypeParameter(J.TypeParameter typeParam, ExecutionContext ctx) {
-            J.TypeParameter tp = super.visitTypeParameter(typeParam, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getTypeExtensionAnd()) && tp.getPadding().getBounds() != null) {
-                int typeBoundsSize = tp.getPadding().getBounds().getPadding().getElements().size();
-                tp = tp.getPadding().withBounds(
-                        tp.getPadding().getBounds().getPadding().withElements(
-                                ListUtils.map(tp.getPadding().getBounds().getPadding().getElements(),
-                                        (index, elemContainer) -> {
-                                            if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                                                if (index != typeBoundsSize - 1 && typeParam.getPadding().getBounds() != null) {
-                                                    JRightPadded<TypeTree> next = typeParam.getPadding().getBounds().getPadding().getElements().get(index + 1);
-                                                    if (next.getElement().getPrefix().getWhitespace().contains("\n")) {
-                                                        elemContainer = elemContainer.withAfter(
-                                                                next.getElement().getPrefix()
-                                                        );
-                                                    }
-                                                } else {
-                                                    if (elemContainer.getElement().getPrefix().getWhitespace().contains("\n")) {
-                                                        elemContainer = elemContainer.withElement(
-                                                                elemContainer.getElement().withPrefix(
-                                                                        elemContainer.getElement().getPrefix().withWhitespace(" ")
-                                                                )
-                                                        );
-                                                    }
-                                                }
-                                            } else {
-                                                if (index != typeBoundsSize - 1) {
-                                                    if (elemContainer.getAfter().getWhitespace().contains("\n")) {
-                                                        elemContainer = elemContainer.withAfter(
-                                                                elemContainer.getAfter().withWhitespace(" ")
-                                                        );
-                                                    }
-                                                } else if (typeBoundsSize > 1 && typeParam.getPadding().getBounds() != null) {
-                                                    JRightPadded<TypeTree> previous = typeParam.getPadding().getBounds().getPadding().getElements().get(index - 1);
-                                                    if (previous.getAfter().getWhitespace().contains("\n")) {
-                                                        elemContainer = elemContainer.withElement(
-                                                                elemContainer.getElement().withPrefix(
-                                                                        previous.getAfter()
-                                                                )
-                                                        );
-                                                    }
-                                                }
-                                            }
-                                            return elemContainer;
-                                        }
-                                )
-                        )
-                );
-            }
-            return tp;
-        }
-
-        @Override
-        public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, ExecutionContext ctx) {
-            J.InstanceOf i = super.visitInstanceOf(instanceOf, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getLiteralInstanceof())) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (i.getClazz().getPrefix().getWhitespace().contains("\n")) {
-                        i = i.getPadding().withExpr(
-                                i.getPadding().getExpr().withAfter(
-                                        i.getClazz().getPrefix()
-                                )
-                        );
-                        i = i.withClazz(
-                                i.getClazz().withPrefix(
-                                        i.getClazz().getPrefix().withWhitespace(" ")
-                                )
-                        );
-                    }
-                } else if (i.getPadding().getExpr().getAfter().getWhitespace().contains("\n")) {
-                    i = i.withClazz(
-                            i.getClazz().withPrefix(
-                                    i.getPadding().getExpr().getAfter()
-                            )
-                    );
-                    i = i.getPadding().withExpr(
-                            i.getPadding().getExpr().withAfter(
-                                    i.getPadding().getExpr().getAfter().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            return i;
-        }
-
-        @Override
-        public J.Ternary visitTernary(J.Ternary ternary, ExecutionContext ctx) {
-            J.Ternary t = super.visitTernary(ternary, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getQuestion())) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (t.getTruePart().getPrefix().getWhitespace().contains("\n")) {
-                        t = t.getPadding().withTruePart(
-                                t.getPadding().getTruePart().withBefore(
-                                        t.getPadding().getTruePart().getElement().getPrefix()
-                                )
-                        );
-                        t = t.getPadding().withTruePart(
-                                t.getPadding().getTruePart().withElement(
-                                        t.getPadding().getTruePart().getElement().withPrefix(
-                                                t.getPadding().getTruePart().getElement().getPrefix().withWhitespace(" ")
-                                        )
-                                )
-                        );
-                    }
-                } else if (t.getPadding().getTruePart().getBefore().getWhitespace().contains("\n")) {
-                    t = t.getPadding().withTruePart(
-                            t.getPadding().getTruePart().withElement(
-                                    t.getPadding().getTruePart().getElement().withPrefix(
-                                            t.getPadding().getTruePart().getBefore()
-                                    )
-                            )
-                    );
-                    t = t.getPadding().withTruePart(
-                            t.getPadding().getTruePart().withBefore(
-                                    t.getPadding().getTruePart().getElement().getPrefix().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            if (Boolean.TRUE.equals(operatorWrapStyle.getColon())) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (t.getPadding().getFalsePart().getElement().getPrefix().getWhitespace().contains("\n")) {
-                        t = t.getPadding().withFalsePart(
-                                t.getPadding().getFalsePart().withBefore(
-                                        t.getPadding().getFalsePart().getElement().getPrefix()
-                                )
-                        );
-                        t = t.getPadding().withFalsePart(
-                                t.getPadding().getFalsePart().withElement(
-                                        t.getPadding().getFalsePart().getElement().withPrefix(
-                                                t.getPadding().getFalsePart().getElement().getPrefix().withWhitespace(" ")
-                                        )
-                                )
-                        );
-                    }
-                } else if (t.getPadding().getFalsePart().getBefore().getWhitespace().contains("\n")) {
-                    t = t.getPadding().withFalsePart(
-                            t.getPadding().getFalsePart().withElement(
-                                    t.getPadding().getFalsePart().getElement().withPrefix(
-                                            t.getPadding().getFalsePart().getBefore()
-                                    )
-                            )
-                    );
-                    t = t.getPadding().withFalsePart(
-                            t.getPadding().getFalsePart().withBefore(
-                                    t.getPadding().getFalsePart().getElement().getPrefix().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            return t;
-        }
-
-        @Override
-        public J.MemberReference visitMemberReference(J.MemberReference memberRef, ExecutionContext ctx) {
-            J.MemberReference m = super.visitMemberReference(memberRef, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getMethodRef())) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (m.getPadding().getReference().getBefore().getWhitespace().contains("\n")) {
-                        m = m.getPadding().withContaining(
-                                m.getPadding().getContaining().withAfter(
-                                        m.getPadding().getReference().getBefore()
-                                )
-                        );
-                        m = m.getPadding().withReference(
-                                m.getPadding().getReference().withBefore(
-                                        m.getPadding().getReference().getBefore().withWhitespace("")
-                                )
-                        );
-                    }
-                } else if (m.getPadding().getContaining().getAfter().getWhitespace().contains("\n")) {
-                    m = m.getPadding().withReference(
-                            m.getPadding().getReference().withBefore(
-                                    m.getPadding().getContaining().getAfter()
-                            )
-                    );
-                    m = m.getPadding().withContaining(
-                            m.getPadding().getContaining().withAfter(
-                                    m.getPadding().getReference().getBefore().withWhitespace("")
-                            )
-                    );
-                }
-            }
-            return m;
-        }
-
-        @Override
-        public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext ctx) {
-            J.Assignment a = super.visitAssignment(assignment, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getAssign())) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (a.getPadding().getAssignment().getElement().getPrefix().getWhitespace().contains("\n")) {
-                        a = a.getPadding().withAssignment(
-                                a.getPadding().getAssignment().withBefore(
-                                        a.getPadding().getAssignment().getElement().getPrefix()
-                                )
-                        );
-                        a = a.getPadding().withAssignment(
-                                a.getPadding().getAssignment().withElement(
-                                        a.getPadding().getAssignment().getElement().withPrefix(
-                                                a.getPadding().getAssignment().getElement().getPrefix().withWhitespace(" ")
-                                        )
-                                )
-                        );
-                    }
-                } else if (a.getPadding().getAssignment().getBefore().getWhitespace().contains("\n")) {
-                    a = a.getPadding().withAssignment(
-                            a.getPadding().getAssignment().withElement(
-                                    a.getPadding().getAssignment().getElement().withPrefix(
-                                            a.getPadding().getAssignment().getBefore()
-                                    )
-                            )
-                    );
-                    a = a.getPadding().withAssignment(
-                            a.getPadding().getAssignment().withBefore(
-                                    a.getPadding().getAssignment().getBefore().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            return a;
-        }
-
-        @Override
-        public J.AssignmentOperation visitAssignmentOperation(J.AssignmentOperation assignOp, ExecutionContext ctx) {
-            J.AssignmentOperation a = super.visitAssignmentOperation(assignOp, ctx);
-            J.AssignmentOperation.Type op = a.getOperator();
-            if ((Boolean.TRUE.equals(operatorWrapStyle.getPlusAssign()) && op == J.AssignmentOperation.Type.Addition) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getMinusAssign()) && op == J.AssignmentOperation.Type.Subtraction) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getStarAssign()) && op == J.AssignmentOperation.Type.Multiplication) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getDivAssign()) && op == J.AssignmentOperation.Type.Division) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getModAssign()) && op == J.AssignmentOperation.Type.Modulo) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getSrAssign()) && op == J.AssignmentOperation.Type.RightShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getSlAssign()) && op == J.AssignmentOperation.Type.LeftShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBsrAssign()) && op == J.AssignmentOperation.Type.UnsignedRightShift) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBandAssign()) && op == J.AssignmentOperation.Type.BitAnd) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBxorAssign()) && op == J.AssignmentOperation.Type.BitXor) ||
-                    (Boolean.TRUE.equals(operatorWrapStyle.getBorAssign()) && op == J.AssignmentOperation.Type.BitOr)) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (a.getAssignment().getPrefix().getWhitespace().contains("\n")) {
-                        a = a.getPadding().withOperator(
-                                a.getPadding().getOperator().withBefore(
-                                        a.getAssignment().getPrefix()
-                                )
-                        );
-                        a = a.withAssignment(
-                                a.getAssignment().withPrefix(
-                                        a.getAssignment().getPrefix().withWhitespace(" ")
-                                )
-                        );
-                    }
-                } else if (a.getPadding().getOperator().getBefore().getWhitespace().contains("\n")) {
-                    a = a.withAssignment(
-                            a.getAssignment().withPrefix(
-                                    a.getPadding().getOperator().getBefore()
-                            )
-                    );
-                    a = a.getPadding().withOperator(
-                            a.getPadding().getOperator().withBefore(
-                                    a.getAssignment().getPrefix().withWhitespace(" ")
-                            )
-                    );
-                }
-            }
-            return a;
-        }
-
-        @Override
-        public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext ctx) {
-            J.VariableDeclarations.NamedVariable v = super.visitVariable(variable, ctx);
-            if (Boolean.TRUE.equals(operatorWrapStyle.getAssign()) && v.getPadding().getInitializer() != null) {
-                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
-                    if (v.getPadding().getInitializer().getElement().getPrefix().getWhitespace().contains("\n")) {
-                        v = v.getPadding().withInitializer(
-                                v.getPadding().getInitializer().withBefore(
-                                        v.getPadding().getInitializer().getElement().getPrefix()
-                                )
-                        );
-                        if (v.getPadding().getInitializer() != null && v.getPadding().getInitializer().getElement() != null) {
-                            v = v.getPadding().withInitializer(
-                                    v.getPadding().getInitializer().withElement(
-                                            v.getPadding().getInitializer().getElement().withPrefix(
-                                                    v.getPadding().getInitializer().getElement().getPrefix().withWhitespace(" ")
-                                            )
-                                    )
-                            );
-                        }
-                    }
-                } else if (v.getPadding().getInitializer().getBefore().getWhitespace().contains("\n")) {
-                    v = v.getPadding().withInitializer(
-                            v.getPadding().getInitializer().withElement(
-                                    v.getPadding().getInitializer().getElement().withPrefix(
-                                            v.getPadding().getInitializer().getBefore()
-                                    )
-                            )
-                    );
-                    if (v.getPadding().getInitializer() != null && v.getPadding().getInitializer().getBefore() != null) {
-                        v = v.getPadding().withInitializer(
-                                v.getPadding().getInitializer().withBefore(
-                                        v.getPadding().getInitializer().getElement().getPrefix().withWhitespace(" ")
-                                )
-                        );
-                    }
-                }
-            }
-            return v;
-        }
-
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.SourceFile;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.style.Checkstyle;
+import org.openrewrite.java.style.OperatorWrapStyle;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JRightPadded;
+import org.openrewrite.java.tree.JavaSourceFile;
+import org.openrewrite.java.tree.TypeTree;
+
+public class OperatorWrap extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Operator wrapping";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Fixes line wrapping policies on operators.";
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new OperatorWrapVisitor();
+    }
+
+    private static class OperatorWrapVisitor extends JavaIsoVisitor<ExecutionContext> {
+        OperatorWrapStyle operatorWrapStyle;
+
+        @Override
+        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
+            SourceFile cu = (SourceFile)javaSourceFile;
+            operatorWrapStyle = cu.getStyle(OperatorWrapStyle.class) == null ? Checkstyle.operatorWrapStyle() : cu.getStyle(OperatorWrapStyle.class);
+            return super.visitJavaSourceFile((JavaSourceFile) cu, ctx);
+        }
+
+        @Override
+        public J.Binary visitBinary(J.Binary binary, ExecutionContext ctx) {
+            J.Binary b = super.visitBinary(binary, ctx);
+            J.Binary.Type op = b.getOperator();
+            if ((Boolean.TRUE.equals(operatorWrapStyle.getDiv()) && op == J.Binary.Type.Division) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getStar()) && op == J.Binary.Type.Multiplication) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getPlus()) && op == J.Binary.Type.Addition) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getMinus()) && op == J.Binary.Type.Subtraction) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getMod()) && op == J.Binary.Type.Modulo) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getSr()) && op == J.Binary.Type.RightShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getSl()) && op == J.Binary.Type.LeftShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBsr()) && op == J.Binary.Type.UnsignedRightShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getEqual()) && op == J.Binary.Type.Equal) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getNotEqual()) && op == J.Binary.Type.NotEqual) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getGt()) && op == J.Binary.Type.GreaterThan) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getGe()) && op == J.Binary.Type.GreaterThanOrEqual) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getLt()) && op == J.Binary.Type.LessThan) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getLe()) && op == J.Binary.Type.LessThanOrEqual) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBand()) && op == J.Binary.Type.BitAnd) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBxor()) && op == J.Binary.Type.BitXor) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBor()) && op == J.Binary.Type.BitOr) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getLand()) && op == J.Binary.Type.And) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getLor()) && op == J.Binary.Type.Or)) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (b.getRight().getPrefix().getWhitespace().contains("\n")) {
+                        b = b.getPadding().withOperator(
+                                b.getPadding().getOperator().withBefore(
+                                        b.getRight().getPrefix()
+                                )
+                        );
+                        b = b.withRight(
+                                b.getRight().withPrefix(
+                                        b.getRight().getPrefix().withWhitespace(" ")
+                                )
+                        );
+                    }
+                } else if (b.getPadding().getOperator().getBefore().getWhitespace().contains("\n")) {
+                    b = b.withRight(
+                            b.getRight().withPrefix(
+                                    b.getPadding().getOperator().getBefore()
+                            )
+                    );
+                    b = b.getPadding().withOperator(
+                            b.getPadding().getOperator().withBefore(
+                                    b.getRight().getPrefix().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            return b;
+        }
+
+        @Override
+        public J.TypeParameter visitTypeParameter(J.TypeParameter typeParam, ExecutionContext ctx) {
+            J.TypeParameter tp = super.visitTypeParameter(typeParam, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getTypeExtensionAnd()) && tp.getPadding().getBounds() != null) {
+                int typeBoundsSize = tp.getPadding().getBounds().getPadding().getElements().size();
+                tp = tp.getPadding().withBounds(
+                        tp.getPadding().getBounds().getPadding().withElements(
+                                ListUtils.map(tp.getPadding().getBounds().getPadding().getElements(),
+                                        (index, elemContainer) -> {
+                                            if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                                                if (index != typeBoundsSize - 1 && typeParam.getPadding().getBounds() != null) {
+                                                    JRightPadded<TypeTree> next = typeParam.getPadding().getBounds().getPadding().getElements().get(index + 1);
+                                                    if (next.getElement().getPrefix().getWhitespace().contains("\n")) {
+                                                        elemContainer = elemContainer.withAfter(
+                                                                next.getElement().getPrefix()
+                                                        );
+                                                    }
+                                                } else {
+                                                    if (elemContainer.getElement().getPrefix().getWhitespace().contains("\n")) {
+                                                        elemContainer = elemContainer.withElement(
+                                                                elemContainer.getElement().withPrefix(
+                                                                        elemContainer.getElement().getPrefix().withWhitespace(" ")
+                                                                )
+                                                        );
+                                                    }
+                                                }
+                                            } else {
+                                                if (index != typeBoundsSize - 1) {
+                                                    if (elemContainer.getAfter().getWhitespace().contains("\n")) {
+                                                        elemContainer = elemContainer.withAfter(
+                                                                elemContainer.getAfter().withWhitespace(" ")
+                                                        );
+                                                    }
+                                                } else if (typeBoundsSize > 1 && typeParam.getPadding().getBounds() != null) {
+                                                    JRightPadded<TypeTree> previous = typeParam.getPadding().getBounds().getPadding().getElements().get(index - 1);
+                                                    if (previous.getAfter().getWhitespace().contains("\n")) {
+                                                        elemContainer = elemContainer.withElement(
+                                                                elemContainer.getElement().withPrefix(
+                                                                        previous.getAfter()
+                                                                )
+                                                        );
+                                                    }
+                                                }
+                                            }
+                                            return elemContainer;
+                                        }
+                                )
+                        )
+                );
+            }
+            return tp;
+        }
+
+        @Override
+        public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, ExecutionContext ctx) {
+            J.InstanceOf i = super.visitInstanceOf(instanceOf, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getLiteralInstanceof())) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (i.getClazz().getPrefix().getWhitespace().contains("\n")) {
+                        i = i.getPadding().withExpr(
+                                i.getPadding().getExpr().withAfter(
+                                        i.getClazz().getPrefix()
+                                )
+                        );
+                        i = i.withClazz(
+                                i.getClazz().withPrefix(
+                                        i.getClazz().getPrefix().withWhitespace(" ")
+                                )
+                        );
+                    }
+                } else if (i.getPadding().getExpr().getAfter().getWhitespace().contains("\n")) {
+                    i = i.withClazz(
+                            i.getClazz().withPrefix(
+                                    i.getPadding().getExpr().getAfter()
+                            )
+                    );
+                    i = i.getPadding().withExpr(
+                            i.getPadding().getExpr().withAfter(
+                                    i.getPadding().getExpr().getAfter().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            return i;
+        }
+
+        @Override
+        public J.Ternary visitTernary(J.Ternary ternary, ExecutionContext ctx) {
+            J.Ternary t = super.visitTernary(ternary, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getQuestion())) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (t.getTruePart().getPrefix().getWhitespace().contains("\n")) {
+                        t = t.getPadding().withTruePart(
+                                t.getPadding().getTruePart().withBefore(
+                                        t.getPadding().getTruePart().getElement().getPrefix()
+                                )
+                        );
+                        t = t.getPadding().withTruePart(
+                                t.getPadding().getTruePart().withElement(
+                                        t.getPadding().getTruePart().getElement().withPrefix(
+                                                t.getPadding().getTruePart().getElement().getPrefix().withWhitespace(" ")
+                                        )
+                                )
+                        );
+                    }
+                } else if (t.getPadding().getTruePart().getBefore().getWhitespace().contains("\n")) {
+                    t = t.getPadding().withTruePart(
+                            t.getPadding().getTruePart().withElement(
+                                    t.getPadding().getTruePart().getElement().withPrefix(
+                                            t.getPadding().getTruePart().getBefore()
+                                    )
+                            )
+                    );
+                    t = t.getPadding().withTruePart(
+                            t.getPadding().getTruePart().withBefore(
+                                    t.getPadding().getTruePart().getElement().getPrefix().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            if (Boolean.TRUE.equals(operatorWrapStyle.getColon())) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (t.getPadding().getFalsePart().getElement().getPrefix().getWhitespace().contains("\n")) {
+                        t = t.getPadding().withFalsePart(
+                                t.getPadding().getFalsePart().withBefore(
+                                        t.getPadding().getFalsePart().getElement().getPrefix()
+                                )
+                        );
+                        t = t.getPadding().withFalsePart(
+                                t.getPadding().getFalsePart().withElement(
+                                        t.getPadding().getFalsePart().getElement().withPrefix(
+                                                t.getPadding().getFalsePart().getElement().getPrefix().withWhitespace(" ")
+                                        )
+                                )
+                        );
+                    }
+                } else if (t.getPadding().getFalsePart().getBefore().getWhitespace().contains("\n")) {
+                    t = t.getPadding().withFalsePart(
+                            t.getPadding().getFalsePart().withElement(
+                                    t.getPadding().getFalsePart().getElement().withPrefix(
+                                            t.getPadding().getFalsePart().getBefore()
+                                    )
+                            )
+                    );
+                    t = t.getPadding().withFalsePart(
+                            t.getPadding().getFalsePart().withBefore(
+                                    t.getPadding().getFalsePart().getElement().getPrefix().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            return t;
+        }
+
+        @Override
+        public J.MemberReference visitMemberReference(J.MemberReference memberRef, ExecutionContext ctx) {
+            J.MemberReference m = super.visitMemberReference(memberRef, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getMethodRef())) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (m.getPadding().getReference().getBefore().getWhitespace().contains("\n")) {
+                        m = m.getPadding().withContaining(
+                                m.getPadding().getContaining().withAfter(
+                                        m.getPadding().getReference().getBefore()
+                                )
+                        );
+                        m = m.getPadding().withReference(
+                                m.getPadding().getReference().withBefore(
+                                        m.getPadding().getReference().getBefore().withWhitespace("")
+                                )
+                        );
+                    }
+                } else if (m.getPadding().getContaining().getAfter().getWhitespace().contains("\n")) {
+                    m = m.getPadding().withReference(
+                            m.getPadding().getReference().withBefore(
+                                    m.getPadding().getContaining().getAfter()
+                            )
+                    );
+                    m = m.getPadding().withContaining(
+                            m.getPadding().getContaining().withAfter(
+                                    m.getPadding().getReference().getBefore().withWhitespace("")
+                            )
+                    );
+                }
+            }
+            return m;
+        }
+
+        @Override
+        public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext ctx) {
+            J.Assignment a = super.visitAssignment(assignment, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getAssign())) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (a.getPadding().getAssignment().getElement().getPrefix().getWhitespace().contains("\n")) {
+                        a = a.getPadding().withAssignment(
+                                a.getPadding().getAssignment().withBefore(
+                                        a.getPadding().getAssignment().getElement().getPrefix()
+                                )
+                        );
+                        a = a.getPadding().withAssignment(
+                                a.getPadding().getAssignment().withElement(
+                                        a.getPadding().getAssignment().getElement().withPrefix(
+                                                a.getPadding().getAssignment().getElement().getPrefix().withWhitespace(" ")
+                                        )
+                                )
+                        );
+                    }
+                } else if (a.getPadding().getAssignment().getBefore().getWhitespace().contains("\n")) {
+                    a = a.getPadding().withAssignment(
+                            a.getPadding().getAssignment().withElement(
+                                    a.getPadding().getAssignment().getElement().withPrefix(
+                                            a.getPadding().getAssignment().getBefore()
+                                    )
+                            )
+                    );
+                    a = a.getPadding().withAssignment(
+                            a.getPadding().getAssignment().withBefore(
+                                    a.getPadding().getAssignment().getBefore().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            return a;
+        }
+
+        @Override
+        public J.AssignmentOperation visitAssignmentOperation(J.AssignmentOperation assignOp, ExecutionContext ctx) {
+            J.AssignmentOperation a = super.visitAssignmentOperation(assignOp, ctx);
+            J.AssignmentOperation.Type op = a.getOperator();
+            if ((Boolean.TRUE.equals(operatorWrapStyle.getPlusAssign()) && op == J.AssignmentOperation.Type.Addition) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getMinusAssign()) && op == J.AssignmentOperation.Type.Subtraction) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getStarAssign()) && op == J.AssignmentOperation.Type.Multiplication) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getDivAssign()) && op == J.AssignmentOperation.Type.Division) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getModAssign()) && op == J.AssignmentOperation.Type.Modulo) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getSrAssign()) && op == J.AssignmentOperation.Type.RightShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getSlAssign()) && op == J.AssignmentOperation.Type.LeftShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBsrAssign()) && op == J.AssignmentOperation.Type.UnsignedRightShift) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBandAssign()) && op == J.AssignmentOperation.Type.BitAnd) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBxorAssign()) && op == J.AssignmentOperation.Type.BitXor) ||
+                    (Boolean.TRUE.equals(operatorWrapStyle.getBorAssign()) && op == J.AssignmentOperation.Type.BitOr)) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (a.getAssignment().getPrefix().getWhitespace().contains("\n")) {
+                        a = a.getPadding().withOperator(
+                                a.getPadding().getOperator().withBefore(
+                                        a.getAssignment().getPrefix()
+                                )
+                        );
+                        a = a.withAssignment(
+                                a.getAssignment().withPrefix(
+                                        a.getAssignment().getPrefix().withWhitespace(" ")
+                                )
+                        );
+                    }
+                } else if (a.getPadding().getOperator().getBefore().getWhitespace().contains("\n")) {
+                    a = a.withAssignment(
+                            a.getAssignment().withPrefix(
+                                    a.getPadding().getOperator().getBefore()
+                            )
+                    );
+                    a = a.getPadding().withOperator(
+                            a.getPadding().getOperator().withBefore(
+                                    a.getAssignment().getPrefix().withWhitespace(" ")
+                            )
+                    );
+                }
+            }
+            return a;
+        }
+
+        @Override
+        public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext ctx) {
+            J.VariableDeclarations.NamedVariable v = super.visitVariable(variable, ctx);
+            if (Boolean.TRUE.equals(operatorWrapStyle.getAssign()) && v.getPadding().getInitializer() != null) {
+                if (OperatorWrapStyle.WrapOption.NL.equals(operatorWrapStyle.getWrapOption())) {
+                    if (v.getPadding().getInitializer().getElement().getPrefix().getWhitespace().contains("\n")) {
+                        v = v.getPadding().withInitializer(
+                                v.getPadding().getInitializer().withBefore(
+                                        v.getPadding().getInitializer().getElement().getPrefix()
+                                )
+                        );
+                        if (v.getPadding().getInitializer() != null && v.getPadding().getInitializer().getElement() != null) {
+                            v = v.getPadding().withInitializer(
+                                    v.getPadding().getInitializer().withElement(
+                                            v.getPadding().getInitializer().getElement().withPrefix(
+                                                    v.getPadding().getInitializer().getElement().getPrefix().withWhitespace(" ")
+                                            )
+                                    )
+                            );
+                        }
+                    }
+                } else if (v.getPadding().getInitializer().getBefore().getWhitespace().contains("\n")) {
+                    v = v.getPadding().withInitializer(
+                            v.getPadding().getInitializer().withElement(
+                                    v.getPadding().getInitializer().getElement().withPrefix(
+                                            v.getPadding().getInitializer().getBefore()
+                                    )
+                            )
+                    );
+                    if (v.getPadding().getInitializer() != null && v.getPadding().getInitializer().getBefore() != null) {
+                        v = v.getPadding().withInitializer(
+                                v.getPadding().getInitializer().withBefore(
+                                        v.getPadding().getInitializer().getElement().getPrefix().withWhitespace(" ")
+                                )
+                        );
+                    }
+                }
+            }
+            return v;
+        }
+
+    }
+
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/PadEmptyForLoopComponents.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/PadEmptyForLoopComponents.java
index f5bb984f3e5..eb879250143 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/PadEmptyForLoopComponents.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/PadEmptyForLoopComponents.java
@@ -1,107 +1,107 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.SourceFile;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.style.EmptyForInitializerPadStyle;
-import org.openrewrite.java.style.EmptyForIteratorPadStyle;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaSourceFile;
-import org.openrewrite.java.tree.Statement;
-import org.openrewrite.marker.SearchResult;
-
-import java.util.List;
-
-import static java.util.Collections.singletonList;
-import static org.openrewrite.Tree.randomId;
-
-public class PadEmptyForLoopComponents extends Recipe {
-
-    @Override
-    public String getDisplayName() {
-        return "Pad empty `for` loop components";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Fixes padding on empty `for` loop iterators and initializers to match Checkstyle policies.";
-    }
-
-    @Override
-    protected @Nullable JavaIsoVisitor<ExecutionContext> getSingleSourceApplicableTest() {
-        return new JavaIsoVisitor<ExecutionContext>() {
-            @Override
-            public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext executionContext) {
-                SourceFile cu = (SourceFile) javaSourceFile;
-                if(cu.getStyle(EmptyForIteratorPadStyle.class) != null || cu.getStyle(EmptyForInitializerPadStyle.class) != null) {
-                    return cu.withMarkers(cu.getMarkers().add(new SearchResult(randomId(), null)));
-                }
-                return (JavaSourceFile) cu;
-            }
-        };
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new JavaIsoVisitor<ExecutionContext>() {
-
-            @Nullable
-            EmptyForIteratorPadStyle emptyForIteratorPadStyle;
-
-            @Nullable
-            EmptyForInitializerPadStyle emptyForInitializerPadStyle;
-
-            @Override
-            public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext executionContext) {
-                SourceFile cu = (SourceFile)javaSourceFile;
-                emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
-                emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
-                return super.visitJavaSourceFile((JavaSourceFile)cu, executionContext);
-            }
-
-            @Override
-            public J.ForLoop visitForLoop(J.ForLoop forLoop, ExecutionContext executionContext) {
-                J.ForLoop fl = super.visitForLoop(forLoop, executionContext);
-                List<Statement> updates = forLoop.getControl().getUpdate();
-                if(emptyForIteratorPadStyle != null && updates.size() == 1 && updates.get(0) instanceof J.Empty) {
-                    Statement update = updates.get(0);
-                    if(emptyForIteratorPadStyle.getSpace() && update.getPrefix().getWhitespace().isEmpty()) {
-                        update = update.withPrefix(update.getPrefix().withWhitespace(" "));
-                    } else if(!emptyForIteratorPadStyle.getSpace() && !update.getPrefix().getWhitespace().isEmpty()) {
-                        update = update.withPrefix(update.getPrefix().withWhitespace(""));
-                    }
-                    fl = fl.withControl(fl.getControl().withUpdate(singletonList(update)));
-                }
-
-                List<Statement> init = forLoop.getControl().getInit();
-                if(emptyForInitializerPadStyle != null && init.get(0) instanceof J.Empty) {
-                    if(emptyForInitializerPadStyle.getSpace() && init.get(0).getPrefix().getWhitespace().isEmpty()) {
-                        init = ListUtils.mapFirst(init, i -> i.withPrefix(i.getPrefix().withWhitespace(" ")));
-                    } else if(!emptyForInitializerPadStyle.getSpace() && !init.get(0).getPrefix().getWhitespace().isEmpty()) {
-                        init = ListUtils.mapFirst(init, i -> i.withPrefix(i.getPrefix().withWhitespace("")));
-                    }
-                    fl = fl.withControl(fl.getControl().withInit(init));
-                }
-                return fl;
-            }
-        };
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.SourceFile;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.style.EmptyForInitializerPadStyle;
+import org.openrewrite.java.style.EmptyForIteratorPadStyle;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaSourceFile;
+import org.openrewrite.java.tree.Statement;
+import org.openrewrite.marker.SearchResult;
+
+import java.util.List;
+
+import static java.util.Collections.singletonList;
+import static org.openrewrite.Tree.randomId;
+
+public class PadEmptyForLoopComponents extends Recipe {
+
+    @Override
+    public String getDisplayName() {
+        return "Pad empty `for` loop components";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Fixes padding on empty `for` loop iterators and initializers to match Checkstyle policies.";
+    }
+
+    @Override
+    protected @Nullable JavaIsoVisitor<ExecutionContext> getSingleSourceApplicableTest() {
+        return new JavaIsoVisitor<ExecutionContext>() {
+            @Override
+            public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext executionContext) {
+                SourceFile cu = (SourceFile) javaSourceFile;
+                if(cu.getStyle(EmptyForIteratorPadStyle.class) != null || cu.getStyle(EmptyForInitializerPadStyle.class) != null) {
+                    return cu.withMarkers(cu.getMarkers().add(new SearchResult(randomId(), null)));
+                }
+                return (JavaSourceFile) cu;
+            }
+        };
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new JavaIsoVisitor<ExecutionContext>() {
+
+            @Nullable
+            EmptyForIteratorPadStyle emptyForIteratorPadStyle;
+
+            @Nullable
+            EmptyForInitializerPadStyle emptyForInitializerPadStyle;
+
+            @Override
+            public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext executionContext) {
+                SourceFile cu = (SourceFile)javaSourceFile;
+                emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
+                emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
+                return super.visitJavaSourceFile((JavaSourceFile)cu, executionContext);
+            }
+
+            @Override
+            public J.ForLoop visitForLoop(J.ForLoop forLoop, ExecutionContext executionContext) {
+                J.ForLoop fl = super.visitForLoop(forLoop, executionContext);
+                List<Statement> updates = forLoop.getControl().getUpdate();
+                if(emptyForIteratorPadStyle != null && updates.size() == 1 && updates.get(0) instanceof J.Empty) {
+                    Statement update = updates.get(0);
+                    if(emptyForIteratorPadStyle.getSpace() && update.getPrefix().getWhitespace().isEmpty()) {
+                        update = update.withPrefix(update.getPrefix().withWhitespace(" "));
+                    } else if(!emptyForIteratorPadStyle.getSpace() && !update.getPrefix().getWhitespace().isEmpty()) {
+                        update = update.withPrefix(update.getPrefix().withWhitespace(""));
+                    }
+                    fl = fl.withControl(fl.getControl().withUpdate(singletonList(update)));
+                }
+
+                List<Statement> init = forLoop.getControl().getInit();
+                if(emptyForInitializerPadStyle != null && init.get(0) instanceof J.Empty) {
+                    if(emptyForInitializerPadStyle.getSpace() && init.get(0).getPrefix().getWhitespace().isEmpty()) {
+                        init = ListUtils.mapFirst(init, i -> i.withPrefix(i.getPrefix().withWhitespace(" ")));
+                    } else if(!emptyForInitializerPadStyle.getSpace() && !init.get(0).getPrefix().getWhitespace().isEmpty()) {
+                        init = ListUtils.mapFirst(init, i -> i.withPrefix(i.getPrefix().withWhitespace("")));
+                    }
+                    fl = fl.withControl(fl.getControl().withInit(init));
+                }
+                return fl;
+            }
+        };
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/TypecastParenPad.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/TypecastParenPad.java
index a7e10be9921..838c87ba9a5 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/TypecastParenPad.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/TypecastParenPad.java
@@ -1,75 +1,75 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.SourceFile;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.format.SpacesVisitor;
-import org.openrewrite.java.style.*;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaSourceFile;
-
-public class TypecastParenPad extends Recipe {
-    @Override
-    public String getDisplayName() {
-        return "Typecast parenthesis padding";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Fixes whitespace padding between a typecast type identifier and the enclosing left and right parenthesis. " +
-                "For example, when configured to remove spacing, `( int ) 0L;` becomes `(int) 0L;`.";
-    }
-
-    @Override
-    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
-        return new TypecastParenPadVisitor();
-    }
-
-    private static class TypecastParenPadVisitor extends JavaIsoVisitor<ExecutionContext> {
-        SpacesStyle spacesStyle;
-        TypecastParenPadStyle typecastParenPadStyle;
-
-        @Nullable
-        EmptyForInitializerPadStyle emptyForInitializerPadStyle;
-
-        @Nullable
-        EmptyForIteratorPadStyle emptyForIteratorPadStyle;
-
-        @Override
-        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
-            SourceFile cu = (SourceFile)javaSourceFile;
-            spacesStyle = cu.getStyle(SpacesStyle.class) == null ? IntelliJ.spaces() : cu.getStyle(SpacesStyle.class);
-            typecastParenPadStyle = cu.getStyle(TypecastParenPadStyle.class) == null ? Checkstyle.typecastParenPadStyle() : cu.getStyle(TypecastParenPadStyle.class);
-            emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
-            emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
-
-            spacesStyle = spacesStyle.withWithin(spacesStyle.getWithin().withTypeCastParentheses(typecastParenPadStyle.getSpace()));
-            return super.visitJavaSourceFile((JavaSourceFile)cu, ctx);
-        }
-
-        @Override
-        public J.TypeCast visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
-            J.TypeCast tc = super.visitTypeCast(typeCast, ctx);
-            doAfterVisit(new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, tc));
-            return tc;
-        }
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.SourceFile;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.format.SpacesVisitor;
+import org.openrewrite.java.style.*;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaSourceFile;
+
+public class TypecastParenPad extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Typecast parenthesis padding";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Fixes whitespace padding between a typecast type identifier and the enclosing left and right parenthesis. " +
+                "For example, when configured to remove spacing, `( int ) 0L;` becomes `(int) 0L;`.";
+    }
+
+    @Override
+    protected JavaIsoVisitor<ExecutionContext> getVisitor() {
+        return new TypecastParenPadVisitor();
+    }
+
+    private static class TypecastParenPadVisitor extends JavaIsoVisitor<ExecutionContext> {
+        SpacesStyle spacesStyle;
+        TypecastParenPadStyle typecastParenPadStyle;
+
+        @Nullable
+        EmptyForInitializerPadStyle emptyForInitializerPadStyle;
+
+        @Nullable
+        EmptyForIteratorPadStyle emptyForIteratorPadStyle;
+
+        @Override
+        public JavaSourceFile visitJavaSourceFile(JavaSourceFile javaSourceFile, ExecutionContext ctx) {
+            SourceFile cu = (SourceFile)javaSourceFile;
+            spacesStyle = cu.getStyle(SpacesStyle.class) == null ? IntelliJ.spaces() : cu.getStyle(SpacesStyle.class);
+            typecastParenPadStyle = cu.getStyle(TypecastParenPadStyle.class) == null ? Checkstyle.typecastParenPadStyle() : cu.getStyle(TypecastParenPadStyle.class);
+            emptyForInitializerPadStyle = cu.getStyle(EmptyForInitializerPadStyle.class);
+            emptyForIteratorPadStyle = cu.getStyle(EmptyForIteratorPadStyle.class);
+
+            spacesStyle = spacesStyle.withWithin(spacesStyle.getWithin().withTypeCastParentheses(typecastParenPadStyle.getSpace()));
+            return super.visitJavaSourceFile((JavaSourceFile)cu, ctx);
+        }
+
+        @Override
+        public J.TypeCast visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
+            J.TypeCast tc = super.visitTypeCast(typeCast, ctx);
+            doAfterVisit(new SpacesVisitor<>(spacesStyle, emptyForInitializerPadStyle, emptyForIteratorPadStyle, tc));
+            return tc;
+        }
+    }
+
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/marker/package-info.java b/rewrite-java/src/main/java/org/openrewrite/java/marker/package-info.java
index 42d82bfdd6d..5870908821d 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/marker/package-info.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/marker/package-info.java
@@ -1,19 +1,19 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@NonNullApi
-package org.openrewrite.java.marker;
-
-import org.openrewrite.internal.lang.NonNullApi;
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package org.openrewrite.java.marker;
+
+import org.openrewrite.internal.lang.NonNullApi;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/Checkstyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/Checkstyle.java
index 2996416103b..50de2cd42e2 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/Checkstyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/Checkstyle.java
@@ -1,149 +1,149 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import org.openrewrite.style.NamedStyles;
-import org.openrewrite.style.Style;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import static java.util.Collections.emptySet;
-import static org.openrewrite.Tree.randomId;
-
-public class Checkstyle extends NamedStyles {
-    private static final Checkstyle INSTANCE = new Checkstyle();
-    private static final String NAME = "org.openrewrite.java.Checkstyle";
-    private static final String DISPLAY_NAME = "Checkstyle";
-    private static final String DESCRIPTION = "Checkstyle defaults for styles";
-
-    private Checkstyle() {
-        super(randomId(),
-                NAME,
-                DISPLAY_NAME,
-                DESCRIPTION,
-                emptySet(),
-                Arrays.asList(
-                        defaultComesLast(),
-                        emptyBlock(),
-                        emptyForInitializerPadStyle(),
-                        emptyForIteratorPadStyle(),
-                        equalsAvoidsNull(),
-                        explicitInitialization(),
-                        fallThrough(),
-                        hiddenFieldStyle(),
-                        hideUtilityClassConstructorStyle(),
-                        methodParamPadStyle(),
-                        needBracesStyle(),
-                        noWhitespaceAfterStyle(),
-                        noWhitespaceBeforeStyle(),
-                        operatorWrapStyle(),
-                        typecastParenPadStyle(),
-                        unnecessaryParentheses()
-                ));
-    }
-
-    Checkstyle(Collection<Style> styles) {
-        super(randomId(), NAME, DISPLAY_NAME, DESCRIPTION, emptySet(), styles);
-    }
-
-    @JsonCreator
-    public static Checkstyle defaults() {
-        return INSTANCE;
-    }
-
-    public static DefaultComesLastStyle defaultComesLast() {
-        return new DefaultComesLastStyle(false);
-    }
-
-    public static final EmptyBlockStyle.BlockPolicy defaultBlockPolicy = EmptyBlockStyle.BlockPolicy.TEXT;
-
-    public static EmptyBlockStyle emptyBlock() {
-        return new EmptyBlockStyle(defaultBlockPolicy, true, true, true, true,
-                true, true, true, true, true, true, true, true);
-    }
-
-    public static EqualsAvoidsNullStyle equalsAvoidsNull() {
-        return new EqualsAvoidsNullStyle(false);
-    }
-
-    public static ExplicitInitializationStyle explicitInitialization() {
-        return new ExplicitInitializationStyle(false);
-    }
-
-    public static FallThroughStyle fallThrough() {
-        return new FallThroughStyle(false);
-    }
-
-    public static HiddenFieldStyle hiddenFieldStyle() {
-        return new HiddenFieldStyle(true, true, true, false);
-    }
-
-    public static HideUtilityClassConstructorStyle hideUtilityClassConstructorStyle() {
-        return new HideUtilityClassConstructorStyle(Arrays.asList(
-                "@lombok.experimental.UtilityClass",
-                "@lombok.Data"
-        ));
-    }
-
-    public static NeedBracesStyle needBracesStyle() {
-        return new NeedBracesStyle(false, false);
-    }
-
-    public static NoWhitespaceAfterStyle noWhitespaceAfterStyle() {
-        return new NoWhitespaceAfterStyle(true, false, false, true, true, true,
-                true, false, true, true, true, true, true, true);
-    }
-
-    public static NoWhitespaceBeforeStyle noWhitespaceBeforeStyle() {
-        return new NoWhitespaceBeforeStyle(false, false, true, true, false, false,
-                false, true, true);
-    }
-
-    public static final OperatorWrapStyle.WrapOption defaultOperatorWrapStyleOption = OperatorWrapStyle.WrapOption.NL;
-
-    public static OperatorWrapStyle operatorWrapStyle() {
-        return new OperatorWrapStyle(defaultOperatorWrapStyleOption, true, true, true, true, true,
-                true, true, true, true, true, true, true, true, true, true,
-                true, true, true, true, true, true, true, true,
-                false, false, false, false, false, false,
-                false, false, false, false, false, false, false);
-    }
-
-    public static TypecastParenPadStyle typecastParenPadStyle() {
-        return new TypecastParenPadStyle(false);
-    }
-
-    public static UnnecessaryParenthesesStyle unnecessaryParentheses() {
-        return new UnnecessaryParenthesesStyle(true, true, true, true, true,
-                true, true, true, true, true, true, true,
-                true, true, true, true, true, true,
-                true, true, true, true, true);
-    }
-
-    public static EmptyForInitializerPadStyle emptyForInitializerPadStyle() {
-        return new EmptyForInitializerPadStyle(false);
-    }
-
-    public static EmptyForIteratorPadStyle emptyForIteratorPadStyle() {
-        return new EmptyForIteratorPadStyle(false);
-    }
-
-    public static MethodParamPadStyle methodParamPadStyle() {
-        return new MethodParamPadStyle(false, false);
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openrewrite.style.NamedStyles;
+import org.openrewrite.style.Style;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static java.util.Collections.emptySet;
+import static org.openrewrite.Tree.randomId;
+
+public class Checkstyle extends NamedStyles {
+    private static final Checkstyle INSTANCE = new Checkstyle();
+    private static final String NAME = "org.openrewrite.java.Checkstyle";
+    private static final String DISPLAY_NAME = "Checkstyle";
+    private static final String DESCRIPTION = "Checkstyle defaults for styles";
+
+    private Checkstyle() {
+        super(randomId(),
+                NAME,
+                DISPLAY_NAME,
+                DESCRIPTION,
+                emptySet(),
+                Arrays.asList(
+                        defaultComesLast(),
+                        emptyBlock(),
+                        emptyForInitializerPadStyle(),
+                        emptyForIteratorPadStyle(),
+                        equalsAvoidsNull(),
+                        explicitInitialization(),
+                        fallThrough(),
+                        hiddenFieldStyle(),
+                        hideUtilityClassConstructorStyle(),
+                        methodParamPadStyle(),
+                        needBracesStyle(),
+                        noWhitespaceAfterStyle(),
+                        noWhitespaceBeforeStyle(),
+                        operatorWrapStyle(),
+                        typecastParenPadStyle(),
+                        unnecessaryParentheses()
+                ));
+    }
+
+    Checkstyle(Collection<Style> styles) {
+        super(randomId(), NAME, DISPLAY_NAME, DESCRIPTION, emptySet(), styles);
+    }
+
+    @JsonCreator
+    public static Checkstyle defaults() {
+        return INSTANCE;
+    }
+
+    public static DefaultComesLastStyle defaultComesLast() {
+        return new DefaultComesLastStyle(false);
+    }
+
+    public static final EmptyBlockStyle.BlockPolicy defaultBlockPolicy = EmptyBlockStyle.BlockPolicy.TEXT;
+
+    public static EmptyBlockStyle emptyBlock() {
+        return new EmptyBlockStyle(defaultBlockPolicy, true, true, true, true,
+                true, true, true, true, true, true, true, true);
+    }
+
+    public static EqualsAvoidsNullStyle equalsAvoidsNull() {
+        return new EqualsAvoidsNullStyle(false);
+    }
+
+    public static ExplicitInitializationStyle explicitInitialization() {
+        return new ExplicitInitializationStyle(false);
+    }
+
+    public static FallThroughStyle fallThrough() {
+        return new FallThroughStyle(false);
+    }
+
+    public static HiddenFieldStyle hiddenFieldStyle() {
+        return new HiddenFieldStyle(true, true, true, false);
+    }
+
+    public static HideUtilityClassConstructorStyle hideUtilityClassConstructorStyle() {
+        return new HideUtilityClassConstructorStyle(Arrays.asList(
+                "@lombok.experimental.UtilityClass",
+                "@lombok.Data"
+        ));
+    }
+
+    public static NeedBracesStyle needBracesStyle() {
+        return new NeedBracesStyle(false, false);
+    }
+
+    public static NoWhitespaceAfterStyle noWhitespaceAfterStyle() {
+        return new NoWhitespaceAfterStyle(true, false, false, true, true, true,
+                true, false, true, true, true, true, true, true);
+    }
+
+    public static NoWhitespaceBeforeStyle noWhitespaceBeforeStyle() {
+        return new NoWhitespaceBeforeStyle(false, false, true, true, false, false,
+                false, true, true);
+    }
+
+    public static final OperatorWrapStyle.WrapOption defaultOperatorWrapStyleOption = OperatorWrapStyle.WrapOption.NL;
+
+    public static OperatorWrapStyle operatorWrapStyle() {
+        return new OperatorWrapStyle(defaultOperatorWrapStyleOption, true, true, true, true, true,
+                true, true, true, true, true, true, true, true, true, true,
+                true, true, true, true, true, true, true, true,
+                false, false, false, false, false, false,
+                false, false, false, false, false, false, false);
+    }
+
+    public static TypecastParenPadStyle typecastParenPadStyle() {
+        return new TypecastParenPadStyle(false);
+    }
+
+    public static UnnecessaryParenthesesStyle unnecessaryParentheses() {
+        return new UnnecessaryParenthesesStyle(true, true, true, true, true,
+                true, true, true, true, true, true, true,
+                true, true, true, true, true, true,
+                true, true, true, true, true);
+    }
+
+    public static EmptyForInitializerPadStyle emptyForInitializerPadStyle() {
+        return new EmptyForInitializerPadStyle(false);
+    }
+
+    public static EmptyForIteratorPadStyle emptyForIteratorPadStyle() {
+        return new EmptyForIteratorPadStyle(false);
+    }
+
+    public static MethodParamPadStyle methodParamPadStyle() {
+        return new MethodParamPadStyle(false, false);
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
index 9d3381840a5..f7d0878a4ac 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
@@ -1,645 +1,645 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
-import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
-import com.puppycrawl.tools.checkstyle.api.Configuration;
-import org.intellij.lang.annotations.Language;
-import org.openrewrite.internal.lang.Nullable;
-import org.xml.sax.InputSource;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.lang.Boolean.parseBoolean;
-import static java.util.stream.Collectors.*;
-import static org.openrewrite.java.style.Checkstyle.defaultBlockPolicy;
-import static org.openrewrite.java.style.Checkstyle.defaultOperatorWrapStyleOption;
-
-public class CheckstyleConfigLoader {
-    private CheckstyleConfigLoader() {
-    }
-
-    public static Checkstyle loadCheckstyleConfig(Path checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
-        try (InputStream is = Files.newInputStream(checkstyleConf)) {
-            return loadCheckstyleConfig(is, properties);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Checkstyle loadCheckstyleConfig(@Language("XML") String checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
-        try (InputStream is = new ByteArrayInputStream(checkstyleConf.getBytes(StandardCharsets.UTF_8))) {
-            return loadCheckstyleConfig(is, properties);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Checkstyle loadCheckstyleConfig(InputStream checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
-        Map<String, List<Module>> conf = loadConfiguration(checkstyleConf, properties);
-
-        return new Checkstyle(
-                Stream.of(
-                                defaultComesLast(conf),
-                                emptyBlock(conf),
-                                emptyForInitializerPadStyle(conf),
-                                emptyForIteratorPadStyle(conf),
-                                equalsAvoidsNull(conf),
-                                explicitInitialization(conf),
-                                fallThrough(conf),
-                                hiddenFieldStyle(conf),
-                                hideUtilityClassConstructorStyle(conf),
-                                methodParamPadStyle(conf),
-                                needBracesStyle(conf),
-                                noWhitespaceAfterStyle(conf),
-                                noWhitespaceBeforeStyle(conf),
-                                operatorWrapStyle(conf),
-                                typecastParenPadStyle(conf),
-                                unnecessaryParentheses(conf))
-                        .filter(Objects::nonNull)
-                        .flatMap(Set::stream)
-                        .collect(toSet()));
-    }
-
-    @Nullable
-    private static Set<DefaultComesLastStyle> defaultComesLast(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("DefaultComesLast");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new DefaultComesLastStyle(parseBoolean(module.properties.get("skipIfLastAndSharedWithCase"))))
-                .collect(Collectors.toSet());
-    }
-
-    @Nullable
-    private static Set<EmptyBlockStyle> emptyBlock(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("EmptyBlock");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String rawOption = module.properties.get("option");
-                    EmptyBlockStyle.BlockPolicy blockPolicy = defaultBlockPolicy;
-                    if (rawOption != null) {
-                        blockPolicy = Enum.valueOf(EmptyBlockStyle.BlockPolicy.class, rawOption.toUpperCase());
-                    }
-                    String rawTokens = module.properties.get("tokens");
-                    boolean instanceInit = true;
-                    boolean literalCatch = true;
-                    boolean literalDo = true;
-                    boolean literalElse = true;
-                    boolean literalFinally = true;
-                    boolean literalFor = true;
-                    boolean literalIf = true;
-                    boolean literalSwitch = true;
-                    boolean literalSynchronized = true;
-                    boolean literalTry = true;
-                    boolean literalWhile = true;
-                    boolean staticInit = true;
-                    if (rawTokens != null) {
-                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
-                                .collect(toSet());
-                        instanceInit = tokens.contains("INSTANCE_INIT");
-                        literalCatch = tokens.contains("LITERAL_CATCH");
-                        literalDo = tokens.contains("LITERAL_DO");
-                        literalElse = tokens.contains("LITERAL_ELSE");
-                        literalFinally = tokens.contains("LITERAL_FINALLY");
-                        literalFor = tokens.contains("LITERAL_FOR");
-                        literalIf = tokens.contains("LITERAL_IF");
-                        literalSwitch = tokens.contains("LITERAL_SWITCH");
-                        literalSynchronized = tokens.contains("LITERAL_SYNCHRONIZED");
-                        literalTry = tokens.contains("LITERAL_TRY");
-                        literalWhile = tokens.contains("LITERAL_WHILE");
-                        staticInit = tokens.contains("STATIC_INIT");
-                    }
-
-                    return new EmptyBlockStyle(blockPolicy, instanceInit, literalCatch, literalDo,
-                            literalElse, literalFinally, literalFor, literalIf, literalSwitch, literalSynchronized, literalTry,
-                            literalWhile, staticInit);
-                })
-                .collect(Collectors.toSet());
-    }
-
-    @Nullable
-    private static Set<EmptyForInitializerPadStyle> emptyForInitializerPadStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("EmptyForInitializerPad");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String option = module.properties.get("option");
-                    // nospace is default, so no option means pad is false
-                    boolean pad = option != null && "space".equals(option.trim());
-                    return new EmptyForInitializerPadStyle(pad);
-                })
-                .collect(Collectors.toSet());
-    }
-
-    @Nullable
-    private static Set<EmptyForIteratorPadStyle> emptyForIteratorPadStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("EmptyForIteratorPad");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String option = module.properties.get("option");
-                    // nospace is default, so no option means pad is false
-                    boolean pad = option != null && "space".equals(option.trim());
-                    return new EmptyForIteratorPadStyle(pad);
-                })
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<EqualsAvoidsNullStyle> equalsAvoidsNull(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("EqualsAvoidNull");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new EqualsAvoidsNullStyle(module.prop("ignoreEqualsIgnoreCase", false)))
-                .collect(toSet());
-    }
-
-
-    @Nullable
-    private static Set<FallThroughStyle> fallThrough(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("FallThrough");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new FallThroughStyle(module.prop("checkLastCaseGroup", false)))
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<HiddenFieldStyle> hiddenFieldStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("HiddenField");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new HiddenFieldStyle(
-                        module.prop("ignoreConstructorParameter", true),
-                        module.prop("ignoreSetter", true),
-                        module.prop("setterCanReturnItsClass", true),
-                        module.prop("ignoreAbstractMethods", false)
-                ))
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<MethodParamPadStyle> methodParamPadStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("MethodParamPad");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String option = module.properties.get("option");
-                    // nospace is default, so no option means pad is false
-                    boolean pad = option != null && "space".equals(option.trim());
-                    return new MethodParamPadStyle(
-                            pad,
-                            module.prop("allowLineBreaks", false)
-                    );
-                })
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<NeedBracesStyle> needBracesStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("NeedBraces");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new NeedBracesStyle(
-                        module.prop("allowSingleLineStatement", false),
-                        module.prop("allowEmptyLoopBody", false)
-                ))
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<NoWhitespaceAfterStyle> noWhitespaceAfterStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("NoWhitespaceAfter");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String rawTokens = module.properties.get("tokens");
-                    boolean typecast = true;
-                    boolean methodRef = false;
-                    boolean arrayDeclarator = true;
-                    boolean annotation = true;
-                    boolean arrayInitializer = true;
-                    boolean indexOperation = true;
-                    boolean dot = false;
-                    boolean inc = true;
-                    boolean dec = true;
-                    boolean bnoc = true;
-                    boolean lnot = true;
-                    boolean unaryPlus = true;
-                    boolean unaryMinus = true;
-                    if (rawTokens != null) {
-                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
-                                .collect(toSet());
-                        typecast = tokens.contains("TYPECAST");
-                        methodRef = tokens.contains("METHOD_REF");
-                        arrayDeclarator = tokens.contains("ARRAY_DECLARATOR");
-                        arrayInitializer = tokens.contains("ARRAY_INIT");
-                        annotation = tokens.contains("AT");
-                        indexOperation = tokens.contains("INDEX_OP");
-                        dot = tokens.contains("INDEX_OP");
-                        inc = tokens.contains("INC");
-                        dec = tokens.contains("DEC");
-                        bnoc = tokens.contains("BNOC");
-                        lnot = tokens.contains("LNOT");
-                        unaryPlus = tokens.contains("UNARY_PLUS");
-                        unaryMinus = tokens.contains("UNARY_MINUS");
-                    }
-                    return new NoWhitespaceAfterStyle(
-                            module.prop("allowLineBreaks", true),
-                            typecast,
-                            methodRef,
-                            arrayDeclarator,
-                            annotation,
-                            arrayInitializer,
-                            indexOperation,
-                            dot,
-                            inc,
-                            dec,
-                            bnoc,
-                            lnot,
-                            unaryPlus,
-                            unaryMinus
-                    );
-                })
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<NoWhitespaceBeforeStyle> noWhitespaceBeforeStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("NoWhitespaceBefore");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String rawTokens = module.properties.get("tokens");
-                    boolean dot = false;
-                    boolean comma = true;
-                    boolean semi = true;
-                    boolean genericStart = false;
-                    boolean genericEnd = false;
-                    boolean methodRef = false;
-                    boolean postInc = true;
-                    boolean postDec = true;
-                    if (rawTokens != null) {
-                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
-                                .collect(toSet());
-                        dot = tokens.contains("DOT");
-                        comma = tokens.contains("COMMA");
-                        semi = tokens.contains("SEMI");
-                        genericStart = tokens.contains("GENERIC_START");
-                        genericEnd = tokens.contains("GENERIC_END");
-                        methodRef = tokens.contains("METHOD_REF");
-                        postInc = tokens.contains("POST_INC");
-                        postDec = tokens.contains("POST_DEC");
-                    }
-                    return new NoWhitespaceBeforeStyle(
-                            module.prop("allowLineBreaks", false),
-                            dot,
-                            comma,
-                            semi,
-                            genericStart,
-                            genericEnd,
-                            methodRef,
-                            postInc,
-                            postDec
-
-                    );
-                })
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<OperatorWrapStyle> operatorWrapStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("OperatorWrap");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String rawOption = module.properties.get("option");
-                    OperatorWrapStyle.WrapOption wrapOption = defaultOperatorWrapStyleOption;
-                    if (rawOption != null) {
-                        wrapOption = Enum.valueOf(OperatorWrapStyle.WrapOption.class, rawOption.toUpperCase());
-                    }
-                    String rawTokens = module.properties.get("tokens");
-                    boolean question = true;
-                    boolean colon = true;
-                    boolean equal = true;
-                    boolean notEqual = true;
-                    boolean div = true;
-                    boolean plus = true;
-                    boolean minus = true;
-                    boolean star = true;
-                    boolean mod = true;
-                    boolean sr = true;
-                    boolean bsr = true;
-                    boolean ge = true;
-                    boolean gt = true;
-                    boolean sl = true;
-                    boolean le = true;
-                    boolean lt = true;
-                    boolean bxor = true;
-                    boolean bor = true;
-                    boolean lor = true;
-                    boolean band = true;
-                    boolean land = true;
-                    boolean typeExtensionAnd = true;
-                    boolean literalInstanceof = true;
-                    boolean methodRef = false;
-                    boolean assign = false;
-                    boolean plusAssign = false;
-                    boolean minusAssign = false;
-                    boolean starAssign = false;
-                    boolean divAssign = false;
-                    boolean modAssign = false;
-                    boolean srAssign = false;
-                    boolean bsrAssign = false;
-                    boolean slAssign = false;
-                    boolean bandAssign = false;
-                    boolean bxorAssign = false;
-                    boolean borAssign = false;
-                    if (rawTokens != null) {
-                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
-                                .collect(toSet());
-                        question = tokens.contains("QUESTION");
-                        colon = tokens.contains("COLON");
-                        equal = tokens.contains("EQUAL");
-                        notEqual = tokens.contains("NOT_EQUAL");
-                        div = tokens.contains("DIV");
-                        plus = tokens.contains("PLUS");
-                        minus = tokens.contains("MINUS");
-                        star = tokens.contains("STAR");
-                        mod = tokens.contains("MOD");
-                        sr = tokens.contains("SR");
-                        bsr = tokens.contains("BSR");
-                        ge = tokens.contains("GE");
-                        gt = tokens.contains("GT");
-                        sl = tokens.contains("SL");
-                        le = tokens.contains("LE");
-                        lt = tokens.contains("LT");
-                        bxor = tokens.contains("BXOR");
-                        bor = tokens.contains("BOR");
-                        lor = tokens.contains("LOR");
-                        band = tokens.contains("BAND");
-                        land = tokens.contains("LAND");
-                        typeExtensionAnd = tokens.contains("TYPE_EXTENSION_AND");
-                        literalInstanceof = tokens.contains("LITERAL_INSTANCEOF");
-                        methodRef = tokens.contains("METHOD_REF");
-                        assign = tokens.contains("ASSIGN");
-                        plusAssign = tokens.contains("PLUS_ASSIGN");
-                        minusAssign = tokens.contains("MINUS_ASSIGN");
-                        starAssign = tokens.contains("STAR_ASSIGN");
-                        divAssign = tokens.contains("DIV_ASSIGN");
-                        modAssign = tokens.contains("MOD_ASSIGN");
-                        srAssign = tokens.contains("SR_ASSIGN");
-                        bsrAssign = tokens.contains("BSR_ASSIGN");
-                        slAssign = tokens.contains("SL_ASSIGN");
-                        bandAssign = tokens.contains("BAND_ASSIGN");
-                        bxorAssign = tokens.contains("BXOR_ASSIGN");
-                        borAssign = tokens.contains("BOR_ASSIGN");
-                    }
-                    return new OperatorWrapStyle(wrapOption, question, colon, equal, notEqual, div, plus,
-                            minus, star, mod, sr, bsr, ge, gt, sl, le, lt, bxor, bor, lor, band, land,
-                            typeExtensionAnd, literalInstanceof, methodRef, assign,
-                            plusAssign, minusAssign, starAssign, divAssign, modAssign, srAssign,
-                            bsrAssign, slAssign, bandAssign, bxorAssign, borAssign);
-                })
-                .collect(toSet());
-    }
-
-    @Nullable
-    private static Set<TypecastParenPadStyle> typecastParenPadStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("TypecastParenPad");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String option = module.properties.get("option");
-                    // nospace is default, so no option means pad is false
-                    boolean pad = option != null && "space".equals(option.trim());
-                    return new TypecastParenPadStyle(pad);
-                })
-                .collect(toSet());
-    }
-
-    @SuppressWarnings("DuplicatedCode")
-    @Nullable
-    private static Set<UnnecessaryParenthesesStyle> unnecessaryParentheses(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("UnnecessaryParentheses");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> {
-                    String rawTokens = module.properties.get("tokens");
-                    boolean expr = true;
-                    boolean ident = true;
-                    boolean numDouble = true;
-                    boolean numFloat = true;
-                    boolean numInt = true;
-                    boolean numLong = true;
-                    boolean stringLiteral = true;
-                    boolean literalNull = true;
-                    boolean literalFalse = true;
-                    boolean literalTrue = true;
-                    boolean assign = true;
-                    boolean bitAndAssign = true;
-                    boolean bitOrAssign = true;
-                    boolean bitShiftRightAssign = true;
-                    boolean bitXorAssign = true;
-                    boolean divAssign = true;
-                    boolean minusAssign = true;
-                    boolean modAssign = true;
-                    boolean plusAssign = true;
-                    boolean shiftLeftAssign = true;
-                    boolean shiftRightAssign = true;
-                    boolean starAssign = true;
-                    boolean lambda = true;
-                    if (rawTokens != null) {
-                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
-                                .collect(toSet());
-                        expr = tokens.contains("EXPR");
-                        ident = tokens.contains("IDENT");
-                        numDouble = tokens.contains("NUM_DOUBLE");
-                        numFloat = tokens.contains("NUM_FLOAT");
-                        numInt = tokens.contains("NUM_INT");
-                        numLong = tokens.contains("NUM_LONG");
-                        stringLiteral = tokens.contains("STRING_LITERAL");
-                        literalNull = tokens.contains("LITERAL_NULL");
-                        literalFalse = tokens.contains("LITERAL_FALSE");
-                        literalTrue = tokens.contains("LITERAL_TRUE");
-                        assign = tokens.contains("ASSIGN");
-                        bitAndAssign = tokens.contains("BIT_AND_ASSIGN");
-                        bitOrAssign = tokens.contains("BIT_OR_ASSIGN");
-                        bitShiftRightAssign = tokens.contains("BIT_SHIFT_RIGHT_ASSIGN");
-                        bitXorAssign = tokens.contains("BIT_XOR_ASSIGN");
-                        divAssign = tokens.contains("DIV_ASSIGN");
-                        minusAssign = tokens.contains("MINUS_ASSIGN");
-                        modAssign = tokens.contains("MOD_ASSIGN");
-                        plusAssign = tokens.contains("PLUS_ASSIGN");
-                        shiftLeftAssign = tokens.contains("SHIFT_LEFT_ASSIGN");
-                        shiftRightAssign = tokens.contains("SHIFT_RIGHT_ASSIGN");
-                        starAssign = tokens.contains("STAR_ASSIGN");
-                        lambda = tokens.contains("LAMBDA");
-                    }
-                    return new UnnecessaryParenthesesStyle(expr, ident, numDouble, numFloat, numInt, numLong, stringLiteral,
-                            literalNull, literalFalse, literalTrue, assign, bitAndAssign, bitOrAssign, bitShiftRightAssign,
-                            bitXorAssign, divAssign, minusAssign, modAssign, plusAssign, shiftLeftAssign, shiftRightAssign,
-                            starAssign, lambda
-                    );
-                })
-                .collect(Collectors.toSet());
-    }
-
-    @Nullable
-    private static Set<HideUtilityClassConstructorStyle> hideUtilityClassConstructorStyle(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("HiddenField");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> Checkstyle.hideUtilityClassConstructorStyle())
-                .collect(Collectors.toSet());
-    }
-
-    protected static class Module {
-        private final String name;
-        private final Map<String, String> properties;
-
-        public Module(String name, Map<String, String> properties) {
-            // Checkstyle allows both "EqualsAvoidNull" and "EqualsAvoidsNullCheck"
-            // For consistency, remove the "Check" suffix if it exists
-            if (name.endsWith("Check")) {
-                this.name = name.substring(0, name.lastIndexOf("Check"));
-            } else {
-                this.name = name;
-            }
-            this.properties = properties;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public boolean prop(String key, boolean defaultValue) {
-            return properties.containsKey(key) ? parseBoolean(properties.get(key))
-                    : defaultValue;
-        }
-
-        @Override
-        public String toString() {
-            return "Module{" +
-                    "name='" + name + '\'' +
-                    '}';
-        }
-    }
-
-
-    @Nullable
-    private static Set<ExplicitInitializationStyle> explicitInitialization(Map<String, List<Module>> conf) {
-        List<Module> moduleList = conf.get("ExplicitInitialization");
-        if (moduleList == null) {
-            return null;
-        }
-        return moduleList.stream()
-                .map(module -> new ExplicitInitializationStyle(module.prop("onlyObjectReferences", false)))
-                .collect(Collectors.toSet());
-    }
-
-    private static Map<String, List<Module>> loadConfiguration(InputStream inputStream, Map<String, Object> properties) throws CheckstyleException {
-        Configuration checkstyleConfig = ConfigurationLoader.loadConfiguration(new InputSource(inputStream),
-                name -> {
-                    Object prop = properties.get(name);
-                    return prop == null ?
-                            name.equals("config_loc") ? "config/checkstyle" : null :
-                            prop.toString();
-                },
-                ConfigurationLoader.IgnoredModulesOptions.OMIT);
-
-        List<Module> modules = new ArrayList<>();
-        for (Configuration firstLevelChild : checkstyleConfig.getChildren()) {
-            if ("TreeWalker".equals(firstLevelChild.getName())) {
-
-                modules.addAll(Arrays.stream(firstLevelChild.getChildren())
-                        .map(child -> {
-                            try {
-                                Map<String, String> props = new HashMap<>();
-                                for (String propertyName : child.getAttributeNames()) {
-                                    props.put(propertyName, child.getAttribute(propertyName));
-                                }
-                                return new Module(child.getName(), props);
-                            } catch (CheckstyleException e) {
-                                return null;
-                            }
-                        })
-                        .filter(Objects::nonNull)
-                        .collect(toList())
-                );
-            } else if ("SuppressionFilter".equals(firstLevelChild.getName())) {
-                continue;
-            } else {
-                Map<String, String> props = new HashMap<>();
-                for (String propertyName : firstLevelChild.getAttributeNames()) {
-                    props.put(propertyName, firstLevelChild.getAttribute(propertyName));
-                }
-                modules.add(new Module(firstLevelChild.getName(), props));
-            }
-        }
-        return modules.stream()
-                .collect(toMap(Module::getName, Collections::singletonList, CheckstyleConfigLoader::mergeModules));
-    }
-
-    private static List<Module> mergeModules(List<Module> list, List<Module> anotherList) {
-        List<Module> result = new ArrayList<>(list);
-        result.addAll(anotherList);
-
-        return result;
-    }
-
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import com.puppycrawl.tools.checkstyle.api.Configuration;
+import org.intellij.lang.annotations.Language;
+import org.openrewrite.internal.lang.Nullable;
+import org.xml.sax.InputSource;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.Boolean.parseBoolean;
+import static java.util.stream.Collectors.*;
+import static org.openrewrite.java.style.Checkstyle.defaultBlockPolicy;
+import static org.openrewrite.java.style.Checkstyle.defaultOperatorWrapStyleOption;
+
+public class CheckstyleConfigLoader {
+    private CheckstyleConfigLoader() {
+    }
+
+    public static Checkstyle loadCheckstyleConfig(Path checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
+        try (InputStream is = Files.newInputStream(checkstyleConf)) {
+            return loadCheckstyleConfig(is, properties);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Checkstyle loadCheckstyleConfig(@Language("XML") String checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
+        try (InputStream is = new ByteArrayInputStream(checkstyleConf.getBytes(StandardCharsets.UTF_8))) {
+            return loadCheckstyleConfig(is, properties);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Checkstyle loadCheckstyleConfig(InputStream checkstyleConf, Map<String, Object> properties) throws CheckstyleException {
+        Map<String, List<Module>> conf = loadConfiguration(checkstyleConf, properties);
+
+        return new Checkstyle(
+                Stream.of(
+                                defaultComesLast(conf),
+                                emptyBlock(conf),
+                                emptyForInitializerPadStyle(conf),
+                                emptyForIteratorPadStyle(conf),
+                                equalsAvoidsNull(conf),
+                                explicitInitialization(conf),
+                                fallThrough(conf),
+                                hiddenFieldStyle(conf),
+                                hideUtilityClassConstructorStyle(conf),
+                                methodParamPadStyle(conf),
+                                needBracesStyle(conf),
+                                noWhitespaceAfterStyle(conf),
+                                noWhitespaceBeforeStyle(conf),
+                                operatorWrapStyle(conf),
+                                typecastParenPadStyle(conf),
+                                unnecessaryParentheses(conf))
+                        .filter(Objects::nonNull)
+                        .flatMap(Set::stream)
+                        .collect(toSet()));
+    }
+
+    @Nullable
+    private static Set<DefaultComesLastStyle> defaultComesLast(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("DefaultComesLast");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new DefaultComesLastStyle(parseBoolean(module.properties.get("skipIfLastAndSharedWithCase"))))
+                .collect(Collectors.toSet());
+    }
+
+    @Nullable
+    private static Set<EmptyBlockStyle> emptyBlock(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("EmptyBlock");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String rawOption = module.properties.get("option");
+                    EmptyBlockStyle.BlockPolicy blockPolicy = defaultBlockPolicy;
+                    if (rawOption != null) {
+                        blockPolicy = Enum.valueOf(EmptyBlockStyle.BlockPolicy.class, rawOption.toUpperCase());
+                    }
+                    String rawTokens = module.properties.get("tokens");
+                    boolean instanceInit = true;
+                    boolean literalCatch = true;
+                    boolean literalDo = true;
+                    boolean literalElse = true;
+                    boolean literalFinally = true;
+                    boolean literalFor = true;
+                    boolean literalIf = true;
+                    boolean literalSwitch = true;
+                    boolean literalSynchronized = true;
+                    boolean literalTry = true;
+                    boolean literalWhile = true;
+                    boolean staticInit = true;
+                    if (rawTokens != null) {
+                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
+                                .collect(toSet());
+                        instanceInit = tokens.contains("INSTANCE_INIT");
+                        literalCatch = tokens.contains("LITERAL_CATCH");
+                        literalDo = tokens.contains("LITERAL_DO");
+                        literalElse = tokens.contains("LITERAL_ELSE");
+                        literalFinally = tokens.contains("LITERAL_FINALLY");
+                        literalFor = tokens.contains("LITERAL_FOR");
+                        literalIf = tokens.contains("LITERAL_IF");
+                        literalSwitch = tokens.contains("LITERAL_SWITCH");
+                        literalSynchronized = tokens.contains("LITERAL_SYNCHRONIZED");
+                        literalTry = tokens.contains("LITERAL_TRY");
+                        literalWhile = tokens.contains("LITERAL_WHILE");
+                        staticInit = tokens.contains("STATIC_INIT");
+                    }
+
+                    return new EmptyBlockStyle(blockPolicy, instanceInit, literalCatch, literalDo,
+                            literalElse, literalFinally, literalFor, literalIf, literalSwitch, literalSynchronized, literalTry,
+                            literalWhile, staticInit);
+                })
+                .collect(Collectors.toSet());
+    }
+
+    @Nullable
+    private static Set<EmptyForInitializerPadStyle> emptyForInitializerPadStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("EmptyForInitializerPad");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String option = module.properties.get("option");
+                    // nospace is default, so no option means pad is false
+                    boolean pad = option != null && "space".equals(option.trim());
+                    return new EmptyForInitializerPadStyle(pad);
+                })
+                .collect(Collectors.toSet());
+    }
+
+    @Nullable
+    private static Set<EmptyForIteratorPadStyle> emptyForIteratorPadStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("EmptyForIteratorPad");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String option = module.properties.get("option");
+                    // nospace is default, so no option means pad is false
+                    boolean pad = option != null && "space".equals(option.trim());
+                    return new EmptyForIteratorPadStyle(pad);
+                })
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<EqualsAvoidsNullStyle> equalsAvoidsNull(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("EqualsAvoidNull");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new EqualsAvoidsNullStyle(module.prop("ignoreEqualsIgnoreCase", false)))
+                .collect(toSet());
+    }
+
+
+    @Nullable
+    private static Set<FallThroughStyle> fallThrough(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("FallThrough");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new FallThroughStyle(module.prop("checkLastCaseGroup", false)))
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<HiddenFieldStyle> hiddenFieldStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("HiddenField");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new HiddenFieldStyle(
+                        module.prop("ignoreConstructorParameter", true),
+                        module.prop("ignoreSetter", true),
+                        module.prop("setterCanReturnItsClass", true),
+                        module.prop("ignoreAbstractMethods", false)
+                ))
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<MethodParamPadStyle> methodParamPadStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("MethodParamPad");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String option = module.properties.get("option");
+                    // nospace is default, so no option means pad is false
+                    boolean pad = option != null && "space".equals(option.trim());
+                    return new MethodParamPadStyle(
+                            pad,
+                            module.prop("allowLineBreaks", false)
+                    );
+                })
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<NeedBracesStyle> needBracesStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("NeedBraces");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new NeedBracesStyle(
+                        module.prop("allowSingleLineStatement", false),
+                        module.prop("allowEmptyLoopBody", false)
+                ))
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<NoWhitespaceAfterStyle> noWhitespaceAfterStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("NoWhitespaceAfter");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String rawTokens = module.properties.get("tokens");
+                    boolean typecast = true;
+                    boolean methodRef = false;
+                    boolean arrayDeclarator = true;
+                    boolean annotation = true;
+                    boolean arrayInitializer = true;
+                    boolean indexOperation = true;
+                    boolean dot = false;
+                    boolean inc = true;
+                    boolean dec = true;
+                    boolean bnoc = true;
+                    boolean lnot = true;
+                    boolean unaryPlus = true;
+                    boolean unaryMinus = true;
+                    if (rawTokens != null) {
+                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
+                                .collect(toSet());
+                        typecast = tokens.contains("TYPECAST");
+                        methodRef = tokens.contains("METHOD_REF");
+                        arrayDeclarator = tokens.contains("ARRAY_DECLARATOR");
+                        arrayInitializer = tokens.contains("ARRAY_INIT");
+                        annotation = tokens.contains("AT");
+                        indexOperation = tokens.contains("INDEX_OP");
+                        dot = tokens.contains("INDEX_OP");
+                        inc = tokens.contains("INC");
+                        dec = tokens.contains("DEC");
+                        bnoc = tokens.contains("BNOC");
+                        lnot = tokens.contains("LNOT");
+                        unaryPlus = tokens.contains("UNARY_PLUS");
+                        unaryMinus = tokens.contains("UNARY_MINUS");
+                    }
+                    return new NoWhitespaceAfterStyle(
+                            module.prop("allowLineBreaks", true),
+                            typecast,
+                            methodRef,
+                            arrayDeclarator,
+                            annotation,
+                            arrayInitializer,
+                            indexOperation,
+                            dot,
+                            inc,
+                            dec,
+                            bnoc,
+                            lnot,
+                            unaryPlus,
+                            unaryMinus
+                    );
+                })
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<NoWhitespaceBeforeStyle> noWhitespaceBeforeStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("NoWhitespaceBefore");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String rawTokens = module.properties.get("tokens");
+                    boolean dot = false;
+                    boolean comma = true;
+                    boolean semi = true;
+                    boolean genericStart = false;
+                    boolean genericEnd = false;
+                    boolean methodRef = false;
+                    boolean postInc = true;
+                    boolean postDec = true;
+                    if (rawTokens != null) {
+                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
+                                .collect(toSet());
+                        dot = tokens.contains("DOT");
+                        comma = tokens.contains("COMMA");
+                        semi = tokens.contains("SEMI");
+                        genericStart = tokens.contains("GENERIC_START");
+                        genericEnd = tokens.contains("GENERIC_END");
+                        methodRef = tokens.contains("METHOD_REF");
+                        postInc = tokens.contains("POST_INC");
+                        postDec = tokens.contains("POST_DEC");
+                    }
+                    return new NoWhitespaceBeforeStyle(
+                            module.prop("allowLineBreaks", false),
+                            dot,
+                            comma,
+                            semi,
+                            genericStart,
+                            genericEnd,
+                            methodRef,
+                            postInc,
+                            postDec
+
+                    );
+                })
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<OperatorWrapStyle> operatorWrapStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("OperatorWrap");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String rawOption = module.properties.get("option");
+                    OperatorWrapStyle.WrapOption wrapOption = defaultOperatorWrapStyleOption;
+                    if (rawOption != null) {
+                        wrapOption = Enum.valueOf(OperatorWrapStyle.WrapOption.class, rawOption.toUpperCase());
+                    }
+                    String rawTokens = module.properties.get("tokens");
+                    boolean question = true;
+                    boolean colon = true;
+                    boolean equal = true;
+                    boolean notEqual = true;
+                    boolean div = true;
+                    boolean plus = true;
+                    boolean minus = true;
+                    boolean star = true;
+                    boolean mod = true;
+                    boolean sr = true;
+                    boolean bsr = true;
+                    boolean ge = true;
+                    boolean gt = true;
+                    boolean sl = true;
+                    boolean le = true;
+                    boolean lt = true;
+                    boolean bxor = true;
+                    boolean bor = true;
+                    boolean lor = true;
+                    boolean band = true;
+                    boolean land = true;
+                    boolean typeExtensionAnd = true;
+                    boolean literalInstanceof = true;
+                    boolean methodRef = false;
+                    boolean assign = false;
+                    boolean plusAssign = false;
+                    boolean minusAssign = false;
+                    boolean starAssign = false;
+                    boolean divAssign = false;
+                    boolean modAssign = false;
+                    boolean srAssign = false;
+                    boolean bsrAssign = false;
+                    boolean slAssign = false;
+                    boolean bandAssign = false;
+                    boolean bxorAssign = false;
+                    boolean borAssign = false;
+                    if (rawTokens != null) {
+                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
+                                .collect(toSet());
+                        question = tokens.contains("QUESTION");
+                        colon = tokens.contains("COLON");
+                        equal = tokens.contains("EQUAL");
+                        notEqual = tokens.contains("NOT_EQUAL");
+                        div = tokens.contains("DIV");
+                        plus = tokens.contains("PLUS");
+                        minus = tokens.contains("MINUS");
+                        star = tokens.contains("STAR");
+                        mod = tokens.contains("MOD");
+                        sr = tokens.contains("SR");
+                        bsr = tokens.contains("BSR");
+                        ge = tokens.contains("GE");
+                        gt = tokens.contains("GT");
+                        sl = tokens.contains("SL");
+                        le = tokens.contains("LE");
+                        lt = tokens.contains("LT");
+                        bxor = tokens.contains("BXOR");
+                        bor = tokens.contains("BOR");
+                        lor = tokens.contains("LOR");
+                        band = tokens.contains("BAND");
+                        land = tokens.contains("LAND");
+                        typeExtensionAnd = tokens.contains("TYPE_EXTENSION_AND");
+                        literalInstanceof = tokens.contains("LITERAL_INSTANCEOF");
+                        methodRef = tokens.contains("METHOD_REF");
+                        assign = tokens.contains("ASSIGN");
+                        plusAssign = tokens.contains("PLUS_ASSIGN");
+                        minusAssign = tokens.contains("MINUS_ASSIGN");
+                        starAssign = tokens.contains("STAR_ASSIGN");
+                        divAssign = tokens.contains("DIV_ASSIGN");
+                        modAssign = tokens.contains("MOD_ASSIGN");
+                        srAssign = tokens.contains("SR_ASSIGN");
+                        bsrAssign = tokens.contains("BSR_ASSIGN");
+                        slAssign = tokens.contains("SL_ASSIGN");
+                        bandAssign = tokens.contains("BAND_ASSIGN");
+                        bxorAssign = tokens.contains("BXOR_ASSIGN");
+                        borAssign = tokens.contains("BOR_ASSIGN");
+                    }
+                    return new OperatorWrapStyle(wrapOption, question, colon, equal, notEqual, div, plus,
+                            minus, star, mod, sr, bsr, ge, gt, sl, le, lt, bxor, bor, lor, band, land,
+                            typeExtensionAnd, literalInstanceof, methodRef, assign,
+                            plusAssign, minusAssign, starAssign, divAssign, modAssign, srAssign,
+                            bsrAssign, slAssign, bandAssign, bxorAssign, borAssign);
+                })
+                .collect(toSet());
+    }
+
+    @Nullable
+    private static Set<TypecastParenPadStyle> typecastParenPadStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("TypecastParenPad");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String option = module.properties.get("option");
+                    // nospace is default, so no option means pad is false
+                    boolean pad = option != null && "space".equals(option.trim());
+                    return new TypecastParenPadStyle(pad);
+                })
+                .collect(toSet());
+    }
+
+    @SuppressWarnings("DuplicatedCode")
+    @Nullable
+    private static Set<UnnecessaryParenthesesStyle> unnecessaryParentheses(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("UnnecessaryParentheses");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> {
+                    String rawTokens = module.properties.get("tokens");
+                    boolean expr = true;
+                    boolean ident = true;
+                    boolean numDouble = true;
+                    boolean numFloat = true;
+                    boolean numInt = true;
+                    boolean numLong = true;
+                    boolean stringLiteral = true;
+                    boolean literalNull = true;
+                    boolean literalFalse = true;
+                    boolean literalTrue = true;
+                    boolean assign = true;
+                    boolean bitAndAssign = true;
+                    boolean bitOrAssign = true;
+                    boolean bitShiftRightAssign = true;
+                    boolean bitXorAssign = true;
+                    boolean divAssign = true;
+                    boolean minusAssign = true;
+                    boolean modAssign = true;
+                    boolean plusAssign = true;
+                    boolean shiftLeftAssign = true;
+                    boolean shiftRightAssign = true;
+                    boolean starAssign = true;
+                    boolean lambda = true;
+                    if (rawTokens != null) {
+                        Set<String> tokens = Arrays.stream(rawTokens.split("\\s*,\\s*"))
+                                .collect(toSet());
+                        expr = tokens.contains("EXPR");
+                        ident = tokens.contains("IDENT");
+                        numDouble = tokens.contains("NUM_DOUBLE");
+                        numFloat = tokens.contains("NUM_FLOAT");
+                        numInt = tokens.contains("NUM_INT");
+                        numLong = tokens.contains("NUM_LONG");
+                        stringLiteral = tokens.contains("STRING_LITERAL");
+                        literalNull = tokens.contains("LITERAL_NULL");
+                        literalFalse = tokens.contains("LITERAL_FALSE");
+                        literalTrue = tokens.contains("LITERAL_TRUE");
+                        assign = tokens.contains("ASSIGN");
+                        bitAndAssign = tokens.contains("BIT_AND_ASSIGN");
+                        bitOrAssign = tokens.contains("BIT_OR_ASSIGN");
+                        bitShiftRightAssign = tokens.contains("BIT_SHIFT_RIGHT_ASSIGN");
+                        bitXorAssign = tokens.contains("BIT_XOR_ASSIGN");
+                        divAssign = tokens.contains("DIV_ASSIGN");
+                        minusAssign = tokens.contains("MINUS_ASSIGN");
+                        modAssign = tokens.contains("MOD_ASSIGN");
+                        plusAssign = tokens.contains("PLUS_ASSIGN");
+                        shiftLeftAssign = tokens.contains("SHIFT_LEFT_ASSIGN");
+                        shiftRightAssign = tokens.contains("SHIFT_RIGHT_ASSIGN");
+                        starAssign = tokens.contains("STAR_ASSIGN");
+                        lambda = tokens.contains("LAMBDA");
+                    }
+                    return new UnnecessaryParenthesesStyle(expr, ident, numDouble, numFloat, numInt, numLong, stringLiteral,
+                            literalNull, literalFalse, literalTrue, assign, bitAndAssign, bitOrAssign, bitShiftRightAssign,
+                            bitXorAssign, divAssign, minusAssign, modAssign, plusAssign, shiftLeftAssign, shiftRightAssign,
+                            starAssign, lambda
+                    );
+                })
+                .collect(Collectors.toSet());
+    }
+
+    @Nullable
+    private static Set<HideUtilityClassConstructorStyle> hideUtilityClassConstructorStyle(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("HiddenField");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> Checkstyle.hideUtilityClassConstructorStyle())
+                .collect(Collectors.toSet());
+    }
+
+    protected static class Module {
+        private final String name;
+        private final Map<String, String> properties;
+
+        public Module(String name, Map<String, String> properties) {
+            // Checkstyle allows both "EqualsAvoidNull" and "EqualsAvoidsNullCheck"
+            // For consistency, remove the "Check" suffix if it exists
+            if (name.endsWith("Check")) {
+                this.name = name.substring(0, name.lastIndexOf("Check"));
+            } else {
+                this.name = name;
+            }
+            this.properties = properties;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public boolean prop(String key, boolean defaultValue) {
+            return properties.containsKey(key) ? parseBoolean(properties.get(key))
+                    : defaultValue;
+        }
+
+        @Override
+        public String toString() {
+            return "Module{" +
+                    "name='" + name + '\'' +
+                    '}';
+        }
+    }
+
+
+    @Nullable
+    private static Set<ExplicitInitializationStyle> explicitInitialization(Map<String, List<Module>> conf) {
+        List<Module> moduleList = conf.get("ExplicitInitialization");
+        if (moduleList == null) {
+            return null;
+        }
+        return moduleList.stream()
+                .map(module -> new ExplicitInitializationStyle(module.prop("onlyObjectReferences", false)))
+                .collect(Collectors.toSet());
+    }
+
+    private static Map<String, List<Module>> loadConfiguration(InputStream inputStream, Map<String, Object> properties) throws CheckstyleException {
+        Configuration checkstyleConfig = ConfigurationLoader.loadConfiguration(new InputSource(inputStream),
+                name -> {
+                    Object prop = properties.get(name);
+                    return prop == null ?
+                            name.equals("config_loc") ? "config/checkstyle" : null :
+                            prop.toString();
+                },
+                ConfigurationLoader.IgnoredModulesOptions.OMIT);
+
+        List<Module> modules = new ArrayList<>();
+        for (Configuration firstLevelChild : checkstyleConfig.getChildren()) {
+            if ("TreeWalker".equals(firstLevelChild.getName())) {
+
+                modules.addAll(Arrays.stream(firstLevelChild.getChildren())
+                        .map(child -> {
+                            try {
+                                Map<String, String> props = new HashMap<>();
+                                for (String propertyName : child.getAttributeNames()) {
+                                    props.put(propertyName, child.getAttribute(propertyName));
+                                }
+                                return new Module(child.getName(), props);
+                            } catch (CheckstyleException e) {
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
+                        .collect(toList())
+                );
+            } else if ("SuppressionFilter".equals(firstLevelChild.getName())) {
+                continue;
+            } else {
+                Map<String, String> props = new HashMap<>();
+                for (String propertyName : firstLevelChild.getAttributeNames()) {
+                    props.put(propertyName, firstLevelChild.getAttribute(propertyName));
+                }
+                modules.add(new Module(firstLevelChild.getName(), props));
+            }
+        }
+        return modules.stream()
+                .collect(toMap(Module::getName, Collections::singletonList, CheckstyleConfigLoader::mergeModules));
+    }
+
+    private static List<Module> mergeModules(List<Module> list, List<Module> anotherList) {
+        List<Module> result = new ArrayList<>(list);
+        result.addAll(anotherList);
+
+        return result;
+    }
+
+
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForInitializerPadStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForInitializerPadStyle.java
index 761150eb2be..a84b6ab2efe 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForInitializerPadStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForInitializerPadStyle.java
@@ -1,37 +1,37 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import lombok.Value;
-import lombok.With;
-import org.openrewrite.style.Style;
-import org.openrewrite.style.StyleHelper;
-
-@Value
-@With
-public class EmptyForInitializerPadStyle implements Style {
-    /**
-     * Track whether empty for loop initializers should have a space or not.
-     * When true: for ( ; i < 10; i++)
-     * When false: for(; i < 10; i++)
-     */
-    Boolean space;
-
-    @Override
-    public Style applyDefaults() {
-        return StyleHelper.merge(Checkstyle.emptyForInitializerPadStyle(), this);
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.style.Style;
+import org.openrewrite.style.StyleHelper;
+
+@Value
+@With
+public class EmptyForInitializerPadStyle implements Style {
+    /**
+     * Track whether empty for loop initializers should have a space or not.
+     * When true: for ( ; i < 10; i++)
+     * When false: for(; i < 10; i++)
+     */
+    Boolean space;
+
+    @Override
+    public Style applyDefaults() {
+        return StyleHelper.merge(Checkstyle.emptyForInitializerPadStyle(), this);
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForIteratorPadStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForIteratorPadStyle.java
index b66f30e15f2..b064aadc762 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForIteratorPadStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/EmptyForIteratorPadStyle.java
@@ -1,37 +1,37 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import lombok.Value;
-import lombok.With;
-import org.openrewrite.style.Style;
-import org.openrewrite.style.StyleHelper;
-
-@Value
-@With
-public class EmptyForIteratorPadStyle implements Style {
-    /**
-     * Track whether empty for loop iterators should have a space or not.
-     * When true: for (int i = 0; i < 10; )
-     * When false: for(int i = 0; i < 10;)
-     */
-    Boolean space;
-
-    @Override
-    public Style applyDefaults() {
-        return StyleHelper.merge(Checkstyle.emptyForIteratorPadStyle(), this);
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.style.Style;
+import org.openrewrite.style.StyleHelper;
+
+@Value
+@With
+public class EmptyForIteratorPadStyle implements Style {
+    /**
+     * Track whether empty for loop iterators should have a space or not.
+     * When true: for (int i = 0; i < 10; )
+     * When false: for(int i = 0; i < 10;)
+     */
+    Boolean space;
+
+    @Override
+    public Style applyDefaults() {
+        return StyleHelper.merge(Checkstyle.emptyForIteratorPadStyle(), this);
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/HideUtilityClassConstructorStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/HideUtilityClassConstructorStyle.java
index d1183d6d506..a5ba147edd3 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/HideUtilityClassConstructorStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/HideUtilityClassConstructorStyle.java
@@ -1,35 +1,35 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import lombok.Value;
-import lombok.With;
-import org.openrewrite.Incubating;
-import org.openrewrite.java.AnnotationMatcher;
-import org.openrewrite.java.JavaStyle;
-
-import java.util.Collection;
-
-@Incubating(since = "7.0.0")
-@Value
-@With
-public class HideUtilityClassConstructorStyle implements JavaStyle {
-    /**
-     * If any of the annotation signatures are present on the utility class, the visitor will ignore operating on the class.
-     * These should be {@link AnnotationMatcher}-compatible, fully-qualified annotation signature strings.
-     */
-    Collection<String> ignoreIfAnnotatedBy;
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.Incubating;
+import org.openrewrite.java.AnnotationMatcher;
+import org.openrewrite.java.JavaStyle;
+
+import java.util.Collection;
+
+@Incubating(since = "7.0.0")
+@Value
+@With
+public class HideUtilityClassConstructorStyle implements JavaStyle {
+    /**
+     * If any of the annotation signatures are present on the utility class, the visitor will ignore operating on the class.
+     * These should be {@link AnnotationMatcher}-compatible, fully-qualified annotation signature strings.
+     */
+    Collection<String> ignoreIfAnnotatedBy;
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/ImportLayoutStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/ImportLayoutStyle.java
index 12dcf52df75..cf80e9cc96a 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/ImportLayoutStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/ImportLayoutStyle.java
@@ -1,947 +1,947 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.type.WritableTypeId;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.JavaPrinter;
-import org.openrewrite.java.JavaStyle;
-import org.openrewrite.java.tree.*;
-import org.openrewrite.marker.Markers;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toList;
-import static org.openrewrite.internal.StreamUtils.distinctBy;
-
-/**
- * A Java Style to define how imports are grouped and ordered. Additionally, this style provides configuration to dictate
- * how wildcard folding should be applied when multiple imports are in the same package or on the same, statically-imported
- * type.
- * <P><P>
- * The import layout consist of three properties:
- * <P><P>
- * <li>classCountToUseStarImport  - How many imports from the same package must be present before they should be collapsed into a star import. The default is 5.</li>
- * <li>nameCountToUseStarImport - How many static imports from the same type must be present before they should be collapsed into a static star import. The default is 3.</li>
- * <li>layout - An ordered list of import groupings which define exactly how imports should be organized within a compilation unit.</li>
- * <li>packagesToFold - An ordered list of packages which are folded when 1 or more types are in use.</li>
- */
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@Getter
-@JsonDeserialize(using = Deserializer.class)
-@JsonSerialize(using = Serializer.class)
-public class ImportLayoutStyle implements JavaStyle {
-
-    @EqualsAndHashCode.Include
-    private final int classCountToUseStarImport;
-
-    @EqualsAndHashCode.Include
-    private final int nameCountToUseStarImport;
-
-    @EqualsAndHashCode.Include
-    private final List<Block> layout;
-
-    @EqualsAndHashCode.Include
-    private final List<Block> packagesToFold;
-
-    private final List<Block> blocksNoCatchalls;
-    private final List<Block> blocksOnlyCatchalls;
-
-    public ImportLayoutStyle(int classCountToUseStarImport, int nameCountToUseStarImport, List<Block> layout, List<Block> packagesToFold) {
-        this.classCountToUseStarImport = classCountToUseStarImport;
-        this.nameCountToUseStarImport = nameCountToUseStarImport;
-        this.layout = layout.isEmpty() ? IntelliJ.importLayout().getLayout() : layout;
-        this.packagesToFold = packagesToFold;
-
-        // Divide the blocks into those that accept imports from any package ("catchalls") and those that accept imports from only specific packages
-        Map<Boolean, List<Block>> blockGroups = layout.stream()
-                .collect(Collectors.partitioningBy(block -> block instanceof Block.AllOthers));
-        blocksNoCatchalls = blockGroups.get(false);
-        blocksOnlyCatchalls = blockGroups.get(true);
-    }
-
-    /**
-     * Adds a new import in a block that best represents the import layout style without
-     * re-ordering any of the existing imports, i.e. a minimally invasive add.
-     *
-     * @param originalImports The import list before inserting.
-     * @param toAdd           The import to add.
-     * @param pkg             A package declaration, if one exists.
-     * @return The import list with a new import added.
-     */
-    public List<JRightPadded<J.Import>> addImport(List<JRightPadded<J.Import>> originalImports,
-                                                  J.Import toAdd, @Nullable J.Package pkg,
-                                                  Collection<JavaType.FullyQualified> classpath) {
-        JRightPadded<J.Import> paddedToAdd = new JRightPadded<>(toAdd, Space.EMPTY, Markers.EMPTY);
-
-        if (originalImports.isEmpty()) {
-            paddedToAdd = pkg == null ? paddedToAdd : paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n\n")));
-            paddedToAdd = isPackageAlwaysFolded(packagesToFold, paddedToAdd.getElement()) ? paddedToAdd.withElement(paddedToAdd.getElement().withQualid(
-                    paddedToAdd.getElement().getQualid().withName(
-                            paddedToAdd.getElement().getQualid().getName().withSimpleName("*")
-                    )
-            )) : paddedToAdd;
-            return singletonList(paddedToAdd);
-        }
-
-        // don't star fold just yet, because we are only going to star fold adjacent imports along with
-        // the import to add at most. we don't even want to star fold other non-adjacent imports in the same
-        // block that should be star folded according to the layout style (minimally invasive change).
-        List<JRightPadded<J.Import>> ideallyOrdered =
-                new ImportLayoutStyle(Integer.MAX_VALUE, Integer.MAX_VALUE, layout, packagesToFold)
-                        .orderImports(ListUtils.concat(originalImports, paddedToAdd), new HashSet<>());
-
-        if (ideallyOrdered.size() == originalImports.size()) {
-            Set<String> originalPaths = new HashSet<>();
-            for (JRightPadded<J.Import> originalImport : originalImports) {
-                originalPaths.add(originalImport.getElement().getTypeName());
-            }
-            int sharedImports = 0;
-            for (JRightPadded<J.Import> importJRightPadded : ideallyOrdered) {
-                if (originalPaths.contains(importJRightPadded.getElement().getTypeName())) {
-                    sharedImports++;
-                }
-            }
-            if (sharedImports == originalImports.size()) {
-                // must be a duplicate of an existing import
-                return originalImports;
-            }
-        }
-
-        JRightPadded<J.Import> before = null;
-        JRightPadded<J.Import> after = null;
-
-        Block addToBlock = block(paddedToAdd);
-        int insertPosition = 0;
-
-        for (int i = 0; i < ideallyOrdered.size(); i++) {
-            JRightPadded<J.Import> anImport = ideallyOrdered.get(i);
-            if (anImport.getElement().isScope(paddedToAdd.getElement())) {
-                before = i > 0 ? ideallyOrdered.get(i - 1) : null;
-                after = i + 1 < ideallyOrdered.size() ? ideallyOrdered.get(i + 1) : null;
-                if (before != null) {
-                    // Use the "before" import to determine insertion point.
-                    // Find the import in the original list to establish insertion position.
-                    for (int j = 0; j < originalImports.size(); j++) {
-                        if (before.getElement().equals(originalImports.get(j).getElement())) {
-                            insertPosition = j + 1;
-                            after = insertPosition < originalImports.size() ? originalImports.get(insertPosition) : null;
-                            break;
-                        }
-                    }
-                } else if (after != null) {
-                    // Otherwise, "after" as the basis for the insertion.
-                    // Find the import in the original list to establish insertion position.
-                    for (int j = 0; j < originalImports.size(); j++) {
-                        if (after.getElement().equals(originalImports.get(j).getElement())) {
-                            insertPosition = j;
-                            before = j > 0 ? originalImports.get(insertPosition - 1) : null;
-                            break;
-                        }
-                    }
-                }
-                break;
-            }
-        }
-
-        AtomicBoolean isNewBlock = new AtomicBoolean(false);
-        if (before == null) {
-            if (pkg != null) {
-                Space prefix = originalImports.get(0).getElement().getPrefix();
-                paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(prefix));
-            }
-        } else if (block(before) != addToBlock) {
-            boolean isFound = false;
-            for (int j = insertPosition; j < originalImports.size(); j++) {
-                if (block(originalImports.get(j)) == addToBlock) {
-                    insertPosition = j;
-                    after = originalImports.get(j);
-                    isFound = true;
-                    break;
-                }
-            }
-            isNewBlock.set(!isFound);
-            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n\n")));
-        } else {
-            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n")));
-        }
-
-        List<JRightPadded<J.Import>> checkConflicts = new ArrayList<>(originalImports);
-        checkConflicts.add(paddedToAdd);
-        boolean isFoldable = new ImportLayoutConflictDetection(classpath, checkConflicts)
-                .isPackageFoldable(packageOrOuterClassName(paddedToAdd));
-
-        // Walk both directions from the insertion point, looking for imports that are in the same block and have the
-        // same package/outerclassname.
-        AtomicInteger starFoldFrom = new AtomicInteger(insertPosition);
-        AtomicInteger starFoldTo = new AtomicInteger(insertPosition);
-        AtomicBoolean starFold = new AtomicBoolean(false);
-        int sameCount = 1; // start at 1 to account for the import being added.
-
-        for (int i = insertPosition; i < originalImports.size(); i++) {
-            JRightPadded<J.Import> anImport = originalImports.get(i);
-            if (block(anImport) == addToBlock && packageOrOuterClassName(anImport)
-                    .equals(packageOrOuterClassName(paddedToAdd))) {
-                starFoldTo.set(i + 1);
-                sameCount++;
-            } else {
-                break;
-            }
-        }
-
-        for (int i = insertPosition - 1; i >= 0; i--) {
-            JRightPadded<J.Import> anImport = originalImports.get(i);
-            if (block(anImport) == addToBlock && packageOrOuterClassName(anImport)
-                    .equals(packageOrOuterClassName(paddedToAdd))) {
-                starFoldFrom.set(i);
-                sameCount++;
-            } else {
-                break;
-            }
-        }
-
-        if (isFoldable && (((paddedToAdd.getElement().isStatic() && nameCountToUseStarImport <= sameCount) ||
-                (!paddedToAdd.getElement().isStatic() && classCountToUseStarImport <= sameCount)) || isPackageAlwaysFolded(packagesToFold, paddedToAdd.getElement()))) {
-            starFold.set(true);
-            if (insertPosition != starFoldFrom.get()) {
-                // if we're adding to the middle of a group of imports that are getting star folded,
-                // adopt the prefix of the first import in this group.
-                paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(
-                        originalImports.get(starFoldFrom.get()).getElement().getPrefix()
-                ));
-            }
-        }
-
-        if (starFold.get()) {
-            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withQualid(
-                    paddedToAdd.getElement().getQualid().withName(
-                            paddedToAdd.getElement().getQualid().getName().withSimpleName("*")
-                    )
-            ));
-            after = starFoldTo.get() < originalImports.size() ?
-                    originalImports.get(starFoldTo.get()) : null;
-        }
-
-        if (after != null) {
-            if (block(after) == addToBlock) {
-                after = after.withElement(after.getElement().withPrefix(Space.format("\n")));
-            } else if (!isNewBlock.get() && after.getElement().getPrefix().getLastWhitespace().chars()
-                    .filter(c -> c == '\n').count() < 2) {
-                after = after.withElement(after.getElement().withPrefix(Space.format("\n\n")));
-            }
-        }
-
-        JRightPadded<J.Import> finalToAdd = paddedToAdd;
-        JRightPadded<J.Import> finalAfter = after;
-        return ListUtils.flatMap(originalImports, (i, anImport) -> {
-            if (starFold.get() && i >= starFoldFrom.get() && i < starFoldTo.get()) {
-                return i == starFoldFrom.get() ?
-                        finalToAdd /* only add the star import once */ :
-                        null;
-            } else if (finalAfter != null && anImport.getElement().isScope(finalAfter.getElement())) {
-                if (starFold.get()) {
-                    // The added import is always folded, and is the first package occurence in the imports.
-                    if (starFoldFrom.get() == starFoldTo.get()) {
-                        return Arrays.asList(finalToAdd, finalAfter);
-                    } else {
-                        return finalAfter;
-                    }
-                } else if (isNewBlock.get()) {
-                    return anImport.getElement().isStatic() && !finalToAdd.getElement().isStatic() ?
-                            Arrays.asList(finalToAdd, finalAfter) : Arrays.asList(finalAfter, finalToAdd);
-                } else {
-                    return Arrays.asList(finalToAdd, finalAfter);
-                }
-            } else if (i == originalImports.size() - 1 && (finalAfter == null)) {
-                return Arrays.asList(anImport, finalToAdd);
-            }
-            return anImport;
-        });
-    }
-
-    private Block block(JRightPadded<J.Import> anImport) {
-        for (Block block : layout) {
-            if (block.accept(anImport)) {
-                return block;
-            }
-        }
-        throw new IllegalStateException("Expected to find a block to fit import into.");
-    }
-
-    /**
-     * This method will order and group a list of imports producing a new list that conforms to the rules defined
-     * by the import layout style.
-     *
-     * @param originalImports A list of potentially unordered imports.
-     * @return A list of imports that are grouped and ordered.
-     */
-    public List<JRightPadded<J.Import>> orderImports(List<JRightPadded<J.Import>> originalImports, Collection<JavaType.FullyQualified> classpath) {
-        LayoutState layoutState = new LayoutState();
-        ImportLayoutConflictDetection importLayoutConflictDetection = new ImportLayoutConflictDetection(classpath, originalImports);
-        List<JRightPadded<J.Import>> orderedImports = new ArrayList<>();
-
-        // Allocate imports to blocks, preferring to put imports into non-catchall blocks
-        nextImport:
-        for (JRightPadded<J.Import> anImport : originalImports) {
-            for (Block block : blocksNoCatchalls) {
-                if (block.accept(anImport)) {
-                    layoutState.claimImport(block, anImport);
-                    continue nextImport;
-                }
-            }
-
-            for (Block block : blocksOnlyCatchalls) {
-                if (block.accept(anImport)) {
-                    layoutState.claimImport(block, anImport);
-                    continue nextImport;
-                }
-            }
-        }
-
-        int importIndex = 0;
-        int extraLineSpaceCount = 0;
-        String prevWhitespace = "";
-        for (Block block : layout) {
-            if (block instanceof Block.BlankLines) {
-                extraLineSpaceCount = 0;
-                for (int i = 0; i < ((Block.BlankLines) block).getCount(); i++) {
-                    extraLineSpaceCount += 1;
-                }
-            } else {
-                List<JRightPadded<J.Import>> blockOrdering = block.orderedImports(layoutState, classCountToUseStarImport, nameCountToUseStarImport, importLayoutConflictDetection, packagesToFold);
-                for (JRightPadded<J.Import> orderedImport : blockOrdering) {
-                    boolean whitespaceContainsCRLF = orderedImport.getElement().getPrefix().getWhitespace().contains("\r\n");
-                    Space prefix;
-                    if (importIndex == 0) {
-                        prefix = originalImports.get(0).getElement().getPrefix();
-                    } else {
-                        // Preserve the existing newline character type of either CRLF or LF.
-                        // Classic Mac OS new line return '\r' is replaced by '\n'.
-                        String newLineCharacters = whitespaceContainsCRLF ||
-                                StringUtils.isNullOrEmpty(orderedImport.getElement().getPrefix().getWhitespace()) &&
-                                        "\r\n".equals(prevWhitespace) ? "\r\n" : "\n";
-
-                        StringBuilder newWhitespace = new StringBuilder(newLineCharacters);
-                        for (int i = 0; i < extraLineSpaceCount; i++) {
-                            newWhitespace.append(newLineCharacters);
-                        }
-                        prefix = orderedImport.getElement().getPrefix().withWhitespace(newWhitespace.toString());
-                    }
-
-                    if (!orderedImport.getElement().getPrefix().equals(prefix)) {
-                        orderedImports.add(orderedImport.withElement(orderedImport.getElement()
-                                .withPrefix(prefix)));
-                    } else {
-                        orderedImports.add(orderedImport);
-                    }
-                    // Imports with null or empty whitespace will be set to the previous prefix.
-                    prevWhitespace = whitespaceContainsCRLF ? "\r\n" : "\n";
-                    extraLineSpaceCount = 0;
-                    importIndex++;
-                }
-            }
-        }
-
-        return orderedImports;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder {
-        private final List<Block> blocks = new ArrayList<>();
-        private final List<Block> packagesToFold = new ArrayList<>();
-        private int classCountToUseStarImport = 5;
-        private int nameCountToUseStarImport = 3;
-
-        public Builder importAllOthers() {
-            blocks.add(new Block.AllOthers(false));
-            return this;
-        }
-
-        public Builder importStaticAllOthers() {
-            blocks.add(new Block.AllOthers(true));
-            return this;
-        }
-
-        public Builder blankLine() {
-            if (!blocks.isEmpty() &&
-                    blocks.get(blocks.size() - 1) instanceof Block.BlankLines) {
-                ((Block.BlankLines) blocks.get(blocks.size() - 1)).count++;
-            } else {
-                blocks.add(new Block.BlankLines());
-            }
-            return this;
-        }
-
-        public Builder importPackage(String packageWildcard, Boolean withSubpackages) {
-            blocks.add(new Block.ImportPackage(false, packageWildcard, withSubpackages));
-            return this;
-        }
-
-        public Builder importPackage(String packageWildcard) {
-            return importPackage(packageWildcard, true);
-        }
-
-        public Builder staticImportPackage(String packageWildcard, Boolean withSubpackages) {
-            blocks.add(new Block.ImportPackage(true, packageWildcard, withSubpackages));
-            return this;
-        }
-
-        public Builder staticImportPackage(String packageWildcard) {
-            return staticImportPackage(packageWildcard, true);
-        }
-
-        public Builder packageToFold(String packageWildcard, Boolean withSubpackages) {
-            packagesToFold.add(new Block.ImportPackage(false, packageWildcard, withSubpackages));
-            return this;
-        }
-
-        public Builder packageToFold(String packageWildcard) {
-            return packageToFold(packageWildcard, true);
-        }
-
-        public Builder staticPackageToFold(String packageWildcard, Boolean withSubpackages) {
-            packagesToFold.add(new Block.ImportPackage(true, packageWildcard, withSubpackages));
-            return this;
-        }
-
-        public Builder staticPackageToFold(String packageWildcard) {
-            return staticPackageToFold(packageWildcard, true);
-        }
-
-        public Builder classCountToUseStarImport(int classCountToUseStarImport) {
-            this.classCountToUseStarImport = classCountToUseStarImport;
-            return this;
-        }
-
-        public Builder nameCountToUseStarImport(int nameCountToUseStarImport) {
-            this.nameCountToUseStarImport = nameCountToUseStarImport;
-            return this;
-        }
-
-        public ImportLayoutStyle build() {
-            assert (blocks.stream().anyMatch(it -> it instanceof Block.AllOthers && ((Block.AllOthers) it).isStatic()))
-                    : "There must be at least one block that accepts all static imports, but no such block was found in the specified layout";
-            assert (blocks.stream().anyMatch(it -> it instanceof Block.AllOthers && !((Block.AllOthers) it).isStatic()))
-                    : "There must be at least one block that accepts all non-static imports, but no such block was found in the specified layout";
-
-            for (Block block : blocks) {
-                if (block instanceof Block.AllOthers) {
-                    ((Block.AllOthers) block).setPackageImports(blocks.stream()
-                            .filter(b -> b.getClass().equals(Block.ImportPackage.class))
-                            .map(Block.ImportPackage.class::cast)
-                            .collect(toList()));
-                }
-            }
-            return new ImportLayoutStyle(classCountToUseStarImport, nameCountToUseStarImport, blocks, packagesToFold);
-        }
-    }
-
-    /**
-     * The in-progress state of a single layout operation.
-     */
-    private static class LayoutState {
-        Map<Block, List<JRightPadded<J.Import>>> imports = new HashMap<>();
-
-        public void claimImport(Block block, JRightPadded<J.Import> impoort) {
-            imports.computeIfAbsent(block, b -> new ArrayList<>()).add(impoort);
-        }
-
-        public List<JRightPadded<J.Import>> getImports(Block block) {
-            return imports.getOrDefault(block, emptyList());
-        }
-    }
-
-    public static boolean isPackageAlwaysFolded(List<Block> packagesToFold, J.Import checkImport) {
-        boolean isPackageFolded = false;
-        String anImportName = checkImport.getQualid().printTrimmed(new JavaPrinter<>());
-        for (Block block : packagesToFold) {
-            Block.ImportPackage importPackage = (Block.ImportPackage) block;
-            if (checkImport.isStatic() == importPackage.isStatic()) {
-                if (importPackage.packageWildcard.matcher(anImportName).matches()) {
-                    isPackageFolded = true;
-                }
-            }
-        }
-        return isPackageFolded;
-    }
-
-    private static class ImportLayoutConflictDetection {
-        private final Collection<JavaType.FullyQualified> classpath;
-        private final List<JRightPadded<J.Import>> originalImports;
-        private final Set<String> jvmClasspathNames = new HashSet<>();
-        private @Nullable Set<String> containsClassNameConflict = null;
-
-        ImportLayoutConflictDetection(Collection<JavaType.FullyQualified> classpath, List<JRightPadded<J.Import>> originalImports) {
-            this.classpath = classpath;
-            this.originalImports = originalImports;
-        }
-
-        /**
-         * Checks if folding the package will create a namespace conflict with any other classes that have already been imported.
-         *
-         * @param packageName package that qualifies for folding into a '*'.
-         * @return folding the package will not create any namespace conflicts.
-         */
-        public boolean isPackageFoldable(String packageName) {
-            if (containsClassNameConflict == null) {
-                containsClassNameConflict = new HashSet<>();
-                setJVMClassNames();
-
-                Map<String, Set<String>> nameToPackages = mapNamesInPackageToPackages();
-                for (String className : nameToPackages.keySet()) {
-                    if (nameToPackages.get(className).size() > 1 || jvmClasspathNames.contains(className)) {
-                        containsClassNameConflict.addAll(nameToPackages.get(className));
-                    }
-                }
-            }
-            return classpath.isEmpty() || !containsClassNameConflict.contains(packageName);
-        }
-
-        private void setJVMClassNames() {
-            for (JavaType.FullyQualified fqn : classpath) {
-                if ("java.lang".equals(fqn.getPackageName())) {
-                    jvmClasspathNames.add(fqn.getClassName());
-                }
-            }
-        }
-
-        private Map<String, Set<String>> mapNamesInPackageToPackages() {
-            Map<String, Set<String>> nameToPackages = new HashMap<>();
-            Set<String> checkPackageForClasses = new HashSet<>();
-
-            for (JRightPadded<J.Import> anImport : originalImports) {
-                checkPackageForClasses.add(packageOrOuterClassName(anImport));
-                nameToPackages.computeIfAbsent(anImport.getElement().getClassName(), p -> new HashSet<>())
-                                .add(anImport.getElement().getPackageName());
-            }
-
-            for (JavaType.FullyQualified classGraphFqn : classpath) {
-                String packageName = classGraphFqn.getPackageName();
-                if (checkPackageForClasses.contains(packageName)) {
-                    String className = classGraphFqn.getClassName();
-                    Set<String> packages = nameToPackages.getOrDefault(className, new HashSet<>());
-                    packages.add(packageName);
-                    nameToPackages.put(className, packages);
-                } else if (checkPackageForClasses.contains(classGraphFqn.getFullyQualifiedName())) {
-                    packageName = classGraphFqn.getFullyQualifiedName();
-                    for (JavaType.Variable member : classGraphFqn.getMembers()) {
-                        if (member.getFlags().contains(Flag.Static)) {
-                            Set<String> packages = nameToPackages.getOrDefault(member.getName(), new HashSet<>());
-                            packages.add(packageName);
-                            nameToPackages.put(member.getName(), packages);
-                        }
-                    }
-
-                    for (JavaType.Method method : classGraphFqn.getMethods()) {
-                        if (method.getFlags().contains(Flag.Static)) {
-                            Set<String> packages = nameToPackages.getOrDefault(method.getName(), new HashSet<>());
-                            packages.add(packageName);
-                            nameToPackages.put(method.getName(), packages);
-                        }
-                    }
-                }
-            }
-            return nameToPackages;
-        }
-    }
-
-    /**
-     * A block represents a grouping of imports based on matching rules. The block provides a mechanism for matching
-     * and storing J.Imports that belong to the block.
-     */
-    public interface Block {
-
-        /**
-         * This method will determine if the passed in import is a match for the rules defined on the block. If the
-         * import is matched, it will be internally stored in the block.
-         *
-         * @param anImport The import to be compared against the block's matching rules.
-         * @return {@code true} if the import was a match
-         */
-        boolean accept(JRightPadded<J.Import> anImport);
-
-        /**
-         * @return Imports belonging to this block, folded appropriately.
-         */
-        List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStarImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold);
-
-        /**
-         * A specialized block implementation to act as a blank line separator between import groupings.
-         */
-        class BlankLines implements Block {
-            private int count = 1;
-
-            private int getCount() {
-                return count;
-            }
-
-            @Override
-            public boolean accept(JRightPadded<J.Import> anImport) {
-                return false;
-            }
-
-            @Override
-            public List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStartImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold) {
-                return emptyList();
-            }
-
-            @Override
-            public String toString() {
-                return "<blank line>" + (count > 1 ? " (x" + count + ")" : "");
-            }
-        }
-
-        @SuppressWarnings("deprecation")
-        class ImportPackage implements Block {
-
-            // VisibleForTesting
-            final static Comparator<JRightPadded<J.Import>> IMPORT_SORTING = (i1, i2) -> {
-                String[] import1 = i1.getElement().getQualid().printTrimmed().split("\\.");
-                String[] import2 = i2.getElement().getQualid().printTrimmed().split("\\.");
-
-                for (int i = 0; i < Math.min(import1.length, import2.length); i++) {
-                    int diff = import1[i].compareTo(import2[i]);
-                    if (diff != 0) {
-                        return diff;
-                    }
-                }
-
-                if (import1.length == import2.length) {
-                    return 0;
-                }
-
-                return import1.length > import2.length ? 1 : -1;
-            };
-
-            private final Boolean statik;
-            private final Pattern packageWildcard;
-
-            public ImportPackage(Boolean statik, String packageWildcard, boolean withSubpackages) {
-                this.statik = statik;
-                this.packageWildcard = Pattern.compile(packageWildcard
-                        .replace(".", "\\.")
-                        .replace("*", withSubpackages ? ".+" : "[^.]+"));
-            }
-
-            public boolean isStatic() {
-                return statik;
-            }
-
-            public Pattern getPackageWildcard() {
-                return packageWildcard;
-            }
-
-            @Override
-            public boolean accept(JRightPadded<J.Import> anImport) {
-                return anImport.getElement().isStatic() == statik &&
-                        packageWildcard.matcher(anImport.getElement().getQualid().printTrimmed()).matches();
-            }
-
-            @Override
-            public List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStarImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold) {
-                List<JRightPadded<J.Import>> imports = layoutState.getImports(this);
-
-                Map<String, List<JRightPadded<J.Import>>> groupedImports = imports
-                        .stream()
-                        .sorted(IMPORT_SORTING)
-                        .collect(groupingBy(
-                                ImportLayoutStyle::packageOrOuterClassName,
-                                LinkedHashMap::new, // Use an ordered map to preserve sorting
-                                Collectors.toList()
-                        ));
-
-                List<JRightPadded<J.Import>> ordered = new ArrayList<>(imports.size());
-
-                for (List<JRightPadded<J.Import>> importGroup : groupedImports.values()) {
-                    JRightPadded<J.Import> toStar = importGroup.get(0);
-                    int threshold = toStar.getElement().isStatic() ? nameCountToUseStarImport : classCountToUseStarImport;
-                    boolean starImportExists = importGroup.stream()
-                            .anyMatch(it -> it.getElement().getQualid().getSimpleName().equals("*"));
-
-                    if (importLayoutConflictDetection.isPackageFoldable(packageOrOuterClassName(toStar)) &&
-                            (isPackageAlwaysFolded(packagesToFold, toStar.getElement()) || importGroup.size() >= threshold || (starImportExists && importGroup.size() > 1))) {
-
-                        J.FieldAccess qualid = toStar.getElement().getQualid();
-                        J.Identifier name = qualid.getName();
-
-                        Set<String> typeNamesInThisGroup = importGroup.stream()
-                                .map(im -> im.getElement().getClassName())
-                                .collect(Collectors.toSet());
-
-                        Optional<String> oneOfTheTypesIsInAnotherGroupToo = groupedImports.values().stream()
-                                .filter(group -> group != importGroup)
-                                .flatMap(group -> group.stream()
-                                        .filter(im -> typeNamesInThisGroup.contains(im.getElement().getClassName())))
-                                .map(im -> im.getElement().getTypeName())
-                                .findAny();
-
-                        if (starImportExists || !oneOfTheTypesIsInAnotherGroupToo.isPresent()) {
-                            ordered.add(toStar.withElement(toStar.getElement().withQualid(qualid.withName(name.withSimpleName("*")))));
-                            continue;
-                        }
-                    }
-
-                    Predicate<JRightPadded<J.Import>> predicate = distinctBy(t -> t.getElement().printTrimmed(new JavaPrinter<>()));
-                    for (JRightPadded<J.Import> importJRightPadded : importGroup) {
-                        if (predicate.test(importJRightPadded)) {
-                            ordered.add(importJRightPadded);
-                        }
-                    }
-                }
-
-                // interleaves inner classes and outer classes back together which are separated into different groups
-                // above for the sake of determining whether groups of outer class or inner class imports need to be star
-                // folded/unfolded
-                ordered.sort(IMPORT_SORTING);
-
-                return ordered;
-            }
-
-            @Override
-            public String toString() {
-                return "import " + (statik ? "static " : "") + packageWildcard;
-            }
-        }
-
-        class AllOthers extends Block.ImportPackage {
-            private final boolean statik;
-            private Collection<ImportPackage> packageImports = emptyList();
-
-            public AllOthers(boolean statik) {
-                super(statik, "*", true
-                );
-                this.statik = statik;
-            }
-
-            public void setPackageImports(Collection<ImportPackage> packageImports) {
-                this.packageImports = packageImports;
-            }
-
-            @Override
-            public boolean isStatic() {
-                return statik;
-            }
-
-            @Override
-            public boolean accept(JRightPadded<J.Import> anImport) {
-                for (ImportPackage pi : packageImports) {
-                    if (pi.accept(anImport)) {
-                        return false;
-                    }
-                }
-                return anImport.getElement().isStatic() == statik;
-            }
-
-            @Override
-            public String toString() {
-                return "import " + (statik ? "static " : "") + "all other imports";
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder s = new StringBuilder();
-        s.append("classWildcards=")
-                .append(classCountToUseStarImport)
-                .append(", staticWildcards=")
-                .append(nameCountToUseStarImport)
-                .append('\n');
-        for (Block block : layout) {
-            s.append(block).append("\n");
-        }
-        return s.toString();
-    }
-
-    private static String packageOrOuterClassName(JRightPadded<J.Import> anImport) {
-        String typeName = anImport.getElement().getTypeName();
-        if (anImport.getElement().isStatic()) {
-            return typeName;
-        } else {
-            String className = anImport.getElement().getClassName();
-            if (className.contains("$")) {
-                return anImport.getElement().getPackageName() + "." +
-                        className.substring(0, className.lastIndexOf('$'))
-                                .replace('$', '.');
-            }
-            return anImport.getElement().getPackageName();
-        }
-    }
-}
-
-class Deserializer extends JsonDeserializer<ImportLayoutStyle> {
-    @Override
-    public ImportLayoutStyle deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        ImportLayoutStyle.Builder builder = ImportLayoutStyle.builder();
-        for (String currentField = null; p.hasCurrentToken() && p.getCurrentToken() != JsonToken.END_OBJECT; p.nextToken()) {
-            switch (p.currentToken()) {
-                case FIELD_NAME:
-                    currentField = p.getCurrentName();
-                    break;
-                case VALUE_STRING:
-                    if ("layout".equals(currentField)) {
-                        String block = p.getText().trim();
-                        if ("<blank line>".equals(block)) {
-                            builder.blankLine();
-                        } else if (block.startsWith("import ")) {
-                            block = block.substring("import ".length());
-                            boolean statik = false;
-                            if (block.startsWith("static")) {
-                                statik = true;
-                                block = block.substring("static ".length());
-                            }
-                            if ("all other imports".equals(block)) {
-                                if (statik) {
-                                    builder.importStaticAllOthers();
-                                } else {
-                                    builder.importAllOthers();
-                                }
-                            } else {
-                                boolean withSubpackages = !block.contains(" without subpackages");
-                                block = withSubpackages ? block : block.substring(0, block.indexOf(" without subpackage"));
-                                if (statik) {
-                                    builder.staticImportPackage(block, withSubpackages);
-                                } else {
-                                    builder.importPackage(block, withSubpackages);
-                                }
-                            }
-                        } else {
-                            throw new IllegalArgumentException("Syntax error in layout block [" + block + "]");
-                        }
-                    } else if ("packagesToFold".equals(currentField)) {
-                        String block = p.getText().trim();
-                        if (block.startsWith("import ")) {
-                            block = block.substring("import ".length());
-                            boolean statik = false;
-                            if (block.startsWith("static")) {
-                                statik = true;
-                                block = block.substring("static ".length());
-                            }
-                            boolean withSubpackages = !block.contains(" without subpackages");
-                            block = withSubpackages ? block : block.substring(0, block.indexOf(" without subpackage"));
-                            if (statik) {
-                                builder.staticPackageToFold(block, withSubpackages);
-                            } else {
-                                builder.packageToFold(block, withSubpackages);
-                            }
-                        }
-                    } else {
-                        break;
-                    }
-                    break;
-                case VALUE_NUMBER_INT:
-                    if ("classCountToUseStarImport".equals(currentField)) {
-                        builder.classCountToUseStarImport(p.getValueAsInt());
-                    } else if ("nameCountToUseStarImport".equals(currentField)) {
-                        builder.nameCountToUseStarImport(p.getValueAsInt());
-                    }
-                    break;
-            }
-        }
-
-        return builder.build();
-    }
-}
-
-class Serializer extends JsonSerializer<ImportLayoutStyle> {
-
-    @Override
-    public void serializeWithType(ImportLayoutStyle value, JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        WritableTypeId typeId = typeSer.typeId(value, JsonToken.START_OBJECT);
-        typeSer.writeTypePrefix(gen, typeId);
-        serializeFields(value, gen);
-        typeSer.writeTypeSuffix(gen, typeId);
-    }
-
-    @Override
-    public void serialize(ImportLayoutStyle value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        gen.writeStartObject();
-        serializeFields(value, gen);
-        gen.writeEndObject();
-    }
-
-    private void serializeFields(ImportLayoutStyle value, JsonGenerator gen) throws IOException {
-        gen.writeNumberField("classCountToUseStarImport", value.getClassCountToUseStarImport());
-        gen.writeNumberField("nameCountToUseStarImport", value.getNameCountToUseStarImport());
-
-        @SuppressWarnings("SuspiciousToArrayCall") String[] blocks = value.getLayout().stream()
-                .map(block -> {
-                    if (block instanceof ImportLayoutStyle.Block.BlankLines) {
-                        return "<blank line>";
-                    } else if (block instanceof ImportLayoutStyle.Block.AllOthers) {
-                        return "import " + (((ImportLayoutStyle.Block.AllOthers) block).isStatic() ? "static " : "") +
-                                "all other imports";
-                    } else if (block instanceof ImportLayoutStyle.Block.ImportPackage) {
-                        ImportLayoutStyle.Block.ImportPackage importPackage = (ImportLayoutStyle.Block.ImportPackage) block;
-                        String withSubpackages = importPackage.getPackageWildcard().pattern().contains("[^.]+") ? " without subpackages" : "";
-                        return "import " + (importPackage.isStatic() ? "static " : "") + importPackage.getPackageWildcard().pattern()
-                                .replace("\\.", ".")
-                                .replace(".+", "*")
-                                .replace("[^.]+", "*") + withSubpackages;
-                    }
-                    return new UnsupportedOperationException("Unknown block type " + block.getClass().getName());
-                })
-                .toArray(String[]::new);
-
-        @SuppressWarnings("SuspiciousToArrayCall") String[] packagesToFold = value.getPackagesToFold().stream()
-                .map(block -> {
-                    if (block instanceof ImportLayoutStyle.Block.ImportPackage) {
-                        ImportLayoutStyle.Block.ImportPackage importPackage = (ImportLayoutStyle.Block.ImportPackage) block;
-                        String withSubpackages = importPackage.getPackageWildcard().pattern().contains("[^.]+") ? " without subpackages" : "";
-                        return "import " + (importPackage.isStatic() ? "static " : "") + importPackage.getPackageWildcard().pattern()
-                                .replace("\\.", ".")
-                                .replace(".+", "*")
-                                .replace("[^.]+", "*")  + withSubpackages;
-                    }
-                    return new UnsupportedOperationException("Unknown block type " + block.getClass().getName());
-                })
-                .toArray(String[]::new);
-
-        gen.writeArrayFieldStart("layout");
-        gen.writeArray(blocks, 0, blocks.length);
-        gen.writeEndArray();
-
-        gen.writeArrayFieldStart("packagesToFold");
-        gen.writeArray(packagesToFold, 0, packagesToFold.length);
-        gen.writeEndArray();
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.type.WritableTypeId;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.JavaPrinter;
+import org.openrewrite.java.JavaStyle;
+import org.openrewrite.java.tree.*;
+import org.openrewrite.marker.Markers;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+import static org.openrewrite.internal.StreamUtils.distinctBy;
+
+/**
+ * A Java Style to define how imports are grouped and ordered. Additionally, this style provides configuration to dictate
+ * how wildcard folding should be applied when multiple imports are in the same package or on the same, statically-imported
+ * type.
+ * <P><P>
+ * The import layout consist of three properties:
+ * <P><P>
+ * <li>classCountToUseStarImport  - How many imports from the same package must be present before they should be collapsed into a star import. The default is 5.</li>
+ * <li>nameCountToUseStarImport - How many static imports from the same type must be present before they should be collapsed into a static star import. The default is 3.</li>
+ * <li>layout - An ordered list of import groupings which define exactly how imports should be organized within a compilation unit.</li>
+ * <li>packagesToFold - An ordered list of packages which are folded when 1 or more types are in use.</li>
+ */
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@Getter
+@JsonDeserialize(using = Deserializer.class)
+@JsonSerialize(using = Serializer.class)
+public class ImportLayoutStyle implements JavaStyle {
+
+    @EqualsAndHashCode.Include
+    private final int classCountToUseStarImport;
+
+    @EqualsAndHashCode.Include
+    private final int nameCountToUseStarImport;
+
+    @EqualsAndHashCode.Include
+    private final List<Block> layout;
+
+    @EqualsAndHashCode.Include
+    private final List<Block> packagesToFold;
+
+    private final List<Block> blocksNoCatchalls;
+    private final List<Block> blocksOnlyCatchalls;
+
+    public ImportLayoutStyle(int classCountToUseStarImport, int nameCountToUseStarImport, List<Block> layout, List<Block> packagesToFold) {
+        this.classCountToUseStarImport = classCountToUseStarImport;
+        this.nameCountToUseStarImport = nameCountToUseStarImport;
+        this.layout = layout.isEmpty() ? IntelliJ.importLayout().getLayout() : layout;
+        this.packagesToFold = packagesToFold;
+
+        // Divide the blocks into those that accept imports from any package ("catchalls") and those that accept imports from only specific packages
+        Map<Boolean, List<Block>> blockGroups = layout.stream()
+                .collect(Collectors.partitioningBy(block -> block instanceof Block.AllOthers));
+        blocksNoCatchalls = blockGroups.get(false);
+        blocksOnlyCatchalls = blockGroups.get(true);
+    }
+
+    /**
+     * Adds a new import in a block that best represents the import layout style without
+     * re-ordering any of the existing imports, i.e. a minimally invasive add.
+     *
+     * @param originalImports The import list before inserting.
+     * @param toAdd           The import to add.
+     * @param pkg             A package declaration, if one exists.
+     * @return The import list with a new import added.
+     */
+    public List<JRightPadded<J.Import>> addImport(List<JRightPadded<J.Import>> originalImports,
+                                                  J.Import toAdd, @Nullable J.Package pkg,
+                                                  Collection<JavaType.FullyQualified> classpath) {
+        JRightPadded<J.Import> paddedToAdd = new JRightPadded<>(toAdd, Space.EMPTY, Markers.EMPTY);
+
+        if (originalImports.isEmpty()) {
+            paddedToAdd = pkg == null ? paddedToAdd : paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n\n")));
+            paddedToAdd = isPackageAlwaysFolded(packagesToFold, paddedToAdd.getElement()) ? paddedToAdd.withElement(paddedToAdd.getElement().withQualid(
+                    paddedToAdd.getElement().getQualid().withName(
+                            paddedToAdd.getElement().getQualid().getName().withSimpleName("*")
+                    )
+            )) : paddedToAdd;
+            return singletonList(paddedToAdd);
+        }
+
+        // don't star fold just yet, because we are only going to star fold adjacent imports along with
+        // the import to add at most. we don't even want to star fold other non-adjacent imports in the same
+        // block that should be star folded according to the layout style (minimally invasive change).
+        List<JRightPadded<J.Import>> ideallyOrdered =
+                new ImportLayoutStyle(Integer.MAX_VALUE, Integer.MAX_VALUE, layout, packagesToFold)
+                        .orderImports(ListUtils.concat(originalImports, paddedToAdd), new HashSet<>());
+
+        if (ideallyOrdered.size() == originalImports.size()) {
+            Set<String> originalPaths = new HashSet<>();
+            for (JRightPadded<J.Import> originalImport : originalImports) {
+                originalPaths.add(originalImport.getElement().getTypeName());
+            }
+            int sharedImports = 0;
+            for (JRightPadded<J.Import> importJRightPadded : ideallyOrdered) {
+                if (originalPaths.contains(importJRightPadded.getElement().getTypeName())) {
+                    sharedImports++;
+                }
+            }
+            if (sharedImports == originalImports.size()) {
+                // must be a duplicate of an existing import
+                return originalImports;
+            }
+        }
+
+        JRightPadded<J.Import> before = null;
+        JRightPadded<J.Import> after = null;
+
+        Block addToBlock = block(paddedToAdd);
+        int insertPosition = 0;
+
+        for (int i = 0; i < ideallyOrdered.size(); i++) {
+            JRightPadded<J.Import> anImport = ideallyOrdered.get(i);
+            if (anImport.getElement().isScope(paddedToAdd.getElement())) {
+                before = i > 0 ? ideallyOrdered.get(i - 1) : null;
+                after = i + 1 < ideallyOrdered.size() ? ideallyOrdered.get(i + 1) : null;
+                if (before != null) {
+                    // Use the "before" import to determine insertion point.
+                    // Find the import in the original list to establish insertion position.
+                    for (int j = 0; j < originalImports.size(); j++) {
+                        if (before.getElement().equals(originalImports.get(j).getElement())) {
+                            insertPosition = j + 1;
+                            after = insertPosition < originalImports.size() ? originalImports.get(insertPosition) : null;
+                            break;
+                        }
+                    }
+                } else if (after != null) {
+                    // Otherwise, "after" as the basis for the insertion.
+                    // Find the import in the original list to establish insertion position.
+                    for (int j = 0; j < originalImports.size(); j++) {
+                        if (after.getElement().equals(originalImports.get(j).getElement())) {
+                            insertPosition = j;
+                            before = j > 0 ? originalImports.get(insertPosition - 1) : null;
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        AtomicBoolean isNewBlock = new AtomicBoolean(false);
+        if (before == null) {
+            if (pkg != null) {
+                Space prefix = originalImports.get(0).getElement().getPrefix();
+                paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(prefix));
+            }
+        } else if (block(before) != addToBlock) {
+            boolean isFound = false;
+            for (int j = insertPosition; j < originalImports.size(); j++) {
+                if (block(originalImports.get(j)) == addToBlock) {
+                    insertPosition = j;
+                    after = originalImports.get(j);
+                    isFound = true;
+                    break;
+                }
+            }
+            isNewBlock.set(!isFound);
+            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n\n")));
+        } else {
+            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(Space.format("\n")));
+        }
+
+        List<JRightPadded<J.Import>> checkConflicts = new ArrayList<>(originalImports);
+        checkConflicts.add(paddedToAdd);
+        boolean isFoldable = new ImportLayoutConflictDetection(classpath, checkConflicts)
+                .isPackageFoldable(packageOrOuterClassName(paddedToAdd));
+
+        // Walk both directions from the insertion point, looking for imports that are in the same block and have the
+        // same package/outerclassname.
+        AtomicInteger starFoldFrom = new AtomicInteger(insertPosition);
+        AtomicInteger starFoldTo = new AtomicInteger(insertPosition);
+        AtomicBoolean starFold = new AtomicBoolean(false);
+        int sameCount = 1; // start at 1 to account for the import being added.
+
+        for (int i = insertPosition; i < originalImports.size(); i++) {
+            JRightPadded<J.Import> anImport = originalImports.get(i);
+            if (block(anImport) == addToBlock && packageOrOuterClassName(anImport)
+                    .equals(packageOrOuterClassName(paddedToAdd))) {
+                starFoldTo.set(i + 1);
+                sameCount++;
+            } else {
+                break;
+            }
+        }
+
+        for (int i = insertPosition - 1; i >= 0; i--) {
+            JRightPadded<J.Import> anImport = originalImports.get(i);
+            if (block(anImport) == addToBlock && packageOrOuterClassName(anImport)
+                    .equals(packageOrOuterClassName(paddedToAdd))) {
+                starFoldFrom.set(i);
+                sameCount++;
+            } else {
+                break;
+            }
+        }
+
+        if (isFoldable && (((paddedToAdd.getElement().isStatic() && nameCountToUseStarImport <= sameCount) ||
+                (!paddedToAdd.getElement().isStatic() && classCountToUseStarImport <= sameCount)) || isPackageAlwaysFolded(packagesToFold, paddedToAdd.getElement()))) {
+            starFold.set(true);
+            if (insertPosition != starFoldFrom.get()) {
+                // if we're adding to the middle of a group of imports that are getting star folded,
+                // adopt the prefix of the first import in this group.
+                paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withPrefix(
+                        originalImports.get(starFoldFrom.get()).getElement().getPrefix()
+                ));
+            }
+        }
+
+        if (starFold.get()) {
+            paddedToAdd = paddedToAdd.withElement(paddedToAdd.getElement().withQualid(
+                    paddedToAdd.getElement().getQualid().withName(
+                            paddedToAdd.getElement().getQualid().getName().withSimpleName("*")
+                    )
+            ));
+            after = starFoldTo.get() < originalImports.size() ?
+                    originalImports.get(starFoldTo.get()) : null;
+        }
+
+        if (after != null) {
+            if (block(after) == addToBlock) {
+                after = after.withElement(after.getElement().withPrefix(Space.format("\n")));
+            } else if (!isNewBlock.get() && after.getElement().getPrefix().getLastWhitespace().chars()
+                    .filter(c -> c == '\n').count() < 2) {
+                after = after.withElement(after.getElement().withPrefix(Space.format("\n\n")));
+            }
+        }
+
+        JRightPadded<J.Import> finalToAdd = paddedToAdd;
+        JRightPadded<J.Import> finalAfter = after;
+        return ListUtils.flatMap(originalImports, (i, anImport) -> {
+            if (starFold.get() && i >= starFoldFrom.get() && i < starFoldTo.get()) {
+                return i == starFoldFrom.get() ?
+                        finalToAdd /* only add the star import once */ :
+                        null;
+            } else if (finalAfter != null && anImport.getElement().isScope(finalAfter.getElement())) {
+                if (starFold.get()) {
+                    // The added import is always folded, and is the first package occurence in the imports.
+                    if (starFoldFrom.get() == starFoldTo.get()) {
+                        return Arrays.asList(finalToAdd, finalAfter);
+                    } else {
+                        return finalAfter;
+                    }
+                } else if (isNewBlock.get()) {
+                    return anImport.getElement().isStatic() && !finalToAdd.getElement().isStatic() ?
+                            Arrays.asList(finalToAdd, finalAfter) : Arrays.asList(finalAfter, finalToAdd);
+                } else {
+                    return Arrays.asList(finalToAdd, finalAfter);
+                }
+            } else if (i == originalImports.size() - 1 && (finalAfter == null)) {
+                return Arrays.asList(anImport, finalToAdd);
+            }
+            return anImport;
+        });
+    }
+
+    private Block block(JRightPadded<J.Import> anImport) {
+        for (Block block : layout) {
+            if (block.accept(anImport)) {
+                return block;
+            }
+        }
+        throw new IllegalStateException("Expected to find a block to fit import into.");
+    }
+
+    /**
+     * This method will order and group a list of imports producing a new list that conforms to the rules defined
+     * by the import layout style.
+     *
+     * @param originalImports A list of potentially unordered imports.
+     * @return A list of imports that are grouped and ordered.
+     */
+    public List<JRightPadded<J.Import>> orderImports(List<JRightPadded<J.Import>> originalImports, Collection<JavaType.FullyQualified> classpath) {
+        LayoutState layoutState = new LayoutState();
+        ImportLayoutConflictDetection importLayoutConflictDetection = new ImportLayoutConflictDetection(classpath, originalImports);
+        List<JRightPadded<J.Import>> orderedImports = new ArrayList<>();
+
+        // Allocate imports to blocks, preferring to put imports into non-catchall blocks
+        nextImport:
+        for (JRightPadded<J.Import> anImport : originalImports) {
+            for (Block block : blocksNoCatchalls) {
+                if (block.accept(anImport)) {
+                    layoutState.claimImport(block, anImport);
+                    continue nextImport;
+                }
+            }
+
+            for (Block block : blocksOnlyCatchalls) {
+                if (block.accept(anImport)) {
+                    layoutState.claimImport(block, anImport);
+                    continue nextImport;
+                }
+            }
+        }
+
+        int importIndex = 0;
+        int extraLineSpaceCount = 0;
+        String prevWhitespace = "";
+        for (Block block : layout) {
+            if (block instanceof Block.BlankLines) {
+                extraLineSpaceCount = 0;
+                for (int i = 0; i < ((Block.BlankLines) block).getCount(); i++) {
+                    extraLineSpaceCount += 1;
+                }
+            } else {
+                List<JRightPadded<J.Import>> blockOrdering = block.orderedImports(layoutState, classCountToUseStarImport, nameCountToUseStarImport, importLayoutConflictDetection, packagesToFold);
+                for (JRightPadded<J.Import> orderedImport : blockOrdering) {
+                    boolean whitespaceContainsCRLF = orderedImport.getElement().getPrefix().getWhitespace().contains("\r\n");
+                    Space prefix;
+                    if (importIndex == 0) {
+                        prefix = originalImports.get(0).getElement().getPrefix();
+                    } else {
+                        // Preserve the existing newline character type of either CRLF or LF.
+                        // Classic Mac OS new line return '\r' is replaced by '\n'.
+                        String newLineCharacters = whitespaceContainsCRLF ||
+                                StringUtils.isNullOrEmpty(orderedImport.getElement().getPrefix().getWhitespace()) &&
+                                        "\r\n".equals(prevWhitespace) ? "\r\n" : "\n";
+
+                        StringBuilder newWhitespace = new StringBuilder(newLineCharacters);
+                        for (int i = 0; i < extraLineSpaceCount; i++) {
+                            newWhitespace.append(newLineCharacters);
+                        }
+                        prefix = orderedImport.getElement().getPrefix().withWhitespace(newWhitespace.toString());
+                    }
+
+                    if (!orderedImport.getElement().getPrefix().equals(prefix)) {
+                        orderedImports.add(orderedImport.withElement(orderedImport.getElement()
+                                .withPrefix(prefix)));
+                    } else {
+                        orderedImports.add(orderedImport);
+                    }
+                    // Imports with null or empty whitespace will be set to the previous prefix.
+                    prevWhitespace = whitespaceContainsCRLF ? "\r\n" : "\n";
+                    extraLineSpaceCount = 0;
+                    importIndex++;
+                }
+            }
+        }
+
+        return orderedImports;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private final List<Block> blocks = new ArrayList<>();
+        private final List<Block> packagesToFold = new ArrayList<>();
+        private int classCountToUseStarImport = 5;
+        private int nameCountToUseStarImport = 3;
+
+        public Builder importAllOthers() {
+            blocks.add(new Block.AllOthers(false));
+            return this;
+        }
+
+        public Builder importStaticAllOthers() {
+            blocks.add(new Block.AllOthers(true));
+            return this;
+        }
+
+        public Builder blankLine() {
+            if (!blocks.isEmpty() &&
+                    blocks.get(blocks.size() - 1) instanceof Block.BlankLines) {
+                ((Block.BlankLines) blocks.get(blocks.size() - 1)).count++;
+            } else {
+                blocks.add(new Block.BlankLines());
+            }
+            return this;
+        }
+
+        public Builder importPackage(String packageWildcard, Boolean withSubpackages) {
+            blocks.add(new Block.ImportPackage(false, packageWildcard, withSubpackages));
+            return this;
+        }
+
+        public Builder importPackage(String packageWildcard) {
+            return importPackage(packageWildcard, true);
+        }
+
+        public Builder staticImportPackage(String packageWildcard, Boolean withSubpackages) {
+            blocks.add(new Block.ImportPackage(true, packageWildcard, withSubpackages));
+            return this;
+        }
+
+        public Builder staticImportPackage(String packageWildcard) {
+            return staticImportPackage(packageWildcard, true);
+        }
+
+        public Builder packageToFold(String packageWildcard, Boolean withSubpackages) {
+            packagesToFold.add(new Block.ImportPackage(false, packageWildcard, withSubpackages));
+            return this;
+        }
+
+        public Builder packageToFold(String packageWildcard) {
+            return packageToFold(packageWildcard, true);
+        }
+
+        public Builder staticPackageToFold(String packageWildcard, Boolean withSubpackages) {
+            packagesToFold.add(new Block.ImportPackage(true, packageWildcard, withSubpackages));
+            return this;
+        }
+
+        public Builder staticPackageToFold(String packageWildcard) {
+            return staticPackageToFold(packageWildcard, true);
+        }
+
+        public Builder classCountToUseStarImport(int classCountToUseStarImport) {
+            this.classCountToUseStarImport = classCountToUseStarImport;
+            return this;
+        }
+
+        public Builder nameCountToUseStarImport(int nameCountToUseStarImport) {
+            this.nameCountToUseStarImport = nameCountToUseStarImport;
+            return this;
+        }
+
+        public ImportLayoutStyle build() {
+            assert (blocks.stream().anyMatch(it -> it instanceof Block.AllOthers && ((Block.AllOthers) it).isStatic()))
+                    : "There must be at least one block that accepts all static imports, but no such block was found in the specified layout";
+            assert (blocks.stream().anyMatch(it -> it instanceof Block.AllOthers && !((Block.AllOthers) it).isStatic()))
+                    : "There must be at least one block that accepts all non-static imports, but no such block was found in the specified layout";
+
+            for (Block block : blocks) {
+                if (block instanceof Block.AllOthers) {
+                    ((Block.AllOthers) block).setPackageImports(blocks.stream()
+                            .filter(b -> b.getClass().equals(Block.ImportPackage.class))
+                            .map(Block.ImportPackage.class::cast)
+                            .collect(toList()));
+                }
+            }
+            return new ImportLayoutStyle(classCountToUseStarImport, nameCountToUseStarImport, blocks, packagesToFold);
+        }
+    }
+
+    /**
+     * The in-progress state of a single layout operation.
+     */
+    private static class LayoutState {
+        Map<Block, List<JRightPadded<J.Import>>> imports = new HashMap<>();
+
+        public void claimImport(Block block, JRightPadded<J.Import> impoort) {
+            imports.computeIfAbsent(block, b -> new ArrayList<>()).add(impoort);
+        }
+
+        public List<JRightPadded<J.Import>> getImports(Block block) {
+            return imports.getOrDefault(block, emptyList());
+        }
+    }
+
+    public static boolean isPackageAlwaysFolded(List<Block> packagesToFold, J.Import checkImport) {
+        boolean isPackageFolded = false;
+        String anImportName = checkImport.getQualid().printTrimmed(new JavaPrinter<>());
+        for (Block block : packagesToFold) {
+            Block.ImportPackage importPackage = (Block.ImportPackage) block;
+            if (checkImport.isStatic() == importPackage.isStatic()) {
+                if (importPackage.packageWildcard.matcher(anImportName).matches()) {
+                    isPackageFolded = true;
+                }
+            }
+        }
+        return isPackageFolded;
+    }
+
+    private static class ImportLayoutConflictDetection {
+        private final Collection<JavaType.FullyQualified> classpath;
+        private final List<JRightPadded<J.Import>> originalImports;
+        private final Set<String> jvmClasspathNames = new HashSet<>();
+        private @Nullable Set<String> containsClassNameConflict = null;
+
+        ImportLayoutConflictDetection(Collection<JavaType.FullyQualified> classpath, List<JRightPadded<J.Import>> originalImports) {
+            this.classpath = classpath;
+            this.originalImports = originalImports;
+        }
+
+        /**
+         * Checks if folding the package will create a namespace conflict with any other classes that have already been imported.
+         *
+         * @param packageName package that qualifies for folding into a '*'.
+         * @return folding the package will not create any namespace conflicts.
+         */
+        public boolean isPackageFoldable(String packageName) {
+            if (containsClassNameConflict == null) {
+                containsClassNameConflict = new HashSet<>();
+                setJVMClassNames();
+
+                Map<String, Set<String>> nameToPackages = mapNamesInPackageToPackages();
+                for (String className : nameToPackages.keySet()) {
+                    if (nameToPackages.get(className).size() > 1 || jvmClasspathNames.contains(className)) {
+                        containsClassNameConflict.addAll(nameToPackages.get(className));
+                    }
+                }
+            }
+            return classpath.isEmpty() || !containsClassNameConflict.contains(packageName);
+        }
+
+        private void setJVMClassNames() {
+            for (JavaType.FullyQualified fqn : classpath) {
+                if ("java.lang".equals(fqn.getPackageName())) {
+                    jvmClasspathNames.add(fqn.getClassName());
+                }
+            }
+        }
+
+        private Map<String, Set<String>> mapNamesInPackageToPackages() {
+            Map<String, Set<String>> nameToPackages = new HashMap<>();
+            Set<String> checkPackageForClasses = new HashSet<>();
+
+            for (JRightPadded<J.Import> anImport : originalImports) {
+                checkPackageForClasses.add(packageOrOuterClassName(anImport));
+                nameToPackages.computeIfAbsent(anImport.getElement().getClassName(), p -> new HashSet<>())
+                                .add(anImport.getElement().getPackageName());
+            }
+
+            for (JavaType.FullyQualified classGraphFqn : classpath) {
+                String packageName = classGraphFqn.getPackageName();
+                if (checkPackageForClasses.contains(packageName)) {
+                    String className = classGraphFqn.getClassName();
+                    Set<String> packages = nameToPackages.getOrDefault(className, new HashSet<>());
+                    packages.add(packageName);
+                    nameToPackages.put(className, packages);
+                } else if (checkPackageForClasses.contains(classGraphFqn.getFullyQualifiedName())) {
+                    packageName = classGraphFqn.getFullyQualifiedName();
+                    for (JavaType.Variable member : classGraphFqn.getMembers()) {
+                        if (member.getFlags().contains(Flag.Static)) {
+                            Set<String> packages = nameToPackages.getOrDefault(member.getName(), new HashSet<>());
+                            packages.add(packageName);
+                            nameToPackages.put(member.getName(), packages);
+                        }
+                    }
+
+                    for (JavaType.Method method : classGraphFqn.getMethods()) {
+                        if (method.getFlags().contains(Flag.Static)) {
+                            Set<String> packages = nameToPackages.getOrDefault(method.getName(), new HashSet<>());
+                            packages.add(packageName);
+                            nameToPackages.put(method.getName(), packages);
+                        }
+                    }
+                }
+            }
+            return nameToPackages;
+        }
+    }
+
+    /**
+     * A block represents a grouping of imports based on matching rules. The block provides a mechanism for matching
+     * and storing J.Imports that belong to the block.
+     */
+    public interface Block {
+
+        /**
+         * This method will determine if the passed in import is a match for the rules defined on the block. If the
+         * import is matched, it will be internally stored in the block.
+         *
+         * @param anImport The import to be compared against the block's matching rules.
+         * @return {@code true} if the import was a match
+         */
+        boolean accept(JRightPadded<J.Import> anImport);
+
+        /**
+         * @return Imports belonging to this block, folded appropriately.
+         */
+        List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStarImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold);
+
+        /**
+         * A specialized block implementation to act as a blank line separator between import groupings.
+         */
+        class BlankLines implements Block {
+            private int count = 1;
+
+            private int getCount() {
+                return count;
+            }
+
+            @Override
+            public boolean accept(JRightPadded<J.Import> anImport) {
+                return false;
+            }
+
+            @Override
+            public List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStartImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold) {
+                return emptyList();
+            }
+
+            @Override
+            public String toString() {
+                return "<blank line>" + (count > 1 ? " (x" + count + ")" : "");
+            }
+        }
+
+        @SuppressWarnings("deprecation")
+        class ImportPackage implements Block {
+
+            // VisibleForTesting
+            final static Comparator<JRightPadded<J.Import>> IMPORT_SORTING = (i1, i2) -> {
+                String[] import1 = i1.getElement().getQualid().printTrimmed().split("\\.");
+                String[] import2 = i2.getElement().getQualid().printTrimmed().split("\\.");
+
+                for (int i = 0; i < Math.min(import1.length, import2.length); i++) {
+                    int diff = import1[i].compareTo(import2[i]);
+                    if (diff != 0) {
+                        return diff;
+                    }
+                }
+
+                if (import1.length == import2.length) {
+                    return 0;
+                }
+
+                return import1.length > import2.length ? 1 : -1;
+            };
+
+            private final Boolean statik;
+            private final Pattern packageWildcard;
+
+            public ImportPackage(Boolean statik, String packageWildcard, boolean withSubpackages) {
+                this.statik = statik;
+                this.packageWildcard = Pattern.compile(packageWildcard
+                        .replace(".", "\\.")
+                        .replace("*", withSubpackages ? ".+" : "[^.]+"));
+            }
+
+            public boolean isStatic() {
+                return statik;
+            }
+
+            public Pattern getPackageWildcard() {
+                return packageWildcard;
+            }
+
+            @Override
+            public boolean accept(JRightPadded<J.Import> anImport) {
+                return anImport.getElement().isStatic() == statik &&
+                        packageWildcard.matcher(anImport.getElement().getQualid().printTrimmed()).matches();
+            }
+
+            @Override
+            public List<JRightPadded<J.Import>> orderedImports(LayoutState layoutState, int classCountToUseStarImport, int nameCountToUseStarImport, ImportLayoutConflictDetection importLayoutConflictDetection, List<Block> packagesToFold) {
+                List<JRightPadded<J.Import>> imports = layoutState.getImports(this);
+
+                Map<String, List<JRightPadded<J.Import>>> groupedImports = imports
+                        .stream()
+                        .sorted(IMPORT_SORTING)
+                        .collect(groupingBy(
+                                ImportLayoutStyle::packageOrOuterClassName,
+                                LinkedHashMap::new, // Use an ordered map to preserve sorting
+                                Collectors.toList()
+                        ));
+
+                List<JRightPadded<J.Import>> ordered = new ArrayList<>(imports.size());
+
+                for (List<JRightPadded<J.Import>> importGroup : groupedImports.values()) {
+                    JRightPadded<J.Import> toStar = importGroup.get(0);
+                    int threshold = toStar.getElement().isStatic() ? nameCountToUseStarImport : classCountToUseStarImport;
+                    boolean starImportExists = importGroup.stream()
+                            .anyMatch(it -> it.getElement().getQualid().getSimpleName().equals("*"));
+
+                    if (importLayoutConflictDetection.isPackageFoldable(packageOrOuterClassName(toStar)) &&
+                            (isPackageAlwaysFolded(packagesToFold, toStar.getElement()) || importGroup.size() >= threshold || (starImportExists && importGroup.size() > 1))) {
+
+                        J.FieldAccess qualid = toStar.getElement().getQualid();
+                        J.Identifier name = qualid.getName();
+
+                        Set<String> typeNamesInThisGroup = importGroup.stream()
+                                .map(im -> im.getElement().getClassName())
+                                .collect(Collectors.toSet());
+
+                        Optional<String> oneOfTheTypesIsInAnotherGroupToo = groupedImports.values().stream()
+                                .filter(group -> group != importGroup)
+                                .flatMap(group -> group.stream()
+                                        .filter(im -> typeNamesInThisGroup.contains(im.getElement().getClassName())))
+                                .map(im -> im.getElement().getTypeName())
+                                .findAny();
+
+                        if (starImportExists || !oneOfTheTypesIsInAnotherGroupToo.isPresent()) {
+                            ordered.add(toStar.withElement(toStar.getElement().withQualid(qualid.withName(name.withSimpleName("*")))));
+                            continue;
+                        }
+                    }
+
+                    Predicate<JRightPadded<J.Import>> predicate = distinctBy(t -> t.getElement().printTrimmed(new JavaPrinter<>()));
+                    for (JRightPadded<J.Import> importJRightPadded : importGroup) {
+                        if (predicate.test(importJRightPadded)) {
+                            ordered.add(importJRightPadded);
+                        }
+                    }
+                }
+
+                // interleaves inner classes and outer classes back together which are separated into different groups
+                // above for the sake of determining whether groups of outer class or inner class imports need to be star
+                // folded/unfolded
+                ordered.sort(IMPORT_SORTING);
+
+                return ordered;
+            }
+
+            @Override
+            public String toString() {
+                return "import " + (statik ? "static " : "") + packageWildcard;
+            }
+        }
+
+        class AllOthers extends Block.ImportPackage {
+            private final boolean statik;
+            private Collection<ImportPackage> packageImports = emptyList();
+
+            public AllOthers(boolean statik) {
+                super(statik, "*", true
+                );
+                this.statik = statik;
+            }
+
+            public void setPackageImports(Collection<ImportPackage> packageImports) {
+                this.packageImports = packageImports;
+            }
+
+            @Override
+            public boolean isStatic() {
+                return statik;
+            }
+
+            @Override
+            public boolean accept(JRightPadded<J.Import> anImport) {
+                for (ImportPackage pi : packageImports) {
+                    if (pi.accept(anImport)) {
+                        return false;
+                    }
+                }
+                return anImport.getElement().isStatic() == statik;
+            }
+
+            @Override
+            public String toString() {
+                return "import " + (statik ? "static " : "") + "all other imports";
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("classWildcards=")
+                .append(classCountToUseStarImport)
+                .append(", staticWildcards=")
+                .append(nameCountToUseStarImport)
+                .append('\n');
+        for (Block block : layout) {
+            s.append(block).append("\n");
+        }
+        return s.toString();
+    }
+
+    private static String packageOrOuterClassName(JRightPadded<J.Import> anImport) {
+        String typeName = anImport.getElement().getTypeName();
+        if (anImport.getElement().isStatic()) {
+            return typeName;
+        } else {
+            String className = anImport.getElement().getClassName();
+            if (className.contains("$")) {
+                return anImport.getElement().getPackageName() + "." +
+                        className.substring(0, className.lastIndexOf('$'))
+                                .replace('$', '.');
+            }
+            return anImport.getElement().getPackageName();
+        }
+    }
+}
+
+class Deserializer extends JsonDeserializer<ImportLayoutStyle> {
+    @Override
+    public ImportLayoutStyle deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        ImportLayoutStyle.Builder builder = ImportLayoutStyle.builder();
+        for (String currentField = null; p.hasCurrentToken() && p.getCurrentToken() != JsonToken.END_OBJECT; p.nextToken()) {
+            switch (p.currentToken()) {
+                case FIELD_NAME:
+                    currentField = p.getCurrentName();
+                    break;
+                case VALUE_STRING:
+                    if ("layout".equals(currentField)) {
+                        String block = p.getText().trim();
+                        if ("<blank line>".equals(block)) {
+                            builder.blankLine();
+                        } else if (block.startsWith("import ")) {
+                            block = block.substring("import ".length());
+                            boolean statik = false;
+                            if (block.startsWith("static")) {
+                                statik = true;
+                                block = block.substring("static ".length());
+                            }
+                            if ("all other imports".equals(block)) {
+                                if (statik) {
+                                    builder.importStaticAllOthers();
+                                } else {
+                                    builder.importAllOthers();
+                                }
+                            } else {
+                                boolean withSubpackages = !block.contains(" without subpackages");
+                                block = withSubpackages ? block : block.substring(0, block.indexOf(" without subpackage"));
+                                if (statik) {
+                                    builder.staticImportPackage(block, withSubpackages);
+                                } else {
+                                    builder.importPackage(block, withSubpackages);
+                                }
+                            }
+                        } else {
+                            throw new IllegalArgumentException("Syntax error in layout block [" + block + "]");
+                        }
+                    } else if ("packagesToFold".equals(currentField)) {
+                        String block = p.getText().trim();
+                        if (block.startsWith("import ")) {
+                            block = block.substring("import ".length());
+                            boolean statik = false;
+                            if (block.startsWith("static")) {
+                                statik = true;
+                                block = block.substring("static ".length());
+                            }
+                            boolean withSubpackages = !block.contains(" without subpackages");
+                            block = withSubpackages ? block : block.substring(0, block.indexOf(" without subpackage"));
+                            if (statik) {
+                                builder.staticPackageToFold(block, withSubpackages);
+                            } else {
+                                builder.packageToFold(block, withSubpackages);
+                            }
+                        }
+                    } else {
+                        break;
+                    }
+                    break;
+                case VALUE_NUMBER_INT:
+                    if ("classCountToUseStarImport".equals(currentField)) {
+                        builder.classCountToUseStarImport(p.getValueAsInt());
+                    } else if ("nameCountToUseStarImport".equals(currentField)) {
+                        builder.nameCountToUseStarImport(p.getValueAsInt());
+                    }
+                    break;
+            }
+        }
+
+        return builder.build();
+    }
+}
+
+class Serializer extends JsonSerializer<ImportLayoutStyle> {
+
+    @Override
+    public void serializeWithType(ImportLayoutStyle value, JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        WritableTypeId typeId = typeSer.typeId(value, JsonToken.START_OBJECT);
+        typeSer.writeTypePrefix(gen, typeId);
+        serializeFields(value, gen);
+        typeSer.writeTypeSuffix(gen, typeId);
+    }
+
+    @Override
+    public void serialize(ImportLayoutStyle value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        serializeFields(value, gen);
+        gen.writeEndObject();
+    }
+
+    private void serializeFields(ImportLayoutStyle value, JsonGenerator gen) throws IOException {
+        gen.writeNumberField("classCountToUseStarImport", value.getClassCountToUseStarImport());
+        gen.writeNumberField("nameCountToUseStarImport", value.getNameCountToUseStarImport());
+
+        @SuppressWarnings("SuspiciousToArrayCall") String[] blocks = value.getLayout().stream()
+                .map(block -> {
+                    if (block instanceof ImportLayoutStyle.Block.BlankLines) {
+                        return "<blank line>";
+                    } else if (block instanceof ImportLayoutStyle.Block.AllOthers) {
+                        return "import " + (((ImportLayoutStyle.Block.AllOthers) block).isStatic() ? "static " : "") +
+                                "all other imports";
+                    } else if (block instanceof ImportLayoutStyle.Block.ImportPackage) {
+                        ImportLayoutStyle.Block.ImportPackage importPackage = (ImportLayoutStyle.Block.ImportPackage) block;
+                        String withSubpackages = importPackage.getPackageWildcard().pattern().contains("[^.]+") ? " without subpackages" : "";
+                        return "import " + (importPackage.isStatic() ? "static " : "") + importPackage.getPackageWildcard().pattern()
+                                .replace("\\.", ".")
+                                .replace(".+", "*")
+                                .replace("[^.]+", "*") + withSubpackages;
+                    }
+                    return new UnsupportedOperationException("Unknown block type " + block.getClass().getName());
+                })
+                .toArray(String[]::new);
+
+        @SuppressWarnings("SuspiciousToArrayCall") String[] packagesToFold = value.getPackagesToFold().stream()
+                .map(block -> {
+                    if (block instanceof ImportLayoutStyle.Block.ImportPackage) {
+                        ImportLayoutStyle.Block.ImportPackage importPackage = (ImportLayoutStyle.Block.ImportPackage) block;
+                        String withSubpackages = importPackage.getPackageWildcard().pattern().contains("[^.]+") ? " without subpackages" : "";
+                        return "import " + (importPackage.isStatic() ? "static " : "") + importPackage.getPackageWildcard().pattern()
+                                .replace("\\.", ".")
+                                .replace(".+", "*")
+                                .replace("[^.]+", "*")  + withSubpackages;
+                    }
+                    return new UnsupportedOperationException("Unknown block type " + block.getClass().getName());
+                })
+                .toArray(String[]::new);
+
+        gen.writeArrayFieldStart("layout");
+        gen.writeArray(blocks, 0, blocks.length);
+        gen.writeEndArray();
+
+        gen.writeArrayFieldStart("packagesToFold");
+        gen.writeArray(packagesToFold, 0, packagesToFold.length);
+        gen.writeEndArray();
+    }
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/MethodParamPadStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/MethodParamPadStyle.java
index e1cd5ca3067..5cf7250131b 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/MethodParamPadStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/MethodParamPadStyle.java
@@ -1,60 +1,60 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import lombok.Value;
-import lombok.With;
-import org.openrewrite.style.Style;
-import org.openrewrite.style.StyleHelper;
-
-@Value
-@With
-public class MethodParamPadStyle implements Style {
-    /**
-     * Whether to add spacing between the method declarations (or method invocations) identifier and the start of the left parenthesis.
-     * <p>
-     * When true:
-     * <p>
-     * {@code method (a, b);}
-     * <p>
-     * When false:
-     * <p>
-     * {@code method(a, b);}
-     */
-    Boolean space;
-
-    /**
-     * Whether to allow a linebreak between the method declaration (or method invocation) identifier and the start of the left parenthesis.
-     * Note this does not add a linebreak if one is missing. It only controls whether a linebreak is permitted.
-     * <p>
-     * When true:
-     * <pre>{@code method // acceptable
-     *      (a, b);
-     * }</pre>
-     * <p>
-     * When false, the linebreak would be removed, becoming:
-     * <p>
-     * {@code method(a, b);}
-     * <p>
-     */
-    Boolean allowLineBreaks;
-
-    @Override
-    public Style applyDefaults() {
-        return StyleHelper.merge(Checkstyle.methodParamPadStyle(), this);
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.style.Style;
+import org.openrewrite.style.StyleHelper;
+
+@Value
+@With
+public class MethodParamPadStyle implements Style {
+    /**
+     * Whether to add spacing between the method declarations (or method invocations) identifier and the start of the left parenthesis.
+     * <p>
+     * When true:
+     * <p>
+     * {@code method (a, b);}
+     * <p>
+     * When false:
+     * <p>
+     * {@code method(a, b);}
+     */
+    Boolean space;
+
+    /**
+     * Whether to allow a linebreak between the method declaration (or method invocation) identifier and the start of the left parenthesis.
+     * Note this does not add a linebreak if one is missing. It only controls whether a linebreak is permitted.
+     * <p>
+     * When true:
+     * <pre>{@code method // acceptable
+     *      (a, b);
+     * }</pre>
+     * <p>
+     * When false, the linebreak would be removed, becoming:
+     * <p>
+     * {@code method(a, b);}
+     * <p>
+     */
+    Boolean allowLineBreaks;
+
+    @Override
+    public Style applyDefaults() {
+        return StyleHelper.merge(Checkstyle.methodParamPadStyle(), this);
+    }
+
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/TabsAndIndentsStyle.java b/rewrite-java/src/main/java/org/openrewrite/java/style/TabsAndIndentsStyle.java
index d6d8af84aba..0f04fbde7c2 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/TabsAndIndentsStyle.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/TabsAndIndentsStyle.java
@@ -1,40 +1,40 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style;
-
-import lombok.AccessLevel;
-import lombok.Value;
-import lombok.With;
-import lombok.experimental.FieldDefaults;
-import org.openrewrite.java.JavaStyle;
-import org.openrewrite.style.Style;
-import org.openrewrite.style.StyleHelper;
-
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@Value
-@With
-public class TabsAndIndentsStyle implements JavaStyle {
-    Boolean useTabCharacter;
-    Integer tabSize;
-    Integer indentSize;
-    Integer continuationIndent;
-    Boolean indentsRelativeToExpressionStart;
-
-    @Override
-    public Style applyDefaults() {
-        return StyleHelper.merge(IntelliJ.tabsAndIndents(), this);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style;
+
+import lombok.AccessLevel;
+import lombok.Value;
+import lombok.With;
+import lombok.experimental.FieldDefaults;
+import org.openrewrite.java.JavaStyle;
+import org.openrewrite.style.Style;
+import org.openrewrite.style.StyleHelper;
+
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@Value
+@With
+public class TabsAndIndentsStyle implements JavaStyle {
+    Boolean useTabCharacter;
+    Integer tabSize;
+    Integer indentSize;
+    Integer continuationIndent;
+    Boolean indentsRelativeToExpressionStart;
+
+    @Override
+    public Style applyDefaults() {
+        return StyleHelper.merge(IntelliJ.tabsAndIndents(), this);
+    }
+}
diff --git a/rewrite-java/src/main/resources/META-INF/rewrite/google-java-format.yml b/rewrite-java/src/main/resources/META-INF/rewrite/google-java-format.yml
index c389301b12f..2fcf9b6956a 100644
--- a/rewrite-java/src/main/resources/META-INF/rewrite/google-java-format.yml
+++ b/rewrite-java/src/main/resources/META-INF/rewrite/google-java-format.yml
@@ -1,27 +1,27 @@
-#
-# Copyright 2020 the original author or authors.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# <p>
-# https://www.apache.org/licenses/LICENSE-2.0
-# <p>
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
----
-type: specs.openrewrite.org/v1beta/style
-name: org.openrewrite.java.GoogleJavaFormat
-displayName: Google java format
-styleConfigs:
-  - org.openrewrite.java.style.ImportLayoutStyle:
-      classCountToUseStarImport: 999
-      nameCountToUseStarImport: 999
-      layout:
-        - import static all other imports
-        - <blank line>
-        - import all other imports
+#
+# Copyright 2020 the original author or authors.
+# <p>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# <p>
+# https://www.apache.org/licenses/LICENSE-2.0
+# <p>
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+type: specs.openrewrite.org/v1beta/style
+name: org.openrewrite.java.GoogleJavaFormat
+displayName: Google java format
+styleConfigs:
+  - org.openrewrite.java.style.ImportLayoutStyle:
+      classCountToUseStarImport: 999
+      nameCountToUseStarImport: 999
+      layout:
+        - import static all other imports
+        - <blank line>
+        - import all other imports
diff --git a/rewrite-java/src/test/kotlin/org/openrewrite/java/style/CheckstyleConfigLoaderTest.kt b/rewrite-java/src/test/kotlin/org/openrewrite/java/style/CheckstyleConfigLoaderTest.kt
index 803bf8e2dae..d407efdf91b 100755
--- a/rewrite-java/src/test/kotlin/org/openrewrite/java/style/CheckstyleConfigLoaderTest.kt
+++ b/rewrite-java/src/test/kotlin/org/openrewrite/java/style/CheckstyleConfigLoaderTest.kt
@@ -1,341 +1,341 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.style
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.java.style.CheckstyleConfigLoader.loadCheckstyleConfig
-
-class CheckstyleConfigLoaderTest {
-
-    @Test
-    fun basicSingleStyle() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="DefaultComesLast"/>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first())
-                .isExactlyInstanceOf(DefaultComesLastStyle::class.java)
-                .matches { (it as DefaultComesLastStyle).skipIfLastAndSharedWithCase == false }
-    }
-
-    @Test
-    fun singleStyleWithProperty() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="DefaultComesLast">
-                    <property name="skipIfLastAndSharedWithCase" value="true"/>
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first())
-                .isExactlyInstanceOf(DefaultComesLastStyle::class.java)
-                .matches { (it as DefaultComesLastStyle).skipIfLastAndSharedWithCase }
-    }
-
-    @Test
-    fun emptyBlockStyle() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="EmptyBlock">
-                    <property name="option" value="text" />
-                    <property name="tokens" value="LITERAL_WHILE, LITERAL_TRY"/>
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EmptyBlockStyle::class.java)
-        val blockStyle = checkstyle.styles.first() as EmptyBlockStyle
-
-        assertThat(blockStyle.blockPolicy).isEqualTo(EmptyBlockStyle.BlockPolicy.TEXT)
-        assertThat(blockStyle.literalWhile).isTrue
-        assertThat(blockStyle.literalTry).isTrue
-        assertThat(blockStyle.literalCatch).isFalse
-    }
-
-    @Test
-    fun equalsAvoidsNull() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="EqualsAvoidNull">
-                    <property name="ignoreEqualsIgnoreCase" value="true" />
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
-        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
-
-        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
-    }
-
-    @Test
-    fun insideTreeWalker() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="TreeWalker">
-                    <module name="EqualsAvoidNull">
-                        <property name="ignoreEqualsIgnoreCase" value="true" />
-                    </module>
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
-        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
-
-        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
-    }
-
-    @Test
-    fun moduleNameEndsWithCheck() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="EqualsAvoidNullCheck">
-                    <property name="ignoreEqualsIgnoreCase" value="true" />
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
-        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
-
-        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
-    }
-
-    @Test
-    fun emptyForPadInitializer() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="EmptyForInitializerPad">
-                <property name="option" value=" space"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-                .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EmptyForInitializerPadStyle::class.java)
-        val emptyForPadInitializerStyle = checkstyle.styles.first() as EmptyForInitializerPadStyle
-
-        assertThat(emptyForPadInitializerStyle.space).isTrue
-    }
-
-    @Test
-    fun methodParamPadStyle() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="MethodParamPad">
-                <property name="option" value=" space"/>
-                <property name="allowLineBreaks" value="true" />
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(MethodParamPadStyle::class.java)
-        val methodParamPadStyle = checkstyle.styles.first() as MethodParamPadStyle
-
-        assertThat(methodParamPadStyle.space).isTrue
-        assertThat(methodParamPadStyle.allowLineBreaks).isTrue
-    }
-
-    @Test
-    fun noWhitespaceAfterStyle() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="NoWhitespaceAfter">
-                <property name="allowLineBreaks" value="true"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NoWhitespaceAfterStyle::class.java)
-        val noWhitespaceAfterStyle = checkstyle.styles.first() as NoWhitespaceAfterStyle
-
-        assertThat(noWhitespaceAfterStyle.allowLineBreaks).isTrue
-    }
-
-    @Test
-    fun noWhitespaceBeforeStyle() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="NoWhitespaceBefore">
-                <property name="allowLineBreaks" value="true"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NoWhitespaceBeforeStyle::class.java)
-        val noWhitespaceBeforeStyle = checkstyle.styles.first() as NoWhitespaceBeforeStyle
-
-        assertThat(noWhitespaceBeforeStyle.allowLineBreaks).isTrue
-    }
-
-    @Test
-    fun needBraces() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="NeedBraces">
-                <property name="allowSingleLineStatement" value="true"/>
-                <property name="allowEmptyLoopBody" value="true"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NeedBracesStyle::class.java)
-        val needBracesStyle = checkstyle.styles.first() as NeedBracesStyle
-
-        assertThat(needBracesStyle.allowSingleLineStatement).isTrue
-        assertThat(needBracesStyle.allowEmptyLoopBody).isTrue
-    }
-
-    @Test
-    fun operatorWrap() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="OperatorWrap">
-                <property name="option" value="EOL"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(OperatorWrapStyle::class.java)
-        val operatorWrapStyle = checkstyle.styles.first() as OperatorWrapStyle
-
-        assertThat(operatorWrapStyle.wrapOption).isEqualTo(OperatorWrapStyle.WrapOption.EOL)
-    }
-
-    @Test
-    fun typecastParenPad() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-              <module name="TypecastParenPad">
-                <property name="option" value=" space"/>
-              </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles)
-            .hasSize(1)
-
-        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(TypecastParenPadStyle::class.java)
-        val needBracesStyle = checkstyle.styles.first() as TypecastParenPadStyle
-
-        assertThat(needBracesStyle.space).isTrue
-    }
-
-
-    @Test
-    fun duplicatedModuleNames() {
-        val checkstyle = loadCheckstyleConfig("""
-            <!DOCTYPE module PUBLIC
-                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
-                "https://checkstyle.org/dtds/configuration_1_2.dtd">
-            <module name="Checker">
-                <module name="UnnecessaryParentheses">
-                    <property name="id" value="expr"/>
-                    <property name="tokens" value="EXPR"/>
-                </module>
-                <module name="UnnecessaryParentheses">
-                    <property name="id" value="stringLiteral"/>
-                    <property name="tokens" value="STRING_LITERAL"/>
-                </module>
-            </module>
-        """.trimIndent(), emptyMap())
-
-        assertThat(checkstyle.styles).hasSize(2)
-        assertThat(checkstyle.styles).allMatch { it is UnnecessaryParenthesesStyle }
-
-        val unnecessaryParenthesesStyle = checkstyle.styles.first() as UnnecessaryParenthesesStyle
-        assertThat(unnecessaryParenthesesStyle.stringLiteral).isTrue
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.style
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.java.style.CheckstyleConfigLoader.loadCheckstyleConfig
+
+class CheckstyleConfigLoaderTest {
+
+    @Test
+    fun basicSingleStyle() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="DefaultComesLast"/>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first())
+                .isExactlyInstanceOf(DefaultComesLastStyle::class.java)
+                .matches { (it as DefaultComesLastStyle).skipIfLastAndSharedWithCase == false }
+    }
+
+    @Test
+    fun singleStyleWithProperty() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="DefaultComesLast">
+                    <property name="skipIfLastAndSharedWithCase" value="true"/>
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first())
+                .isExactlyInstanceOf(DefaultComesLastStyle::class.java)
+                .matches { (it as DefaultComesLastStyle).skipIfLastAndSharedWithCase }
+    }
+
+    @Test
+    fun emptyBlockStyle() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="EmptyBlock">
+                    <property name="option" value="text" />
+                    <property name="tokens" value="LITERAL_WHILE, LITERAL_TRY"/>
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EmptyBlockStyle::class.java)
+        val blockStyle = checkstyle.styles.first() as EmptyBlockStyle
+
+        assertThat(blockStyle.blockPolicy).isEqualTo(EmptyBlockStyle.BlockPolicy.TEXT)
+        assertThat(blockStyle.literalWhile).isTrue
+        assertThat(blockStyle.literalTry).isTrue
+        assertThat(blockStyle.literalCatch).isFalse
+    }
+
+    @Test
+    fun equalsAvoidsNull() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="EqualsAvoidNull">
+                    <property name="ignoreEqualsIgnoreCase" value="true" />
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
+        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
+
+        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
+    }
+
+    @Test
+    fun insideTreeWalker() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="TreeWalker">
+                    <module name="EqualsAvoidNull">
+                        <property name="ignoreEqualsIgnoreCase" value="true" />
+                    </module>
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
+        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
+
+        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
+    }
+
+    @Test
+    fun moduleNameEndsWithCheck() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="EqualsAvoidNullCheck">
+                    <property name="ignoreEqualsIgnoreCase" value="true" />
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EqualsAvoidsNullStyle::class.java)
+        val equalsAvoidsNullStyle = checkstyle.styles.first() as EqualsAvoidsNullStyle
+
+        assertThat(equalsAvoidsNullStyle.ignoreEqualsIgnoreCase).isTrue
+    }
+
+    @Test
+    fun emptyForPadInitializer() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="EmptyForInitializerPad">
+                <property name="option" value=" space"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+                .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(EmptyForInitializerPadStyle::class.java)
+        val emptyForPadInitializerStyle = checkstyle.styles.first() as EmptyForInitializerPadStyle
+
+        assertThat(emptyForPadInitializerStyle.space).isTrue
+    }
+
+    @Test
+    fun methodParamPadStyle() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="MethodParamPad">
+                <property name="option" value=" space"/>
+                <property name="allowLineBreaks" value="true" />
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(MethodParamPadStyle::class.java)
+        val methodParamPadStyle = checkstyle.styles.first() as MethodParamPadStyle
+
+        assertThat(methodParamPadStyle.space).isTrue
+        assertThat(methodParamPadStyle.allowLineBreaks).isTrue
+    }
+
+    @Test
+    fun noWhitespaceAfterStyle() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="NoWhitespaceAfter">
+                <property name="allowLineBreaks" value="true"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NoWhitespaceAfterStyle::class.java)
+        val noWhitespaceAfterStyle = checkstyle.styles.first() as NoWhitespaceAfterStyle
+
+        assertThat(noWhitespaceAfterStyle.allowLineBreaks).isTrue
+    }
+
+    @Test
+    fun noWhitespaceBeforeStyle() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="NoWhitespaceBefore">
+                <property name="allowLineBreaks" value="true"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NoWhitespaceBeforeStyle::class.java)
+        val noWhitespaceBeforeStyle = checkstyle.styles.first() as NoWhitespaceBeforeStyle
+
+        assertThat(noWhitespaceBeforeStyle.allowLineBreaks).isTrue
+    }
+
+    @Test
+    fun needBraces() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="NeedBraces">
+                <property name="allowSingleLineStatement" value="true"/>
+                <property name="allowEmptyLoopBody" value="true"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(NeedBracesStyle::class.java)
+        val needBracesStyle = checkstyle.styles.first() as NeedBracesStyle
+
+        assertThat(needBracesStyle.allowSingleLineStatement).isTrue
+        assertThat(needBracesStyle.allowEmptyLoopBody).isTrue
+    }
+
+    @Test
+    fun operatorWrap() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="OperatorWrap">
+                <property name="option" value="EOL"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(OperatorWrapStyle::class.java)
+        val operatorWrapStyle = checkstyle.styles.first() as OperatorWrapStyle
+
+        assertThat(operatorWrapStyle.wrapOption).isEqualTo(OperatorWrapStyle.WrapOption.EOL)
+    }
+
+    @Test
+    fun typecastParenPad() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+              <module name="TypecastParenPad">
+                <property name="option" value=" space"/>
+              </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles)
+            .hasSize(1)
+
+        assertThat(checkstyle.styles.first()).isExactlyInstanceOf(TypecastParenPadStyle::class.java)
+        val needBracesStyle = checkstyle.styles.first() as TypecastParenPadStyle
+
+        assertThat(needBracesStyle.space).isTrue
+    }
+
+
+    @Test
+    fun duplicatedModuleNames() {
+        val checkstyle = loadCheckstyleConfig("""
+            <!DOCTYPE module PUBLIC
+                "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+                "https://checkstyle.org/dtds/configuration_1_2.dtd">
+            <module name="Checker">
+                <module name="UnnecessaryParentheses">
+                    <property name="id" value="expr"/>
+                    <property name="tokens" value="EXPR"/>
+                </module>
+                <module name="UnnecessaryParentheses">
+                    <property name="id" value="stringLiteral"/>
+                    <property name="tokens" value="STRING_LITERAL"/>
+                </module>
+            </module>
+        """.trimIndent(), emptyMap())
+
+        assertThat(checkstyle.styles).hasSize(2)
+        assertThat(checkstyle.styles).allMatch { it is UnnecessaryParenthesesStyle }
+
+        val unnecessaryParenthesesStyle = checkstyle.styles.first() as UnnecessaryParenthesesStyle
+        assertThat(unnecessaryParenthesesStyle.stringLiteral).isTrue
+    }
+}
diff --git a/rewrite-json/src/test/kotlin/org/openrewrite/json/ChangeKeyTest.kt b/rewrite-json/src/test/kotlin/org/openrewrite/json/ChangeKeyTest.kt
index 948a9b9b6f3..aa12f445f5f 100755
--- a/rewrite-json/src/test/kotlin/org/openrewrite/json/ChangeKeyTest.kt
+++ b/rewrite-json/src/test/kotlin/org/openrewrite/json/ChangeKeyTest.kt
@@ -1,101 +1,101 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.json
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.Example
-
-class ChangeKeyTest : JsonRecipeTest {
-    @Test
-    fun simpleChangeRootKey() = assertChanged(
-        recipe = ChangeKey(
-            "$.description",
-            "\"newDescription\"",
-            null
-        ),
-        before = """
-            {
-              "id": "something",
-              "description": "desc",
-              "other": "whatever"
-            }
-        """,
-        after = """
-            {
-              "id": "something",
-              "newDescription": "desc",
-              "other": "whatever"
-            }
-        """
-    )
-
-    @Example
-    @Test
-    fun changeNestedKey() = assertChanged(
-        recipe = ChangeKey(
-            "$.metadata.name",
-            "\"name2\"",
-            null
-        ),
-        before = """
-            {
-              "apiVersion": "v1",
-              "metadata": {
-                "name": "monitoring-tools",
-                "namespace": "monitoring-tools"
-              }
-            }
-        """,
-        after = """
-            {
-              "apiVersion": "v1",
-              "metadata": {
-                "name2": "monitoring-tools",
-                "namespace": "monitoring-tools"
-              }
-            }
-        """
-    )
-
-    @Test
-    fun changeArrayKey() = assertChanged(
-        recipe = ChangeKey(
-            "$.subjects.kind",
-            "\"kind2\"",
-            null
-        ),
-        before = """
-            {
-              "subjects": [
-                {
-                  "kind": "ServiceAccount",
-                  "name": "monitoring-tools"
-                }
-              ]
-            }
-        """,
-        after = """
-            {
-              "subjects": [
-                {
-                  "kind2": "ServiceAccount",
-                  "name": "monitoring-tools"
-                }
-              ]
-            }
-        """
-    )
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.json
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.Example
+
+class ChangeKeyTest : JsonRecipeTest {
+    @Test
+    fun simpleChangeRootKey() = assertChanged(
+        recipe = ChangeKey(
+            "$.description",
+            "\"newDescription\"",
+            null
+        ),
+        before = """
+            {
+              "id": "something",
+              "description": "desc",
+              "other": "whatever"
+            }
+        """,
+        after = """
+            {
+              "id": "something",
+              "newDescription": "desc",
+              "other": "whatever"
+            }
+        """
+    )
+
+    @Example
+    @Test
+    fun changeNestedKey() = assertChanged(
+        recipe = ChangeKey(
+            "$.metadata.name",
+            "\"name2\"",
+            null
+        ),
+        before = """
+            {
+              "apiVersion": "v1",
+              "metadata": {
+                "name": "monitoring-tools",
+                "namespace": "monitoring-tools"
+              }
+            }
+        """,
+        after = """
+            {
+              "apiVersion": "v1",
+              "metadata": {
+                "name2": "monitoring-tools",
+                "namespace": "monitoring-tools"
+              }
+            }
+        """
+    )
+
+    @Test
+    fun changeArrayKey() = assertChanged(
+        recipe = ChangeKey(
+            "$.subjects.kind",
+            "\"kind2\"",
+            null
+        ),
+        before = """
+            {
+              "subjects": [
+                {
+                  "kind": "ServiceAccount",
+                  "name": "monitoring-tools"
+                }
+              ]
+            }
+        """,
+        after = """
+            {
+              "subjects": [
+                {
+                  "kind2": "ServiceAccount",
+                  "name": "monitoring-tools"
+                }
+              ]
+            }
+        """
+    )
+}
diff --git a/rewrite-maven/build.gradle.kts b/rewrite-maven/build.gradle.kts
index 535476b957a..230d519da76 100755
--- a/rewrite-maven/build.gradle.kts
+++ b/rewrite-maven/build.gradle.kts
@@ -1,100 +1,100 @@
-import nl.javadude.gradle.plugins.license.LicenseExtension
-
-plugins {
-    id("org.openrewrite.java-library")
-    id("org.openrewrite.maven-publish")
-}
-
-apply(plugin = "nebula.integtest-standalone")
-
-val integTestImplementation = configurations.getByName("integTestImplementation")
-
-dependencies {
-    api(project(":rewrite-xml"))
-    api("org.jetbrains:annotations:latest.release")
-
-    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
-
-    // Caffeine 2.x works with Java 8, Caffeine 3.x is Java 11 only.
-    implementation("com.github.ben-manes.caffeine:caffeine:2.+")
-
-    implementation("org.antlr:antlr4:4.9.+")
-    // FIXME: switch to `latest.release`
-    // when https://github.com/resilience4j/resilience4j/issues/1472 is resolved
-    implementation("io.github.resilience4j:resilience4j-retry:1.7.0")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:latest.release")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:latest.release")
-    implementation("com.fasterxml.jackson.module:jackson-module-jaxb-annotations:latest.release")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:latest.release")
-
-    implementation("org.slf4j:slf4j-api:1.7.+")
-
-    // needed by AddDependency
-    implementation(project(":rewrite-java"))
-
-    implementation("guru.nidi:graphviz-java:latest.release")
-
-    compileOnly("org.rocksdb:rocksdbjni:latest.release")
-    compileOnly(project(":rewrite-yaml"))
-    compileOnly(project(":rewrite-properties"))
-
-    implementation("io.micrometer:micrometer-core:1.+")
-
-    implementation("org.apache.commons:commons-text:latest.release")
-
-    integTestImplementation("org.eclipse.aether:aether-api:latest.release")
-    integTestImplementation("org.eclipse.aether:aether-spi:latest.release")
-    integTestImplementation("org.eclipse.aether:aether-util:latest.release")
-    integTestImplementation("org.eclipse.aether:aether-connector-basic:latest.release")
-    integTestImplementation("org.eclipse.aether:aether-transport-file:latest.release")
-    integTestImplementation("org.eclipse.aether:aether-transport-http:latest.release")
-    integTestImplementation("org.apache.maven:maven-aether-provider:latest.release")
-    integTestImplementation("org.apache.maven:maven-core:latest.release")
-    integTestImplementation("io.micrometer:micrometer-registry-prometheus:1.+")
-    integTestImplementation("org.rocksdb:rocksdbjni:latest.release")
-
-    integTestImplementation(project(":rewrite-java-11"))
-    integTestImplementation(project(":rewrite-properties"))
-    integTestImplementation(project(":rewrite-xml"))
-    integTestImplementation(project(":rewrite-yaml"))
-
-    testImplementation(project(":rewrite-test"))
-    testImplementation("ch.qos.logback:logback-classic:1.2.11")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")
-    testImplementation("org.mapdb:mapdb:latest.release")
-
-    testRuntimeOnly("org.mapdb:mapdb:latest.release")
-    testRuntimeOnly(project(":rewrite-java-11"))
-    testRuntimeOnly("org.rocksdb:rocksdbjni:latest.release")
-    testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin:latest.release")
-}
-
-tasks.register<JavaExec>("generateAntlrSources") {
-    main = "org.antlr.v4.Tool"
-
-    args = listOf(
-            "-o", "src/main/java/org/openrewrite/maven/internal/grammar",
-            "-package", "org.openrewrite.maven.internal.grammar",
-            "-visitor"
-    ) + fileTree("src/main/antlr").matching { include("**/*.g4") }.map { it.path }
-
-    classpath = sourceSets["main"].runtimeClasspath
-}
-
-tasks.withType<Javadoc> {
-    // generated ANTLR sources violate doclint
-    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
-
-    // TODO
-    // openrewrite/rewrite/rewrite-maven/src/main/java/org/openrewrite/maven/AddDependency.java:29: error: cannot find symbol
-    // @AllArgsConstructor(onConstructor_=@JsonCreator)
-    //                     ^
-    //   symbol:   method onConstructor_()
-    //   location: @interface AllArgsConstructor
-    // 1 error
-    exclude("**/VersionRangeParser**", "**/AddDependency**")
-}
-
-configure<LicenseExtension> {
-    excludePatterns.add("**/unresolvable.txt")
-}
+import nl.javadude.gradle.plugins.license.LicenseExtension
+
+plugins {
+    id("org.openrewrite.java-library")
+    id("org.openrewrite.maven-publish")
+}
+
+apply(plugin = "nebula.integtest-standalone")
+
+val integTestImplementation = configurations.getByName("integTestImplementation")
+
+dependencies {
+    api(project(":rewrite-xml"))
+    api("org.jetbrains:annotations:latest.release")
+
+    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
+
+    // Caffeine 2.x works with Java 8, Caffeine 3.x is Java 11 only.
+    implementation("com.github.ben-manes.caffeine:caffeine:2.+")
+
+    implementation("org.antlr:antlr4:4.9.+")
+    // FIXME: switch to `latest.release`
+    // when https://github.com/resilience4j/resilience4j/issues/1472 is resolved
+    implementation("io.github.resilience4j:resilience4j-retry:1.7.0")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:latest.release")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:latest.release")
+    implementation("com.fasterxml.jackson.module:jackson-module-jaxb-annotations:latest.release")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:latest.release")
+
+    implementation("org.slf4j:slf4j-api:1.7.+")
+
+    // needed by AddDependency
+    implementation(project(":rewrite-java"))
+
+    implementation("guru.nidi:graphviz-java:latest.release")
+
+    compileOnly("org.rocksdb:rocksdbjni:latest.release")
+    compileOnly(project(":rewrite-yaml"))
+    compileOnly(project(":rewrite-properties"))
+
+    implementation("io.micrometer:micrometer-core:1.+")
+
+    implementation("org.apache.commons:commons-text:latest.release")
+
+    integTestImplementation("org.eclipse.aether:aether-api:latest.release")
+    integTestImplementation("org.eclipse.aether:aether-spi:latest.release")
+    integTestImplementation("org.eclipse.aether:aether-util:latest.release")
+    integTestImplementation("org.eclipse.aether:aether-connector-basic:latest.release")
+    integTestImplementation("org.eclipse.aether:aether-transport-file:latest.release")
+    integTestImplementation("org.eclipse.aether:aether-transport-http:latest.release")
+    integTestImplementation("org.apache.maven:maven-aether-provider:latest.release")
+    integTestImplementation("org.apache.maven:maven-core:latest.release")
+    integTestImplementation("io.micrometer:micrometer-registry-prometheus:1.+")
+    integTestImplementation("org.rocksdb:rocksdbjni:latest.release")
+
+    integTestImplementation(project(":rewrite-java-11"))
+    integTestImplementation(project(":rewrite-properties"))
+    integTestImplementation(project(":rewrite-xml"))
+    integTestImplementation(project(":rewrite-yaml"))
+
+    testImplementation(project(":rewrite-test"))
+    testImplementation("ch.qos.logback:logback-classic:1.2.11")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")
+    testImplementation("org.mapdb:mapdb:latest.release")
+
+    testRuntimeOnly("org.mapdb:mapdb:latest.release")
+    testRuntimeOnly(project(":rewrite-java-11"))
+    testRuntimeOnly("org.rocksdb:rocksdbjni:latest.release")
+    testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin:latest.release")
+}
+
+tasks.register<JavaExec>("generateAntlrSources") {
+    main = "org.antlr.v4.Tool"
+
+    args = listOf(
+            "-o", "src/main/java/org/openrewrite/maven/internal/grammar",
+            "-package", "org.openrewrite.maven.internal.grammar",
+            "-visitor"
+    ) + fileTree("src/main/antlr").matching { include("**/*.g4") }.map { it.path }
+
+    classpath = sourceSets["main"].runtimeClasspath
+}
+
+tasks.withType<Javadoc> {
+    // generated ANTLR sources violate doclint
+    (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
+
+    // TODO
+    // openrewrite/rewrite/rewrite-maven/src/main/java/org/openrewrite/maven/AddDependency.java:29: error: cannot find symbol
+    // @AllArgsConstructor(onConstructor_=@JsonCreator)
+    //                     ^
+    //   symbol:   method onConstructor_()
+    //   location: @interface AllArgsConstructor
+    // 1 error
+    exclude("**/VersionRangeParser**", "**/AddDependency**")
+}
+
+configure<LicenseExtension> {
+    excludePatterns.add("**/unresolvable.txt")
+}
diff --git a/rewrite-maven/src/integTest/kotlin/org/openrewrite/maven/ParentModelResolver.java b/rewrite-maven/src/integTest/kotlin/org/openrewrite/maven/ParentModelResolver.java
index be1beb9cf78..62e86e9ae04 100644
--- a/rewrite-maven/src/integTest/kotlin/org/openrewrite/maven/ParentModelResolver.java
+++ b/rewrite-maven/src/integTest/kotlin/org/openrewrite/maven/ParentModelResolver.java
@@ -1,191 +1,191 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Parent;
-import org.apache.maven.model.Repository;
-import org.apache.maven.model.building.ModelSource;
-import org.apache.maven.model.building.ModelSource2;
-import org.apache.maven.model.resolution.InvalidRepositoryException;
-import org.apache.maven.model.resolution.ModelResolver;
-import org.apache.maven.model.resolution.UnresolvableModelException;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.ProjectModelResolver;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.impl.RemoteRepositoryManager;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.openrewrite.internal.lang.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class ParentModelResolver extends ProjectModelResolver {
-    private static final Logger logger = LoggerFactory.getLogger(ParentModelResolver.class);
-
-    public ParentModelResolver(RepositorySystemSession session,
-                               RepositorySystem resolver,
-                               RemoteRepositoryManager remoteRepositoryManager,
-                               List<RemoteRepository> repositories) {
-        super(session,
-                new RequestTrace(null),
-                resolver,
-                remoteRepositoryManager,
-                repositories.stream()
-                        .map(ParentModelResolver::httpsFallback)
-                        .collect(Collectors.toList()),
-                ProjectBuildingRequest.RepositoryMerging.POM_DOMINANT,
-                null);
-    }
-
-    /**
-     * Most repositories, at least the big public ones, in the maven ecosystem now require HTTPS.
-     * If a remote repository with an HTTP protocol comes in, check to see if the repository accepts HTTP connections
-     * and switch to HTTPS if it does not
-     */
-    private static RemoteRepository httpsFallback(RemoteRepository repository) {
-        RemoteRepository result = repository;
-        try {
-            if ("http".equals(repository.getProtocol())) {
-                URLConnection connection = URI.create(repository.getUrl()).toURL().openConnection();
-                if (connection instanceof HttpURLConnection) {
-                    HttpURLConnection httpConnection = (HttpURLConnection) connection;
-                    httpConnection.setRequestMethod("HEAD");
-                    if (httpConnection.getResponseCode() == 403) {
-                      result = new RemoteRepository.Builder(repository)
-                              .setUrl(repository.getUrl().replace("http:", "https:"))
-                              .build();
-                    }
-                }
-            }
-        } catch (IOException e) {
-            logger.warn("Unable to add repository with URL: {}", repository.getUrl(), e);
-        }
-        return result;
-    }
-
-    @Override
-    public void addRepository(Repository repository, boolean replace) throws InvalidRepositoryException {
-        try {
-            if (repository.getUrl().contains("http:")) {
-                URLConnection connection = URI.create(repository.getUrl()).toURL().openConnection();
-                if (connection instanceof HttpURLConnection) {
-                    HttpURLConnection httpConnection = (HttpURLConnection) connection;
-                    httpConnection.setRequestMethod("HEAD");
-                    if (httpConnection.getResponseCode() == 403) {
-                        repository.setUrl(repository.getUrl().replace("http:", "https:"));
-                    }
-                }
-            }
-            super.addRepository(repository, replace);
-        } catch (IOException e) {
-            logger.warn("Unable to add repository with URL: {}", repository.getUrl(), e);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ModelSource resolveModel(String groupId, String artifactId, String version) {
-        logger.trace("resolving model for: {}:{}", groupId, artifactId);
-
-        try {
-            return super.resolveModel(groupId, artifactId, version);
-        } catch (UnresolvableModelException e) {
-            logger.error("unable to resolve model", e);
-            return new UnresolvedModelSource(groupId, artifactId, version);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ModelSource resolveModel(Parent parent) {
-        return resolveModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ModelSource resolveModel(Dependency dependency) {
-        logger.trace("resolving model for: {}:{}", dependency.getGroupId(), dependency.getArtifactId());
-
-        try {
-            return super.resolveModel(dependency);
-        } catch (UnresolvableModelException e) {
-            logger.error("unable to resolve model", e);
-            return new UnresolvedModelSource(dependency.getGroupId(),
-                    dependency.getArtifactId(),
-                    dependency.getVersion());
-        }
-    }
-
-    @Override
-    public ModelResolver newCopy() {
-        return this;
-    }
-
-    private static class UnresolvedModelSource implements ModelSource2 {
-        private final String groupId;
-        private final String artifactId;
-        private final String version;
-
-        private UnresolvedModelSource(String groupId, String artifactId, String version) {
-            this.groupId = groupId;
-            this.artifactId = artifactId;
-            this.version = version;
-        }
-
-        @Nullable
-        @Override
-        public ModelSource2 getRelatedSource(String relPath) {
-            return null;
-        }
-
-        @Nullable
-        @Override
-        public URI getLocationURI() {
-            return null;
-        }
-
-        @Override
-        public InputStream getInputStream() {
-            String syntheticPom = "<project>\n" +
-                    "<modelVersion>4.0.0</modelVersion>\n" +
-                    "<packaging>pom</packaging>\n" +
-                    "<groupId>" + groupId + "</groupId>\n" +
-                    "<artifactId>" + artifactId + "</artifactId>\n" +
-                    "<version>" + version + "</version>\n" +
-                    "</project>";
-
-            return new ByteArrayInputStream(syntheticPom.getBytes(StandardCharsets.UTF_8));
-        }
-
-        @Nullable
-        @Override
-        public String getLocation() {
-            return null;
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.building.ModelSource;
+import org.apache.maven.model.building.ModelSource2;
+import org.apache.maven.model.resolution.InvalidRepositoryException;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.ProjectModelResolver;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.RequestTrace;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.openrewrite.internal.lang.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ParentModelResolver extends ProjectModelResolver {
+    private static final Logger logger = LoggerFactory.getLogger(ParentModelResolver.class);
+
+    public ParentModelResolver(RepositorySystemSession session,
+                               RepositorySystem resolver,
+                               RemoteRepositoryManager remoteRepositoryManager,
+                               List<RemoteRepository> repositories) {
+        super(session,
+                new RequestTrace(null),
+                resolver,
+                remoteRepositoryManager,
+                repositories.stream()
+                        .map(ParentModelResolver::httpsFallback)
+                        .collect(Collectors.toList()),
+                ProjectBuildingRequest.RepositoryMerging.POM_DOMINANT,
+                null);
+    }
+
+    /**
+     * Most repositories, at least the big public ones, in the maven ecosystem now require HTTPS.
+     * If a remote repository with an HTTP protocol comes in, check to see if the repository accepts HTTP connections
+     * and switch to HTTPS if it does not
+     */
+    private static RemoteRepository httpsFallback(RemoteRepository repository) {
+        RemoteRepository result = repository;
+        try {
+            if ("http".equals(repository.getProtocol())) {
+                URLConnection connection = URI.create(repository.getUrl()).toURL().openConnection();
+                if (connection instanceof HttpURLConnection) {
+                    HttpURLConnection httpConnection = (HttpURLConnection) connection;
+                    httpConnection.setRequestMethod("HEAD");
+                    if (httpConnection.getResponseCode() == 403) {
+                      result = new RemoteRepository.Builder(repository)
+                              .setUrl(repository.getUrl().replace("http:", "https:"))
+                              .build();
+                    }
+                }
+            }
+        } catch (IOException e) {
+            logger.warn("Unable to add repository with URL: {}", repository.getUrl(), e);
+        }
+        return result;
+    }
+
+    @Override
+    public void addRepository(Repository repository, boolean replace) throws InvalidRepositoryException {
+        try {
+            if (repository.getUrl().contains("http:")) {
+                URLConnection connection = URI.create(repository.getUrl()).toURL().openConnection();
+                if (connection instanceof HttpURLConnection) {
+                    HttpURLConnection httpConnection = (HttpURLConnection) connection;
+                    httpConnection.setRequestMethod("HEAD");
+                    if (httpConnection.getResponseCode() == 403) {
+                        repository.setUrl(repository.getUrl().replace("http:", "https:"));
+                    }
+                }
+            }
+            super.addRepository(repository, replace);
+        } catch (IOException e) {
+            logger.warn("Unable to add repository with URL: {}", repository.getUrl(), e);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public ModelSource resolveModel(String groupId, String artifactId, String version) {
+        logger.trace("resolving model for: {}:{}", groupId, artifactId);
+
+        try {
+            return super.resolveModel(groupId, artifactId, version);
+        } catch (UnresolvableModelException e) {
+            logger.error("unable to resolve model", e);
+            return new UnresolvedModelSource(groupId, artifactId, version);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public ModelSource resolveModel(Parent parent) {
+        return resolveModel(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public ModelSource resolveModel(Dependency dependency) {
+        logger.trace("resolving model for: {}:{}", dependency.getGroupId(), dependency.getArtifactId());
+
+        try {
+            return super.resolveModel(dependency);
+        } catch (UnresolvableModelException e) {
+            logger.error("unable to resolve model", e);
+            return new UnresolvedModelSource(dependency.getGroupId(),
+                    dependency.getArtifactId(),
+                    dependency.getVersion());
+        }
+    }
+
+    @Override
+    public ModelResolver newCopy() {
+        return this;
+    }
+
+    private static class UnresolvedModelSource implements ModelSource2 {
+        private final String groupId;
+        private final String artifactId;
+        private final String version;
+
+        private UnresolvedModelSource(String groupId, String artifactId, String version) {
+            this.groupId = groupId;
+            this.artifactId = artifactId;
+            this.version = version;
+        }
+
+        @Nullable
+        @Override
+        public ModelSource2 getRelatedSource(String relPath) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public URI getLocationURI() {
+            return null;
+        }
+
+        @Override
+        public InputStream getInputStream() {
+            String syntheticPom = "<project>\n" +
+                    "<modelVersion>4.0.0</modelVersion>\n" +
+                    "<packaging>pom</packaging>\n" +
+                    "<groupId>" + groupId + "</groupId>\n" +
+                    "<artifactId>" + artifactId + "</artifactId>\n" +
+                    "<version>" + version + "</version>\n" +
+                    "</project>";
+
+            return new ByteArrayInputStream(syntheticPom.getBytes(StandardCharsets.UTF_8));
+        }
+
+        @Nullable
+        @Override
+        public String getLocation() {
+            return null;
+        }
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java
index fae889937fa..5fa807554ed 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java
@@ -1,103 +1,103 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.xml.ChangeTagValueVisitor;
-import org.openrewrite.xml.tree.Xml;
-
-import java.util.Optional;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangeDependencyGroupIdAndArtifactId extends Recipe {
-    @Option(displayName = "Old groupId",
-            description = "The old groupId to replace. The groupId is the first part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "org.openrewrite.recipe")
-    String oldGroupId;
-
-    @Option(displayName = "Old artifactId",
-            description = "The old artifactId to replace. The artifactId is the second part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "rewrite-testing-frameworks")
-    String oldArtifactId;
-
-    @Option(displayName = "New groupId",
-            description = "The new groupId to use.",
-            example = "corp.internal.openrewrite.recipe")
-    String newGroupId;
-
-    @Option(displayName = "New artifactId",
-            description = "The new artifactId to use.",
-            example = "rewrite-testing-frameworks")
-    String newArtifactId;
-
-    @Option(displayName = "New version",
-            description = "The new version to use.",
-            example = "2.0.0",
-            required = false)
-    @Nullable
-    String newVersion;
-
-    @Override
-    public String getDisplayName() {
-        return "Change Maven dependency groupId, artifactId and optionally the version";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change the groupId, artifactId and optionally the version of a specified Maven dependency.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new MavenVisitor<ExecutionContext>() {
-            @Override
-            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
-                if (isDependencyTag(oldGroupId, oldArtifactId)) {
-                    Optional<Xml.Tag> groupIdTag = tag.getChild("groupId");
-                    boolean changed = false;
-                    if (groupIdTag.isPresent() && !newGroupId.equals(groupIdTag.get().getValue().orElse(null))) {
-                        doAfterVisit(new ChangeTagValueVisitor<>(groupIdTag.get(), newGroupId));
-                        changed = true;
-                    }
-                    Optional<Xml.Tag> artifactIdTag = tag.getChild("artifactId");
-                    if (artifactIdTag.isPresent() && !newArtifactId.equals(artifactIdTag.get().getValue().orElse(null))) {
-                        doAfterVisit(new ChangeTagValueVisitor<>(artifactIdTag.get(), newArtifactId));
-                        changed = true;
-                    }
-                    if (newVersion != null) {
-                        Optional<Xml.Tag> versionTag = tag.getChild("version");
-                        if (versionTag.isPresent() && !newVersion.equals(versionTag.get().getValue().orElse(null))) {
-                            doAfterVisit(new ChangeTagValueVisitor<>(versionTag.get(), newVersion));
-                            changed = true;
-                        }
-                    }
-                    if (changed) {
-                        maybeUpdateModel();
-                    }
-                }
-
-                return super.visitTag(tag, ctx);
-            }
-        };
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.xml.ChangeTagValueVisitor;
+import org.openrewrite.xml.tree.Xml;
+
+import java.util.Optional;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangeDependencyGroupIdAndArtifactId extends Recipe {
+    @Option(displayName = "Old groupId",
+            description = "The old groupId to replace. The groupId is the first part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "org.openrewrite.recipe")
+    String oldGroupId;
+
+    @Option(displayName = "Old artifactId",
+            description = "The old artifactId to replace. The artifactId is the second part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "rewrite-testing-frameworks")
+    String oldArtifactId;
+
+    @Option(displayName = "New groupId",
+            description = "The new groupId to use.",
+            example = "corp.internal.openrewrite.recipe")
+    String newGroupId;
+
+    @Option(displayName = "New artifactId",
+            description = "The new artifactId to use.",
+            example = "rewrite-testing-frameworks")
+    String newArtifactId;
+
+    @Option(displayName = "New version",
+            description = "The new version to use.",
+            example = "2.0.0",
+            required = false)
+    @Nullable
+    String newVersion;
+
+    @Override
+    public String getDisplayName() {
+        return "Change Maven dependency groupId, artifactId and optionally the version";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change the groupId, artifactId and optionally the version of a specified Maven dependency.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new MavenVisitor<ExecutionContext>() {
+            @Override
+            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
+                if (isDependencyTag(oldGroupId, oldArtifactId)) {
+                    Optional<Xml.Tag> groupIdTag = tag.getChild("groupId");
+                    boolean changed = false;
+                    if (groupIdTag.isPresent() && !newGroupId.equals(groupIdTag.get().getValue().orElse(null))) {
+                        doAfterVisit(new ChangeTagValueVisitor<>(groupIdTag.get(), newGroupId));
+                        changed = true;
+                    }
+                    Optional<Xml.Tag> artifactIdTag = tag.getChild("artifactId");
+                    if (artifactIdTag.isPresent() && !newArtifactId.equals(artifactIdTag.get().getValue().orElse(null))) {
+                        doAfterVisit(new ChangeTagValueVisitor<>(artifactIdTag.get(), newArtifactId));
+                        changed = true;
+                    }
+                    if (newVersion != null) {
+                        Optional<Xml.Tag> versionTag = tag.getChild("version");
+                        if (versionTag.isPresent() && !newVersion.equals(versionTag.get().getValue().orElse(null))) {
+                            doAfterVisit(new ChangeTagValueVisitor<>(versionTag.get(), newVersion));
+                            changed = true;
+                        }
+                    }
+                    if (changed) {
+                        maybeUpdateModel();
+                    }
+                }
+
+                return super.visitTag(tag, ctx);
+            }
+        };
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyScope.java b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyScope.java
index 319b03401ba..7250c0e0a90 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyScope.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyScope.java
@@ -1,93 +1,93 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.xml.AddToTagVisitor;
-import org.openrewrite.xml.ChangeTagValueVisitor;
-import org.openrewrite.xml.RemoveContentVisitor;
-import org.openrewrite.xml.tree.Xml;
-
-import java.util.Optional;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangeDependencyScope extends Recipe {
-
-    @Option(displayName = "Group",
-            description = "The first part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "com.google.guava")
-    String groupId;
-
-    @Option(displayName = "Artifact",
-            description = "The second part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "guava")
-    String artifactId;
-
-    /**
-     * If null, strips the scope from an existing dependency.
-     */
-    @Option(displayName = "New scope",
-            description = "Scope to apply to specified Maven dependency. " +
-                    "May be omitted, which indicates that no scope should be added and any existing scope be removed from the dependency.",
-            valid = {"compile", "test", "runtime", "provided"},
-            example = "compile",
-            required = false)
-    @Nullable
-    String newScope;
-
-    @Override
-    public String getDisplayName() {
-        return "Change Maven dependency scope";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Add or alter the scope of the specified dependency.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new MavenVisitor<ExecutionContext>() {
-            @Override
-            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
-                if (isDependencyTag()) {
-                    if (groupId.equals(tag.getChildValue("groupId").orElse(getResolutionResult().getPom().getGroupId())) &&
-                            artifactId.equals(tag.getChildValue("artifactId").orElse(null))) {
-                        Optional<Xml.Tag> scope = tag.getChild("scope");
-                        if (scope.isPresent()) {
-                            if (newScope == null) {
-                                doAfterVisit(new RemoveContentVisitor<>(scope.get(), false));
-                            } else if (!newScope.equals(scope.get().getValue().orElse(null))) {
-                                doAfterVisit(new ChangeTagValueVisitor<>(scope.get(), newScope));
-                            }
-                        } else if (newScope != null) {
-                            doAfterVisit(new AddToTagVisitor<>(tag, Xml.Tag.build("<scope>" + newScope + "</scope>")));
-                        }
-                    }
-                }
-
-                return super.visitTag(tag, ctx);
-            }
-        };
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.xml.AddToTagVisitor;
+import org.openrewrite.xml.ChangeTagValueVisitor;
+import org.openrewrite.xml.RemoveContentVisitor;
+import org.openrewrite.xml.tree.Xml;
+
+import java.util.Optional;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangeDependencyScope extends Recipe {
+
+    @Option(displayName = "Group",
+            description = "The first part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "com.google.guava")
+    String groupId;
+
+    @Option(displayName = "Artifact",
+            description = "The second part of a dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "guava")
+    String artifactId;
+
+    /**
+     * If null, strips the scope from an existing dependency.
+     */
+    @Option(displayName = "New scope",
+            description = "Scope to apply to specified Maven dependency. " +
+                    "May be omitted, which indicates that no scope should be added and any existing scope be removed from the dependency.",
+            valid = {"compile", "test", "runtime", "provided"},
+            example = "compile",
+            required = false)
+    @Nullable
+    String newScope;
+
+    @Override
+    public String getDisplayName() {
+        return "Change Maven dependency scope";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Add or alter the scope of the specified dependency.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new MavenVisitor<ExecutionContext>() {
+            @Override
+            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
+                if (isDependencyTag()) {
+                    if (groupId.equals(tag.getChildValue("groupId").orElse(getResolutionResult().getPom().getGroupId())) &&
+                            artifactId.equals(tag.getChildValue("artifactId").orElse(null))) {
+                        Optional<Xml.Tag> scope = tag.getChild("scope");
+                        if (scope.isPresent()) {
+                            if (newScope == null) {
+                                doAfterVisit(new RemoveContentVisitor<>(scope.get(), false));
+                            } else if (!newScope.equals(scope.get().getValue().orElse(null))) {
+                                doAfterVisit(new ChangeTagValueVisitor<>(scope.get(), newScope));
+                            }
+                        } else if (newScope != null) {
+                            doAfterVisit(new AddToTagVisitor<>(tag, Xml.Tag.build("<scope>" + newScope + "</scope>")));
+                        }
+                    }
+                }
+
+                return super.visitTag(tag, ctx);
+            }
+        };
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java
index dfc351c193f..69f1926f135 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java
@@ -1,104 +1,104 @@
-/*
- * Copyright 2022 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import java.util.Optional;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.xml.ChangeTagValueVisitor;
-import org.openrewrite.xml.tree.Xml;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangeManagedDependencyGroupIdAndArtifactId extends Recipe {
-    @Option(displayName = "Old groupId",
-            description = "The old groupId to replace. The groupId is the first part of a managed dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "org.openrewrite.recipe")
-    String oldGroupId;
-
-    @Option(displayName = "Old artifactId",
-            description = "The old artifactId to replace. The artifactId is the second part of a managed dependency coordinate 'com.google.guava:guava:VERSION'.",
-            example = "rewrite-testing-frameworks")
-    String oldArtifactId;
-
-    @Option(displayName = "New groupId",
-            description = "The new groupId to use.",
-            example = "corp.internal.openrewrite.recipe")
-    String newGroupId;
-
-    @Option(displayName = "New artifactId",
-            description = "The new artifactId to use.",
-            example = "rewrite-testing-frameworks")
-    String newArtifactId;
-
-    @Option(displayName = "New version",
-            description = "The new version to use.",
-            example = "2.0.0",
-            required = false)
-    @Nullable
-    String newVersion;
-
-    @Override
-    public String getDisplayName() {
-        return "Change Maven managed dependency groupId, artifactId and optionally the version";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change the groupId, artifactId and optionally the version of a specified Maven managed dependency.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new MavenVisitor<ExecutionContext>() {
-            @Override
-            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
-                if (isManagedDependencyTag(oldGroupId, oldArtifactId)) {
-                    Optional<Xml.Tag> groupIdTag = tag.getChild("groupId");
-                    boolean changed = false;
-                    if (groupIdTag.isPresent() && !newGroupId.equals(groupIdTag.get().getValue().orElse(null))) {
-                        doAfterVisit(new ChangeTagValueVisitor<>(groupIdTag.get(), newGroupId));
-                        changed = true;
-                    }
-                    Optional<Xml.Tag> artifactIdTag = tag.getChild("artifactId");
-                    if (artifactIdTag.isPresent() && !newArtifactId.equals(artifactIdTag.get().getValue().orElse(null))) {
-                        doAfterVisit(new ChangeTagValueVisitor<>(artifactIdTag.get(), newArtifactId));
-                        changed = true;
-                    }
-                    if (newVersion != null) {
-                        Optional<Xml.Tag> versionTag = tag.getChild("version");
-                        if (versionTag.isPresent() && !newVersion.equals(versionTag.get().getValue().orElse(null))) {
-                            doAfterVisit(new ChangeTagValueVisitor<>(versionTag.get(), newVersion));
-                            changed = true;
-                        }
-                    }
-                    if (changed) {
-                        maybeUpdateModel();
-                    }
-                }
-
-                return super.visitTag(tag, ctx);
-            }
-        };
-    }
-}
+/*
+ * Copyright 2022 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import java.util.Optional;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.xml.ChangeTagValueVisitor;
+import org.openrewrite.xml.tree.Xml;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangeManagedDependencyGroupIdAndArtifactId extends Recipe {
+    @Option(displayName = "Old groupId",
+            description = "The old groupId to replace. The groupId is the first part of a managed dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "org.openrewrite.recipe")
+    String oldGroupId;
+
+    @Option(displayName = "Old artifactId",
+            description = "The old artifactId to replace. The artifactId is the second part of a managed dependency coordinate 'com.google.guava:guava:VERSION'.",
+            example = "rewrite-testing-frameworks")
+    String oldArtifactId;
+
+    @Option(displayName = "New groupId",
+            description = "The new groupId to use.",
+            example = "corp.internal.openrewrite.recipe")
+    String newGroupId;
+
+    @Option(displayName = "New artifactId",
+            description = "The new artifactId to use.",
+            example = "rewrite-testing-frameworks")
+    String newArtifactId;
+
+    @Option(displayName = "New version",
+            description = "The new version to use.",
+            example = "2.0.0",
+            required = false)
+    @Nullable
+    String newVersion;
+
+    @Override
+    public String getDisplayName() {
+        return "Change Maven managed dependency groupId, artifactId and optionally the version";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change the groupId, artifactId and optionally the version of a specified Maven managed dependency.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new MavenVisitor<ExecutionContext>() {
+            @Override
+            public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
+                if (isManagedDependencyTag(oldGroupId, oldArtifactId)) {
+                    Optional<Xml.Tag> groupIdTag = tag.getChild("groupId");
+                    boolean changed = false;
+                    if (groupIdTag.isPresent() && !newGroupId.equals(groupIdTag.get().getValue().orElse(null))) {
+                        doAfterVisit(new ChangeTagValueVisitor<>(groupIdTag.get(), newGroupId));
+                        changed = true;
+                    }
+                    Optional<Xml.Tag> artifactIdTag = tag.getChild("artifactId");
+                    if (artifactIdTag.isPresent() && !newArtifactId.equals(artifactIdTag.get().getValue().orElse(null))) {
+                        doAfterVisit(new ChangeTagValueVisitor<>(artifactIdTag.get(), newArtifactId));
+                        changed = true;
+                    }
+                    if (newVersion != null) {
+                        Optional<Xml.Tag> versionTag = tag.getChild("version");
+                        if (versionTag.isPresent() && !newVersion.equals(versionTag.get().getValue().orElse(null))) {
+                            doAfterVisit(new ChangeTagValueVisitor<>(versionTag.get(), newVersion));
+                            changed = true;
+                        }
+                    }
+                    if (changed) {
+                        maybeUpdateModel();
+                    }
+                }
+
+                return super.visitTag(tag, ctx);
+            }
+        };
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangePropertyValue.java b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangePropertyValue.java
index 5f608c49a89..cfad5eb9e8d 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangePropertyValue.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangePropertyValue.java
@@ -1,97 +1,97 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.xml.AddToTagVisitor;
-import org.openrewrite.xml.ChangeTagValueVisitor;
-import org.openrewrite.xml.TagNameComparator;
-import org.openrewrite.xml.format.AutoFormatVisitor;
-import org.openrewrite.xml.tree.Xml;
-
-import java.util.Optional;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangePropertyValue extends Recipe {
-
-    @Option(displayName = "Key",
-            description = "The name of the property key whose value is to be changed.",
-            example = "junit.version")
-    String key;
-
-    @Option(displayName = "Value",
-            description = "Value to apply to the matching property.",
-            example = "4.13")
-    String newValue;
-
-    @Option(displayName = "Add If Missing",
-            description = "Add the property if it is missing from the pom file.",
-            required = false,
-            example = "false")
-    @Nullable
-    Boolean addIfMissing;
-
-    @Override
-    public String getDisplayName() {
-        return "Change Maven project property value";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Changes the specified Maven project property value leaving the key intact.";
-    }
-
-    @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new MavenIsoVisitor<ExecutionContext>() {
-            final String propertyName = key.replace("${", "").replace("}", "");
-
-            @Override
-            public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
-                Xml.Document d = super.visitDocument(document, ctx);
-
-                if (Boolean.TRUE.equals(addIfMissing)) {
-                    Xml.Tag root = d.getRoot();
-                    Optional<Xml.Tag> properties = root.getChild("properties");
-                    if (!properties.isPresent()) {
-                        Xml.Tag propertiesTag = Xml.Tag.build("<properties>\n<" + propertyName + ">" + newValue + "</" + propertyName + ">\n</properties>");
-                        d = (Xml.Document) new AddToTagVisitor<ExecutionContext>(root, propertiesTag, new MavenTagInsertionComparator(root.getChildren())).visitNonNull(d, ctx);
-                    } else if (!properties.get().getChildValue(propertyName).isPresent()) {
-                        Xml.Tag propertyTag = Xml.Tag.build("<" + propertyName + ">" + newValue + "</" + propertyName + ">");
-                        d = (Xml.Document) new AddToTagVisitor<>(properties.get(), propertyTag, new TagNameComparator()).visitNonNull(d, ctx);
-                    }
-                }
-                return d;
-            }
-
-            @Override
-            public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
-                if (isPropertyTag() && propertyName.equals(tag.getName()) &&
-                        !newValue.equals(tag.getValue().orElse(null))) {
-                    doAfterVisit(new ChangeTagValueVisitor<>(tag, newValue));
-                }
-                return super.visitTag(tag, ctx);
-            }
-        };
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.xml.AddToTagVisitor;
+import org.openrewrite.xml.ChangeTagValueVisitor;
+import org.openrewrite.xml.TagNameComparator;
+import org.openrewrite.xml.format.AutoFormatVisitor;
+import org.openrewrite.xml.tree.Xml;
+
+import java.util.Optional;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangePropertyValue extends Recipe {
+
+    @Option(displayName = "Key",
+            description = "The name of the property key whose value is to be changed.",
+            example = "junit.version")
+    String key;
+
+    @Option(displayName = "Value",
+            description = "Value to apply to the matching property.",
+            example = "4.13")
+    String newValue;
+
+    @Option(displayName = "Add If Missing",
+            description = "Add the property if it is missing from the pom file.",
+            required = false,
+            example = "false")
+    @Nullable
+    Boolean addIfMissing;
+
+    @Override
+    public String getDisplayName() {
+        return "Change Maven project property value";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Changes the specified Maven project property value leaving the key intact.";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new MavenIsoVisitor<ExecutionContext>() {
+            final String propertyName = key.replace("${", "").replace("}", "");
+
+            @Override
+            public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
+                Xml.Document d = super.visitDocument(document, ctx);
+
+                if (Boolean.TRUE.equals(addIfMissing)) {
+                    Xml.Tag root = d.getRoot();
+                    Optional<Xml.Tag> properties = root.getChild("properties");
+                    if (!properties.isPresent()) {
+                        Xml.Tag propertiesTag = Xml.Tag.build("<properties>\n<" + propertyName + ">" + newValue + "</" + propertyName + ">\n</properties>");
+                        d = (Xml.Document) new AddToTagVisitor<ExecutionContext>(root, propertiesTag, new MavenTagInsertionComparator(root.getChildren())).visitNonNull(d, ctx);
+                    } else if (!properties.get().getChildValue(propertyName).isPresent()) {
+                        Xml.Tag propertyTag = Xml.Tag.build("<" + propertyName + ">" + newValue + "</" + propertyName + ">");
+                        d = (Xml.Document) new AddToTagVisitor<>(properties.get(), propertyTag, new TagNameComparator()).visitNonNull(d, ctx);
+                    }
+                }
+                return d;
+            }
+
+            @Override
+            public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
+                if (isPropertyTag() && propertyName.equals(tag.getName()) &&
+                        !newValue.equals(tag.getValue().orElse(null))) {
+                    doAfterVisit(new ChangeTagValueVisitor<>(tag, newValue));
+                }
+                return super.visitTag(tag, ctx);
+            }
+        };
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenTagInsertionComparator.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenTagInsertionComparator.java
index 127f918a068..dc663fe21bb 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenTagInsertionComparator.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenTagInsertionComparator.java
@@ -1,112 +1,112 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import org.openrewrite.xml.tree.Content;
-import org.openrewrite.xml.tree.Xml;
-
-import java.util.*;
-
-/**
- * Helps to insert a new POM element in the most idiomatic
- * place possible while preserving the existing order of the already
- * present elements.
- * <p>
- * So we'll prefer to insert a dependencies block after
- * GAV coordinates, SCM, properties, but before plugins.
- * "After" ordering preference takes priority over "before".
- */
-public class MavenTagInsertionComparator implements Comparator<Content> {
-    private static final List<String> canonicalOrdering = Arrays.asList(
-            "modelVersion",
-            "parent",
-            "groupId",
-            "artifactId",
-            "version",
-            "packaging",
-            "name",
-            "description",
-            "url",
-            "inceptionYear",
-            "organization",
-            "licenses",
-            "developers",
-            "contributors",
-            "mailingLists",
-            "prerequisites",
-            "modules",
-            "scm",
-            "issueManagement",
-            "ciManagement",
-            "distributionManagement",
-            "properties",
-            "dependencyManagement",
-            "dependencies",
-            "repositories",
-            "pluginRepositories",
-            "build",
-            "reports",
-            "reporting",
-            "profiles"
-    );
-
-    private final Map<Content, Integer> existingIndices = new IdentityHashMap<>();
-
-    public MavenTagInsertionComparator(List<? extends Content> existingTags) {
-        for (int i = 0; i < existingTags.size(); i++) {
-            existingIndices.put(existingTags.get(i), i);
-        }
-    }
-
-    @Override
-    public int compare(Content c1,Content c2) {
-        if (!(c1 instanceof Xml.Tag) || !(c2 instanceof Xml.Tag)) {
-            return 1;
-        }
-
-        Xml.Tag t1 = (Xml.Tag) c1;
-        Xml.Tag t2 = (Xml.Tag) c2;
-        int i1 = existingIndices.getOrDefault(t1, -1);
-        int i2 = existingIndices.getOrDefault(t2, -1);
-
-        if (i1 == -1) {
-            if (i2 == -1) {
-                return canonicalOrdering.indexOf(t1.getName()) -
-                        canonicalOrdering.indexOf(t2.getName());
-            } else {
-                // trying to place a new t1
-                for (int i = 0; i < canonicalOrdering.indexOf(t2.getName()); i++) {
-                    if (canonicalOrdering.get(i).equals(t1.getName())) {
-                        return -1;
-                    }
-                }
-                return 1;
-            }
-        } else {
-            if (i2 == -1) {
-                // trying to place a new t2
-                for (int i = 0; i < canonicalOrdering.indexOf(t1.getName()); i++) {
-                    if (canonicalOrdering.get(i).equals(t2.getName())) {
-                        return 1;
-                    }
-                }
-                return -1;
-            } else {
-                return i1 - i2;
-            }
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import org.openrewrite.xml.tree.Content;
+import org.openrewrite.xml.tree.Xml;
+
+import java.util.*;
+
+/**
+ * Helps to insert a new POM element in the most idiomatic
+ * place possible while preserving the existing order of the already
+ * present elements.
+ * <p>
+ * So we'll prefer to insert a dependencies block after
+ * GAV coordinates, SCM, properties, but before plugins.
+ * "After" ordering preference takes priority over "before".
+ */
+public class MavenTagInsertionComparator implements Comparator<Content> {
+    private static final List<String> canonicalOrdering = Arrays.asList(
+            "modelVersion",
+            "parent",
+            "groupId",
+            "artifactId",
+            "version",
+            "packaging",
+            "name",
+            "description",
+            "url",
+            "inceptionYear",
+            "organization",
+            "licenses",
+            "developers",
+            "contributors",
+            "mailingLists",
+            "prerequisites",
+            "modules",
+            "scm",
+            "issueManagement",
+            "ciManagement",
+            "distributionManagement",
+            "properties",
+            "dependencyManagement",
+            "dependencies",
+            "repositories",
+            "pluginRepositories",
+            "build",
+            "reports",
+            "reporting",
+            "profiles"
+    );
+
+    private final Map<Content, Integer> existingIndices = new IdentityHashMap<>();
+
+    public MavenTagInsertionComparator(List<? extends Content> existingTags) {
+        for (int i = 0; i < existingTags.size(); i++) {
+            existingIndices.put(existingTags.get(i), i);
+        }
+    }
+
+    @Override
+    public int compare(Content c1,Content c2) {
+        if (!(c1 instanceof Xml.Tag) || !(c2 instanceof Xml.Tag)) {
+            return 1;
+        }
+
+        Xml.Tag t1 = (Xml.Tag) c1;
+        Xml.Tag t2 = (Xml.Tag) c2;
+        int i1 = existingIndices.getOrDefault(t1, -1);
+        int i2 = existingIndices.getOrDefault(t2, -1);
+
+        if (i1 == -1) {
+            if (i2 == -1) {
+                return canonicalOrdering.indexOf(t1.getName()) -
+                        canonicalOrdering.indexOf(t2.getName());
+            } else {
+                // trying to place a new t1
+                for (int i = 0; i < canonicalOrdering.indexOf(t2.getName()); i++) {
+                    if (canonicalOrdering.get(i).equals(t1.getName())) {
+                        return -1;
+                    }
+                }
+                return 1;
+            }
+        } else {
+            if (i2 == -1) {
+                // trying to place a new t2
+                for (int i = 0; i < canonicalOrdering.indexOf(t1.getName()); i++) {
+                    if (canonicalOrdering.get(i).equals(t2.getName())) {
+                        return 1;
+                    }
+                }
+                return -1;
+            } else {
+                return i1 - i2;
+            }
+        }
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeParentVersion.java b/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeParentVersion.java
index d24407b3333..58a113cb7b2 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeParentVersion.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeParentVersion.java
@@ -1,97 +1,97 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Option;
-import org.openrewrite.Recipe;
-import org.openrewrite.Validated;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.semver.Semver;
-
-@EqualsAndHashCode(callSuper = true)
-public class UpgradeParentVersion extends Recipe {
-
-    public UpgradeParentVersion(String groupId, String artifactId, String newVersion, @Nullable String versionPattern) {
-        this.groupId = groupId;
-        this.artifactId = artifactId;
-        this.newVersion = newVersion;
-        this.versionPattern = versionPattern;
-        changeParentPom = new ChangeParentPom(groupId, groupId, artifactId, artifactId, newVersion, versionPattern, false);
-    }
-
-    @Option(displayName = "Group",
-            description = "The first part of a dependency coordinate 'org.springframework.boot:spring-boot-parent:VERSION'.",
-            example = "org.springframework.boot")
-    @Getter
-    private final String groupId;
-
-    @Option(displayName = "Artifact",
-            description = "The second part of a dependency coordinate 'org.springframework.boot:spring-boot-parent:VERSION'.",
-            example = "spring-boot-parent")
-    @Getter
-    private final String artifactId;
-
-    @Option(displayName = "New version",
-            description = "An exact version number, or node-style semver selector used to select the version number.",
-            example = "29.X")
-    @Getter
-    private final String newVersion;
-
-    @Option(displayName = "Version pattern",
-            description = "Allows version selection to be extended beyond the original Node Semver semantics. So for example," +
-                    "Setting 'version' to \"25-29\" can be paired with a metadata pattern of \"-jre\" to select Guava 29.0-jre",
-            example = "-jre",
-            required = false)
-    @Getter
-    @Nullable
-    private final String versionPattern;
-
-    @EqualsAndHashCode.Exclude
-    private final ChangeParentPom changeParentPom;
-
-    @Override
-    public String getDisplayName() {
-        return "Upgrade Maven parent project version";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Set the parent pom version number according to a node-style semver selector or to a specific version number.";
-    }
-
-    @Override
-    public Validated validate() {
-        Validated validated = super.validate();
-        //noinspection ConstantConditions
-        if (newVersion != null) {
-            validated = validated.and(Semver.validate(newVersion, versionPattern));
-        }
-        return validated;
-    }
-
-    @Override
-    protected MavenVisitor<ExecutionContext> getSingleSourceApplicableTest() {
-        return changeParentPom.getSingleSourceApplicableTest();
-    }
-
-    @Override
-    protected MavenVisitor<ExecutionContext> getVisitor() {
-        return changeParentPom.getVisitor();
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.Validated;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.semver.Semver;
+
+@EqualsAndHashCode(callSuper = true)
+public class UpgradeParentVersion extends Recipe {
+
+    public UpgradeParentVersion(String groupId, String artifactId, String newVersion, @Nullable String versionPattern) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.newVersion = newVersion;
+        this.versionPattern = versionPattern;
+        changeParentPom = new ChangeParentPom(groupId, groupId, artifactId, artifactId, newVersion, versionPattern, false);
+    }
+
+    @Option(displayName = "Group",
+            description = "The first part of a dependency coordinate 'org.springframework.boot:spring-boot-parent:VERSION'.",
+            example = "org.springframework.boot")
+    @Getter
+    private final String groupId;
+
+    @Option(displayName = "Artifact",
+            description = "The second part of a dependency coordinate 'org.springframework.boot:spring-boot-parent:VERSION'.",
+            example = "spring-boot-parent")
+    @Getter
+    private final String artifactId;
+
+    @Option(displayName = "New version",
+            description = "An exact version number, or node-style semver selector used to select the version number.",
+            example = "29.X")
+    @Getter
+    private final String newVersion;
+
+    @Option(displayName = "Version pattern",
+            description = "Allows version selection to be extended beyond the original Node Semver semantics. So for example," +
+                    "Setting 'version' to \"25-29\" can be paired with a metadata pattern of \"-jre\" to select Guava 29.0-jre",
+            example = "-jre",
+            required = false)
+    @Getter
+    @Nullable
+    private final String versionPattern;
+
+    @EqualsAndHashCode.Exclude
+    private final ChangeParentPom changeParentPom;
+
+    @Override
+    public String getDisplayName() {
+        return "Upgrade Maven parent project version";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Set the parent pom version number according to a node-style semver selector or to a specific version number.";
+    }
+
+    @Override
+    public Validated validate() {
+        Validated validated = super.validate();
+        //noinspection ConstantConditions
+        if (newVersion != null) {
+            validated = validated.and(Semver.validate(newVersion, versionPattern));
+        }
+        return validated;
+    }
+
+    @Override
+    protected MavenVisitor<ExecutionContext> getSingleSourceApplicableTest() {
+        return changeParentPom.getSingleSourceApplicableTest();
+    }
+
+    @Override
+    protected MavenVisitor<ExecutionContext> getVisitor() {
+        return changeParentPom.getVisitor();
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenDownloadingException.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenDownloadingException.java
index 4cc7f70f204..b23b98d6213 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenDownloadingException.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenDownloadingException.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven.internal;
-
-public class MavenDownloadingException extends RuntimeException {
-    public MavenDownloadingException(String message) {
-        super(message);
-    }
-
-    public MavenDownloadingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MavenDownloadingException(String message, Object... args) {
-        super(String.format(message, args));
-    }
-
-    public MavenDownloadingException(Throwable throwable) {
-        super(throwable);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven.internal;
+
+public class MavenDownloadingException extends RuntimeException {
+    public MavenDownloadingException(String message) {
+        super(message);
+    }
+
+    public MavenDownloadingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public MavenDownloadingException(String message, Object... args) {
+        super(String.format(message, args));
+    }
+
+    public MavenDownloadingException(Throwable throwable) {
+        super(throwable);
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenParsingException.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenParsingException.java
index 254fd2a2b5e..f5978a393a3 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenParsingException.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenParsingException.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven.internal;
-
-public class MavenParsingException extends RuntimeException {
-    public MavenParsingException(String message) {
-        super(message);
-    }
-
-    public MavenParsingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MavenParsingException(String message, Object... args) {
-        super(String.format(message, args));
-    }
-
-    public MavenParsingException(Throwable throwable) {
-        super(throwable);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven.internal;
+
+public class MavenParsingException extends RuntimeException {
+    public MavenParsingException(String message) {
+        super(message);
+    }
+
+    public MavenParsingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public MavenParsingException(String message, Object... args) {
+        super(String.format(message, args));
+    }
+
+    public MavenParsingException(Throwable throwable) {
+        super(throwable);
+    }
+}
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBom.java
index e758b7defa9..3d5a15011d8 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBom.java
@@ -1,224 +1,224 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven.utilities;
-
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.maven.tree.*;
-import org.openrewrite.xml.tree.Xml;
-
-import java.time.Instant;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * Print the dependency graph in the CycloneDX (https://cyclonedx.org/) bill of materials (BOM) format.
- */
-public final class PrintMavenAsCycloneDxBom {
-
-    private PrintMavenAsCycloneDxBom() {
-    }
-
-    public static String print(Xml.Document maven) {
-
-        MavenResolutionResult resolutionResult = maven.getMarkers().findFirst(MavenResolutionResult.class)
-                .orElseThrow(() -> new IllegalStateException("Expected to find a maven resolution marker"));
-
-        ResolvedPom pom = resolutionResult.getPom();
-
-        StringBuilder bom = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-        bom.append("<bom xmlns=\"http://cyclonedx.org/schema/bom/1.2\" serialNumber=\"urn:uuid:")
-                .append(maven.getId().toString()).append("\" version=\"1\">\n");
-        writeMetadata(pom, bom);
-
-        List<ResolvedDependency> compileScopeDependencies = resolutionResult.getDependencies().get(Scope.Compile);
-        List<ResolvedDependency> providedScopeDependencies = resolutionResult.getDependencies().get(Scope.Provided);
-
-        if (providedScopeDependencies != null && !providedScopeDependencies.isEmpty()) {
-            //Filter out duplicate group/artifacts that already exist in compile scope
-            Set<GroupArtifact> artifacts = compileScopeDependencies.stream().map(PrintMavenAsCycloneDxBom::dependencyToGroupArtifact).collect(Collectors.toSet());
-            providedScopeDependencies = providedScopeDependencies.stream().filter(d -> !artifacts.contains(PrintMavenAsCycloneDxBom.dependencyToGroupArtifact(d))).collect(Collectors.toList());
-        }
-
-        //May need to do more dependencies (in the various scopes)
-        writeComponents(compileScopeDependencies, providedScopeDependencies, bom);
-        writeDependencies(ListUtils.concatAll(compileScopeDependencies, providedScopeDependencies), bom);
-
-        bom.append("</bom>\n");
-
-        return bom.toString();
-    }
-
-    private static GroupArtifact dependencyToGroupArtifact(ResolvedDependency dependency) {
-        return new GroupArtifact(dependency.getGroupId(), dependency.getArtifactId());
-    }
-
-    private static void writeMetadata(ResolvedPom pom, StringBuilder bom) {
-        bom.append("    <metadata>\n");
-        bom.append("        <timestamp>").append(Instant.now().toString()).append("</timestamp>\n");
-        bom.append("        <tools>\n");
-        bom.append("            <tool>\n");
-        bom.append("                <vendor>OpenRewrite</vendor>\n");
-        bom.append("                <name>OpenRewrite CycloneDX</name>\n");
-        //Probably should pull the version from build properties.
-        bom.append("                <version>7.18.0</version>\n");
-        bom.append("            </tool>\n");
-        bom.append("        </tools>\n");
-
-        //(Scope scope, String groupId, String artifactId, String version, String packaging, List<String> licenses, String bomReference, StringBuilder bom) {
-        String packaging = ("war".equals(pom.getPackaging()) || "ear".equals(pom.getPackaging())) ? "application" : "library";
-
-        writeComponent(
-                Scope.Compile,
-                pom.getValue(pom.getGroupId()),
-                pom.getArtifactId(),
-                pom.getValue(pom.getVersion()),
-                packaging,
-                pom.getRequested().getLicenses(),
-                bom);
-
-        bom.append("    </metadata>\n");
-    }
-
-    private static void writeComponents(List<ResolvedDependency> dependencies, List<ResolvedDependency> provided, StringBuilder bom) {
-        if (dependencies.isEmpty()) {
-            return;
-        }
-
-        bom.append("    <components>\n");
-        for (ResolvedDependency dependency : dependencies) {
-            writeComponent(
-                    Scope.Compile,
-                    dependency.getGroupId(),
-                    dependency.getArtifactId(),
-                    dependency.getVersion(),
-                    "library",
-                    dependency.getLicenses(),
-                    bom);
-        }
-        for (ResolvedDependency dependency : provided) {
-            writeComponent(
-                    Scope.Provided,
-                    dependency.getGroupId(),
-                    dependency.getArtifactId(),
-                    dependency.getVersion(),
-                    "library",
-                    dependency.getLicenses(),
-                    bom);
-        }
-        bom.append("    </components>\n");
-    }
-    private static void writeDependencies(List<ResolvedDependency> dependencies, StringBuilder bom) {
-        if (dependencies.isEmpty()) {
-            return;
-        }
-        bom.append("    <dependencies>\n");
-        for (ResolvedDependency dependency : dependencies) {
-            writeDependency(dependency, bom);
-        }
-        bom.append("    </dependencies>\n");
-    }
-
-    private static void writeDependency(ResolvedDependency dependency, StringBuilder bom) {
-        String bomReference = getBomReference(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
-        bom.append("        <dependency ref=\"").append(bomReference).append("\">\n");
-        if (dependency.getDependencies() != null) {
-            for (ResolvedDependency nested : dependency.getDependencies()) {
-                bom.append("            <dependency ref=\"")
-                        .append(getBomReference(
-                                nested.getGroupId(),
-                                nested.getArtifactId(),
-                                nested.getVersion())
-                        ).append("\"/>\n");
-            }
-        }
-        bom.append("        </dependency>\n");
-    }
-
-    private static void writeComponent(Scope scope, String groupId, String artifactId, String version,
-                                       String packaging, List<License> licenses, StringBuilder bom) {
-
-        String indent = "        ";
-        String bomReference = getBomReference(groupId, artifactId, version);
-        bom.append(indent).append("<component bom-ref=\"").append(bomReference).append("\" type=\"").append(packaging).append("\">\n");
-        bom.append(indent).append("    <group>").append(groupId).append("</group>\n");
-        bom.append(indent).append("    <name>").append(artifactId).append("</name>\n");
-        bom.append(indent).append("    <version>").append(version).append("</version>\n");
-
-        if (scope != null) {
-            //Cyclone schema allows three scopes:
-            String cycloneScope;
-            switch (scope) {
-                case Compile:
-                case System:
-                    cycloneScope = "required";
-                    break;
-                case None:
-                case Invalid:
-                case Test:
-                    cycloneScope = "excluded";
-                    break;
-                default:
-                    cycloneScope = "optional";
-            }
-            bom.append(indent).append("    <scope>").append(cycloneScope).append("</scope>\n");
-        }
-        writeLicenses(licenses, bom, indent);
-        bom.append(indent).append("    <purl>").append(bomReference).append("</purl>\n");
-        bom.append(indent).append("</component>\n");
-    }
-
-    private static void writeLicenses(List<License> licenses, StringBuilder bom, String indent) {
-
-        if (!licenses.isEmpty()) {
-            bom.append(indent).append("    <licenses>\n");
-
-            for (License license : licenses) {
-                bom.append(indent).append("        <license>\n");
-                String spdxId = null;
-
-                //This logic maps the rewrite license type to the spdx equivalent.
-
-                //The only license type that we can establish unambiguously is the Apache 2.0 license.
-
-                //BSD has several SPDX Mappings (no way to resolve this)
-                //CDDL has a v1.0 and v1.1 (we do not distinguish them)
-                //CreativeCommons has several SPDX Mappings (no way to resolve this)
-                //Eclipse has a v1.0 and v2.0 (we do not distinguish them)
-                //GPL has several SPDX Mappings (no way to resolve this)
-                //LGPL has several SPDX Mappings (no way to resolve this)
-                //MIT has several SPDX Mappings (no way to resolve this)
-                //Mozilla has several SPDX Mappings (no way to resolve this)
-                //PublicDomain unclear which ID to use.
-
-                if (license.getType() == License.Type.Apache2) {
-                    spdxId = "Apache-2.0";
-                }
-                if (spdxId != null) {
-                    bom.append(indent).append("            <id>").append(spdxId).append("</id>\n");
-                }
-                bom.append(indent).append("            <name>").append(license.getName()).append("</name>\n");
-                bom.append(indent).append("        </license>\n");
-            }
-            bom.append(indent).append("      </licenses>\n");
-        }
-    }
-
-    private static String getBomReference(String group, String artifactId, String version) {
-        return "pkg:maven/" + group + "/" + artifactId + "@" + version + "?type=jar";
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven.utilities;
+
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.maven.tree.*;
+import org.openrewrite.xml.tree.Xml;
+
+import java.time.Instant;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Print the dependency graph in the CycloneDX (https://cyclonedx.org/) bill of materials (BOM) format.
+ */
+public final class PrintMavenAsCycloneDxBom {
+
+    private PrintMavenAsCycloneDxBom() {
+    }
+
+    public static String print(Xml.Document maven) {
+
+        MavenResolutionResult resolutionResult = maven.getMarkers().findFirst(MavenResolutionResult.class)
+                .orElseThrow(() -> new IllegalStateException("Expected to find a maven resolution marker"));
+
+        ResolvedPom pom = resolutionResult.getPom();
+
+        StringBuilder bom = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+        bom.append("<bom xmlns=\"http://cyclonedx.org/schema/bom/1.2\" serialNumber=\"urn:uuid:")
+                .append(maven.getId().toString()).append("\" version=\"1\">\n");
+        writeMetadata(pom, bom);
+
+        List<ResolvedDependency> compileScopeDependencies = resolutionResult.getDependencies().get(Scope.Compile);
+        List<ResolvedDependency> providedScopeDependencies = resolutionResult.getDependencies().get(Scope.Provided);
+
+        if (providedScopeDependencies != null && !providedScopeDependencies.isEmpty()) {
+            //Filter out duplicate group/artifacts that already exist in compile scope
+            Set<GroupArtifact> artifacts = compileScopeDependencies.stream().map(PrintMavenAsCycloneDxBom::dependencyToGroupArtifact).collect(Collectors.toSet());
+            providedScopeDependencies = providedScopeDependencies.stream().filter(d -> !artifacts.contains(PrintMavenAsCycloneDxBom.dependencyToGroupArtifact(d))).collect(Collectors.toList());
+        }
+
+        //May need to do more dependencies (in the various scopes)
+        writeComponents(compileScopeDependencies, providedScopeDependencies, bom);
+        writeDependencies(ListUtils.concatAll(compileScopeDependencies, providedScopeDependencies), bom);
+
+        bom.append("</bom>\n");
+
+        return bom.toString();
+    }
+
+    private static GroupArtifact dependencyToGroupArtifact(ResolvedDependency dependency) {
+        return new GroupArtifact(dependency.getGroupId(), dependency.getArtifactId());
+    }
+
+    private static void writeMetadata(ResolvedPom pom, StringBuilder bom) {
+        bom.append("    <metadata>\n");
+        bom.append("        <timestamp>").append(Instant.now().toString()).append("</timestamp>\n");
+        bom.append("        <tools>\n");
+        bom.append("            <tool>\n");
+        bom.append("                <vendor>OpenRewrite</vendor>\n");
+        bom.append("                <name>OpenRewrite CycloneDX</name>\n");
+        //Probably should pull the version from build properties.
+        bom.append("                <version>7.18.0</version>\n");
+        bom.append("            </tool>\n");
+        bom.append("        </tools>\n");
+
+        //(Scope scope, String groupId, String artifactId, String version, String packaging, List<String> licenses, String bomReference, StringBuilder bom) {
+        String packaging = ("war".equals(pom.getPackaging()) || "ear".equals(pom.getPackaging())) ? "application" : "library";
+
+        writeComponent(
+                Scope.Compile,
+                pom.getValue(pom.getGroupId()),
+                pom.getArtifactId(),
+                pom.getValue(pom.getVersion()),
+                packaging,
+                pom.getRequested().getLicenses(),
+                bom);
+
+        bom.append("    </metadata>\n");
+    }
+
+    private static void writeComponents(List<ResolvedDependency> dependencies, List<ResolvedDependency> provided, StringBuilder bom) {
+        if (dependencies.isEmpty()) {
+            return;
+        }
+
+        bom.append("    <components>\n");
+        for (ResolvedDependency dependency : dependencies) {
+            writeComponent(
+                    Scope.Compile,
+                    dependency.getGroupId(),
+                    dependency.getArtifactId(),
+                    dependency.getVersion(),
+                    "library",
+                    dependency.getLicenses(),
+                    bom);
+        }
+        for (ResolvedDependency dependency : provided) {
+            writeComponent(
+                    Scope.Provided,
+                    dependency.getGroupId(),
+                    dependency.getArtifactId(),
+                    dependency.getVersion(),
+                    "library",
+                    dependency.getLicenses(),
+                    bom);
+        }
+        bom.append("    </components>\n");
+    }
+    private static void writeDependencies(List<ResolvedDependency> dependencies, StringBuilder bom) {
+        if (dependencies.isEmpty()) {
+            return;
+        }
+        bom.append("    <dependencies>\n");
+        for (ResolvedDependency dependency : dependencies) {
+            writeDependency(dependency, bom);
+        }
+        bom.append("    </dependencies>\n");
+    }
+
+    private static void writeDependency(ResolvedDependency dependency, StringBuilder bom) {
+        String bomReference = getBomReference(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion());
+        bom.append("        <dependency ref=\"").append(bomReference).append("\">\n");
+        if (dependency.getDependencies() != null) {
+            for (ResolvedDependency nested : dependency.getDependencies()) {
+                bom.append("            <dependency ref=\"")
+                        .append(getBomReference(
+                                nested.getGroupId(),
+                                nested.getArtifactId(),
+                                nested.getVersion())
+                        ).append("\"/>\n");
+            }
+        }
+        bom.append("        </dependency>\n");
+    }
+
+    private static void writeComponent(Scope scope, String groupId, String artifactId, String version,
+                                       String packaging, List<License> licenses, StringBuilder bom) {
+
+        String indent = "        ";
+        String bomReference = getBomReference(groupId, artifactId, version);
+        bom.append(indent).append("<component bom-ref=\"").append(bomReference).append("\" type=\"").append(packaging).append("\">\n");
+        bom.append(indent).append("    <group>").append(groupId).append("</group>\n");
+        bom.append(indent).append("    <name>").append(artifactId).append("</name>\n");
+        bom.append(indent).append("    <version>").append(version).append("</version>\n");
+
+        if (scope != null) {
+            //Cyclone schema allows three scopes:
+            String cycloneScope;
+            switch (scope) {
+                case Compile:
+                case System:
+                    cycloneScope = "required";
+                    break;
+                case None:
+                case Invalid:
+                case Test:
+                    cycloneScope = "excluded";
+                    break;
+                default:
+                    cycloneScope = "optional";
+            }
+            bom.append(indent).append("    <scope>").append(cycloneScope).append("</scope>\n");
+        }
+        writeLicenses(licenses, bom, indent);
+        bom.append(indent).append("    <purl>").append(bomReference).append("</purl>\n");
+        bom.append(indent).append("</component>\n");
+    }
+
+    private static void writeLicenses(List<License> licenses, StringBuilder bom, String indent) {
+
+        if (!licenses.isEmpty()) {
+            bom.append(indent).append("    <licenses>\n");
+
+            for (License license : licenses) {
+                bom.append(indent).append("        <license>\n");
+                String spdxId = null;
+
+                //This logic maps the rewrite license type to the spdx equivalent.
+
+                //The only license type that we can establish unambiguously is the Apache 2.0 license.
+
+                //BSD has several SPDX Mappings (no way to resolve this)
+                //CDDL has a v1.0 and v1.1 (we do not distinguish them)
+                //CreativeCommons has several SPDX Mappings (no way to resolve this)
+                //Eclipse has a v1.0 and v2.0 (we do not distinguish them)
+                //GPL has several SPDX Mappings (no way to resolve this)
+                //LGPL has several SPDX Mappings (no way to resolve this)
+                //MIT has several SPDX Mappings (no way to resolve this)
+                //Mozilla has several SPDX Mappings (no way to resolve this)
+                //PublicDomain unclear which ID to use.
+
+                if (license.getType() == License.Type.Apache2) {
+                    spdxId = "Apache-2.0";
+                }
+                if (spdxId != null) {
+                    bom.append(indent).append("            <id>").append(spdxId).append("</id>\n");
+                }
+                bom.append(indent).append("            <name>").append(license.getName()).append("</name>\n");
+                bom.append(indent).append("        </license>\n");
+            }
+            bom.append(indent).append("      </licenses>\n");
+        }
+    }
+
+    private static String getBomReference(String group, String artifactId, String version) {
+        return "pkg:maven/" + group + "/" + artifactId + "@" + version + "?type=jar";
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/AddPluginTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/AddPluginTest.kt
index 82f348cf8b7..c7984c0674f 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/AddPluginTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/AddPluginTest.kt
@@ -1,255 +1,255 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.Recipe
-
-class AddPluginTest : MavenRecipeTest {
-    override val recipe: Recipe
-        get() = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, null, null)
-
-    @Test
-    fun addPluginWithConfiguration() = assertChanged(
-        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0",
-            "<configuration>\n<activeRecipes>\n<recipe>io.moderne.FindTest</recipe>\n</activeRecipes>\n</configuration>",
-            null, null),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>100.0</version>
-                    <configuration>
-                      <activeRecipes>
-                        <recipe>io.moderne.FindTest</recipe>
-                      </activeRecipes>
-                    </configuration>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """
-    )
-
-    @Test
-    fun addPluginWithDependencies() = assertChanged(
-        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, """
-            <dependencies>
-                <dependency>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>java-8-migration</artifactId>
-                    <version>1.0.0</version>
-                </dependency>
-            </dependencies> 
-        """.trimIndent(), null),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>100.0</version>
-                    <dependencies>
-                      <dependency>
-                        <groupId>org.openrewrite.maven</groupId>
-                        <artifactId>java-8-migration</artifactId>
-                        <version>1.0.0</version>
-                      </dependency>
-                    </dependencies>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """
-    )
-
-    @Test
-    fun addPluginWithExecutions() = assertChanged(
-        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, null, """
-            <executions>
-              <execution>
-                <id>xjc</id>
-                <goals>
-                  <goal>xjc</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>/src/main/resources/countries.xsd</source>
-                    <source>/src/main/resources/countries1.xsd</source>
-                  </sources>
-                  <outputDirectory>/src/main/generated-java</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-        """.trimIndent()),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>100.0</version>
-                    <executions>
-                      <execution>
-                        <id>xjc</id>
-                        <goals>
-                          <goal>xjc</goal>
-                        </goals>
-                        <configuration>
-                          <sources>
-                            <source>/src/main/resources/countries.xsd</source>
-                            <source>/src/main/resources/countries1.xsd</source>
-                          </sources>
-                          <outputDirectory>/src/main/generated-java</outputDirectory>
-                        </configuration>
-                      </execution>
-                    </executions>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """
-    )
-
-    @Test
-    fun addPlugin() = assertChanged(
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>100.0</version>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """
-    )
-
-    @Test
-    fun updatePluginVersion() = assertChanged(
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>99.0</version>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>100.0</version>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = AddPlugin(null, null, null, null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(3)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("groupId")
-        assertThat(valid.failures()[2].property).isEqualTo("version")
-
-        recipe = AddPlugin(null, "rewrite-maven", null, null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("groupId")
-        assertThat(valid.failures()[1].property).isEqualTo("version")
-
-        recipe = AddPlugin("org.openrewrite", null, null, null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("version")
-
-        recipe = AddPlugin("org.openrewrite", "rewrite-maven", "1.0.0", null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.Recipe
+
+class AddPluginTest : MavenRecipeTest {
+    override val recipe: Recipe
+        get() = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, null, null)
+
+    @Test
+    fun addPluginWithConfiguration() = assertChanged(
+        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0",
+            "<configuration>\n<activeRecipes>\n<recipe>io.moderne.FindTest</recipe>\n</activeRecipes>\n</configuration>",
+            null, null),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>100.0</version>
+                    <configuration>
+                      <activeRecipes>
+                        <recipe>io.moderne.FindTest</recipe>
+                      </activeRecipes>
+                    </configuration>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """
+    )
+
+    @Test
+    fun addPluginWithDependencies() = assertChanged(
+        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, """
+            <dependencies>
+                <dependency>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>java-8-migration</artifactId>
+                    <version>1.0.0</version>
+                </dependency>
+            </dependencies> 
+        """.trimIndent(), null),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>100.0</version>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.openrewrite.maven</groupId>
+                        <artifactId>java-8-migration</artifactId>
+                        <version>1.0.0</version>
+                      </dependency>
+                    </dependencies>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """
+    )
+
+    @Test
+    fun addPluginWithExecutions() = assertChanged(
+        recipe = AddPlugin("org.openrewrite.maven", "rewrite-maven-plugin", "100.0", null, null, """
+            <executions>
+              <execution>
+                <id>xjc</id>
+                <goals>
+                  <goal>xjc</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>/src/main/resources/countries.xsd</source>
+                    <source>/src/main/resources/countries1.xsd</source>
+                  </sources>
+                  <outputDirectory>/src/main/generated-java</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+        """.trimIndent()),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>100.0</version>
+                    <executions>
+                      <execution>
+                        <id>xjc</id>
+                        <goals>
+                          <goal>xjc</goal>
+                        </goals>
+                        <configuration>
+                          <sources>
+                            <source>/src/main/resources/countries.xsd</source>
+                            <source>/src/main/resources/countries1.xsd</source>
+                          </sources>
+                          <outputDirectory>/src/main/generated-java</outputDirectory>
+                        </configuration>
+                      </execution>
+                    </executions>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """
+    )
+
+    @Test
+    fun addPlugin() = assertChanged(
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>100.0</version>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """
+    )
+
+    @Test
+    fun updatePluginVersion() = assertChanged(
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>99.0</version>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>100.0</version>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = AddPlugin(null, null, null, null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(3)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("groupId")
+        assertThat(valid.failures()[2].property).isEqualTo("version")
+
+        recipe = AddPlugin(null, "rewrite-maven", null, null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("groupId")
+        assertThat(valid.failures()[1].property).isEqualTo("version")
+
+        recipe = AddPlugin("org.openrewrite", null, null, null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("version")
+
+        recipe = AddPlugin("org.openrewrite", "rewrite-maven", "1.0.0", null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.kt
index 8fa9cd9e068..04d4baeae08 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.kt
@@ -1,293 +1,293 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import org.openrewrite.InMemoryExecutionContext
-import java.nio.file.Path
-
-class ChangeDependencyGroupIdAndArtifactIdTest : MavenRecipeTest {
-
-    override val recipe: ChangeDependencyGroupIdAndArtifactId
-        get() = ChangeDependencyGroupIdAndArtifactId(
-            "org.openrewrite.recipe",
-            "rewrite-testing-frameworks",
-            "org.openrewrite.recipe",
-            "rewrite-migrate-java",
-            null
-        )
-
-    @Test
-    fun changeDependencyGroupIdAndArtifactId() = assertChanged(
-        recipe =  ChangeDependencyGroupIdAndArtifactId(
-            "javax.activation",
-            "javax.activation-api",
-            "jakarta.activation",
-            "jakarta.activation-api",
-            null
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>javax.activation-api</artifactId>
-                    </dependency>
-                </dependencies>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                    </dependency>
-                </dependencies>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-
-    @Test
-    fun changeOnlyArtifactId() = assertChanged(
-        recipe = ChangeDependencyGroupIdAndArtifactId(
-            "org.openrewrite",
-            "rewrite-java-8",
-            "org.openrewrite",
-            "rewrite-java-11",
-            null
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openrewrite</groupId>
-                        <artifactId>rewrite-java-8</artifactId>
-                        <version>7.20.0</version>
-                    </dependency>
-                </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openrewrite</groupId>
-                        <artifactId>rewrite-java-11</artifactId>
-                        <version>7.20.0</version>
-                    </dependency>
-                </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun doNotChangeUnlessBothGroupIdAndArtifactIdMatch() = assertUnchanged(
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openrewrite.recipe</groupId>
-                        <artifactId>rewrite-spring</artifactId>
-                        <version>4.12.0</version>
-                    </dependency>
-                </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun changeDependencyGroupIdAndArtifactIdAndVersion() = assertChanged(
-        recipe =  ChangeDependencyGroupIdAndArtifactId(
-            "javax.activation",
-            "javax.activation-api",
-            "jakarta.activation",
-            "jakarta.activation-api",
-            "2.1.0"
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.activation</groupId>
-                        <artifactId>javax.activation-api</artifactId>
-                        <version>1.2.0</version>
-                    </dependency>
-                </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.activation</groupId>
-                        <artifactId>jakarta.activation-api</artifactId>
-                        <version>2.1.0</version>
-                    </dependency>
-                </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun changeDependencyGroupIdAndArtifactIdWithDeepHierarchy(@TempDir tempDir: Path) {
-        val parent = tempDir.resolve("pom.xml")
-        val child = tempDir.resolve("child/pom.xml")
-        val subchild = tempDir.resolve("child/subchild/pom.xml")
-
-        subchild.toFile().parentFile.mkdirs()
-
-        parent.toFile().writeText(
-            //language=xml
-            """
-                <project>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>parent</artifactId>
-                    <version>1</version>
-                    <modules>
-                        <module>child</module>
-                    </modules>
-                </project>
-            """.trimIndent()
-        )
-
-        child.toFile().writeText(
-            //language=xml
-            """
-                <project>
-                    <parent>
-                        <groupId>com.mycompany.app</groupId>
-                        <artifactId>parent</artifactId>
-                        <version>1</version>
-                    </parent>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>child</artifactId>
-                    <version>1</version>
-                    <modules>
-                        <module>subchild</module>
-                    </modules>
-                </project>
-            """.trimIndent()
-        )
-
-        subchild.toFile().writeText(
-            //language=xml
-            """
-                <project>
-                    <parent>
-                        <groupId>com.mycompany.app</groupId>
-                        <artifactId>child</artifactId>
-                        <version>1</version>
-                    </parent>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>subchild</artifactId>
-                    <version>1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-core</artifactId>
-                            <version>2.8.0.Final</version>
-                        </dependency>
-                    </dependencies>
-                </project>
-            """.trimIndent()
-        )
-
-        val results = ChangeDependencyGroupIdAndArtifactId("io.quarkus", "quarkus-core", "io.quarkus", "quarkus-arc", null)
-            .run(parser.parse(listOf(subchild, child, parent), tempDir, InMemoryExecutionContext()))
-
-        assertThat(results).hasSize(1)
-        assertThat(results[0].after!!.printAllTrimmed()).isEqualTo(
-            """
-                <project>
-                    <parent>
-                        <groupId>com.mycompany.app</groupId>
-                        <artifactId>child</artifactId>
-                        <version>1</version>
-                    </parent>
-                    <groupId>com.mycompany.app</groupId>
-                    <artifactId>subchild</artifactId>
-                    <version>1</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-arc</artifactId>
-                            <version>2.8.0.Final</version>
-                        </dependency>
-                    </dependencies>
-                </project>
-            """.trimIndent()
-        )
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import org.openrewrite.InMemoryExecutionContext
+import java.nio.file.Path
+
+class ChangeDependencyGroupIdAndArtifactIdTest : MavenRecipeTest {
+
+    override val recipe: ChangeDependencyGroupIdAndArtifactId
+        get() = ChangeDependencyGroupIdAndArtifactId(
+            "org.openrewrite.recipe",
+            "rewrite-testing-frameworks",
+            "org.openrewrite.recipe",
+            "rewrite-migrate-java",
+            null
+        )
+
+    @Test
+    fun changeDependencyGroupIdAndArtifactId() = assertChanged(
+        recipe =  ChangeDependencyGroupIdAndArtifactId(
+            "javax.activation",
+            "javax.activation-api",
+            "jakarta.activation",
+            "jakarta.activation-api",
+            null
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
+                    </dependency>
+                </dependencies>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                    </dependency>
+                </dependencies>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+
+    @Test
+    fun changeOnlyArtifactId() = assertChanged(
+        recipe = ChangeDependencyGroupIdAndArtifactId(
+            "org.openrewrite",
+            "rewrite-java-8",
+            "org.openrewrite",
+            "rewrite-java-11",
+            null
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-java-8</artifactId>
+                        <version>7.20.0</version>
+                    </dependency>
+                </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-java-11</artifactId>
+                        <version>7.20.0</version>
+                    </dependency>
+                </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun doNotChangeUnlessBothGroupIdAndArtifactIdMatch() = assertUnchanged(
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-spring</artifactId>
+                        <version>4.12.0</version>
+                    </dependency>
+                </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun changeDependencyGroupIdAndArtifactIdAndVersion() = assertChanged(
+        recipe =  ChangeDependencyGroupIdAndArtifactId(
+            "javax.activation",
+            "javax.activation-api",
+            "jakarta.activation",
+            "jakarta.activation-api",
+            "2.1.0"
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
+                        <version>1.2.0</version>
+                    </dependency>
+                </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                        <version>2.1.0</version>
+                    </dependency>
+                </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun changeDependencyGroupIdAndArtifactIdWithDeepHierarchy(@TempDir tempDir: Path) {
+        val parent = tempDir.resolve("pom.xml")
+        val child = tempDir.resolve("child/pom.xml")
+        val subchild = tempDir.resolve("child/subchild/pom.xml")
+
+        subchild.toFile().parentFile.mkdirs()
+
+        parent.toFile().writeText(
+            //language=xml
+            """
+                <project>
+                    <groupId>com.mycompany.app</groupId>
+                    <artifactId>parent</artifactId>
+                    <version>1</version>
+                    <modules>
+                        <module>child</module>
+                    </modules>
+                </project>
+            """.trimIndent()
+        )
+
+        child.toFile().writeText(
+            //language=xml
+            """
+                <project>
+                    <parent>
+                        <groupId>com.mycompany.app</groupId>
+                        <artifactId>parent</artifactId>
+                        <version>1</version>
+                    </parent>
+                    <groupId>com.mycompany.app</groupId>
+                    <artifactId>child</artifactId>
+                    <version>1</version>
+                    <modules>
+                        <module>subchild</module>
+                    </modules>
+                </project>
+            """.trimIndent()
+        )
+
+        subchild.toFile().writeText(
+            //language=xml
+            """
+                <project>
+                    <parent>
+                        <groupId>com.mycompany.app</groupId>
+                        <artifactId>child</artifactId>
+                        <version>1</version>
+                    </parent>
+                    <groupId>com.mycompany.app</groupId>
+                    <artifactId>subchild</artifactId>
+                    <version>1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-core</artifactId>
+                            <version>2.8.0.Final</version>
+                        </dependency>
+                    </dependencies>
+                </project>
+            """.trimIndent()
+        )
+
+        val results = ChangeDependencyGroupIdAndArtifactId("io.quarkus", "quarkus-core", "io.quarkus", "quarkus-arc", null)
+            .run(parser.parse(listOf(subchild, child, parent), tempDir, InMemoryExecutionContext()))
+
+        assertThat(results).hasSize(1)
+        assertThat(results[0].after!!.printAllTrimmed()).isEqualTo(
+            """
+                <project>
+                    <parent>
+                        <groupId>com.mycompany.app</groupId>
+                        <artifactId>child</artifactId>
+                        <version>1</version>
+                    </parent>
+                    <groupId>com.mycompany.app</groupId>
+                    <artifactId>subchild</artifactId>
+                    <version>1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-arc</artifactId>
+                            <version>2.8.0.Final</version>
+                        </dependency>
+                    </dependencies>
+                </project>
+            """.trimIndent()
+        )
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyScopeTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyScopeTest.kt
index a732bd7887e..0c279234678 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyScopeTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeDependencyScopeTest.kt
@@ -1,170 +1,170 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class ChangeDependencyScopeTest : MavenRecipeTest {
-    override val recipe: ChangeDependencyScope
-        get() = ChangeDependencyScope("com.google.guava", "guava", "test")
-
-    @Test
-    fun noScopeToScope() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-            
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-            
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                  <scope>test</scope>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun scopeToScope() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                  <scope>compile</scope>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                  <scope>test</scope>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun scopeToNoScope() = assertChanged(
-        recipe = ChangeDependencyScope("com.google.guava", "guava", null as String?),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                  <scope>test</scope>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>28.2-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = ChangeDependencyScope(null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("groupId")
-
-        recipe = ChangeDependencyScope(null, "rewrite-maven", "test")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("groupId")
-
-        recipe = ChangeDependencyScope("org.openrewrite", null, "test")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-
-        recipe = ChangeDependencyScope("org.openrewrite", "rewrite-maven", "test")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class ChangeDependencyScopeTest : MavenRecipeTest {
+    override val recipe: ChangeDependencyScope
+        get() = ChangeDependencyScope("com.google.guava", "guava", "test")
+
+    @Test
+    fun noScopeToScope() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+            
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+            
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                  <scope>test</scope>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun scopeToScope() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                  <scope>compile</scope>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                  <scope>test</scope>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun scopeToNoScope() = assertChanged(
+        recipe = ChangeDependencyScope("com.google.guava", "guava", null as String?),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                  <scope>test</scope>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>28.2-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = ChangeDependencyScope(null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("groupId")
+
+        recipe = ChangeDependencyScope(null, "rewrite-maven", "test")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("groupId")
+
+        recipe = ChangeDependencyScope("org.openrewrite", null, "test")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+
+        recipe = ChangeDependencyScope("org.openrewrite", "rewrite-maven", "test")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactIdTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactIdTest.kt
index a92e1310fb0..e45dc9eb95c 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactIdTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactIdTest.kt
@@ -1,66 +1,66 @@
-/*
- * Copyright 2022 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.junit.jupiter.api.Test
-
-class ChangeManagedDependencyGroupIdAndArtifactIdTest : MavenRecipeTest {
-
-    @Test
-    fun changeManagedDependencyGroupIdAndArtifactId() = assertChanged(
-        recipe =  ChangeManagedDependencyGroupIdAndArtifactId(
-            "javax.activation",
-            "javax.activation-api",
-            "jakarta.activation",
-            "jakarta.activation-api",
-            "2.1.0"
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>2.1.0</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-}
+/*
+ * Copyright 2022 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.junit.jupiter.api.Test
+
+class ChangeManagedDependencyGroupIdAndArtifactIdTest : MavenRecipeTest {
+
+    @Test
+    fun changeManagedDependencyGroupIdAndArtifactId() = assertChanged(
+        recipe =  ChangeManagedDependencyGroupIdAndArtifactId(
+            "javax.activation",
+            "javax.activation-api",
+            "jakarta.activation",
+            "jakarta.activation-api",
+            "2.1.0"
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>2.1.0</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangePropertyValueTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangePropertyValueTest.kt
index 2221c4804fd..f097510d3c6 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangePropertyValueTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/ChangePropertyValueTest.kt
@@ -1,171 +1,171 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class ChangePropertyValueTest : MavenRecipeTest {
-    @Test
-    fun property() = assertChanged(
-        recipe = ChangePropertyValue("guava.version", "29.0-jre", false),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-               
-              <properties>
-                <guava.version>28.2-jre</guava.version>
-              </properties>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-               
-              <properties>
-                <guava.version>29.0-jre</guava.version>
-              </properties>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-    @Test
-    fun addFirstProperty() = assertChanged(
-        recipe = ChangePropertyValue("key", "value", true),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <properties>
-                <key>value</key>
-              </properties>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun changeExistingProperty() = assertChanged(
-        recipe = ChangePropertyValue("key", "value", true),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <properties>
-                <key>v</key>
-              </properties>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <properties>
-                <key>value</key>
-              </properties>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun addPropertyInOrder() = assertChanged(
-        recipe = ChangePropertyValue("key", "value", true),
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <properties>
-                <abc>value</abc>
-                <other>value</other>
-              </properties>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <properties>
-                <abc>value</abc>
-                <key>value</key>
-                <other>value</other>
-              </properties>
-            
-              <dependencies>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = ChangePropertyValue(null, null, false)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("key")
-        assertThat(valid.failures()[1].property).isEqualTo("newValue")
-
-        recipe = ChangePropertyValue(null, "8", false)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("key")
-
-        recipe = ChangePropertyValue("java.version", null, false)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("newValue")
-
-        recipe = ChangePropertyValue("java.version", "8", false)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class ChangePropertyValueTest : MavenRecipeTest {
+    @Test
+    fun property() = assertChanged(
+        recipe = ChangePropertyValue("guava.version", "29.0-jre", false),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+               
+              <properties>
+                <guava.version>28.2-jre</guava.version>
+              </properties>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+               
+              <properties>
+                <guava.version>29.0-jre</guava.version>
+              </properties>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+    @Test
+    fun addFirstProperty() = assertChanged(
+        recipe = ChangePropertyValue("key", "value", true),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <properties>
+                <key>value</key>
+              </properties>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun changeExistingProperty() = assertChanged(
+        recipe = ChangePropertyValue("key", "value", true),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <properties>
+                <key>v</key>
+              </properties>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <properties>
+                <key>value</key>
+              </properties>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun addPropertyInOrder() = assertChanged(
+        recipe = ChangePropertyValue("key", "value", true),
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <properties>
+                <abc>value</abc>
+                <other>value</other>
+              </properties>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <properties>
+                <abc>value</abc>
+                <key>value</key>
+                <other>value</other>
+              </properties>
+            
+              <dependencies>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = ChangePropertyValue(null, null, false)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("key")
+        assertThat(valid.failures()[1].property).isEqualTo("newValue")
+
+        recipe = ChangePropertyValue(null, "8", false)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("key")
+
+        recipe = ChangePropertyValue("java.version", null, false)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("newValue")
+
+        recipe = ChangePropertyValue("java.version", "8", false)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveDependencyTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveDependencyTest.kt
index 52099fd3bad..e1031d46e44 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveDependencyTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveDependencyTest.kt
@@ -1,230 +1,230 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-
-class RemoveDependencyTest : MavenRecipeTest {
-    override val recipe = RemoveDependency("junit","junit", null)
-
-    @Test
-    fun removeDependency() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-                <dependency>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-                  <version>4.13.1</version>
-                  <scope>test</scope>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun noDependencyToRemove() = assertUnchanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = RemoveDependency(null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("groupId")
-
-        recipe = RemoveDependency(null, "rewrite-maven", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("groupId")
-
-        recipe = RemoveDependency("org.openrewrite", null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-
-        recipe = RemoveDependency("org.openrewrite", "rewrite-maven", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-
-    @Test
-    fun shouldRemoveScopedDependency() = assertChanged(
-        recipe = RemoveDependency("org.junit.jupiter","junit-jupiter", "compile"),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                       <dependency>
-                            <groupId>org.junit.jupiter</groupId>
-                            <artifactId>junit-jupiter</artifactId>
-                            <version>5.7.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter</artifactId>
-                        <scope>test</scope>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter-api</artifactId>
-                        <version>5.6.3</version>
-                        <scope>test</scope>
-                    </dependency>
-                </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                       <dependency>
-                            <groupId>org.junit.jupiter</groupId>
-                            <artifactId>junit-jupiter</artifactId>
-                            <version>5.7.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter</artifactId>
-                        <scope>test</scope>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter-api</artifactId>
-                        <version>5.6.3</version>
-                        <scope>test</scope>
-                    </dependency>
-                </dependencies>
-            </project>
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/422")
-    @Test
-    fun removeDependencyByEffectiveScope() = assertChanged(
-        recipe = RemoveDependency("junit","junit", "runtime"),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-                <dependency>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-                  <version>4.13.1</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+
+class RemoveDependencyTest : MavenRecipeTest {
+    override val recipe = RemoveDependency("junit","junit", null)
+
+    @Test
+    fun removeDependency() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+                <dependency>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                  <version>4.13.1</version>
+                  <scope>test</scope>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun noDependencyToRemove() = assertUnchanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = RemoveDependency(null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("groupId")
+
+        recipe = RemoveDependency(null, "rewrite-maven", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("groupId")
+
+        recipe = RemoveDependency("org.openrewrite", null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+
+        recipe = RemoveDependency("org.openrewrite", "rewrite-maven", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+
+    @Test
+    fun shouldRemoveScopedDependency() = assertChanged(
+        recipe = RemoveDependency("org.junit.jupiter","junit-jupiter", "compile"),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                       <dependency>
+                            <groupId>org.junit.jupiter</groupId>
+                            <artifactId>junit-jupiter</artifactId>
+                            <version>5.7.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter</artifactId>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter</artifactId>
+                        <scope>test</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-api</artifactId>
+                        <version>5.6.3</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                       <dependency>
+                            <groupId>org.junit.jupiter</groupId>
+                            <artifactId>junit-jupiter</artifactId>
+                            <version>5.7.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter</artifactId>
+                        <scope>test</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-api</artifactId>
+                        <version>5.6.3</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+            </project>
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/422")
+    @Test
+    fun removeDependencyByEffectiveScope() = assertChanged(
+        recipe = RemoveDependency("junit","junit", "runtime"),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+                <dependency>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                  <version>4.13.1</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveExclusionTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveExclusionTest.kt
index 8bc0360d02e..02caca08c7a 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveExclusionTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveExclusionTest.kt
@@ -1,107 +1,107 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.junit.jupiter.api.Test
-
-class RemoveExclusionTest : MavenRecipeTest {
-    override val recipe = RemoveExclusion(
-        "com.google.guava",
-        "guava",
-        "commons-lang",
-        "commons-lang"
-    )
-
-    @Test
-    fun removeUnusedExclusions() = assertChanged(
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                  <exclusions>
-                    <exclusion>
-                      <groupId>commons-lang</groupId>
-                      <artifactId>commons-lang</artifactId>
-                    </exclusion>
-                  </exclusions>
-                </dependency>
-              </dependencies>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <dependencies>
-                <dependency>
-                  <groupId>com.google.guava</groupId>
-                  <artifactId>guava</artifactId>
-                  <version>29.0-jre</version>
-                </dependency>
-              </dependencies>
-            </project>
-        """
-    )
-
-    @Test
-    fun removeUnusedExclusionsFromDependencyManagement() = assertChanged(
-        before = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <dependencyManagement>
-                <dependencies>
-                  <dependency>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                    <version>29.0-jre</version>
-                    <exclusions>
-                      <exclusion>
-                        <groupId>commons-lang</groupId>
-                        <artifactId>commons-lang</artifactId>
-                      </exclusion>
-                    </exclusions>
-                  </dependency>
-                </dependencies>
-              </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-              <dependencyManagement>
-                <dependencies>
-                  <dependency>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                    <version>29.0-jre</version>
-                  </dependency>
-                </dependencies>
-              </dependencyManagement>
-            </project>
-        """
-    )
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.junit.jupiter.api.Test
+
+class RemoveExclusionTest : MavenRecipeTest {
+    override val recipe = RemoveExclusion(
+        "com.google.guava",
+        "guava",
+        "commons-lang",
+        "commons-lang"
+    )
+
+    @Test
+    fun removeUnusedExclusions() = assertChanged(
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                  <exclusions>
+                    <exclusion>
+                      <groupId>commons-lang</groupId>
+                      <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                  </exclusions>
+                </dependency>
+              </dependencies>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <dependencies>
+                <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>29.0-jre</version>
+                </dependency>
+              </dependencies>
+            </project>
+        """
+    )
+
+    @Test
+    fun removeUnusedExclusionsFromDependencyManagement() = assertChanged(
+        before = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <dependencyManagement>
+                <dependencies>
+                  <dependency>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                    <version>29.0-jre</version>
+                    <exclusions>
+                      <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                      </exclusion>
+                    </exclusions>
+                  </dependency>
+                </dependencies>
+              </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+              <dependencyManagement>
+                <dependencies>
+                  <dependency>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                    <version>29.0-jre</version>
+                  </dependency>
+                </dependencies>
+              </dependencyManagement>
+            </project>
+        """
+    )
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveManagedDependencyTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveManagedDependencyTest.kt
index 94fa5f5bfbb..aab9caf2cca 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveManagedDependencyTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemoveManagedDependencyTest.kt
@@ -1,199 +1,199 @@
-/*
- * Copyright 2022 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.junit.jupiter.api.Test
-
-class RemoveManagedDependencyTest : MavenRecipeTest {
-
-    @Test
-    fun removeManagedDependency() = assertChanged(
-        recipe =  RemoveManagedDependency(
-            "javax.activation",
-            "javax.activation-api",
-            null
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-
-    @Test
-    fun removeManagedDependencyWithScopeNone() = assertChanged(
-        recipe =  RemoveManagedDependency(
-            "javax.activation",
-            "javax.activation-api",
-            null
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                            <scope>test</scope>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-
-    @Test
-    fun removeManagedDependencyWithScopeMatching() = assertChanged(
-        recipe =  RemoveManagedDependency(
-            "javax.activation",
-            "javax.activation-api",
-            "test"
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                            <scope>test</scope>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """,
-        after = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-
-    @Test
-    fun removeManagedDependencyWithScopeNonMatching() = assertUnchanged(
-        recipe =  RemoveManagedDependency(
-            "javax.activation",
-            "javax.activation-api",
-            "compile"
-        ),
-        before = """
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>com.mycompany.app</groupId>
-                <artifactId>my-app</artifactId>
-                <version>1</version>
-                <dependencyManagement>
-                    <dependencies>
-                        <dependency>
-                            <groupId>javax.activation</groupId>
-                            <artifactId>javax.activation-api</artifactId>
-                            <version>1.2.0</version>
-                            <scope>test</scope>
-                        </dependency>
-                        <dependency>
-                            <groupId>jakarta.activation</groupId>
-                            <artifactId>jakarta.activation-api</artifactId>
-                            <version>1.2.1</version>
-                        </dependency>
-                    </dependencies>
-                </dependencyManagement>
-            </project>
-        """
-    )
-}
+/*
+ * Copyright 2022 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.junit.jupiter.api.Test
+
+class RemoveManagedDependencyTest : MavenRecipeTest {
+
+    @Test
+    fun removeManagedDependency() = assertChanged(
+        recipe =  RemoveManagedDependency(
+            "javax.activation",
+            "javax.activation-api",
+            null
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+
+    @Test
+    fun removeManagedDependencyWithScopeNone() = assertChanged(
+        recipe =  RemoveManagedDependency(
+            "javax.activation",
+            "javax.activation-api",
+            null
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+
+    @Test
+    fun removeManagedDependencyWithScopeMatching() = assertChanged(
+        recipe =  RemoveManagedDependency(
+            "javax.activation",
+            "javax.activation-api",
+            "test"
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """,
+        after = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+
+    @Test
+    fun removeManagedDependencyWithScopeNonMatching() = assertUnchanged(
+        recipe =  RemoveManagedDependency(
+            "javax.activation",
+            "javax.activation-api",
+            "compile"
+        ),
+        before = """
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+                <dependencyManagement>
+                    <dependencies>
+                        <dependency>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>javax.activation-api</artifactId>
+                            <version>1.2.0</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>jakarta.activation</groupId>
+                            <artifactId>jakarta.activation-api</artifactId>
+                            <version>1.2.1</version>
+                        </dependency>
+                    </dependencies>
+                </dependencyManagement>
+            </project>
+        """
+    )
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemovePluginTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemovePluginTest.kt
index ddbef640917..961f863570c 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemovePluginTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/RemovePluginTest.kt
@@ -1,306 +1,306 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.Recipe
-
-class RemovePluginTest : MavenRecipeTest {
-    override val recipe: Recipe
-        get() = RemovePlugin("org.openrewrite.maven", "rewrite-maven-plugin")
-
-    @Test
-    fun removePluginFromBuild() = assertChanged(
-        recipe = RemovePlugin("org.apache.avro", "avro-maven-plugin"),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <properties>
-                <avro-maven-plugin.version>1.10.2</avro-maven-plugin.version>
-              </properties>
-
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.apache.avro</groupId>
-                    <artifactId>avro-maven-plugin</artifactId>
-                    <version>${"$"}{avro-maven-plugin.version}</version>
-                    <executions>
-                      <execution>
-                        <id>schemas</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                          <goal>schema</goal>
-                          <goal>protocol</goal>
-                          <goal>idl-protocol</goal>
-                        </goals>
-                        <configuration>
-                          <sourceDirectory>${"$"}{project.basedir}/src/main/resources/</sourceDirectory>
-                          <outputDirectory>${"$"}{project.basedir}/src/main/java/</outputDirectory>
-                        </configuration>
-                      </execution>
-                    </executions>
-                  </plugin>
-                </plugins>
-              </build>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <properties>
-                <avro-maven-plugin.version>1.10.2</avro-maven-plugin.version>
-              </properties>
-            </project>
-        """
-    )
-
-    @Test
-    fun removePluginFromReporting() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <reporting>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>4.0.0</version>
-                  </plugin>
-                </plugins>
-              </reporting>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-
-    @Test
-    fun removePluginFromBothBuildAndReporting() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>4.0.0</version>
-                  </plugin>
-                </plugins>
-              </build>
-
-              <reporting>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>4.0.0</version>
-                  </plugin>
-                </plugins>
-              </reporting>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-
-    @Test
-    fun removePluginWhenAlongsideOtherPlugins() = assertChanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <properties>
-                <rewrite-maven-plugin.version>4.0.0</rewrite-maven-plugin.version>
-                <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-              </properties>
-
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>${"$"}{rewrite-maven-plugin.version}</version>
-                  </plugin>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>3.0.1</version>
-                  </plugin>
-                </plugins>
-              </build>
-
-              <reporting>
-                <plugins>
-                  <plugin>
-                    <groupId>org.openrewrite.maven</groupId>
-                    <artifactId>rewrite-maven-plugin</artifactId>
-                    <version>${"$"}{rewrite-maven-plugin.version}</version>
-                  </plugin>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${"$"}{maven-checkstyle-plugin.version}</version>
-                    <configuration>
-                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
-                    </configuration>
-                  </plugin>
-                </plugins>
-              </reporting>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <properties>
-                <rewrite-maven-plugin.version>4.0.0</rewrite-maven-plugin.version>
-                <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-              </properties>
-
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>3.0.1</version>
-                  </plugin>
-                </plugins>
-              </build>
-
-              <reporting>
-                <plugins>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${"$"}{maven-checkstyle-plugin.version}</version>
-                    <configuration>
-                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
-                    </configuration>
-                  </plugin>
-                </plugins>
-              </reporting>
-            </project>
-        """
-    )
-
-    @Test
-    fun pluginToRemoveNotFound() = assertUnchanged(
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-
-              <groupId>org.openrewrite.example</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-
-              <build>
-                <plugins>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>3.0.1</version>
-                  </plugin>
-                </plugins>
-              </build>
-
-              <reporting>
-                <plugins>
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${"$"}{maven-checkstyle-plugin}</version>
-                    <configuration>
-                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
-                    </configuration>
-                  </plugin>
-                </plugins>
-              </reporting>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = RemovePlugin(null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("groupId")
-
-        recipe = RemovePlugin(null, "rewrite-maven-plugin")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("groupId")
-
-        recipe = RemovePlugin("org.openrewrite.maven", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-
-        recipe = RemovePlugin("org.openrewrite.maven", "rewrite-maven-plugin")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.Recipe
+
+class RemovePluginTest : MavenRecipeTest {
+    override val recipe: Recipe
+        get() = RemovePlugin("org.openrewrite.maven", "rewrite-maven-plugin")
+
+    @Test
+    fun removePluginFromBuild() = assertChanged(
+        recipe = RemovePlugin("org.apache.avro", "avro-maven-plugin"),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <properties>
+                <avro-maven-plugin.version>1.10.2</avro-maven-plugin.version>
+              </properties>
+
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.avro</groupId>
+                    <artifactId>avro-maven-plugin</artifactId>
+                    <version>${"$"}{avro-maven-plugin.version}</version>
+                    <executions>
+                      <execution>
+                        <id>schemas</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                          <goal>schema</goal>
+                          <goal>protocol</goal>
+                          <goal>idl-protocol</goal>
+                        </goals>
+                        <configuration>
+                          <sourceDirectory>${"$"}{project.basedir}/src/main/resources/</sourceDirectory>
+                          <outputDirectory>${"$"}{project.basedir}/src/main/java/</outputDirectory>
+                        </configuration>
+                      </execution>
+                    </executions>
+                  </plugin>
+                </plugins>
+              </build>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <properties>
+                <avro-maven-plugin.version>1.10.2</avro-maven-plugin.version>
+              </properties>
+            </project>
+        """
+    )
+
+    @Test
+    fun removePluginFromReporting() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <reporting>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>4.0.0</version>
+                  </plugin>
+                </plugins>
+              </reporting>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+
+    @Test
+    fun removePluginFromBothBuildAndReporting() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>4.0.0</version>
+                  </plugin>
+                </plugins>
+              </build>
+
+              <reporting>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>4.0.0</version>
+                  </plugin>
+                </plugins>
+              </reporting>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+
+    @Test
+    fun removePluginWhenAlongsideOtherPlugins() = assertChanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <properties>
+                <rewrite-maven-plugin.version>4.0.0</rewrite-maven-plugin.version>
+                <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+              </properties>
+
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>${"$"}{rewrite-maven-plugin.version}</version>
+                  </plugin>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>3.0.1</version>
+                  </plugin>
+                </plugins>
+              </build>
+
+              <reporting>
+                <plugins>
+                  <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>${"$"}{rewrite-maven-plugin.version}</version>
+                  </plugin>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${"$"}{maven-checkstyle-plugin.version}</version>
+                    <configuration>
+                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                    </configuration>
+                  </plugin>
+                </plugins>
+              </reporting>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <properties>
+                <rewrite-maven-plugin.version>4.0.0</rewrite-maven-plugin.version>
+                <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+              </properties>
+
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>3.0.1</version>
+                  </plugin>
+                </plugins>
+              </build>
+
+              <reporting>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${"$"}{maven-checkstyle-plugin.version}</version>
+                    <configuration>
+                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                    </configuration>
+                  </plugin>
+                </plugins>
+              </reporting>
+            </project>
+        """
+    )
+
+    @Test
+    fun pluginToRemoveNotFound() = assertUnchanged(
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+
+              <groupId>org.openrewrite.example</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+
+              <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>3.0.1</version>
+                  </plugin>
+                </plugins>
+              </build>
+
+              <reporting>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${"$"}{maven-checkstyle-plugin}</version>
+                    <configuration>
+                      <configLocation>src/main/resources/checkstyle.xml</configLocation>
+                    </configuration>
+                  </plugin>
+                </plugins>
+              </reporting>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = RemovePlugin(null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("groupId")
+
+        recipe = RemovePlugin(null, "rewrite-maven-plugin")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("groupId")
+
+        recipe = RemovePlugin("org.openrewrite.maven", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+
+        recipe = RemovePlugin("org.openrewrite.maven", "rewrite-maven-plugin")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradeParentVersionTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradeParentVersionTest.kt
index d6399fc5077..8eefe7fe266 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradeParentVersionTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/UpgradeParentVersionTest.kt
@@ -1,171 +1,171 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-
-class UpgradeParentVersionTest : MavenRecipeTest {
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1317")
-    @Test
-    fun doesNotDowngradeVersion() = assertUnchanged(
-        recipe = UpgradeParentVersion(
-            "org.springframework.boot",
-            "spring-boot-starter-parent",
-            "~1.5",
-            null
-        ),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <parent>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.4.12</version>
-                <relativePath/> <!-- lookup parent from repository -->
-              </parent>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-
-    @Test
-    fun upgradeVersion() = assertChanged(
-        recipe = UpgradeParentVersion(
-            "org.springframework.boot",
-            "spring-boot-starter-parent",
-            "~1.5",
-            null
-        ),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <parent>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>1.5.12.RELEASE</version>
-                <relativePath/> <!-- lookup parent from repository -->
-              </parent>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <parent>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>1.5.22.RELEASE</version>
-                <relativePath/> <!-- lookup parent from repository -->
-              </parent>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-
-    @Test
-    fun upgradeToExactVersion() = assertChanged(
-        recipe = UpgradeParentVersion(
-            "org.springframework.boot",
-            "spring-boot-starter-parent",
-            "1.5.22.RELEASE",
-            null
-        ),
-        before = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <parent>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>1.5.12.RELEASE</version>
-                <relativePath/> <!-- lookup parent from repository -->
-              </parent>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """,
-        after = """
-            <project>
-              <modelVersion>4.0.0</modelVersion>
-              
-              <parent>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>1.5.22.RELEASE</version>
-                <relativePath/> <!-- lookup parent from repository -->
-              </parent>
-              
-              <groupId>com.mycompany.app</groupId>
-              <artifactId>my-app</artifactId>
-              <version>1</version>
-            </project>
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = UpgradeParentVersion(null, null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(3)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("groupId")
-        assertThat(valid.failures()[2].property).isEqualTo("newVersion")
-
-        recipe = UpgradeParentVersion(null, "rewrite-maven", "latest.release", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("groupId")
-
-        recipe = UpgradeParentVersion("org.openrewrite", null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
-        assertThat(valid.failures()[1].property).isEqualTo("newVersion")
-
-        recipe = UpgradeParentVersion("org.openrewrite", "rewrite-maven", "latest.release", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-
-        recipe = UpgradeParentVersion("org.openrewrite", "rewrite-maven", "latest.release", "123")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-
-        recipe = UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", "1.5.22.RELEASE", null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+
+class UpgradeParentVersionTest : MavenRecipeTest {
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1317")
+    @Test
+    fun doesNotDowngradeVersion() = assertUnchanged(
+        recipe = UpgradeParentVersion(
+            "org.springframework.boot",
+            "spring-boot-starter-parent",
+            "~1.5",
+            null
+        ),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>2.4.12</version>
+                <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+
+    @Test
+    fun upgradeVersion() = assertChanged(
+        recipe = UpgradeParentVersion(
+            "org.springframework.boot",
+            "spring-boot-starter-parent",
+            "~1.5",
+            null
+        ),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>1.5.12.RELEASE</version>
+                <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>1.5.22.RELEASE</version>
+                <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+
+    @Test
+    fun upgradeToExactVersion() = assertChanged(
+        recipe = UpgradeParentVersion(
+            "org.springframework.boot",
+            "spring-boot-starter-parent",
+            "1.5.22.RELEASE",
+            null
+        ),
+        before = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>1.5.12.RELEASE</version>
+                <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """,
+        after = """
+            <project>
+              <modelVersion>4.0.0</modelVersion>
+              
+              <parent>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>1.5.22.RELEASE</version>
+                <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              
+              <groupId>com.mycompany.app</groupId>
+              <artifactId>my-app</artifactId>
+              <version>1</version>
+            </project>
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = UpgradeParentVersion(null, null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(3)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("groupId")
+        assertThat(valid.failures()[2].property).isEqualTo("newVersion")
+
+        recipe = UpgradeParentVersion(null, "rewrite-maven", "latest.release", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("groupId")
+
+        recipe = UpgradeParentVersion("org.openrewrite", null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("artifactId")
+        assertThat(valid.failures()[1].property).isEqualTo("newVersion")
+
+        recipe = UpgradeParentVersion("org.openrewrite", "rewrite-maven", "latest.release", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+
+        recipe = UpgradeParentVersion("org.openrewrite", "rewrite-maven", "latest.release", "123")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+
+        recipe = UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", "1.5.22.RELEASE", null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+}
diff --git a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBomTest.kt b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBomTest.kt
index c1ac2e386de..5b2cb17ae52 100755
--- a/rewrite-maven/src/test/kotlin/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBomTest.kt
+++ b/rewrite-maven/src/test/kotlin/org/openrewrite/maven/utilities/PrintMavenAsCycloneDxBomTest.kt
@@ -1,95 +1,95 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven.utilities
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.maven.MavenParser
-
-class PrintMavenAsCycloneDxBomTest {
-    @Test
-    fun cycloneDxBom() {
-        val pom = MavenParser.builder()
-                .build()
-                .parse("""
-                    <project>
-                      <modelVersion>4.0.0</modelVersion>
-                       
-                      <groupId>com.mycompany.app</groupId>
-                      <artifactId>my-app</artifactId>
-                      <version>1</version>
-                      
-                      <dependencies>
-                        <dependency>
-                            <groupId>org.yaml</groupId>
-                            <artifactId>snakeyaml</artifactId>
-                            <version>1.27</version>
-                        </dependency>
-                        <dependency>
-                          <groupId>org.junit.jupiter</groupId>
-                          <artifactId>junit-jupiter</artifactId>
-                          <version>5.7.0</version>
-                          <scope>test</scope>
-                        </dependency>
-                      </dependencies>
-                    </project>
-                """)
-        val bom = PrintMavenAsCycloneDxBom.print(pom[0]).replace(Regex("<timestamp>.*</timestamp>"), "<timestamp>TODAY</timestamp>")
-
-        assertThat(bom).isEqualTo("""
-            <?xml version="1.0" encoding="UTF-8"?>
-            <bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:${pom[0].id}" version="1">
-                <metadata>
-                    <timestamp>TODAY</timestamp>
-                    <tools>
-                        <tool>
-                            <vendor>OpenRewrite</vendor>
-                            <name>OpenRewrite CycloneDX</name>
-                            <version>7.18.0</version>
-                        </tool>
-                    </tools>
-                    <component bom-ref="pkg:maven/com.mycompany.app/my-app@1?type=jar" type="library">
-                        <group>com.mycompany.app</group>
-                        <name>my-app</name>
-                        <version>1</version>
-                        <scope>required</scope>
-                        <purl>pkg:maven/com.mycompany.app/my-app@1?type=jar</purl>
-                    </component>
-                </metadata>
-                <components>
-                    <component bom-ref="pkg:maven/org.yaml/snakeyaml@1.27?type=jar" type="library">
-                        <group>org.yaml</group>
-                        <name>snakeyaml</name>
-                        <version>1.27</version>
-                        <scope>required</scope>
-                        <licenses>
-                            <license>
-                                <id>Apache-2.0</id>
-                                <name>Apache License, Version 2.0</name>
-                            </license>
-                          </licenses>
-                        <purl>pkg:maven/org.yaml/snakeyaml@1.27?type=jar</purl>
-                    </component>
-                </components>
-                <dependencies>
-                    <dependency ref="pkg:maven/org.yaml/snakeyaml@1.27?type=jar">
-                    </dependency>
-                </dependencies>
-            </bom>
-
-        """.trimIndent())
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven.utilities
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.maven.MavenParser
+
+class PrintMavenAsCycloneDxBomTest {
+    @Test
+    fun cycloneDxBom() {
+        val pom = MavenParser.builder()
+                .build()
+                .parse("""
+                    <project>
+                      <modelVersion>4.0.0</modelVersion>
+                       
+                      <groupId>com.mycompany.app</groupId>
+                      <artifactId>my-app</artifactId>
+                      <version>1</version>
+                      
+                      <dependencies>
+                        <dependency>
+                            <groupId>org.yaml</groupId>
+                            <artifactId>snakeyaml</artifactId>
+                            <version>1.27</version>
+                        </dependency>
+                        <dependency>
+                          <groupId>org.junit.jupiter</groupId>
+                          <artifactId>junit-jupiter</artifactId>
+                          <version>5.7.0</version>
+                          <scope>test</scope>
+                        </dependency>
+                      </dependencies>
+                    </project>
+                """)
+        val bom = PrintMavenAsCycloneDxBom.print(pom[0]).replace(Regex("<timestamp>.*</timestamp>"), "<timestamp>TODAY</timestamp>")
+
+        assertThat(bom).isEqualTo("""
+            <?xml version="1.0" encoding="UTF-8"?>
+            <bom xmlns="http://cyclonedx.org/schema/bom/1.2" serialNumber="urn:uuid:${pom[0].id}" version="1">
+                <metadata>
+                    <timestamp>TODAY</timestamp>
+                    <tools>
+                        <tool>
+                            <vendor>OpenRewrite</vendor>
+                            <name>OpenRewrite CycloneDX</name>
+                            <version>7.18.0</version>
+                        </tool>
+                    </tools>
+                    <component bom-ref="pkg:maven/com.mycompany.app/my-app@1?type=jar" type="library">
+                        <group>com.mycompany.app</group>
+                        <name>my-app</name>
+                        <version>1</version>
+                        <scope>required</scope>
+                        <purl>pkg:maven/com.mycompany.app/my-app@1?type=jar</purl>
+                    </component>
+                </metadata>
+                <components>
+                    <component bom-ref="pkg:maven/org.yaml/snakeyaml@1.27?type=jar" type="library">
+                        <group>org.yaml</group>
+                        <name>snakeyaml</name>
+                        <version>1.27</version>
+                        <scope>required</scope>
+                        <licenses>
+                            <license>
+                                <id>Apache-2.0</id>
+                                <name>Apache License, Version 2.0</name>
+                            </license>
+                          </licenses>
+                        <purl>pkg:maven/org.yaml/snakeyaml@1.27?type=jar</purl>
+                    </component>
+                </components>
+                <dependencies>
+                    <dependency ref="pkg:maven/org.yaml/snakeyaml@1.27?type=jar">
+                    </dependency>
+                </dependencies>
+            </bom>
+
+        """.trimIndent())
+    }
+}
diff --git a/rewrite-maven/src/test/resources/logback.xml b/rewrite-maven/src/test/resources/logback.xml
index e7763a68449..07d329f9c35 100755
--- a/rewrite-maven/src/test/resources/logback.xml
+++ b/rewrite-maven/src/test/resources/logback.xml
@@ -1,31 +1,31 @@
-<!--
-
-    Copyright 2020 the original author or authors.
-    <p>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    <p>
-    https://www.apache.org/licenses/LICENSE-2.0
-    <p>
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
+<!--
+
+    Copyright 2020 the original author or authors.
+    <p>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    <p>
+    https://www.apache.org/licenses/LICENSE-2.0
+    <p>
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
 </configuration>
\ No newline at end of file
diff --git a/rewrite-properties/build.gradle.kts b/rewrite-properties/build.gradle.kts
index d760aad33ac..1169c6b98b4 100755
--- a/rewrite-properties/build.gradle.kts
+++ b/rewrite-properties/build.gradle.kts
@@ -1,14 +1,14 @@
-plugins {
-    id("org.openrewrite.java-library")
-    id("org.openrewrite.maven-publish")
-}
-
-dependencies {
-    api(project(":rewrite-core"))
-    api("org.jetbrains:annotations:latest.release")
-    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
-
-    implementation("io.micrometer:micrometer-core:1.+")
-
-    testImplementation(project(":rewrite-test"))
-}
+plugins {
+    id("org.openrewrite.java-library")
+    id("org.openrewrite.maven-publish")
+}
+
+dependencies {
+    api(project(":rewrite-core"))
+    api("org.jetbrains:annotations:latest.release")
+    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
+
+    implementation("io.micrometer:micrometer-core:1.+")
+
+    testImplementation(project(":rewrite-test"))
+}
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyKey.java b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyKey.java
index 162683bb988..3eb9d525c55 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyKey.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyKey.java
@@ -1,91 +1,91 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.*;
-import org.openrewrite.internal.NameCaseConvention;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.properties.tree.Properties;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangePropertyKey extends Recipe {
-
-    @Option(displayName = "Old property key",
-            description = "The property key to rename.",
-            example = "management.metrics.binders.files.enabled")
-    String oldPropertyKey;
-
-    @Option(displayName = "New property key",
-            description = "The new name for the key identified by `oldPropertyKey`.",
-            example = "management.metrics.enable.process.files")
-    String newPropertyKey;
-
-    @Incubating(since = "7.17.0")
-    @Option(displayName = "Use relaxed binding",
-            description = "Whether to match the `oldPropertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
-                    "rules. Default is `true`. Set to `false`  to use exact matching.",
-            required = false)
-    @Nullable
-    Boolean relaxedBinding;
-
-    @Incubating(since = "7.8.0")
-    @Option(displayName = "Optional file matcher",
-            description = "Matching files will be modified. This is a glob expression.",
-            required = false,
-            example = "**/application-*.properties")
-    @Nullable
-    String fileMatcher;
-
-    @Override
-    public String getDisplayName() {
-        return "Change property key";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change a property key leaving the value intact.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
-        if (fileMatcher != null) {
-            return new HasSourcePath<>(fileMatcher);
-        }
-        return null;
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new ChangePropertyKeyVisitor<>();
-    }
-
-    public class ChangePropertyKeyVisitor<P> extends PropertiesVisitor<P> {
-        public ChangePropertyKeyVisitor() {
-        }
-
-        @Override
-        public Properties visitEntry(Properties.Entry entry, P p) {
-            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(entry.getKey(), oldPropertyKey) : entry.getKey().equals(oldPropertyKey)) {
-                entry = entry.withKey(newPropertyKey).withPrefix(entry.getPrefix());
-            }
-            return super.visitEntry(entry, p);
-        }
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.*;
+import org.openrewrite.internal.NameCaseConvention;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.properties.tree.Properties;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangePropertyKey extends Recipe {
+
+    @Option(displayName = "Old property key",
+            description = "The property key to rename.",
+            example = "management.metrics.binders.files.enabled")
+    String oldPropertyKey;
+
+    @Option(displayName = "New property key",
+            description = "The new name for the key identified by `oldPropertyKey`.",
+            example = "management.metrics.enable.process.files")
+    String newPropertyKey;
+
+    @Incubating(since = "7.17.0")
+    @Option(displayName = "Use relaxed binding",
+            description = "Whether to match the `oldPropertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
+                    "rules. Default is `true`. Set to `false`  to use exact matching.",
+            required = false)
+    @Nullable
+    Boolean relaxedBinding;
+
+    @Incubating(since = "7.8.0")
+    @Option(displayName = "Optional file matcher",
+            description = "Matching files will be modified. This is a glob expression.",
+            required = false,
+            example = "**/application-*.properties")
+    @Nullable
+    String fileMatcher;
+
+    @Override
+    public String getDisplayName() {
+        return "Change property key";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change a property key leaving the value intact.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
+        if (fileMatcher != null) {
+            return new HasSourcePath<>(fileMatcher);
+        }
+        return null;
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new ChangePropertyKeyVisitor<>();
+    }
+
+    public class ChangePropertyKeyVisitor<P> extends PropertiesVisitor<P> {
+        public ChangePropertyKeyVisitor() {
+        }
+
+        @Override
+        public Properties visitEntry(Properties.Entry entry, P p) {
+            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(entry.getKey(), oldPropertyKey) : entry.getKey().equals(oldPropertyKey)) {
+                entry = entry.withKey(newPropertyKey).withPrefix(entry.getPrefix());
+            }
+            return super.visitEntry(entry, p);
+        }
+    }
+
+}
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
index 959fa59c2c9..d5af755dff0 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
@@ -1,99 +1,99 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.*;
-import org.openrewrite.internal.NameCaseConvention;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.properties.tree.Properties;
-
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangePropertyValue extends Recipe {
-
-    @Option(displayName = "Property key",
-            description = "The name of the property key whose value is to be changed.",
-            example = "management.metrics.binders.files.enabled")
-    String propertyKey;
-
-    @Option(displayName = "New value",
-            description = "The new value to be used for key specified by `propertyKey`.",
-            example = "false")
-    String newValue;
-
-    @Option(displayName = "Old value",
-            example = "true",
-            required = false,
-            description = "Only change the property value if it matches the configured `oldValue`.")
-    @Nullable
-    String oldValue;
-
-    @Incubating(since = "7.17.0")
-    @Option(displayName = "Use relaxed binding",
-            description = "Whether to match the `propertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
-                    "rules. Default is `true`. Set to `false`  to use exact matching.",
-            required = false)
-    @Nullable
-    Boolean relaxedBinding;
-
-    @Option(displayName = "Optional file matcher",
-            description = "Matching files will be modified. This is a glob expression.",
-            required = false,
-            example = "'**/application-*.properties'")
-    @Nullable
-    String fileMatcher;
-
-    @Override
-    public String getDisplayName() {
-        return "Change property value";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change a property value leaving the key intact.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
-        if (fileMatcher != null) {
-            return new HasSourcePath<>(fileMatcher);
-        }
-        return null;
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new ChangePropertyValueVisitor<>();
-    }
-
-    public class ChangePropertyValueVisitor<P> extends PropertiesVisitor<P> {
-        public ChangePropertyValueVisitor() {
-        }
-
-        @Override
-        public Properties visitEntry(Properties.Entry entry, P p) {
-            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(entry.getKey(), propertyKey) : entry.getKey().equals(propertyKey)) {
-                if (oldValue == null ? !entry.getValue().getText().equals(newValue) : oldValue.equals(entry.getValue().getText())) {
-                    entry = entry.withValue(entry.getValue().withText(newValue));
-                }
-            }
-            return super.visitEntry(entry, p);
-        }
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.*;
+import org.openrewrite.internal.NameCaseConvention;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.properties.tree.Properties;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangePropertyValue extends Recipe {
+
+    @Option(displayName = "Property key",
+            description = "The name of the property key whose value is to be changed.",
+            example = "management.metrics.binders.files.enabled")
+    String propertyKey;
+
+    @Option(displayName = "New value",
+            description = "The new value to be used for key specified by `propertyKey`.",
+            example = "false")
+    String newValue;
+
+    @Option(displayName = "Old value",
+            example = "true",
+            required = false,
+            description = "Only change the property value if it matches the configured `oldValue`.")
+    @Nullable
+    String oldValue;
+
+    @Incubating(since = "7.17.0")
+    @Option(displayName = "Use relaxed binding",
+            description = "Whether to match the `propertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
+                    "rules. Default is `true`. Set to `false`  to use exact matching.",
+            required = false)
+    @Nullable
+    Boolean relaxedBinding;
+
+    @Option(displayName = "Optional file matcher",
+            description = "Matching files will be modified. This is a glob expression.",
+            required = false,
+            example = "'**/application-*.properties'")
+    @Nullable
+    String fileMatcher;
+
+    @Override
+    public String getDisplayName() {
+        return "Change property value";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change a property value leaving the key intact.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
+        if (fileMatcher != null) {
+            return new HasSourcePath<>(fileMatcher);
+        }
+        return null;
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new ChangePropertyValueVisitor<>();
+    }
+
+    public class ChangePropertyValueVisitor<P> extends PropertiesVisitor<P> {
+        public ChangePropertyValueVisitor() {
+        }
+
+        @Override
+        public Properties visitEntry(Properties.Entry entry, P p) {
+            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(entry.getKey(), propertyKey) : entry.getKey().equals(propertyKey)) {
+                if (oldValue == null ? !entry.getValue().getText().equals(newValue) : oldValue.equals(entry.getValue().getText())) {
+                    entry = entry.withValue(entry.getValue().withText(newValue));
+                }
+            }
+            return super.visitEntry(entry, p);
+        }
+    }
+
+}
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
index c3d1d7ce218..0c8c07b40e5 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
@@ -1,243 +1,243 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties;
-
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
-import org.intellij.lang.annotations.Language;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.Parser;
-import org.openrewrite.internal.EncodingDetectingInputStream;
-import org.openrewrite.internal.MetricsHelper;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.properties.tree.Properties;
-import org.openrewrite.tree.ParsingEventListener;
-import org.openrewrite.tree.ParsingExecutionContextView;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static java.util.stream.Collectors.toList;
-import static org.openrewrite.Tree.randomId;
-
-public class PropertiesParser implements Parser<Properties.File> {
-    @Override
-    public List<Properties.File> parse(@Language("properties") String... sources) {
-        return parse(new InMemoryExecutionContext(), sources);
-    }
-
-    @Override
-    public List<Properties.File> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
-        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
-        return acceptedInputs(sourceFiles).stream()
-                .map(sourceFile -> {
-                    Timer.Builder timer = Timer.builder("rewrite.parse")
-                            .description("The time spent parsing a properties file")
-                            .tag("file.type", "Properties");
-                    Timer.Sample sample = Timer.start();
-                    try (EncodingDetectingInputStream is = sourceFile.getSource()) {
-                        Properties.File file = parseFromInput(sourceFile.getRelativePath(relativeTo), is);
-                        sample.stop(MetricsHelper.successTags(timer).register(Metrics.globalRegistry));
-                        parsingListener.parsed(sourceFile, file);
-                        return file;
-                    } catch (Throwable t) {
-                        sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
-                        return null;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .collect(toList());
-    }
-
-    private Properties.File parseFromInput(Path sourceFile, EncodingDetectingInputStream source) {
-        List<Properties.Content> contents = new ArrayList<>();
-
-        StringBuilder prefix = new StringBuilder();
-        StringBuilder buff = new StringBuilder();
-        String s = source.readFully();
-        for (char c : s.toCharArray()) {
-            if (c == '\n') {
-                Properties.Content content = extractContent(buff.toString(), prefix);
-                if (content != null) {
-                    contents.add(content);
-                }
-                buff = new StringBuilder();
-                prefix.append(c);
-            } else {
-                buff.append(c);
-            }
-        }
-        Properties.Content content = extractContent(buff.toString(), prefix);
-        if (content != null) {
-            contents.add(content);
-        }
-
-        return new Properties.File(
-                randomId(),
-                "",
-                Markers.EMPTY,
-                sourceFile,
-                contents,
-                prefix.toString(),
-                source.getCharset().name(),
-                source.isCharsetBomMarked()
-        );
-    }
-
-    @Nullable
-    private Properties.Content extractContent(String line, StringBuilder prefix) {
-        Properties.Content content = null;
-        if (line.trim().startsWith("#")) {
-            content = commentFromLine(line, prefix.toString());
-            prefix.delete(0, prefix.length());
-        } else if (line.contains("=")) {
-            StringBuilder trailingWhitespaceBuffer = new StringBuilder();
-            content = entryFromLine(line, prefix.toString(), trailingWhitespaceBuffer);
-            prefix.delete(0, prefix.length());
-            prefix.append(trailingWhitespaceBuffer);
-        } else {
-            prefix.append(line);
-        }
-        return content;
-    }
-
-    private Properties.Comment commentFromLine(String line, String prefix) {
-        StringBuilder prefixBuilder = new StringBuilder(prefix);
-        StringBuilder message = new StringBuilder();
-
-        int state = 0;
-        for (char c : line.toCharArray()) {
-            switch (state) {
-                case 0:
-                    if (Character.isWhitespace(c)) {
-                        prefixBuilder.append(c);
-                        break;
-                    }
-                    state++;
-                case 1:
-                    if (c == '#') {
-                        continue;
-                    } else if (!Character.isWhitespace(c)) {
-                        message.append(c);
-                        break;
-                    }
-                    state++;
-                case 2:
-                    if (!Character.isWhitespace(c)) {
-                        // multi-word comment
-                        message.append(c);
-                        state--;
-                        break;
-                    } else {
-                        message.append(c);
-                    }
-            }
-        }
-
-        return new Properties.Comment(
-                randomId(),
-                prefixBuilder.toString(),
-                Markers.EMPTY,
-                message.toString()
-        );
-    }
-
-    private Properties.Entry entryFromLine(String line, String prefix, StringBuilder trailingWhitespaceBuffer) {
-        StringBuilder prefixBuilder = new StringBuilder(prefix),
-                key = new StringBuilder(),
-                equalsPrefix = new StringBuilder(),
-                valuePrefix = new StringBuilder(),
-                value = new StringBuilder();
-
-        int state = 0;
-        for (char c : line.toCharArray()) {
-            switch (state) {
-                case 0:
-                    if (Character.isWhitespace(c)) {
-                        prefixBuilder.append(c);
-                        break;
-                    }
-                    state++;
-                case 1:
-                    if (c == '=') {
-                        state += 2;
-                    } else if (!Character.isWhitespace(c)) {
-                        key.append(c);
-                        break;
-                    } else {
-                        state++;
-                    }
-                case 2:
-                    if (Character.isWhitespace(c)) {
-                        equalsPrefix.append(c);
-                        break;
-                    }
-                    state++;
-                case 3:
-                    if (c == '=') {
-                        continue;
-                    } else if (Character.isWhitespace(c)) {
-                        valuePrefix.append(c);
-                        break;
-                    }
-                    state++;
-                case 4:
-                    if (!Character.isWhitespace(c)) {
-                        value.append(c);
-                        break;
-                    }
-                    state++;
-                case 5:
-                    if (!Character.isWhitespace(c)) {
-                        // multi-word value
-                        value.append(trailingWhitespaceBuffer);
-                        trailingWhitespaceBuffer.delete(0, trailingWhitespaceBuffer.length());
-                        value.append(c);
-                        state--;
-                        break;
-                    } else {
-                        trailingWhitespaceBuffer.append(c);
-                    }
-            }
-        }
-
-        return new Properties.Entry(
-                randomId(),
-                prefixBuilder.toString(),
-                Markers.EMPTY,
-                key.toString(),
-                equalsPrefix.toString(),
-                new Properties.Value(randomId(), valuePrefix.toString(), Markers.EMPTY, value.toString())
-        );
-    }
-
-    @Override
-    public boolean accept(Path path) {
-        return path.toString().endsWith(".properties");
-    }
-
-    @Override
-    public Path sourcePathFromSourceText(Path prefix, String sourceCode) {
-        return prefix.resolve("file.properties");
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties;
+
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import org.intellij.lang.annotations.Language;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Parser;
+import org.openrewrite.internal.EncodingDetectingInputStream;
+import org.openrewrite.internal.MetricsHelper;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.properties.tree.Properties;
+import org.openrewrite.tree.ParsingEventListener;
+import org.openrewrite.tree.ParsingExecutionContextView;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static java.util.stream.Collectors.toList;
+import static org.openrewrite.Tree.randomId;
+
+public class PropertiesParser implements Parser<Properties.File> {
+    @Override
+    public List<Properties.File> parse(@Language("properties") String... sources) {
+        return parse(new InMemoryExecutionContext(), sources);
+    }
+
+    @Override
+    public List<Properties.File> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
+        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
+        return acceptedInputs(sourceFiles).stream()
+                .map(sourceFile -> {
+                    Timer.Builder timer = Timer.builder("rewrite.parse")
+                            .description("The time spent parsing a properties file")
+                            .tag("file.type", "Properties");
+                    Timer.Sample sample = Timer.start();
+                    try (EncodingDetectingInputStream is = sourceFile.getSource()) {
+                        Properties.File file = parseFromInput(sourceFile.getRelativePath(relativeTo), is);
+                        sample.stop(MetricsHelper.successTags(timer).register(Metrics.globalRegistry));
+                        parsingListener.parsed(sourceFile, file);
+                        return file;
+                    } catch (Throwable t) {
+                        sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
+                        ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(toList());
+    }
+
+    private Properties.File parseFromInput(Path sourceFile, EncodingDetectingInputStream source) {
+        List<Properties.Content> contents = new ArrayList<>();
+
+        StringBuilder prefix = new StringBuilder();
+        StringBuilder buff = new StringBuilder();
+        String s = source.readFully();
+        for (char c : s.toCharArray()) {
+            if (c == '\n') {
+                Properties.Content content = extractContent(buff.toString(), prefix);
+                if (content != null) {
+                    contents.add(content);
+                }
+                buff = new StringBuilder();
+                prefix.append(c);
+            } else {
+                buff.append(c);
+            }
+        }
+        Properties.Content content = extractContent(buff.toString(), prefix);
+        if (content != null) {
+            contents.add(content);
+        }
+
+        return new Properties.File(
+                randomId(),
+                "",
+                Markers.EMPTY,
+                sourceFile,
+                contents,
+                prefix.toString(),
+                source.getCharset().name(),
+                source.isCharsetBomMarked()
+        );
+    }
+
+    @Nullable
+    private Properties.Content extractContent(String line, StringBuilder prefix) {
+        Properties.Content content = null;
+        if (line.trim().startsWith("#")) {
+            content = commentFromLine(line, prefix.toString());
+            prefix.delete(0, prefix.length());
+        } else if (line.contains("=")) {
+            StringBuilder trailingWhitespaceBuffer = new StringBuilder();
+            content = entryFromLine(line, prefix.toString(), trailingWhitespaceBuffer);
+            prefix.delete(0, prefix.length());
+            prefix.append(trailingWhitespaceBuffer);
+        } else {
+            prefix.append(line);
+        }
+        return content;
+    }
+
+    private Properties.Comment commentFromLine(String line, String prefix) {
+        StringBuilder prefixBuilder = new StringBuilder(prefix);
+        StringBuilder message = new StringBuilder();
+
+        int state = 0;
+        for (char c : line.toCharArray()) {
+            switch (state) {
+                case 0:
+                    if (Character.isWhitespace(c)) {
+                        prefixBuilder.append(c);
+                        break;
+                    }
+                    state++;
+                case 1:
+                    if (c == '#') {
+                        continue;
+                    } else if (!Character.isWhitespace(c)) {
+                        message.append(c);
+                        break;
+                    }
+                    state++;
+                case 2:
+                    if (!Character.isWhitespace(c)) {
+                        // multi-word comment
+                        message.append(c);
+                        state--;
+                        break;
+                    } else {
+                        message.append(c);
+                    }
+            }
+        }
+
+        return new Properties.Comment(
+                randomId(),
+                prefixBuilder.toString(),
+                Markers.EMPTY,
+                message.toString()
+        );
+    }
+
+    private Properties.Entry entryFromLine(String line, String prefix, StringBuilder trailingWhitespaceBuffer) {
+        StringBuilder prefixBuilder = new StringBuilder(prefix),
+                key = new StringBuilder(),
+                equalsPrefix = new StringBuilder(),
+                valuePrefix = new StringBuilder(),
+                value = new StringBuilder();
+
+        int state = 0;
+        for (char c : line.toCharArray()) {
+            switch (state) {
+                case 0:
+                    if (Character.isWhitespace(c)) {
+                        prefixBuilder.append(c);
+                        break;
+                    }
+                    state++;
+                case 1:
+                    if (c == '=') {
+                        state += 2;
+                    } else if (!Character.isWhitespace(c)) {
+                        key.append(c);
+                        break;
+                    } else {
+                        state++;
+                    }
+                case 2:
+                    if (Character.isWhitespace(c)) {
+                        equalsPrefix.append(c);
+                        break;
+                    }
+                    state++;
+                case 3:
+                    if (c == '=') {
+                        continue;
+                    } else if (Character.isWhitespace(c)) {
+                        valuePrefix.append(c);
+                        break;
+                    }
+                    state++;
+                case 4:
+                    if (!Character.isWhitespace(c)) {
+                        value.append(c);
+                        break;
+                    }
+                    state++;
+                case 5:
+                    if (!Character.isWhitespace(c)) {
+                        // multi-word value
+                        value.append(trailingWhitespaceBuffer);
+                        trailingWhitespaceBuffer.delete(0, trailingWhitespaceBuffer.length());
+                        value.append(c);
+                        state--;
+                        break;
+                    } else {
+                        trailingWhitespaceBuffer.append(c);
+                    }
+            }
+        }
+
+        return new Properties.Entry(
+                randomId(),
+                prefixBuilder.toString(),
+                Markers.EMPTY,
+                key.toString(),
+                equalsPrefix.toString(),
+                new Properties.Value(randomId(), valuePrefix.toString(), Markers.EMPTY, value.toString())
+        );
+    }
+
+    @Override
+    public boolean accept(Path path) {
+        return path.toString().endsWith(".properties");
+    }
+
+    @Override
+    public Path sourcePathFromSourceText(Path prefix, String sourceCode) {
+        return prefix.resolve("file.properties");
+    }
+}
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java b/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
index 6aec57b72e0..3437532e9d8 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
@@ -1,149 +1,149 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties.tree;
-
-import lombok.*;
-import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.properties.PropertiesVisitor;
-import org.openrewrite.properties.internal.PropertiesPrinter;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.UUID;
-
-public interface Properties extends Tree {
-
-    @SuppressWarnings("unchecked")
-    @Override
-    default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
-        return (R) acceptProperties((PropertiesVisitor<P>) v, p);
-    }
-
-    @Override
-    default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
-        return v instanceof PropertiesVisitor;
-    }
-
-    @Nullable
-    default <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
-        return v.defaultValue(this, p);
-    }
-
-    String getPrefix();
-
-    Properties withPrefix(String prefix);
-
-    <T extends Properties> T withMarkers(Markers markers);
-
-    Markers getMarkers();
-
-    @lombok.Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class File implements Properties, SourceFile {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        Path sourcePath;
-        List<Content> content;
-        String eof;
-
-        @Nullable // for backwards compatibility
-        @With(AccessLevel.PRIVATE)
-        String charsetName;
-
-        @With
-        @Getter
-        boolean charsetBomMarked;
-
-        @Override
-        public Charset getCharset() {
-            return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
-        }
-
-        @Override
-        public SourceFile withCharset(Charset charset) {
-            return withCharsetName(charset.name());
-        }
-
-        @Override
-        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
-            return v.visitFile(this, p);
-        }
-
-        @Override
-        public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
-            return new PropertiesPrinter<>();
-        }
-    }
-
-    interface Content extends Properties {
-    }
-
-    @lombok.Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Entry implements Content {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        String key;
-        String beforeEquals;
-        Value value;
-
-        @Override
-        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
-            return v.visitEntry(this, p);
-        }
-    }
-
-    @lombok.Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Value {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        String text;
-    }
-
-    @lombok.Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Comment implements Content {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        String message;
-
-        @Override
-        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
-            return v.visitComment(this, p);
-        }
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties.tree;
+
+import lombok.*;
+import org.openrewrite.*;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.properties.PropertiesVisitor;
+import org.openrewrite.properties.internal.PropertiesPrinter;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.UUID;
+
+public interface Properties extends Tree {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
+        return (R) acceptProperties((PropertiesVisitor<P>) v, p);
+    }
+
+    @Override
+    default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
+        return v instanceof PropertiesVisitor;
+    }
+
+    @Nullable
+    default <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
+        return v.defaultValue(this, p);
+    }
+
+    String getPrefix();
+
+    Properties withPrefix(String prefix);
+
+    <T extends Properties> T withMarkers(Markers markers);
+
+    Markers getMarkers();
+
+    @lombok.Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class File implements Properties, SourceFile {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        Path sourcePath;
+        List<Content> content;
+        String eof;
+
+        @Nullable // for backwards compatibility
+        @With(AccessLevel.PRIVATE)
+        String charsetName;
+
+        @With
+        @Getter
+        boolean charsetBomMarked;
+
+        @Override
+        public Charset getCharset() {
+            return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
+        }
+
+        @Override
+        public SourceFile withCharset(Charset charset) {
+            return withCharsetName(charset.name());
+        }
+
+        @Override
+        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
+            return v.visitFile(this, p);
+        }
+
+        @Override
+        public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
+            return new PropertiesPrinter<>();
+        }
+    }
+
+    interface Content extends Properties {
+    }
+
+    @lombok.Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Entry implements Content {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        String key;
+        String beforeEquals;
+        Value value;
+
+        @Override
+        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
+            return v.visitEntry(this, p);
+        }
+    }
+
+    @lombok.Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Value {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        String text;
+    }
+
+    @lombok.Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Comment implements Content {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        String message;
+
+        @Override
+        public <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
+            return v.visitComment(this, p);
+        }
+    }
+}
diff --git a/rewrite-properties/src/test/kotlin/org/openrewrite/properties/ChangePropertyKeyTest.kt b/rewrite-properties/src/test/kotlin/org/openrewrite/properties/ChangePropertyKeyTest.kt
index 096f0b7d8ea..65fea1ab10e 100755
--- a/rewrite-properties/src/test/kotlin/org/openrewrite/properties/ChangePropertyKeyTest.kt
+++ b/rewrite-properties/src/test/kotlin/org/openrewrite/properties/ChangePropertyKeyTest.kt
@@ -1,143 +1,143 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.ValueSource
-import org.openrewrite.Issue
-import java.nio.file.Path
-
-@Suppress("UnusedProperty")
-class ChangePropertyKeyTest : PropertiesRecipeTest {
-    override val recipe = ChangePropertyKey(
-        "management.metrics.binders.files.enabled",
-        "management.metrics.enable.process.files",
-        null,
-        null
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/575")
-    @Test
-    fun preserveComment() = assertChanged(
-        before = """
-            # comment
-            management.metrics.binders.files.enabled=true
-        """,
-        after = """
-            # comment
-            management.metrics.enable.process.files=true
-        """
-    )
-
-    @Test
-    fun changeKey() = assertChanged(
-        before = "management.metrics.binders.files.enabled=true",
-        after = "management.metrics.enable.process.files=true"
-    )
-
-    @ParameterizedTest
-    @ValueSource(
-        strings = [
-            "acme.my-project.person.first-name",
-            "acme.myProject.person.firstName",
-            "acme.my_project.person.first_name",
-        ]
-    )
-    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
-    fun relaxedBinding(propertyKey: String) = assertChanged(
-        recipe = ChangePropertyKey(propertyKey, "acme.my-project.person.change-to", true, null),
-        before = """
-            acme.my-project.person.first-name=example
-            management.contextPath=/manage
-        """,
-        after = """
-            acme.my-project.person.change-to=example
-            management.contextPath=/manage
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
-    fun exactMatch() = assertChanged(
-        recipe = ChangePropertyKey(
-            "acme.my-project.person.first-name",
-            "acme.my-project.person.change-to",
-            false,
-            null
-        ),
-        before = """
-            acme.my-project.person.first-name=example
-            acme.myProject.person.firstName=example
-            acme.my_project.person.first_name=example
-        """,
-        after = """
-            acme.my-project.person.change-to=example
-            acme.myProject.person.firstName=example
-            acme.my_project.person.first_name=example
-        """
-    )
-
-    @Test
-    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
-        val matchingFile = tempDir.resolve("a.properties").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("management.metrics=true")
-        }.toFile()
-        val nonMatchingFile = tempDir.resolve("b.properties").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("management.metrics=true")
-        }.toFile()
-        val recipe = ChangePropertyKey("management.metrics", "management.stats", null, "**/a.properties")
-        assertChanged(recipe = recipe, before = matchingFile, after = "management.stats=true")
-        assertUnchanged(recipe = recipe, before = nonMatchingFile)
-    }
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = ChangePropertyKey(null, null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
-        assertThat(valid.failures()[1].property).isEqualTo("oldPropertyKey")
-
-        recipe = ChangePropertyKey(null, "management.metrics.enable.process.files", null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("oldPropertyKey")
-
-        recipe = ChangePropertyKey("management.metrics.binders.files.enabled", null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
-
-        recipe =
-            ChangePropertyKey(
-                "management.metrics.binders.files.enabled",
-                "management.metrics.enable.process.files",
-                null,
-                null
-            )
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import org.openrewrite.Issue
+import java.nio.file.Path
+
+@Suppress("UnusedProperty")
+class ChangePropertyKeyTest : PropertiesRecipeTest {
+    override val recipe = ChangePropertyKey(
+        "management.metrics.binders.files.enabled",
+        "management.metrics.enable.process.files",
+        null,
+        null
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/575")
+    @Test
+    fun preserveComment() = assertChanged(
+        before = """
+            # comment
+            management.metrics.binders.files.enabled=true
+        """,
+        after = """
+            # comment
+            management.metrics.enable.process.files=true
+        """
+    )
+
+    @Test
+    fun changeKey() = assertChanged(
+        before = "management.metrics.binders.files.enabled=true",
+        after = "management.metrics.enable.process.files=true"
+    )
+
+    @ParameterizedTest
+    @ValueSource(
+        strings = [
+            "acme.my-project.person.first-name",
+            "acme.myProject.person.firstName",
+            "acme.my_project.person.first_name",
+        ]
+    )
+    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
+    fun relaxedBinding(propertyKey: String) = assertChanged(
+        recipe = ChangePropertyKey(propertyKey, "acme.my-project.person.change-to", true, null),
+        before = """
+            acme.my-project.person.first-name=example
+            management.contextPath=/manage
+        """,
+        after = """
+            acme.my-project.person.change-to=example
+            management.contextPath=/manage
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
+    fun exactMatch() = assertChanged(
+        recipe = ChangePropertyKey(
+            "acme.my-project.person.first-name",
+            "acme.my-project.person.change-to",
+            false,
+            null
+        ),
+        before = """
+            acme.my-project.person.first-name=example
+            acme.myProject.person.firstName=example
+            acme.my_project.person.first_name=example
+        """,
+        after = """
+            acme.my-project.person.change-to=example
+            acme.myProject.person.firstName=example
+            acme.my_project.person.first_name=example
+        """
+    )
+
+    @Test
+    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
+        val matchingFile = tempDir.resolve("a.properties").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("management.metrics=true")
+        }.toFile()
+        val nonMatchingFile = tempDir.resolve("b.properties").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("management.metrics=true")
+        }.toFile()
+        val recipe = ChangePropertyKey("management.metrics", "management.stats", null, "**/a.properties")
+        assertChanged(recipe = recipe, before = matchingFile, after = "management.stats=true")
+        assertUnchanged(recipe = recipe, before = nonMatchingFile)
+    }
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = ChangePropertyKey(null, null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
+        assertThat(valid.failures()[1].property).isEqualTo("oldPropertyKey")
+
+        recipe = ChangePropertyKey(null, "management.metrics.enable.process.files", null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("oldPropertyKey")
+
+        recipe = ChangePropertyKey("management.metrics.binders.files.enabled", null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
+
+        recipe =
+            ChangePropertyKey(
+                "management.metrics.binders.files.enabled",
+                "management.metrics.enable.process.files",
+                null,
+                null
+            )
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue
+    }
+}
diff --git a/rewrite-test/build.gradle.kts b/rewrite-test/build.gradle.kts
index 566e7374aa8..3970e8a0fea 100644
--- a/rewrite-test/build.gradle.kts
+++ b/rewrite-test/build.gradle.kts
@@ -1,49 +1,49 @@
-plugins {
-    id("org.openrewrite.java-library")
-    id("org.openrewrite.maven-publish")
-}
-
-dependencies {
-    api(project(":rewrite-core"))
-    api(project(":rewrite-gradle"))
-    api(project(":rewrite-groovy"))
-    api(project(":rewrite-hcl"))
-    api(project(":rewrite-java"))
-    api(project(":rewrite-json"))
-    api(project(":rewrite-maven"))
-    api(project(":rewrite-properties"))
-    api(project(":rewrite-protobuf"))
-    api(project(":rewrite-xml"))
-    api(project(":rewrite-yaml"))
-
-    api("org.eclipse.jgit:org.eclipse.jgit:5.13.+")
-
-    compileOnly("io.micrometer:micrometer-registry-prometheus:1.+")
-
-    implementation("com.squareup.okhttp3:okhttp:4.9.3")
-
-    api("org.junit.jupiter:junit-jupiter-api:latest.release")
-    api("org.junit.jupiter:junit-jupiter-params:latest.release")
-
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("io.github.classgraph:classgraph:latest.release")
-    implementation("org.assertj:assertj-core:latest.release")
-
-    // later versions are compiled with Java 11, so are not usable in rewrite-java-8 tests
-//    implementation("com.google.googlejavaformat:google-java-format:1.6")
-
-    implementation("org.slf4j:slf4j-api:1.7.36")
-    implementation("ch.qos.logback:logback-classic:1.2.11")
-
-    // configuration generator for service providers
-    implementation("com.google.auto.service:auto-service:latest.release")
-
-    implementation("org.apache.hbase:hbase-shaded-client:2.4.11")
-    testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin:latest.release")
-}
-
-tasks.withType<Javadoc> {
-    isFailOnError = false
-    exclude("org/openrewrite/java/**")
-}
+plugins {
+    id("org.openrewrite.java-library")
+    id("org.openrewrite.maven-publish")
+}
+
+dependencies {
+    api(project(":rewrite-core"))
+    api(project(":rewrite-gradle"))
+    api(project(":rewrite-groovy"))
+    api(project(":rewrite-hcl"))
+    api(project(":rewrite-java"))
+    api(project(":rewrite-json"))
+    api(project(":rewrite-maven"))
+    api(project(":rewrite-properties"))
+    api(project(":rewrite-protobuf"))
+    api(project(":rewrite-xml"))
+    api(project(":rewrite-yaml"))
+
+    api("org.eclipse.jgit:org.eclipse.jgit:5.13.+")
+
+    compileOnly("io.micrometer:micrometer-registry-prometheus:1.+")
+
+    implementation("com.squareup.okhttp3:okhttp:4.9.3")
+
+    api("org.junit.jupiter:junit-jupiter-api:latest.release")
+    api("org.junit.jupiter:junit-jupiter-params:latest.release")
+
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("io.github.classgraph:classgraph:latest.release")
+    implementation("org.assertj:assertj-core:latest.release")
+
+    // later versions are compiled with Java 11, so are not usable in rewrite-java-8 tests
+//    implementation("com.google.googlejavaformat:google-java-format:1.6")
+
+    implementation("org.slf4j:slf4j-api:1.7.36")
+    implementation("ch.qos.logback:logback-classic:1.2.11")
+
+    // configuration generator for service providers
+    implementation("com.google.auto.service:auto-service:latest.release")
+
+    implementation("org.apache.hbase:hbase-shaded-client:2.4.11")
+    testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin:latest.release")
+}
+
+tasks.withType<Javadoc> {
+    isFailOnError = false
+    exclude("org/openrewrite/java/**")
+}
diff --git a/rewrite-test/src/main/java/org/openrewrite/DebugOnly.java b/rewrite-test/src/main/java/org/openrewrite/DebugOnly.java
index 08901d70185..aafc5e107d4 100644
--- a/rewrite-test/src/main/java/org/openrewrite/DebugOnly.java
+++ b/rewrite-test/src/main/java/org/openrewrite/DebugOnly.java
@@ -1,33 +1,33 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite;
-
-import org.junit.jupiter.api.Tag;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a test as used only for debugging. It shouldn't
- * run as part of the normal build's tests.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Tag("debug")
-public @interface DebugOnly {
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite;
+
+import org.junit.jupiter.api.Tag;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a test as used only for debugging. It shouldn't
+ * run as part of the normal build's tests.
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Tag("debug")
+public @interface DebugOnly {
+}
diff --git a/rewrite-test/src/main/java/org/openrewrite/Issue.java b/rewrite-test/src/main/java/org/openrewrite/Issue.java
index 6e754ef290c..80e4e47ad1c 100644
--- a/rewrite-test/src/main/java/org/openrewrite/Issue.java
+++ b/rewrite-test/src/main/java/org/openrewrite/Issue.java
@@ -1,30 +1,30 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a test as related to a Github issue.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.SOURCE)
-public @interface Issue {
-    String value();
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a test as related to a Github issue.
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.SOURCE)
+public @interface Issue {
+    String value();
+}
diff --git a/rewrite-test/src/main/java/org/openrewrite/java/JavaParserResolver.java b/rewrite-test/src/main/java/org/openrewrite/java/JavaParserResolver.java
index 3bab4a0f66a..125e69c40d3 100644
--- a/rewrite-test/src/main/java/org/openrewrite/java/JavaParserResolver.java
+++ b/rewrite-test/src/main/java/org/openrewrite/java/JavaParserResolver.java
@@ -1,74 +1,74 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java;
-
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ParameterContext;
-import org.junit.jupiter.api.extension.ParameterResolutionException;
-import org.junit.jupiter.api.extension.ParameterResolver;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.java.tree.J;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import static org.assertj.core.api.Assertions.fail;
-
-public class JavaParserResolver implements ParameterResolver {
-    @Override
-    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
-        Class<?> paramType = parameterContext.getParameter().getType();
-        return paramType.equals(JavaParser.class) || paramType.equals(JavaParser.Builder.class);
-    }
-
-    @Nullable
-    @Override
-    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
-        @SuppressWarnings("OptionalGetWithoutIsPresent") Object o = extensionContext.getTestInstance().get();
-        try {
-            // support arbitrarily nested tests in the TCK
-            Class<?> clazz = o.getClass();
-            Object target = o;
-            do {
-                try {
-                    J.clearCaches();
-
-                    Method javaParser = clazz.getMethod("javaParser");
-                    javaParser.setAccessible(true); // because JUnit 5 test classes don't have to be public
-
-                    Class<?> paramType = parameterContext.getParameter().getType();
-                    Object param = javaParser.invoke(target);
-                    if (paramType.equals(JavaParser.Builder.class)) {
-                        return param;
-                    } else if (paramType.equals(JavaParser.class)) {
-                        return ((JavaParser.Builder<?, ?>) param).build();
-                    }
-                } catch (NoSuchMethodException ignored) {
-                }
-
-                try {
-                    target = o.getClass().getDeclaredField("this$0").get(target);
-                } catch (NoSuchFieldException e) {
-                    break;
-                }
-            } while ((clazz = clazz.getEnclosingClass()) != null);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        fail("This should never happen -- an implementation of javaParser() was not found");
-        return null;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.java.tree.J;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static org.assertj.core.api.Assertions.fail;
+
+public class JavaParserResolver implements ParameterResolver {
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
+        Class<?> paramType = parameterContext.getParameter().getType();
+        return paramType.equals(JavaParser.class) || paramType.equals(JavaParser.Builder.class);
+    }
+
+    @Nullable
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
+        @SuppressWarnings("OptionalGetWithoutIsPresent") Object o = extensionContext.getTestInstance().get();
+        try {
+            // support arbitrarily nested tests in the TCK
+            Class<?> clazz = o.getClass();
+            Object target = o;
+            do {
+                try {
+                    J.clearCaches();
+
+                    Method javaParser = clazz.getMethod("javaParser");
+                    javaParser.setAccessible(true); // because JUnit 5 test classes don't have to be public
+
+                    Class<?> paramType = parameterContext.getParameter().getType();
+                    Object param = javaParser.invoke(target);
+                    if (paramType.equals(JavaParser.Builder.class)) {
+                        return param;
+                    } else if (paramType.equals(JavaParser.class)) {
+                        return ((JavaParser.Builder<?, ?>) param).build();
+                    }
+                } catch (NoSuchMethodException ignored) {
+                }
+
+                try {
+                    target = o.getClass().getDeclaredField("this$0").get(target);
+                } catch (NoSuchFieldException e) {
+                    break;
+                }
+            } while ((clazz = clazz.getEnclosingClass()) != null);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        fail("This should never happen -- an implementation of javaParser() was not found");
+        return null;
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/groovy/GroovyRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/groovy/GroovyRecipeTest.kt
index c183c6f2b0f..f11dcffc704 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/groovy/GroovyRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/groovy/GroovyRecipeTest.kt
@@ -1,78 +1,78 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.groovy
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.*
-import org.openrewrite.groovy.tree.G
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface GroovyRecipeTest : RecipeTest<G.CompilationUnit> {
-    override val parser: Parser<G.CompilationUnit>
-        get() = GroovyParser.builder().build()
-
-    fun assertChanged(
-        parser: Parser<G.CompilationUnit> = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("groovy") before: String,
-        @Language("groovy") dependsOn: Array<String> = emptyArray(),
-        @Language("groovy") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (G.CompilationUnit) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: Parser<G.CompilationUnit> = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("groovy") before: File,
-        relativeTo: Path? = null,
-        @Language("groovy") dependsOn: Array<File> = emptyArray(),
-        @Language("groovy") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (G.CompilationUnit) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: Parser<G.CompilationUnit> = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("groovy") before: String,
-        @Language("groovy") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: Parser<G.CompilationUnit> = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("groovy") before: File,
-        relativeTo: Path? = null,
-        @Language("groovy") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.groovy
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.*
+import org.openrewrite.groovy.tree.G
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface GroovyRecipeTest : RecipeTest<G.CompilationUnit> {
+    override val parser: Parser<G.CompilationUnit>
+        get() = GroovyParser.builder().build()
+
+    fun assertChanged(
+        parser: Parser<G.CompilationUnit> = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("groovy") before: String,
+        @Language("groovy") dependsOn: Array<String> = emptyArray(),
+        @Language("groovy") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (G.CompilationUnit) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: Parser<G.CompilationUnit> = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("groovy") before: File,
+        relativeTo: Path? = null,
+        @Language("groovy") dependsOn: Array<File> = emptyArray(),
+        @Language("groovy") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (G.CompilationUnit) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: Parser<G.CompilationUnit> = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("groovy") before: String,
+        @Language("groovy") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: Parser<G.CompilationUnit> = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("groovy") before: File,
+        relativeTo: Path? = null,
+        @Language("groovy") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/hcl/HclRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/hcl/HclRecipeTest.kt
index 1b1db09b14c..4ca6a67ea92 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/hcl/HclRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/hcl/HclRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.hcl
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.hcl.tree.Hcl
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface HclRecipeTest : RecipeTest<Hcl.ConfigFile> {
-    override val parser: HclParser
-        get() = HclParser.builder().build()
-
-    fun assertChanged(
-        parser: HclParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("HCL") before: String,
-        @Language("HCL") dependsOn: Array<String> = emptyArray(),
-        @Language("HCL") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Hcl.ConfigFile) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: HclParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("HCL") before: File,
-        relativeTo: Path? = null,
-        @Language("HCL") dependsOn: Array<File> = emptyArray(),
-        @Language("HCL") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Hcl.ConfigFile) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: HclParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("HCL") before: String,
-        @Language("HCL") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: HclParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("HCL") before: File,
-        relativeTo: Path? = null,
-        @Language("HCL") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.hcl
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.hcl.tree.Hcl
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface HclRecipeTest : RecipeTest<Hcl.ConfigFile> {
+    override val parser: HclParser
+        get() = HclParser.builder().build()
+
+    fun assertChanged(
+        parser: HclParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("HCL") before: String,
+        @Language("HCL") dependsOn: Array<String> = emptyArray(),
+        @Language("HCL") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Hcl.ConfigFile) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: HclParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("HCL") before: File,
+        relativeTo: Path? = null,
+        @Language("HCL") dependsOn: Array<File> = emptyArray(),
+        @Language("HCL") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Hcl.ConfigFile) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: HclParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("HCL") before: String,
+        @Language("HCL") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: HclParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("HCL") before: File,
+        relativeTo: Path? = null,
+        @Language("HCL") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/ChangeMethodAccessLevelTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/ChangeMethodAccessLevelTest.kt
index c2b02dc902e..d7c83fa4dbc 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/ChangeMethodAccessLevelTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/ChangeMethodAccessLevelTest.kt
@@ -1,360 +1,360 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-
-interface ChangeMethodAccessLevelTest : JavaRecipeTest {
-
-    @Test
-    fun publicToPrivate() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "private", null),
-        before = """
-            package com.abc;
-
-            class A {
-                @SuppressWarnings("ALL") // comment
-                public void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                public void aMethod() {
-                }
-
-                // comment
-                public void aMethod(Integer i) {
-                }
-
-                public void aMethod(Double i) {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                @SuppressWarnings("ALL") // comment
-                private void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                private void aMethod() {
-                }
-
-                // comment
-                private void aMethod(Integer i) {
-                }
-
-                private void aMethod(Double i) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun packagePrivateToProtected() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
-        before = """
-            package com.abc;
-
-            class A {
-                @SuppressWarnings("ALL") // comment
-                static void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                void aMethod() {
-                }
-
-                // comment
-                void aMethod(Integer i) {
-                }
-
-                void aMethod(Double i) {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                @SuppressWarnings("ALL") // comment
-                protected static void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                protected void aMethod() {
-                }
-
-                // comment
-                protected void aMethod(Integer i) {
-                }
-
-                protected void aMethod(Double i) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun publicToPackagePrivate() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "package", null),
-        before = """
-            package com.abc;
-
-            class A {
-                @SuppressWarnings("ALL") // comment
-                public void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                public void aMethod() {
-                }
-
-                // comment
-                public void aMethod(Integer i) {
-                }
-
-                public void aMethod(Double i) {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                // comment
-                @SuppressWarnings("ALL")
-                void aMethod(String s) {
-                }
-
-                // comment
-                @SuppressWarnings("ALL")
-                void aMethod() {
-                }
-
-                // comment
-                void aMethod(Integer i) {
-                }
-
-                void aMethod(Double i) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun publicToPackagePrivateWildcard() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A *(..)", "package", null),
-        before = """
-            package com.abc;
-
-            class A {
-                // comment
-                public A(Integer i) {
-                }
-
-                @Deprecated // comment
-                public A(Float f) {
-                }
-
-                @Deprecated // comment
-                public void aMethod(String s) {
-                }
-
-                // comment
-                public void aMethod(Integer i) {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                // comment
-                A(Integer i) {
-                }
-
-                // comment
-                @Deprecated
-                A(Float f) {
-                }
-
-                // comment
-                @Deprecated
-                void aMethod(String s) {
-                }
-
-                // comment
-                void aMethod(Integer i) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun doNotChangeExistingAccessLevel() = assertUnchanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(String)", "public", null),
-        before = """
-            package com.abc;
-
-            class A {
-                // comment
-                public void aMethod(String s) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun packagePrivateToProtectedWithOtherModifier() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
-        before = """
-            package com.abc;
-
-            class A {
-                // comment
-                @Deprecated
-                static void aMethod(Double d) {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                // comment
-                @Deprecated
-                protected static void aMethod(Double d) {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun packagePrivateToProtectedWithConstructor() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A <constructor>(..)", "protected", null),
-        before = """
-            package com.abc;
-
-            class A {
-                A(Integer i) {
-                }
-
-                // comment
-                A() {
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                protected A(Integer i) {
-                }
-
-                // comment
-                protected A() {
-                }
-            }
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1215")
-    @Suppress("MethodMayBeStatic")
-    fun methodPatternExactMatch() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
-        before = """
-            package com.abc;
-
-            class A {
-                public String aMethod() {
-                    return "example_A";
-                }
-            }
-
-            class B extends A {
-                @Override
-                public String aMethod() {
-                    return "example_B";
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                protected String aMethod() {
-                    return "example_A";
-                }
-            }
-
-            class B extends A {
-                @Override
-                public String aMethod() {
-                    return "example_B";
-                }
-            }
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1215")
-    @Suppress("MethodMayBeStatic")
-    fun matchOverrides() = assertChanged(
-        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", true),
-        before = """
-            package com.abc;
-
-            class A {
-                public String aMethod() {
-                    return "example_A";
-                }
-            }
-
-            class B extends A {
-                @Override
-                public String aMethod() {
-                    return "example_B";
-                }
-            }
-        """,
-        after = """
-            package com.abc;
-
-            class A {
-                protected String aMethod() {
-                    return "example_A";
-                }
-            }
-
-            class B extends A {
-                @Override
-                protected String aMethod() {
-                    return "example_B";
-                }
-            }
-        """
-    )
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+
+interface ChangeMethodAccessLevelTest : JavaRecipeTest {
+
+    @Test
+    fun publicToPrivate() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "private", null),
+        before = """
+            package com.abc;
+
+            class A {
+                @SuppressWarnings("ALL") // comment
+                public void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                public void aMethod() {
+                }
+
+                // comment
+                public void aMethod(Integer i) {
+                }
+
+                public void aMethod(Double i) {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                @SuppressWarnings("ALL") // comment
+                private void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                private void aMethod() {
+                }
+
+                // comment
+                private void aMethod(Integer i) {
+                }
+
+                private void aMethod(Double i) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun packagePrivateToProtected() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
+        before = """
+            package com.abc;
+
+            class A {
+                @SuppressWarnings("ALL") // comment
+                static void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                void aMethod() {
+                }
+
+                // comment
+                void aMethod(Integer i) {
+                }
+
+                void aMethod(Double i) {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                @SuppressWarnings("ALL") // comment
+                protected static void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                protected void aMethod() {
+                }
+
+                // comment
+                protected void aMethod(Integer i) {
+                }
+
+                protected void aMethod(Double i) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun publicToPackagePrivate() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "package", null),
+        before = """
+            package com.abc;
+
+            class A {
+                @SuppressWarnings("ALL") // comment
+                public void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                public void aMethod() {
+                }
+
+                // comment
+                public void aMethod(Integer i) {
+                }
+
+                public void aMethod(Double i) {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                // comment
+                @SuppressWarnings("ALL")
+                void aMethod(String s) {
+                }
+
+                // comment
+                @SuppressWarnings("ALL")
+                void aMethod() {
+                }
+
+                // comment
+                void aMethod(Integer i) {
+                }
+
+                void aMethod(Double i) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun publicToPackagePrivateWildcard() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A *(..)", "package", null),
+        before = """
+            package com.abc;
+
+            class A {
+                // comment
+                public A(Integer i) {
+                }
+
+                @Deprecated // comment
+                public A(Float f) {
+                }
+
+                @Deprecated // comment
+                public void aMethod(String s) {
+                }
+
+                // comment
+                public void aMethod(Integer i) {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                // comment
+                A(Integer i) {
+                }
+
+                // comment
+                @Deprecated
+                A(Float f) {
+                }
+
+                // comment
+                @Deprecated
+                void aMethod(String s) {
+                }
+
+                // comment
+                void aMethod(Integer i) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun doNotChangeExistingAccessLevel() = assertUnchanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(String)", "public", null),
+        before = """
+            package com.abc;
+
+            class A {
+                // comment
+                public void aMethod(String s) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun packagePrivateToProtectedWithOtherModifier() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
+        before = """
+            package com.abc;
+
+            class A {
+                // comment
+                @Deprecated
+                static void aMethod(Double d) {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                // comment
+                @Deprecated
+                protected static void aMethod(Double d) {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun packagePrivateToProtectedWithConstructor() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A <constructor>(..)", "protected", null),
+        before = """
+            package com.abc;
+
+            class A {
+                A(Integer i) {
+                }
+
+                // comment
+                A() {
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                protected A(Integer i) {
+                }
+
+                // comment
+                protected A() {
+                }
+            }
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1215")
+    @Suppress("MethodMayBeStatic")
+    fun methodPatternExactMatch() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", null),
+        before = """
+            package com.abc;
+
+            class A {
+                public String aMethod() {
+                    return "example_A";
+                }
+            }
+
+            class B extends A {
+                @Override
+                public String aMethod() {
+                    return "example_B";
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                protected String aMethod() {
+                    return "example_A";
+                }
+            }
+
+            class B extends A {
+                @Override
+                public String aMethod() {
+                    return "example_B";
+                }
+            }
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1215")
+    @Suppress("MethodMayBeStatic")
+    fun matchOverrides() = assertChanged(
+        recipe = ChangeMethodAccessLevel("com.abc.A aMethod(..)", "protected", true),
+        before = """
+            package com.abc;
+
+            class A {
+                public String aMethod() {
+                    return "example_A";
+                }
+            }
+
+            class B extends A {
+                @Override
+                public String aMethod() {
+                    return "example_B";
+                }
+            }
+        """,
+        after = """
+            package com.abc;
+
+            class A {
+                protected String aMethod() {
+                    return "example_A";
+                }
+            }
+
+            class B extends A {
+                @Override
+                protected String aMethod() {
+                    return "example_B";
+                }
+            }
+        """
+    )
+
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/ImplementInterfaceTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/ImplementInterfaceTest.kt
index 7d808a2fa80..d6886ca1983 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/ImplementInterfaceTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/ImplementInterfaceTest.kt
@@ -1,76 +1,76 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.TreeVisitor
-import org.openrewrite.java.tree.J
-
-interface ImplementInterfaceTest : JavaRecipeTest {
-    override val recipe: Recipe?
-        get() = object : TestRecipe() {
-            override fun getVisitor(): TreeVisitor<*, ExecutionContext> {
-                return object : JavaVisitor<ExecutionContext>() {
-                    override fun visitClassDeclaration(classDecl: J.ClassDeclaration, ctx: ExecutionContext): J {
-                        doAfterVisit(ImplementInterface(classDecl, "b.B"))
-                        return classDecl
-                    }
-                }
-            }
-        }
-
-    companion object {
-        private const val b = "package b;\npublic interface B {}"
-        private const val c = "package c;\npublic interface C {}"
-    }
-
-    @Test
-    fun firstImplementedInterface(jp: JavaParser) = assertChanged(
-        jp,
-        dependsOn = arrayOf(b),
-        before = """
-            class A {
-            }
-        """,
-        after = """
-            import b.B;
-            
-            class A implements B {
-            }
-        """
-    )
-
-    @Test
-    fun addAnImplementedInterface(jp: JavaParser) = assertChanged(
-        jp,
-        dependsOn = arrayOf(b, c),
-        before = """
-            import c.C;
-            
-            class A implements C {
-            }
-        """,
-        after = """
-            import b.B;
-            import c.C;
-            
-            class A implements C, B {
-            }
-        """
-    )
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.TreeVisitor
+import org.openrewrite.java.tree.J
+
+interface ImplementInterfaceTest : JavaRecipeTest {
+    override val recipe: Recipe?
+        get() = object : TestRecipe() {
+            override fun getVisitor(): TreeVisitor<*, ExecutionContext> {
+                return object : JavaVisitor<ExecutionContext>() {
+                    override fun visitClassDeclaration(classDecl: J.ClassDeclaration, ctx: ExecutionContext): J {
+                        doAfterVisit(ImplementInterface(classDecl, "b.B"))
+                        return classDecl
+                    }
+                }
+            }
+        }
+
+    companion object {
+        private const val b = "package b;\npublic interface B {}"
+        private const val c = "package c;\npublic interface C {}"
+    }
+
+    @Test
+    fun firstImplementedInterface(jp: JavaParser) = assertChanged(
+        jp,
+        dependsOn = arrayOf(b),
+        before = """
+            class A {
+            }
+        """,
+        after = """
+            import b.B;
+            
+            class A implements B {
+            }
+        """
+    )
+
+    @Test
+    fun addAnImplementedInterface(jp: JavaParser) = assertChanged(
+        jp,
+        dependsOn = arrayOf(b, c),
+        before = """
+            import c.C;
+            
+            class A implements C {
+            }
+        """,
+        after = """
+            import b.B;
+            import c.C;
+            
+            class A implements C, B {
+            }
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/JavaTreeCompatibilityKit.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/JavaTreeCompatibilityKit.kt
index c0aa3f8f296..5f6b2560d13 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/JavaTreeCompatibilityKit.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/JavaTreeCompatibilityKit.kt
@@ -1,177 +1,177 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.extension.ExtendWith
-import org.openrewrite.java.tree.*
-
-//----------------------------------------------------------------------------------------
-// If test classes are added here, they should also be added to Java11TreeDebugTests.kt
-// Tests are in alphabetical order.
-//----------------------------------------------------------------------------------------
-
-@ExtendWith(JavaParserResolver::class)
-abstract class JavaTreeCompatibilityKit {
-    abstract fun javaParser(): JavaParser.Builder<*, *>
-
-    @Nested
-    inner class AnnotationTck : AnnotationTest
-
-    @Nested
-    inner class ArrayAccessTck : ArrayAccessTest
-
-    @Nested
-    inner class ArrayTypeTck : ArrayTypeTest
-
-    @Nested
-    inner class AssertTck : AssertTest
-
-    @Nested
-    inner class AssignmentOperationTck : AssignmentOperationTest
-
-    @Nested
-    inner class AssignmentTck : AssignmentTest
-
-    @Nested
-    inner class BinaryTck: BinaryTest
-
-    @Nested
-    inner class BlockTck : BlockTest
-
-    @Nested
-    inner class BreakTck : BreakTest
-
-    @Nested
-    inner class ClassDeclarationTck : ClassDeclarationTest
-
-    @Nested
-    inner class CommentTck : CommentTest
-
-    @Nested
-    inner class CompilationUnitTck : CompilationUnitTest
-
-    @Nested
-    inner class ContinueTck : ContinueTest
-
-    @Nested
-    inner class DoWhileLoopTck : DoWhileLoopTest
-
-    @Nested
-    inner class EmptyTck : EmptyTest
-
-    @Nested
-    inner class EnumTck : EnumTest
-
-    @Nested
-    inner class FieldAccessTck : FieldAccessTest
-
-    @Nested
-    inner class ForLoopTck : ForLoopTest
-
-    @Nested
-    inner class ForEachLoopTck : ForEachLoopTest
-
-    @Nested
-    inner class IdentifierTck : IdentifierTest
-
-    @Nested
-    inner class IfTck : IfTest
-
-    @Nested
-    inner class ImportTck : ImportTest
-
-    @Nested
-    inner class InstanceOfTck : InstanceOfTest
-
-    @Nested
-    inner class JavadocTck : JavadocTest
-
-    @Nested
-    inner class JavaParserTck : JavaParserTest
-
-    @Nested
-    inner class LabelTck : LabelTest
-
-    @Nested
-    inner class LambdaTck : LambdaTest
-
-    @Nested
-    inner class LiteralTck : LiteralTest
-
-    @Nested
-    inner class MemberReferenceTck : MemberReferenceTest
-
-    @Nested
-    inner class MethodDeclarationTck : MethodDeclarationTest
-
-    @Nested
-    inner class MethodInvocationTck : MethodInvocationTest
-
-    @Nested
-    inner class MethodMatcherTck : MethodMatcherTest
-
-    @Nested
-    inner class MethodParamPadTck : MethodParamPadTest
-
-    @Nested
-    inner class NewArrayTck : NewArrayTest
-
-    @Nested
-    inner class NewClassTck : NewClassTest
-
-    @Nested
-    inner class PackageTck : PackageTest
-
-    @Nested
-    inner class ParenthesesTck : ParenthesesTest
-
-    @Nested
-    inner class PrimitiveTck : PrimitiveTest
-
-    @Nested
-    inner class ReturnTck : ReturnTest
-
-    @Nested
-    inner class SwitchTck : SwitchTest
-
-    @Nested
-    inner class SynchronizedTck : SynchronizedTest
-
-    @Nested
-    inner class TernaryTck : TernaryTest
-
-    @Nested
-    inner class ThrowTck : ThrowTest
-
-    @Nested
-    inner class TryCatchTck : TryCatchTest
-
-    @Nested
-    inner class TypeCastTck : TypeCastTest
-
-    @Nested
-    inner class TypeParameterAndWildcardTck : TypeParameterAndWildcardTest
-
-    @Nested
-    inner class UnaryTck : UnaryTest
-
-    @Nested
-    inner class VariableDeclarationsTck : VariableDeclarationsTest
-
-    @Nested
-    inner class WhileLoopTck : WhileLoopTest
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.extension.ExtendWith
+import org.openrewrite.java.tree.*
+
+//----------------------------------------------------------------------------------------
+// If test classes are added here, they should also be added to Java11TreeDebugTests.kt
+// Tests are in alphabetical order.
+//----------------------------------------------------------------------------------------
+
+@ExtendWith(JavaParserResolver::class)
+abstract class JavaTreeCompatibilityKit {
+    abstract fun javaParser(): JavaParser.Builder<*, *>
+
+    @Nested
+    inner class AnnotationTck : AnnotationTest
+
+    @Nested
+    inner class ArrayAccessTck : ArrayAccessTest
+
+    @Nested
+    inner class ArrayTypeTck : ArrayTypeTest
+
+    @Nested
+    inner class AssertTck : AssertTest
+
+    @Nested
+    inner class AssignmentOperationTck : AssignmentOperationTest
+
+    @Nested
+    inner class AssignmentTck : AssignmentTest
+
+    @Nested
+    inner class BinaryTck: BinaryTest
+
+    @Nested
+    inner class BlockTck : BlockTest
+
+    @Nested
+    inner class BreakTck : BreakTest
+
+    @Nested
+    inner class ClassDeclarationTck : ClassDeclarationTest
+
+    @Nested
+    inner class CommentTck : CommentTest
+
+    @Nested
+    inner class CompilationUnitTck : CompilationUnitTest
+
+    @Nested
+    inner class ContinueTck : ContinueTest
+
+    @Nested
+    inner class DoWhileLoopTck : DoWhileLoopTest
+
+    @Nested
+    inner class EmptyTck : EmptyTest
+
+    @Nested
+    inner class EnumTck : EnumTest
+
+    @Nested
+    inner class FieldAccessTck : FieldAccessTest
+
+    @Nested
+    inner class ForLoopTck : ForLoopTest
+
+    @Nested
+    inner class ForEachLoopTck : ForEachLoopTest
+
+    @Nested
+    inner class IdentifierTck : IdentifierTest
+
+    @Nested
+    inner class IfTck : IfTest
+
+    @Nested
+    inner class ImportTck : ImportTest
+
+    @Nested
+    inner class InstanceOfTck : InstanceOfTest
+
+    @Nested
+    inner class JavadocTck : JavadocTest
+
+    @Nested
+    inner class JavaParserTck : JavaParserTest
+
+    @Nested
+    inner class LabelTck : LabelTest
+
+    @Nested
+    inner class LambdaTck : LambdaTest
+
+    @Nested
+    inner class LiteralTck : LiteralTest
+
+    @Nested
+    inner class MemberReferenceTck : MemberReferenceTest
+
+    @Nested
+    inner class MethodDeclarationTck : MethodDeclarationTest
+
+    @Nested
+    inner class MethodInvocationTck : MethodInvocationTest
+
+    @Nested
+    inner class MethodMatcherTck : MethodMatcherTest
+
+    @Nested
+    inner class MethodParamPadTck : MethodParamPadTest
+
+    @Nested
+    inner class NewArrayTck : NewArrayTest
+
+    @Nested
+    inner class NewClassTck : NewClassTest
+
+    @Nested
+    inner class PackageTck : PackageTest
+
+    @Nested
+    inner class ParenthesesTck : ParenthesesTest
+
+    @Nested
+    inner class PrimitiveTck : PrimitiveTest
+
+    @Nested
+    inner class ReturnTck : ReturnTest
+
+    @Nested
+    inner class SwitchTck : SwitchTest
+
+    @Nested
+    inner class SynchronizedTck : SynchronizedTest
+
+    @Nested
+    inner class TernaryTck : TernaryTest
+
+    @Nested
+    inner class ThrowTck : ThrowTest
+
+    @Nested
+    inner class TryCatchTck : TryCatchTest
+
+    @Nested
+    inner class TypeCastTck : TypeCastTest
+
+    @Nested
+    inner class TypeParameterAndWildcardTck : TypeParameterAndWildcardTest
+
+    @Nested
+    inner class UnaryTck : UnaryTest
+
+    @Nested
+    inner class VariableDeclarationsTck : VariableDeclarationsTest
+
+    @Nested
+    inner class WhileLoopTck : WhileLoopTest
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/MethodParamPadTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/MethodParamPadTest.kt
index 5120e145388..e1c9c63d446 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/MethodParamPadTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/MethodParamPadTest.kt
@@ -1,303 +1,303 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.ExecutionContext
-import org.openrewrite.InMemoryExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.Tree
-import org.openrewrite.java.cleanup.MethodParamPad
-import org.openrewrite.java.format.AutoFormatVisitor
-import org.openrewrite.java.style.MethodParamPadStyle
-import org.openrewrite.style.NamedStyles
-import org.openrewrite.style.Style
-
-@Suppress("InfiniteRecursion")
-interface MethodParamPadTest : JavaRecipeTest {
-    override val recipe: Recipe
-        get() = MethodParamPad()
-
-    fun namedStyles(styles: Collection<Style>): Iterable<NamedStyles> {
-        return listOf(NamedStyles(Tree.randomId(), "Test", "test", "test", emptySet(), styles))
-    }
-
-    @Test
-    fun addSpacePadding(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            MethodParamPadStyle(
-                true,
-                false
-            )
-        ))).build(),
-        before = """
-            enum E {
-                E1()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A() {
-                    super();
-                }
-
-                static void method(int x, int y) {
-                    A a = new A();
-                    method(0, 1);
-                }
-            }
-        """,
-        after = """
-            enum E {
-                E1 ()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A () {
-                    super ();
-                }
-
-                static void method (int x, int y) {
-                    A a = new A ();
-                    method (0, 1);
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun removeSpacePadding(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            MethodParamPadStyle(
-                false,
-                false
-            )
-        ))).build(),
-        before = """
-            enum E {
-                E1 ()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A () {
-                    super ();
-                }
-
-                static void method (int x, int y) {
-                    A a = new A ();
-                    method (0, 1);
-                }
-            }
-        """,
-        after = """
-            enum E {
-                E1()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A() {
-                    super();
-                }
-
-                static void method(int x, int y) {
-                    A a = new A();
-                    method(0, 1);
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun allowLineBreaks(jp: JavaParser.Builder<*, *>) = assertUnchanged(
-        parser = jp.styles(namedStyles(listOf(
-            MethodParamPadStyle(
-                true,
-                true
-            )
-        ))).build(),
-        before = """
-            enum E {
-                E1
-                        ()
-            }
-            
-            class B {
-            }
-            
-            class A extends B {
-                A
-                        () {
-                    super
-                            ();
-                }
-            
-                static void method
-                        (int x, int y) {
-                    A a = new A
-                            ();
-                    method
-                            (0, 1);
-                }
-            }
-        """
-    )
-
-    @Test
-    fun removeLineBreaks(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            MethodParamPadStyle(
-                false,
-                false
-            )
-        ))).build(),
-        before = """
-            enum E {
-                E1
-                        ()
-            }
-            
-            class B {
-            }
-            
-            class A extends B {
-                A
-                        () {
-                    super
-                            ();
-                }
-            
-                static void method
-                        (int x, int y) {
-                    A a = new A
-                            ();
-                    method
-                            (0, 1);
-                }
-            }
-        """,
-        after = """
-            enum E {
-                E1()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A() {
-                    super();
-                }
-
-                static void method(int x, int y) {
-                    A a = new A();
-                    method(0, 1);
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun removeLineBreaksAndAddSpaces(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            MethodParamPadStyle(
-                true,
-                false
-            )
-        ))).build(),
-        before = """
-            enum E {
-                E1
-                        ()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A
-                        () {
-                    super
-                            ();
-                }
-
-                static void method
-                        (int x, int y) {
-                    A a = new A
-                            ();
-                    method
-                            (0, 1);
-                }
-            }
-        """,
-        after = """
-            enum E {
-                E1 ()
-            }
-
-            class B {
-            }
-
-            class A extends B {
-                A () {
-                    super ();
-                }
-
-                static void method (int x, int y) {
-                    A a = new A ();
-                    method (0, 1);
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun initializeStyleWhenOtherwiseNotProvided(jp: JavaParser.Builder<*, *>) = assertUnchanged(
-        before = """
-            enum E {
-                E1()
-            }
-        """
-    )
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.ExecutionContext
+import org.openrewrite.InMemoryExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.Tree
+import org.openrewrite.java.cleanup.MethodParamPad
+import org.openrewrite.java.format.AutoFormatVisitor
+import org.openrewrite.java.style.MethodParamPadStyle
+import org.openrewrite.style.NamedStyles
+import org.openrewrite.style.Style
+
+@Suppress("InfiniteRecursion")
+interface MethodParamPadTest : JavaRecipeTest {
+    override val recipe: Recipe
+        get() = MethodParamPad()
+
+    fun namedStyles(styles: Collection<Style>): Iterable<NamedStyles> {
+        return listOf(NamedStyles(Tree.randomId(), "Test", "test", "test", emptySet(), styles))
+    }
+
+    @Test
+    fun addSpacePadding(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            MethodParamPadStyle(
+                true,
+                false
+            )
+        ))).build(),
+        before = """
+            enum E {
+                E1()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A() {
+                    super();
+                }
+
+                static void method(int x, int y) {
+                    A a = new A();
+                    method(0, 1);
+                }
+            }
+        """,
+        after = """
+            enum E {
+                E1 ()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A () {
+                    super ();
+                }
+
+                static void method (int x, int y) {
+                    A a = new A ();
+                    method (0, 1);
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun removeSpacePadding(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            MethodParamPadStyle(
+                false,
+                false
+            )
+        ))).build(),
+        before = """
+            enum E {
+                E1 ()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A () {
+                    super ();
+                }
+
+                static void method (int x, int y) {
+                    A a = new A ();
+                    method (0, 1);
+                }
+            }
+        """,
+        after = """
+            enum E {
+                E1()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A() {
+                    super();
+                }
+
+                static void method(int x, int y) {
+                    A a = new A();
+                    method(0, 1);
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun allowLineBreaks(jp: JavaParser.Builder<*, *>) = assertUnchanged(
+        parser = jp.styles(namedStyles(listOf(
+            MethodParamPadStyle(
+                true,
+                true
+            )
+        ))).build(),
+        before = """
+            enum E {
+                E1
+                        ()
+            }
+            
+            class B {
+            }
+            
+            class A extends B {
+                A
+                        () {
+                    super
+                            ();
+                }
+            
+                static void method
+                        (int x, int y) {
+                    A a = new A
+                            ();
+                    method
+                            (0, 1);
+                }
+            }
+        """
+    )
+
+    @Test
+    fun removeLineBreaks(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            MethodParamPadStyle(
+                false,
+                false
+            )
+        ))).build(),
+        before = """
+            enum E {
+                E1
+                        ()
+            }
+            
+            class B {
+            }
+            
+            class A extends B {
+                A
+                        () {
+                    super
+                            ();
+                }
+            
+                static void method
+                        (int x, int y) {
+                    A a = new A
+                            ();
+                    method
+                            (0, 1);
+                }
+            }
+        """,
+        after = """
+            enum E {
+                E1()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A() {
+                    super();
+                }
+
+                static void method(int x, int y) {
+                    A a = new A();
+                    method(0, 1);
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun removeLineBreaksAndAddSpaces(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            MethodParamPadStyle(
+                true,
+                false
+            )
+        ))).build(),
+        before = """
+            enum E {
+                E1
+                        ()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A
+                        () {
+                    super
+                            ();
+                }
+
+                static void method
+                        (int x, int y) {
+                    A a = new A
+                            ();
+                    method
+                            (0, 1);
+                }
+            }
+        """,
+        after = """
+            enum E {
+                E1 ()
+            }
+
+            class B {
+            }
+
+            class A extends B {
+                A () {
+                    super ();
+                }
+
+                static void method (int x, int y) {
+                    A a = new A ();
+                    method (0, 1);
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = AutoFormatVisitor<ExecutionContext>().visit(cu, InMemoryExecutionContext {})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun initializeStyleWhenOtherwiseNotProvided(jp: JavaParser.Builder<*, *>) = assertUnchanged(
+        before = """
+            enum E {
+                E1()
+            }
+        """
+    )
+
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/NoStaticImportTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/NoStaticImportTest.kt
index d3ae830084f..094f907b23c 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/NoStaticImportTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/NoStaticImportTest.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.Test
-
-interface NoStaticImportTest : JavaRecipeTest {
-
-    @Test
-    fun replaceWithNoStaticImports(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = NoStaticImport("java.util.Collections emptyList()"),
-        before = """
-            import static java.util.Collections.emptyList;
-            class Test {
-                void test() {
-                    Object o = emptyList();
-                }
-            }
-        """,
-        after = """
-            import java.util.Collections;
-            
-            class Test {
-                void test() {
-                    Object o = Collections.emptyList();
-                }
-            }
-        """
-    )
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.Test
+
+interface NoStaticImportTest : JavaRecipeTest {
+
+    @Test
+    fun replaceWithNoStaticImports(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = NoStaticImport("java.util.Collections emptyList()"),
+        before = """
+            import static java.util.Collections.emptyList;
+            class Test {
+                void test() {
+                    Object o = emptyList();
+                }
+            }
+        """,
+        after = """
+            import java.util.Collections;
+            
+            class Test {
+                void test() {
+                    Object o = Collections.emptyList();
+                }
+            }
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportsTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportsTest.kt
index 7f07a193ccc..cf7b53ac0f5 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportsTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/OrderImportsTest.kt
@@ -1,571 +1,571 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-import org.openrewrite.Tree.randomId
-import org.openrewrite.java.style.ImportLayoutStyle
-import org.openrewrite.style.NamedStyles
-import org.openrewrite.style.Style
-
-interface OrderImportsTest : JavaRecipeTest {
-    override val recipe: OrderImports
-        get() = OrderImports(false)
-
-    @Test
-    fun sortInnerAndOuterClassesInTheSamePackage(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = "class Test {}"
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/259")
-    @Test
-    fun multipleClassesWithTheSameNameButDifferentPackages(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import java.awt.List;
-            import java.util.List;
-            
-            class Test {}
-        """
-    )
-
-    @Test
-    fun foldIntoStar(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import java.util.List;
-            import java.util.ArrayList;
-            import java.util.regex.Pattern;
-            import java.util.Objects;
-            import java.util.Set;
-            import java.util.Map;
-        """,
-        after = """
-            import java.util.*;
-            import java.util.regex.Pattern;
-        """
-    )
-
-    @Test
-    fun blankLinesNotFollowedByBlockArentAdded(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import java.util.List;
-            
-            import static java.util.Collections.*;
-            
-            class A {}
-        """
-    )
-
-    @Test
-    fun foldIntoExistingStar(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import java.util.*;
-            import java.util.ArrayList;
-            import java.util.regex.Pattern;
-            import java.util.Objects;
-        """,
-        after = """
-            import java.util.*;
-            import java.util.regex.Pattern;
-        """
-    )
-
-    @Test
-    fun idempotence(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import java.util.*;
-            import java.util.regex.Pattern;
-        """
-    )
-
-    @Test
-    fun unfoldStar(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import java.util.*;
-            
-            class A {
-                List<Integer> list;
-                List<Integer> list2;
-            }
-        """,
-        after = """
-            import java.util.List;
-            
-            class A {
-                List<Integer> list;
-                List<Integer> list2;
-            }
-        """
-    )
-
-    @Test
-    fun unfoldStarMultiple(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import java.util.*;
-            
-            class A {
-                List<Integer> list;
-                List<Integer> list2;
-                Map<Integer, Integer> map;
-            }
-        """,
-        after = """
-            import java.util.List;
-            import java.util.Map;
-            
-            class A {
-                List<Integer> list;
-                List<Integer> list2;
-                Map<Integer, Integer> map;
-            }
-        """
-    )
-
-    @Test
-    fun removeUnused(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import java.util.*;
-        """,
-        after = ""
-    )
-
-    @Test
-    fun unfoldStaticStar(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import java.util.List;
-            
-            import static java.util.Collections.*;
-            
-            class A {
-                List<Integer> list = emptyList();
-            }
-        """,
-        after = """
-            import java.util.List;
-            
-            import static java.util.Collections.emptyList;
-            
-            class A {
-                List<Integer> list = emptyList();
-            }
-        """
-    )
-
-    @Test
-    fun packagePatternEscapesDots(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import javax.annotation.Nonnull;
-        """
-    )
-
-    @Test
-    fun twoImportsFollowedByStar(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import java.io.IOException;
-            import java.io.UncheckedIOException;
-            import java.nio.files.*;
-        """
-    )
-
-    @Test
-    fun springCloudFormat() = assertUnchanged(
-        JavaParser.fromJavaVersion().styles(
-            listOf(
-                NamedStyles(
-                    randomId(), "spring", "spring", "spring", emptySet(), listOf(
-                        ImportLayoutStyle.builder()
-                            .classCountToUseStarImport(999)
-                            .nameCountToUseStarImport(999)
-                            .importPackage("java.*")
-                            .blankLine()
-                            .importPackage("javax.*")
-                            .blankLine()
-                            .importAllOthers()
-                            .blankLine()
-                            .importPackage("org.springframework.*")
-                            .blankLine()
-                            .importStaticAllOthers()
-                            .build()
-                    )
-                )
-            )
-        ).build(),
-        before = """
-            import java.io.ByteArrayOutputStream;
-            import java.nio.charset.StandardCharsets;
-            import java.util.Collections;
-            import java.util.zip.GZIPOutputStream;
-            
-            import javax.servlet.ReadListener;
-            import javax.servlet.ServletInputStream;
-            import javax.servlet.ServletOutputStream;
-            
-            import com.fasterxml.jackson.databind.ObjectMapper;
-            import org.apache.commons.logging.Log;
-            import reactor.core.publisher.Mono;
-            
-            import org.springframework.core.io.buffer.DataBuffer;
-            import org.springframework.core.io.buffer.DataBufferFactory;
-            import org.springframework.http.HttpHeaders;
-            import org.springframework.util.MultiValueMap;
-            import org.springframework.web.bind.annotation.PathVariable;
-            import org.springframework.web.server.ServerWebExchange;
-            
-            import static java.util.Arrays.stream;
-            import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.toAsyncPredicate;
-            
-            class A {}
-        """
-    )
-
-    @Test
-    fun importSorting(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import r.core.Flux;
-            import s.core.Flux;
-            import com.fasterxml.jackson.databind.ObjectMapper;
-            import org.apache.commons.logging.Log;
-            import reactor.core.publisher.Mono;
-        """,
-        after = """
-            import com.fasterxml.jackson.databind.ObjectMapper;
-            import org.apache.commons.logging.Log;
-            import r.core.Flux;
-            import reactor.core.publisher.Mono;
-            import s.core.Flux;
-        """
-    )
-
-    @Test
-    fun foldGroupOfStaticImportsThatAppearLast(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import static java.util.stream.Collectors.toList;
-            import static java.util.stream.Collectors.toMap;
-            import static java.util.stream.Collectors.toSet;
-        """,
-        after = """
-            import static java.util.stream.Collectors.*;
-        """
-    )
-
-    @Test
-    fun preservesStaticStarImportWhenRemovingUnused(jp: JavaParser) = assertUnchanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import static java.util.Collections.*;
-            
-            class Test {
-                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
-            }
-        """
-    )
-
-    @Test
-    fun preservesStaticInheritanceImport(jp: JavaParser) = assertUnchanged(
-        jp,
-        recipe = OrderImports(true),
-        dependsOn = arrayOf("package my; public class MyCollections extends java.util.Collections {}"),
-        before = """
-            import static my.MyCollections.*;
-            
-            class Test {
-                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
-            }
-        """
-    )
-
-    @Test
-    fun preservesStaticMethodArguments(jp: JavaParser) = assertUnchanged(
-        jp,
-        recipe = OrderImports(true),
-        before = """
-            import static java.util.Collections.*;
-            
-            class Test {
-                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
-            }
-        """
-    )
-
-    @Test
-    fun preservesDifferentStaticImportsFromSamePackage(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            import static java.util.Collections.emptyList;
-            import static java.util.Collections.emptyMap;
-            import static java.util.GregorianCalendar.getAvailableCalendarTypes;
-            import static java.util.GregorianCalendar.getAvailableLocales;
-        """
-    )
-
-    @Test
-    fun collapsesDifferentStaticImportsFromSamePackage(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import static java.util.Collections.emptyList;
-            import static java.util.Collections.emptyMap;
-            import static java.util.Collections.emptySet;
-            import static java.util.GregorianCalendar.getAvailableCalendarTypes;
-            import static java.util.GregorianCalendar.getAvailableLocales;
-            import static java.util.GregorianCalendar.getInstance;
-        """,
-        after = """
-            import static java.util.Collections.*;
-            import static java.util.GregorianCalendar.*;
-        """
-    )
-
-    @Test
-    fun removesRedundantImports(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import java.util.List;
-            import java.util.List;
-        """,
-        after = """
-            import java.util.List;
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/474")
-    @Test
-    fun blankLinesBetweenImports(jp: JavaParser.Builder<*, *>) = assertChanged(
-        jp.styles(
-            listOf(
-                NamedStyles(
-                    randomId(),
-                    "custom",
-                    "custom style",
-                    null,
-                    emptySet(),
-                    listOf(
-                        ImportLayoutStyle.builder()
-                            .classCountToUseStarImport(9999)
-                            .nameCountToUseStarImport(9999)
-                            .importStaticAllOthers()
-                            .blankLine()
-                            .importAllOthers()
-                            .blankLine()
-                            .build() as Style
-                    )
-                )
-            )
-        ).build(),
-        before = """
-            import java.util.List;
-            import static java.util.Collections.singletonList;
-            class Test {
-            }
-        """,
-        after = """
-            import static java.util.Collections.singletonList;
-            
-            import java.util.List;
-            
-            class Test {
-            }
-        """
-    )
-
-    @Issue("#352")
-    @Test
-    fun groupImportsIsAwareOfNestedClasses(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import org.openrewrite.java.J.CompilationUnit;
-            import org.openrewrite.java.J;
-            import org.openrewrite.java.JavaVisitor;
-            import org.openrewrite.java.JavaPrinter;
-            import org.openrewrite.java.ChangeMethodName;
-            import org.openrewrite.java.ChangeType;
-        """,
-        after = """
-            import org.openrewrite.java.*;
-            import org.openrewrite.java.J.CompilationUnit;
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/733")
-    @Test
-    fun detectBlockPattern(jp: JavaParser) = assertUnchanged(
-        jp,
-        before = """
-            // org.slf4j should be detected as a block pattern, and not be moved to all other imports.
-            import org.slf4j.Logger;
-            import org.slf4j.LoggerFactory;
-            
-            import java.util.Arrays;
-            import java.util.List;
-            
-            public class C {
-            }
-        """
-    )
-
-    @Test
-    fun doNotFoldImports(jp: JavaParser.Builder<*, *>) = assertUnchanged(
-        jp.styles(
-            listOf(
-                NamedStyles(
-                    randomId(),
-                    "custom",
-                    "custom style",
-                    null,
-                    emptySet(),
-                    listOf(
-                        ImportLayoutStyle.builder()
-                            .classCountToUseStarImport(2147483647)
-                            .nameCountToUseStarImport(2147483647)
-                            .importPackage("java.*")
-                            .blankLine()
-                            .importPackage("javax.*")
-                            .blankLine()
-                            .importAllOthers()
-                            .blankLine()
-                            .importStaticAllOthers()
-                            .build() as Style
-                    )
-                )
-            )
-        ).build(),
-        before = """
-            import java.util.ArrayList;
-            import java.util.Collections;
-            import java.util.HashSet;
-            import java.util.List;
-            import java.util.Set;
-            
-            import javax.persistence.Entity;
-            import javax.persistence.FetchType;
-            import javax.persistence.JoinColumn;
-            import javax.persistence.JoinTable;
-            import javax.persistence.ManyToMany;
-            import javax.persistence.Table;
-            
-            public class C {
-            }
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/860")
-    @Test
-    fun orderAndDoNotFoldStaticClasses(jp: JavaParser) = assertChanged(
-        jp,
-        recipe = OrderImports(false),
-        before = """
-            import static org.openrewrite.java.J.CompilationUnit.*;
-            import static org.openrewrite.java.J.ClassDeclaration.*;
-            import static org.openrewrite.java.J.MethodInvocation.*;
-            import static org.openrewrite.java.J.MethodDeclaration.*;
-            import static org.openrewrite.java.J.If.*;
-        """,
-        after = """
-            import static org.openrewrite.java.J.ClassDeclaration.*;
-            import static org.openrewrite.java.J.CompilationUnit.*;
-            import static org.openrewrite.java.J.If.*;
-            import static org.openrewrite.java.J.MethodDeclaration.*;
-            import static org.openrewrite.java.J.MethodInvocation.*;
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/860")
-    @Test
-    fun orderAndDoNotFoldImports(jp: JavaParser) = assertChanged(
-        jp,
-        before = """
-            import java.aws.List;
-            import java.awt.Panel;
-            import java.util.Collection;
-            import java.util.List;
-            import java.awt.Point;
-            import java.awt.Robot;
-            import java.util.TreeMap;
-            import java.util.Map;
-            import java.util.Set;
-            import java.awt.Polygon;
-        """,
-        after = """
-            import java.aws.List;
-            import java.awt.Panel;
-            import java.awt.Point;
-            import java.awt.Polygon;
-            import java.awt.Robot;
-            import java.util.Collection;
-            import java.util.List;
-            import java.util.Map;
-            import java.util.Set;
-            import java.util.TreeMap;
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/859")
-    @Test
-    fun doNotFoldPackageWithJavaLangClassNames(jp: JavaParser) = assertUnchanged(
-        jp,
-        recipe = OrderImports(false),
-        executionContext = executionContext.apply {putMessage(JavaParser.SKIP_SOURCE_SET_TYPE_GENERATION, false)},
-        before = """
-            import kotlin.DeepRecursiveFunction;
-            import kotlin.Function;
-            import kotlin.Lazy;
-            import kotlin.Pair;
-            import kotlin.String;
-        """
-    )
-
-    @Test
-    fun foldPackageWithExistingImports() = assertChanged(
-        JavaParser.fromJavaVersion().styles(
-            listOf(
-                NamedStyles(
-                    randomId(), "test", "test", "test", emptySet(), listOf(
-                        ImportLayoutStyle.builder()
-                            .packageToFold("java.util.*", false)
-                            .importAllOthers()
-                            .importStaticAllOthers()
-                            .build()
-                    )
-                )
-            )
-        ).build(),
-        recipe = OrderImports(false),
-        before = """
-            import java.util.List;
-        """,
-        after = """
-            import java.util.*;
-        """
-    )
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+import org.openrewrite.Tree.randomId
+import org.openrewrite.java.style.ImportLayoutStyle
+import org.openrewrite.style.NamedStyles
+import org.openrewrite.style.Style
+
+interface OrderImportsTest : JavaRecipeTest {
+    override val recipe: OrderImports
+        get() = OrderImports(false)
+
+    @Test
+    fun sortInnerAndOuterClassesInTheSamePackage(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = "class Test {}"
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/259")
+    @Test
+    fun multipleClassesWithTheSameNameButDifferentPackages(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import java.awt.List;
+            import java.util.List;
+            
+            class Test {}
+        """
+    )
+
+    @Test
+    fun foldIntoStar(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import java.util.List;
+            import java.util.ArrayList;
+            import java.util.regex.Pattern;
+            import java.util.Objects;
+            import java.util.Set;
+            import java.util.Map;
+        """,
+        after = """
+            import java.util.*;
+            import java.util.regex.Pattern;
+        """
+    )
+
+    @Test
+    fun blankLinesNotFollowedByBlockArentAdded(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import java.util.List;
+            
+            import static java.util.Collections.*;
+            
+            class A {}
+        """
+    )
+
+    @Test
+    fun foldIntoExistingStar(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import java.util.*;
+            import java.util.ArrayList;
+            import java.util.regex.Pattern;
+            import java.util.Objects;
+        """,
+        after = """
+            import java.util.*;
+            import java.util.regex.Pattern;
+        """
+    )
+
+    @Test
+    fun idempotence(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import java.util.*;
+            import java.util.regex.Pattern;
+        """
+    )
+
+    @Test
+    fun unfoldStar(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import java.util.*;
+            
+            class A {
+                List<Integer> list;
+                List<Integer> list2;
+            }
+        """,
+        after = """
+            import java.util.List;
+            
+            class A {
+                List<Integer> list;
+                List<Integer> list2;
+            }
+        """
+    )
+
+    @Test
+    fun unfoldStarMultiple(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import java.util.*;
+            
+            class A {
+                List<Integer> list;
+                List<Integer> list2;
+                Map<Integer, Integer> map;
+            }
+        """,
+        after = """
+            import java.util.List;
+            import java.util.Map;
+            
+            class A {
+                List<Integer> list;
+                List<Integer> list2;
+                Map<Integer, Integer> map;
+            }
+        """
+    )
+
+    @Test
+    fun removeUnused(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import java.util.*;
+        """,
+        after = ""
+    )
+
+    @Test
+    fun unfoldStaticStar(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import java.util.List;
+            
+            import static java.util.Collections.*;
+            
+            class A {
+                List<Integer> list = emptyList();
+            }
+        """,
+        after = """
+            import java.util.List;
+            
+            import static java.util.Collections.emptyList;
+            
+            class A {
+                List<Integer> list = emptyList();
+            }
+        """
+    )
+
+    @Test
+    fun packagePatternEscapesDots(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import javax.annotation.Nonnull;
+        """
+    )
+
+    @Test
+    fun twoImportsFollowedByStar(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import java.io.IOException;
+            import java.io.UncheckedIOException;
+            import java.nio.files.*;
+        """
+    )
+
+    @Test
+    fun springCloudFormat() = assertUnchanged(
+        JavaParser.fromJavaVersion().styles(
+            listOf(
+                NamedStyles(
+                    randomId(), "spring", "spring", "spring", emptySet(), listOf(
+                        ImportLayoutStyle.builder()
+                            .classCountToUseStarImport(999)
+                            .nameCountToUseStarImport(999)
+                            .importPackage("java.*")
+                            .blankLine()
+                            .importPackage("javax.*")
+                            .blankLine()
+                            .importAllOthers()
+                            .blankLine()
+                            .importPackage("org.springframework.*")
+                            .blankLine()
+                            .importStaticAllOthers()
+                            .build()
+                    )
+                )
+            )
+        ).build(),
+        before = """
+            import java.io.ByteArrayOutputStream;
+            import java.nio.charset.StandardCharsets;
+            import java.util.Collections;
+            import java.util.zip.GZIPOutputStream;
+            
+            import javax.servlet.ReadListener;
+            import javax.servlet.ServletInputStream;
+            import javax.servlet.ServletOutputStream;
+            
+            import com.fasterxml.jackson.databind.ObjectMapper;
+            import org.apache.commons.logging.Log;
+            import reactor.core.publisher.Mono;
+            
+            import org.springframework.core.io.buffer.DataBuffer;
+            import org.springframework.core.io.buffer.DataBufferFactory;
+            import org.springframework.http.HttpHeaders;
+            import org.springframework.util.MultiValueMap;
+            import org.springframework.web.bind.annotation.PathVariable;
+            import org.springframework.web.server.ServerWebExchange;
+            
+            import static java.util.Arrays.stream;
+            import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.toAsyncPredicate;
+            
+            class A {}
+        """
+    )
+
+    @Test
+    fun importSorting(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import r.core.Flux;
+            import s.core.Flux;
+            import com.fasterxml.jackson.databind.ObjectMapper;
+            import org.apache.commons.logging.Log;
+            import reactor.core.publisher.Mono;
+        """,
+        after = """
+            import com.fasterxml.jackson.databind.ObjectMapper;
+            import org.apache.commons.logging.Log;
+            import r.core.Flux;
+            import reactor.core.publisher.Mono;
+            import s.core.Flux;
+        """
+    )
+
+    @Test
+    fun foldGroupOfStaticImportsThatAppearLast(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import static java.util.stream.Collectors.toList;
+            import static java.util.stream.Collectors.toMap;
+            import static java.util.stream.Collectors.toSet;
+        """,
+        after = """
+            import static java.util.stream.Collectors.*;
+        """
+    )
+
+    @Test
+    fun preservesStaticStarImportWhenRemovingUnused(jp: JavaParser) = assertUnchanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import static java.util.Collections.*;
+            
+            class Test {
+                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
+            }
+        """
+    )
+
+    @Test
+    fun preservesStaticInheritanceImport(jp: JavaParser) = assertUnchanged(
+        jp,
+        recipe = OrderImports(true),
+        dependsOn = arrayOf("package my; public class MyCollections extends java.util.Collections {}"),
+        before = """
+            import static my.MyCollections.*;
+            
+            class Test {
+                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
+            }
+        """
+    )
+
+    @Test
+    fun preservesStaticMethodArguments(jp: JavaParser) = assertUnchanged(
+        jp,
+        recipe = OrderImports(true),
+        before = """
+            import static java.util.Collections.*;
+            
+            class Test {
+                Object[] o = new Object[] { emptyList(), emptyMap(), emptySet() };
+            }
+        """
+    )
+
+    @Test
+    fun preservesDifferentStaticImportsFromSamePackage(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            import static java.util.Collections.emptyList;
+            import static java.util.Collections.emptyMap;
+            import static java.util.GregorianCalendar.getAvailableCalendarTypes;
+            import static java.util.GregorianCalendar.getAvailableLocales;
+        """
+    )
+
+    @Test
+    fun collapsesDifferentStaticImportsFromSamePackage(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import static java.util.Collections.emptyList;
+            import static java.util.Collections.emptyMap;
+            import static java.util.Collections.emptySet;
+            import static java.util.GregorianCalendar.getAvailableCalendarTypes;
+            import static java.util.GregorianCalendar.getAvailableLocales;
+            import static java.util.GregorianCalendar.getInstance;
+        """,
+        after = """
+            import static java.util.Collections.*;
+            import static java.util.GregorianCalendar.*;
+        """
+    )
+
+    @Test
+    fun removesRedundantImports(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import java.util.List;
+            import java.util.List;
+        """,
+        after = """
+            import java.util.List;
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/474")
+    @Test
+    fun blankLinesBetweenImports(jp: JavaParser.Builder<*, *>) = assertChanged(
+        jp.styles(
+            listOf(
+                NamedStyles(
+                    randomId(),
+                    "custom",
+                    "custom style",
+                    null,
+                    emptySet(),
+                    listOf(
+                        ImportLayoutStyle.builder()
+                            .classCountToUseStarImport(9999)
+                            .nameCountToUseStarImport(9999)
+                            .importStaticAllOthers()
+                            .blankLine()
+                            .importAllOthers()
+                            .blankLine()
+                            .build() as Style
+                    )
+                )
+            )
+        ).build(),
+        before = """
+            import java.util.List;
+            import static java.util.Collections.singletonList;
+            class Test {
+            }
+        """,
+        after = """
+            import static java.util.Collections.singletonList;
+            
+            import java.util.List;
+            
+            class Test {
+            }
+        """
+    )
+
+    @Issue("#352")
+    @Test
+    fun groupImportsIsAwareOfNestedClasses(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import org.openrewrite.java.J.CompilationUnit;
+            import org.openrewrite.java.J;
+            import org.openrewrite.java.JavaVisitor;
+            import org.openrewrite.java.JavaPrinter;
+            import org.openrewrite.java.ChangeMethodName;
+            import org.openrewrite.java.ChangeType;
+        """,
+        after = """
+            import org.openrewrite.java.*;
+            import org.openrewrite.java.J.CompilationUnit;
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/733")
+    @Test
+    fun detectBlockPattern(jp: JavaParser) = assertUnchanged(
+        jp,
+        before = """
+            // org.slf4j should be detected as a block pattern, and not be moved to all other imports.
+            import org.slf4j.Logger;
+            import org.slf4j.LoggerFactory;
+            
+            import java.util.Arrays;
+            import java.util.List;
+            
+            public class C {
+            }
+        """
+    )
+
+    @Test
+    fun doNotFoldImports(jp: JavaParser.Builder<*, *>) = assertUnchanged(
+        jp.styles(
+            listOf(
+                NamedStyles(
+                    randomId(),
+                    "custom",
+                    "custom style",
+                    null,
+                    emptySet(),
+                    listOf(
+                        ImportLayoutStyle.builder()
+                            .classCountToUseStarImport(2147483647)
+                            .nameCountToUseStarImport(2147483647)
+                            .importPackage("java.*")
+                            .blankLine()
+                            .importPackage("javax.*")
+                            .blankLine()
+                            .importAllOthers()
+                            .blankLine()
+                            .importStaticAllOthers()
+                            .build() as Style
+                    )
+                )
+            )
+        ).build(),
+        before = """
+            import java.util.ArrayList;
+            import java.util.Collections;
+            import java.util.HashSet;
+            import java.util.List;
+            import java.util.Set;
+            
+            import javax.persistence.Entity;
+            import javax.persistence.FetchType;
+            import javax.persistence.JoinColumn;
+            import javax.persistence.JoinTable;
+            import javax.persistence.ManyToMany;
+            import javax.persistence.Table;
+            
+            public class C {
+            }
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/860")
+    @Test
+    fun orderAndDoNotFoldStaticClasses(jp: JavaParser) = assertChanged(
+        jp,
+        recipe = OrderImports(false),
+        before = """
+            import static org.openrewrite.java.J.CompilationUnit.*;
+            import static org.openrewrite.java.J.ClassDeclaration.*;
+            import static org.openrewrite.java.J.MethodInvocation.*;
+            import static org.openrewrite.java.J.MethodDeclaration.*;
+            import static org.openrewrite.java.J.If.*;
+        """,
+        after = """
+            import static org.openrewrite.java.J.ClassDeclaration.*;
+            import static org.openrewrite.java.J.CompilationUnit.*;
+            import static org.openrewrite.java.J.If.*;
+            import static org.openrewrite.java.J.MethodDeclaration.*;
+            import static org.openrewrite.java.J.MethodInvocation.*;
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/860")
+    @Test
+    fun orderAndDoNotFoldImports(jp: JavaParser) = assertChanged(
+        jp,
+        before = """
+            import java.aws.List;
+            import java.awt.Panel;
+            import java.util.Collection;
+            import java.util.List;
+            import java.awt.Point;
+            import java.awt.Robot;
+            import java.util.TreeMap;
+            import java.util.Map;
+            import java.util.Set;
+            import java.awt.Polygon;
+        """,
+        after = """
+            import java.aws.List;
+            import java.awt.Panel;
+            import java.awt.Point;
+            import java.awt.Polygon;
+            import java.awt.Robot;
+            import java.util.Collection;
+            import java.util.List;
+            import java.util.Map;
+            import java.util.Set;
+            import java.util.TreeMap;
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/859")
+    @Test
+    fun doNotFoldPackageWithJavaLangClassNames(jp: JavaParser) = assertUnchanged(
+        jp,
+        recipe = OrderImports(false),
+        executionContext = executionContext.apply {putMessage(JavaParser.SKIP_SOURCE_SET_TYPE_GENERATION, false)},
+        before = """
+            import kotlin.DeepRecursiveFunction;
+            import kotlin.Function;
+            import kotlin.Lazy;
+            import kotlin.Pair;
+            import kotlin.String;
+        """
+    )
+
+    @Test
+    fun foldPackageWithExistingImports() = assertChanged(
+        JavaParser.fromJavaVersion().styles(
+            listOf(
+                NamedStyles(
+                    randomId(), "test", "test", "test", emptySet(), listOf(
+                        ImportLayoutStyle.builder()
+                            .packageToFold("java.util.*", false)
+                            .importAllOthers()
+                            .importStaticAllOthers()
+                            .build()
+                    )
+                )
+            )
+        ).build(),
+        recipe = OrderImports(false),
+        before = """
+            import java.util.List;
+        """,
+        after = """
+            import java.util.*;
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/PadEmptyForLoopComponentsTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/PadEmptyForLoopComponentsTest.kt
index a63166e6574..4291498bca4 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/PadEmptyForLoopComponentsTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/PadEmptyForLoopComponentsTest.kt
@@ -1,174 +1,174 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.ExecutionContext
-import org.openrewrite.InMemoryExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.Tree
-import org.openrewrite.java.cleanup.PadEmptyForLoopComponents
-import org.openrewrite.java.format.SpacesVisitor
-import org.openrewrite.java.style.EmptyForInitializerPadStyle
-import org.openrewrite.java.style.EmptyForIteratorPadStyle
-import org.openrewrite.java.style.IntelliJ
-import org.openrewrite.style.NamedStyles
-import org.openrewrite.style.Style
-
-/**
- * It's important that these tests validate both that PadEmptyForLoopComponents does the right thing and that
- * SpacesVisitor does not undo that change. Since AutoFormat is used frequently if there were a disagreement over
- * this formatting they would fight back and forth until max cycles was reached.
- */
-interface PadEmptyForLoopComponentsTest : JavaRecipeTest {
-    override val recipe: Recipe
-        get() = PadEmptyForLoopComponents()
-
-    fun namedStyles(styles: Collection<Style>) : Iterable<NamedStyles> {
-        return listOf(NamedStyles(Tree.randomId(), "Test", "test", "test", emptySet(), styles))
-    }
-
-    @Test
-    fun addSpaceToEmptyInitializer(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            EmptyForInitializerPadStyle(
-                true
-            )
-        ))).build(),
-        before = """
-            public class A {
-                {
-                    int i = 0;
-                    int j = 10;
-                    for (; i < j; i++, j--) { }
-                }
-            }
-        """,
-        after = """
-            public class A {
-                {
-                    int i = 0;
-                    int j = 10;
-                    for ( ; i < j; i++, j--) { }
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(),
-                EmptyForInitializerPadStyle(true), null)
-                    .visit(cu, InMemoryExecutionContext{})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun removeSpaceFromEmptyInitializer(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            EmptyForInitializerPadStyle(
-                false
-            )
-        ))).build(),
-        before = """
-            public class A {
-                {
-                    int i = 0;
-                    int j = 10;
-                    for ( ; i < j; i++, j--) { }
-                }
-            }
-        """,
-        after = """
-            public class A {
-                {
-                    int i = 0;
-                    int j = 10;
-                    for (; i < j; i++, j--) { }
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(),
-                EmptyForInitializerPadStyle(false), null)
-                    .visit(cu, InMemoryExecutionContext{})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun addSpaceToEmptyIterator(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            EmptyForIteratorPadStyle(
-                true
-            )
-        ))).build(),
-        before = """
-            public class A {
-                {
-                    int i = 0;
-                    for (int i = 0; i < 10;) { i++; }
-                }
-            }
-        """,
-        after = """
-            public class A {
-                {
-                    int i = 0;
-                    for (int i = 0; i < 10; ) { i++; }
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(), null,
-                EmptyForIteratorPadStyle(true)
-            )
-                    .visit(cu, InMemoryExecutionContext{})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-
-    @Test
-    fun removeSpaceFromEmptyIterator(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp.styles(namedStyles(listOf(
-            EmptyForIteratorPadStyle(
-                false
-            )
-        ))).build(),
-        before = """
-            public class A {
-                {
-                    int i = 0;
-                    for (int i = 0; i < 10; ) { i++; }
-                }
-            }
-        """,
-        after = """
-            public class A {
-                {
-                    int i = 0;
-                    for (int i = 0; i < 10;) { i++; }
-                }
-            }
-        """,
-        afterConditions = { cu ->
-            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(), null,
-                EmptyForIteratorPadStyle(false)
-            )
-                    .visit(cu, InMemoryExecutionContext{})
-            assertThat(nucu).isEqualTo(cu)
-        }
-    )
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.ExecutionContext
+import org.openrewrite.InMemoryExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.Tree
+import org.openrewrite.java.cleanup.PadEmptyForLoopComponents
+import org.openrewrite.java.format.SpacesVisitor
+import org.openrewrite.java.style.EmptyForInitializerPadStyle
+import org.openrewrite.java.style.EmptyForIteratorPadStyle
+import org.openrewrite.java.style.IntelliJ
+import org.openrewrite.style.NamedStyles
+import org.openrewrite.style.Style
+
+/**
+ * It's important that these tests validate both that PadEmptyForLoopComponents does the right thing and that
+ * SpacesVisitor does not undo that change. Since AutoFormat is used frequently if there were a disagreement over
+ * this formatting they would fight back and forth until max cycles was reached.
+ */
+interface PadEmptyForLoopComponentsTest : JavaRecipeTest {
+    override val recipe: Recipe
+        get() = PadEmptyForLoopComponents()
+
+    fun namedStyles(styles: Collection<Style>) : Iterable<NamedStyles> {
+        return listOf(NamedStyles(Tree.randomId(), "Test", "test", "test", emptySet(), styles))
+    }
+
+    @Test
+    fun addSpaceToEmptyInitializer(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            EmptyForInitializerPadStyle(
+                true
+            )
+        ))).build(),
+        before = """
+            public class A {
+                {
+                    int i = 0;
+                    int j = 10;
+                    for (; i < j; i++, j--) { }
+                }
+            }
+        """,
+        after = """
+            public class A {
+                {
+                    int i = 0;
+                    int j = 10;
+                    for ( ; i < j; i++, j--) { }
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(),
+                EmptyForInitializerPadStyle(true), null)
+                    .visit(cu, InMemoryExecutionContext{})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun removeSpaceFromEmptyInitializer(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            EmptyForInitializerPadStyle(
+                false
+            )
+        ))).build(),
+        before = """
+            public class A {
+                {
+                    int i = 0;
+                    int j = 10;
+                    for ( ; i < j; i++, j--) { }
+                }
+            }
+        """,
+        after = """
+            public class A {
+                {
+                    int i = 0;
+                    int j = 10;
+                    for (; i < j; i++, j--) { }
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(),
+                EmptyForInitializerPadStyle(false), null)
+                    .visit(cu, InMemoryExecutionContext{})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun addSpaceToEmptyIterator(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            EmptyForIteratorPadStyle(
+                true
+            )
+        ))).build(),
+        before = """
+            public class A {
+                {
+                    int i = 0;
+                    for (int i = 0; i < 10;) { i++; }
+                }
+            }
+        """,
+        after = """
+            public class A {
+                {
+                    int i = 0;
+                    for (int i = 0; i < 10; ) { i++; }
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(), null,
+                EmptyForIteratorPadStyle(true)
+            )
+                    .visit(cu, InMemoryExecutionContext{})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+
+    @Test
+    fun removeSpaceFromEmptyIterator(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp.styles(namedStyles(listOf(
+            EmptyForIteratorPadStyle(
+                false
+            )
+        ))).build(),
+        before = """
+            public class A {
+                {
+                    int i = 0;
+                    for (int i = 0; i < 10; ) { i++; }
+                }
+            }
+        """,
+        after = """
+            public class A {
+                {
+                    int i = 0;
+                    for (int i = 0; i < 10;) { i++; }
+                }
+            }
+        """,
+        afterConditions = { cu ->
+            val nucu = SpacesVisitor<ExecutionContext>(IntelliJ.spaces(), null,
+                EmptyForIteratorPadStyle(false)
+            )
+                    .visit(cu, InMemoryExecutionContext{})
+            assertThat(nucu).isEqualTo(cu)
+        }
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/TypeValidator.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/TypeValidator.kt
index 975deec0708..6238939fa69 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/TypeValidator.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/TypeValidator.kt
@@ -1,100 +1,100 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.junit.jupiter.api.fail
-
-import org.openrewrite.java.search.FindMissingTypes
-import org.openrewrite.java.tree.J
-
-/**
- * Produces a report about missing type attributions within a CompilationUnit.
- */
-class TypeValidator {
-
-    data class ValidationOptions(
-        val classDeclarations: Boolean = true,
-        val identifiers: Boolean = true,
-        val methodDeclarations: Boolean = true,
-        val methodInvocations: Boolean = true,
-    ) {
-        companion object {
-            class Builder(
-                var classDeclarations: Boolean = true,
-                var identifiers: Boolean = true,
-                var methodDeclarations: Boolean = true,
-                var methodInvocations: Boolean = true,
-            )
-
-            fun builder(init: Builder.() -> Unit): ValidationOptions {
-                val builder = Builder()
-                init.invoke(builder)
-                return ValidationOptions(
-                    classDeclarations = builder.classDeclarations,
-                    identifiers = builder.identifiers,
-                    methodDeclarations = builder.methodDeclarations,
-                    methodInvocations = builder.methodInvocations
-                )
-            }
-        }
-    }
-
-    companion object {
-        private val defaultOptions = ValidationOptions()
-
-        @JvmStatic
-        fun analyzeTypes(
-            cu: J.CompilationUnit,
-            options: ValidationOptions = defaultOptions
-        ): List<FindMissingTypes.MissingTypeResult> {
-            val report = FindMissingTypes.findMissingTypes(cu)
-            return report.filter {
-                if (it.j is J.Identifier && !options.identifiers) {
-                    return@filter false
-                } else if (it.j is J.ClassDeclaration && !options.classDeclarations) {
-                    return@filter false
-                } else if (it.j is J.MethodDeclaration && !options.methodDeclarations) {
-                    return@filter false
-                } else if (it.j is J.MethodInvocation && !options.methodInvocations) {
-                    return@filter false
-                }
-                return@filter true
-            }
-        }
-
-        @JvmStatic
-        fun assertTypesValid(
-            cu: J.CompilationUnit,
-            options: ValidationOptions = defaultOptions
-        ) {
-            val report = analyzeTypes(cu, options)
-            if (report.isNotEmpty()) {
-
-                val reportText = report.asSequence()
-                    .map {
-                        """
-                            |  ${it.message}
-                            |  AT:  ${it.path}
-                            |  AST: ${it.printedTree}
-                        """.trimMargin()
-                    }
-                    .joinToString("\n")
-                fail("AST contains missing or invalid type information: \n$reportText")
-            }
-        }
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.junit.jupiter.api.fail
+
+import org.openrewrite.java.search.FindMissingTypes
+import org.openrewrite.java.tree.J
+
+/**
+ * Produces a report about missing type attributions within a CompilationUnit.
+ */
+class TypeValidator {
+
+    data class ValidationOptions(
+        val classDeclarations: Boolean = true,
+        val identifiers: Boolean = true,
+        val methodDeclarations: Boolean = true,
+        val methodInvocations: Boolean = true,
+    ) {
+        companion object {
+            class Builder(
+                var classDeclarations: Boolean = true,
+                var identifiers: Boolean = true,
+                var methodDeclarations: Boolean = true,
+                var methodInvocations: Boolean = true,
+            )
+
+            fun builder(init: Builder.() -> Unit): ValidationOptions {
+                val builder = Builder()
+                init.invoke(builder)
+                return ValidationOptions(
+                    classDeclarations = builder.classDeclarations,
+                    identifiers = builder.identifiers,
+                    methodDeclarations = builder.methodDeclarations,
+                    methodInvocations = builder.methodInvocations
+                )
+            }
+        }
+    }
+
+    companion object {
+        private val defaultOptions = ValidationOptions()
+
+        @JvmStatic
+        fun analyzeTypes(
+            cu: J.CompilationUnit,
+            options: ValidationOptions = defaultOptions
+        ): List<FindMissingTypes.MissingTypeResult> {
+            val report = FindMissingTypes.findMissingTypes(cu)
+            return report.filter {
+                if (it.j is J.Identifier && !options.identifiers) {
+                    return@filter false
+                } else if (it.j is J.ClassDeclaration && !options.classDeclarations) {
+                    return@filter false
+                } else if (it.j is J.MethodDeclaration && !options.methodDeclarations) {
+                    return@filter false
+                } else if (it.j is J.MethodInvocation && !options.methodInvocations) {
+                    return@filter false
+                }
+                return@filter true
+            }
+        }
+
+        @JvmStatic
+        fun assertTypesValid(
+            cu: J.CompilationUnit,
+            options: ValidationOptions = defaultOptions
+        ) {
+            val report = analyzeTypes(cu, options)
+            if (report.isNotEmpty()) {
+
+                val reportText = report.asSequence()
+                    .map {
+                        """
+                            |  ${it.message}
+                            |  AT:  ${it.path}
+                            |  AST: ${it.printedTree}
+                        """.trimMargin()
+                    }
+                    .joinToString("\n")
+                fail("AST contains missing or invalid type information: \n$reportText")
+            }
+        }
+    }
+
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/UseStaticImportTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/UseStaticImportTest.kt
index b3339dc80d5..06e623bc148 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/UseStaticImportTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/UseStaticImportTest.kt
@@ -1,191 +1,191 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.ExecutionContext
-import org.openrewrite.java.tree.J
-import org.openrewrite.java.tree.JavaType
-
-interface UseStaticImportTest : JavaRecipeTest {
-    @Test
-    fun replaceWithStaticImports(jp: JavaParser) = assertChanged(
-        jp,
-        dependsOn = arrayOf(
-            """
-                package asserts;
-                
-                public class Assert {
-                    public static void assertTrue(boolean b) {}
-                    public static void assertFalse(boolean b) {}
-                    public static void assertEquals(int m, int n) {}
-                }
-            """
-        ),
-        recipe = UseStaticImport("asserts.Assert assert*(..)"),
-        before = """
-            package test;
-            
-            import asserts.Assert;
-            
-            class Test {
-                void test() {
-                    Assert.assertTrue(true);
-                    Assert.assertEquals(1, 2);
-                    Assert.assertFalse(false);
-                }
-            }
-        """,
-        after = """
-            package test;
-            
-            import static asserts.Assert.*;
-            
-            class Test {
-                void test() {
-                    assertTrue(true);
-                    assertEquals(1, 2);
-                    assertFalse(false);
-                }
-            }
-        """
-    )
-
-    @Test
-    fun methodInvocationsHavingNullSelect(jp: JavaParser) = assertChanged(
-        jp,
-        dependsOn = arrayOf(
-            """
-                package asserts;
-                
-                public class Assert {
-                    public static void assertTrue(boolean b) {}
-                    public static void assertEquals(int m, int n) {}
-                }
-                
-                public class MyAssert {
-                    public void assertTrue(boolean b) {Assert.assertTrue(b);}
-                    public void assertEquals(int m, int n) {Assert.assertEquals(m, n);}
-                }
-            """
-        ),
-        recipe = toRecipe {
-            object : JavaIsoVisitor<ExecutionContext>() {
-                override fun visitClassDeclaration(
-                    classDecl: J.ClassDeclaration,
-                    p: ExecutionContext
-                ): J.ClassDeclaration {
-                    val cd = super.visitClassDeclaration(classDecl, p)
-                    return cd.withExtends(null)
-                }
-
-                override fun visitImport(_import: J.Import, p: ExecutionContext): J.Import? {
-                    return null
-                }
-
-                override fun visitMethodInvocation(
-                    method: J.MethodInvocation,
-                    p: ExecutionContext
-                ): J.MethodInvocation {
-                    val mi = super.visitMethodInvocation(method, p)
-                    return mi.withDeclaringType(JavaType.Class.build("asserts.Assert"))
-                }
-
-                override fun visitCompilationUnit(cu: J.CompilationUnit, p: ExecutionContext): J.CompilationUnit {
-                    doAfterVisit(UseStaticImport("asserts.Assert assert*(..)"))
-                    return super.visitCompilationUnit(cu, p)
-                }
-            }
-        },
-        before = """
-            package test;
-            
-            import asserts.MyAssert;
-            
-            class Test extends MyAssert {
-                void test() {
-                    assertTrue(true);
-                    assertEquals(1, 2);
-                }
-            }
-        """,
-        after = """
-            package test;
-            
-            import static asserts.Assert.assertEquals;
-            import static asserts.Assert.assertTrue;
-            
-            class Test {
-                void test() {
-                    assertTrue(true);
-                    assertEquals(1, 2);
-                }
-            }
-        """,
-        cycles = 2,
-        expectedCyclesThatMakeChanges = 2
-    )
-
-    @Test
-    fun junit5Assertions(jp: JavaParser.Builder<*, *>) = assertChanged(
-        parser = jp
-            .classpath(JavaParser.dependenciesFromClasspath("junit-jupiter-api"))
-            .build(),
-        recipe = UseStaticImport("org.junit.jupiter.api.Assertions assert*(..)"),
-        before = """
-            package org.openrewrite;
-
-            import org.junit.jupiter.api.Test;
-            import org.junit.jupiter.api.Assertions;
-
-            class Sample {
-                @Test
-                void sample() {
-                    Assertions.assertEquals(42, 21*2);
-                }
-            }
-        """,
-        after = """
-            package org.openrewrite;
-
-            import org.junit.jupiter.api.Test;
-            
-            import static org.junit.jupiter.api.Assertions.assertEquals;
-
-            class Sample {
-                @Test
-                void sample() {
-                    assertEquals(42, 21*2);
-                }
-            }
-        """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = UseStaticImport(null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse()
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("methodPattern")
-
-        recipe = UseStaticImport("Foo.F foo()")
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue()
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.ExecutionContext
+import org.openrewrite.java.tree.J
+import org.openrewrite.java.tree.JavaType
+
+interface UseStaticImportTest : JavaRecipeTest {
+    @Test
+    fun replaceWithStaticImports(jp: JavaParser) = assertChanged(
+        jp,
+        dependsOn = arrayOf(
+            """
+                package asserts;
+                
+                public class Assert {
+                    public static void assertTrue(boolean b) {}
+                    public static void assertFalse(boolean b) {}
+                    public static void assertEquals(int m, int n) {}
+                }
+            """
+        ),
+        recipe = UseStaticImport("asserts.Assert assert*(..)"),
+        before = """
+            package test;
+            
+            import asserts.Assert;
+            
+            class Test {
+                void test() {
+                    Assert.assertTrue(true);
+                    Assert.assertEquals(1, 2);
+                    Assert.assertFalse(false);
+                }
+            }
+        """,
+        after = """
+            package test;
+            
+            import static asserts.Assert.*;
+            
+            class Test {
+                void test() {
+                    assertTrue(true);
+                    assertEquals(1, 2);
+                    assertFalse(false);
+                }
+            }
+        """
+    )
+
+    @Test
+    fun methodInvocationsHavingNullSelect(jp: JavaParser) = assertChanged(
+        jp,
+        dependsOn = arrayOf(
+            """
+                package asserts;
+                
+                public class Assert {
+                    public static void assertTrue(boolean b) {}
+                    public static void assertEquals(int m, int n) {}
+                }
+                
+                public class MyAssert {
+                    public void assertTrue(boolean b) {Assert.assertTrue(b);}
+                    public void assertEquals(int m, int n) {Assert.assertEquals(m, n);}
+                }
+            """
+        ),
+        recipe = toRecipe {
+            object : JavaIsoVisitor<ExecutionContext>() {
+                override fun visitClassDeclaration(
+                    classDecl: J.ClassDeclaration,
+                    p: ExecutionContext
+                ): J.ClassDeclaration {
+                    val cd = super.visitClassDeclaration(classDecl, p)
+                    return cd.withExtends(null)
+                }
+
+                override fun visitImport(_import: J.Import, p: ExecutionContext): J.Import? {
+                    return null
+                }
+
+                override fun visitMethodInvocation(
+                    method: J.MethodInvocation,
+                    p: ExecutionContext
+                ): J.MethodInvocation {
+                    val mi = super.visitMethodInvocation(method, p)
+                    return mi.withDeclaringType(JavaType.Class.build("asserts.Assert"))
+                }
+
+                override fun visitCompilationUnit(cu: J.CompilationUnit, p: ExecutionContext): J.CompilationUnit {
+                    doAfterVisit(UseStaticImport("asserts.Assert assert*(..)"))
+                    return super.visitCompilationUnit(cu, p)
+                }
+            }
+        },
+        before = """
+            package test;
+            
+            import asserts.MyAssert;
+            
+            class Test extends MyAssert {
+                void test() {
+                    assertTrue(true);
+                    assertEquals(1, 2);
+                }
+            }
+        """,
+        after = """
+            package test;
+            
+            import static asserts.Assert.assertEquals;
+            import static asserts.Assert.assertTrue;
+            
+            class Test {
+                void test() {
+                    assertTrue(true);
+                    assertEquals(1, 2);
+                }
+            }
+        """,
+        cycles = 2,
+        expectedCyclesThatMakeChanges = 2
+    )
+
+    @Test
+    fun junit5Assertions(jp: JavaParser.Builder<*, *>) = assertChanged(
+        parser = jp
+            .classpath(JavaParser.dependenciesFromClasspath("junit-jupiter-api"))
+            .build(),
+        recipe = UseStaticImport("org.junit.jupiter.api.Assertions assert*(..)"),
+        before = """
+            package org.openrewrite;
+
+            import org.junit.jupiter.api.Test;
+            import org.junit.jupiter.api.Assertions;
+
+            class Sample {
+                @Test
+                void sample() {
+                    Assertions.assertEquals(42, 21*2);
+                }
+            }
+        """,
+        after = """
+            package org.openrewrite;
+
+            import org.junit.jupiter.api.Test;
+            
+            import static org.junit.jupiter.api.Assertions.assertEquals;
+
+            class Sample {
+                @Test
+                void sample() {
+                    assertEquals(42, 21*2);
+                }
+            }
+        """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = UseStaticImport(null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse()
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("methodPattern")
+
+        recipe = UseStaticImport("Foo.F foo()")
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue()
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/CatchClauseOnlyRethrowsTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/CatchClauseOnlyRethrowsTest.kt
index f46e4a75dd1..eb36114b137 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/CatchClauseOnlyRethrowsTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/CatchClauseOnlyRethrowsTest.kt
@@ -1,196 +1,196 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.Recipe
-import org.openrewrite.java.JavaRecipeTest
-
-interface CatchClauseOnlyRethrowsTest : JavaRecipeTest {
-    override val recipe: Recipe
-        get() = CatchClauseOnlyRethrows()
-
-    @Test
-    fun rethrownButWithDifferentMessage() = assertUnchanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        throw new IOException("another message", e);
-                    } catch(Exception e) {
-                        throw new Exception("another message");
-                    }
-                }
-            }
-        """
-    )
-
-    @Test
-    fun catchShouldBePreservedBecauseLessSpecificCatchFollows() = assertUnchanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        throw e;
-                    } catch(Exception e) {
-                        System.out.println(e.getMessage());
-                    } catch(Throwable t) {
-                        t.printStackTrace();
-                    }
-                }
-            }
-        """
-    )
-
-    @Test
-    fun tryCanBeRemoved() = assertChanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        throw e;
-                    }
-                }
-            }
-        """,
-        after = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    new FileReader("").read();
-                }
-            }
-        """
-    )
-
-    @Test
-    fun tryShouldBePreservedBecauseFinally() = assertChanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        throw e;
-                    } finally {
-                        // should be untouched since this might do something
-                    }
-                }
-            }
-        """,
-        after = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } finally {
-                        // should be untouched since this might do something
-                    }
-                }
-            }
-        """
-    )
-
-    @Test
-    fun tryShouldBePreservedBecauseResources() = assertChanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try(FileReader fr = new FileReader("")) {
-                        fr.read();
-                    } catch (IOException e) {
-                        throw e;
-                    }
-                }
-            }
-        """,
-        after = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try(FileReader fr = new FileReader("")) {
-                        fr.read();
-                    }
-                }
-            }
-        """
-    )
-
-    @Test
-    fun wrappingAndRethrowingIsUnchanged() = assertUnchanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        """
-    )
-
-    @Test
-    fun loggingAndRethrowingIsUnchanged() = assertUnchanged(
-        before = """
-            import java.io.FileReader;
-            import java.io.IOException;
-            
-            class A {
-                void foo() throws IOException {
-                    try {
-                        new FileReader("").read();
-                    } catch (IOException e) {
-                        System.out.println("Oh no an exception!!");
-                        throw e;
-                    }
-                }
-            }
-        """
-    )
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.Recipe
+import org.openrewrite.java.JavaRecipeTest
+
+interface CatchClauseOnlyRethrowsTest : JavaRecipeTest {
+    override val recipe: Recipe
+        get() = CatchClauseOnlyRethrows()
+
+    @Test
+    fun rethrownButWithDifferentMessage() = assertUnchanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        throw new IOException("another message", e);
+                    } catch(Exception e) {
+                        throw new Exception("another message");
+                    }
+                }
+            }
+        """
+    )
+
+    @Test
+    fun catchShouldBePreservedBecauseLessSpecificCatchFollows() = assertUnchanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        throw e;
+                    } catch(Exception e) {
+                        System.out.println(e.getMessage());
+                    } catch(Throwable t) {
+                        t.printStackTrace();
+                    }
+                }
+            }
+        """
+    )
+
+    @Test
+    fun tryCanBeRemoved() = assertChanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        throw e;
+                    }
+                }
+            }
+        """,
+        after = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    new FileReader("").read();
+                }
+            }
+        """
+    )
+
+    @Test
+    fun tryShouldBePreservedBecauseFinally() = assertChanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        throw e;
+                    } finally {
+                        // should be untouched since this might do something
+                    }
+                }
+            }
+        """,
+        after = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } finally {
+                        // should be untouched since this might do something
+                    }
+                }
+            }
+        """
+    )
+
+    @Test
+    fun tryShouldBePreservedBecauseResources() = assertChanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try(FileReader fr = new FileReader("")) {
+                        fr.read();
+                    } catch (IOException e) {
+                        throw e;
+                    }
+                }
+            }
+        """,
+        after = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try(FileReader fr = new FileReader("")) {
+                        fr.read();
+                    }
+                }
+            }
+        """
+    )
+
+    @Test
+    fun wrappingAndRethrowingIsUnchanged() = assertUnchanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        """
+    )
+
+    @Test
+    fun loggingAndRethrowingIsUnchanged() = assertUnchanged(
+        before = """
+            import java.io.FileReader;
+            import java.io.IOException;
+            
+            class A {
+                void foo() throws IOException {
+                    try {
+                        new FileReader("").read();
+                    } catch (IOException e) {
+                        System.out.println("Oh no an exception!!");
+                        throw e;
+                    }
+                }
+            }
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/FinalClassTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/FinalClassTest.kt
index 2a7fb1d0264..92b3dbc2530 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/FinalClassTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/cleanup/FinalClassTest.kt
@@ -1,115 +1,115 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.cleanup
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-import org.openrewrite.Recipe
-import org.openrewrite.java.JavaRecipeTest
-
-interface FinalClassTest : JavaRecipeTest {
-    override val recipe: Recipe
-        get() = FinalClass()
-
-    @Test
-    fun finalizeClass() = assertChanged(
-        before = """
-            public class A {
-                private A(String s) {
-                }
-            
-                private A() {
-                }
-            }
-        """,
-        after = """
-            public final class A {
-                private A(String s) {
-                }
-            
-                private A() {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun hasPublicConstructor() = assertUnchanged(
-        before = """
-            public class A {
-                private A(String s) {
-                }
-                
-                public A() {
-                }
-            }
-        """
-    )
-
-    @Test
-    fun hasImplicitConstructor() = assertUnchanged(
-        before = """
-            public class A {
-            }
-        """
-    )
-
-    @Test
-    fun innerClass() = assertChanged(
-        before = """
-            class A {
-            
-                class B {
-                    private B() {}
-                }
-            }
-        """,
-        after = """
-            class A {
-            
-                final class B {
-                    private B() {}
-                }
-            }
-        """
-    )
-
-    @Test
-    fun classInsideInterfaceIsImplicitlyFinal() = assertUnchanged(
-         before = """
-             public interface A {
-                class B {
-                    private B() { }
-                }
-             }
-         """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1061")
-    @Test
-    fun abstractClass() = assertUnchanged(
-        before = """
-            public abstract class A {
-                
-                public static void foo() {
-                }
-                
-                private A() {
-                }
-            }
-        """
-    )
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.cleanup
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+import org.openrewrite.Recipe
+import org.openrewrite.java.JavaRecipeTest
+
+interface FinalClassTest : JavaRecipeTest {
+    override val recipe: Recipe
+        get() = FinalClass()
+
+    @Test
+    fun finalizeClass() = assertChanged(
+        before = """
+            public class A {
+                private A(String s) {
+                }
+            
+                private A() {
+                }
+            }
+        """,
+        after = """
+            public final class A {
+                private A(String s) {
+                }
+            
+                private A() {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun hasPublicConstructor() = assertUnchanged(
+        before = """
+            public class A {
+                private A(String s) {
+                }
+                
+                public A() {
+                }
+            }
+        """
+    )
+
+    @Test
+    fun hasImplicitConstructor() = assertUnchanged(
+        before = """
+            public class A {
+            }
+        """
+    )
+
+    @Test
+    fun innerClass() = assertChanged(
+        before = """
+            class A {
+            
+                class B {
+                    private B() {}
+                }
+            }
+        """,
+        after = """
+            class A {
+            
+                final class B {
+                    private B() {}
+                }
+            }
+        """
+    )
+
+    @Test
+    fun classInsideInterfaceIsImplicitlyFinal() = assertUnchanged(
+         before = """
+             public interface A {
+                class B {
+                    private B() { }
+                }
+             }
+         """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1061")
+    @Test
+    fun abstractClass() = assertUnchanged(
+        before = """
+            public abstract class A {
+                
+                public static void foo() {
+                }
+                
+                private A() {
+                }
+            }
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/internal/TypesInUseTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/internal/TypesInUseTest.kt
index 0af051dbdcc..3764b04c1eb 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/internal/TypesInUseTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/internal/TypesInUseTest.kt
@@ -1,61 +1,61 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.internal
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-import org.openrewrite.java.JavaParser
-import org.openrewrite.java.tree.JavaType
-import org.openrewrite.java.tree.TypeUtils
-
-interface TypesInUseTest {
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/617")
-    @Test
-    fun findAnnotationArgumentType(jp: JavaParser.Builder<*, *>) {
-        val cus = jp.build().parse(
-            """
-            package org.openrewrite.test;
-            
-            public @interface YesOrNo {
-                Status status();
-                enum Status {
-                    YES, NO
-                }
-            }
-        """,
-            """
-            package org.openrewrite.test;
-            
-            import static org.openrewrite.test.YesOrNo.Status.YES;
-            
-            @YesOrNo(status = YES)
-            public class Foo {}
-        """
-        )
-
-        val foo = cus.find { it.classes[0].name.simpleName == "Foo" }!!
-        val foundTypes = foo.typesInUse.variables
-        assertThat(foundTypes.isNotEmpty())
-        assertThat(foundTypes).anyMatch { TypeUtils.asFullyQualified(it.type)!!.fullyQualifiedName.equals("org.openrewrite.test.YesOrNo.Status") }
-
-        assertThat(
-            foundTypes.filterIsInstance<JavaType.FullyQualified>()
-                .map { TypeUtils.asFullyQualified(it)!!.fullyQualifiedName }
-        ).containsExactlyInAnyOrder("org.openrewrite.test.YesOrNo", "org.openrewrite.test.YesOrNo.Status")
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.internal
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+import org.openrewrite.java.JavaParser
+import org.openrewrite.java.tree.JavaType
+import org.openrewrite.java.tree.TypeUtils
+
+interface TypesInUseTest {
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/617")
+    @Test
+    fun findAnnotationArgumentType(jp: JavaParser.Builder<*, *>) {
+        val cus = jp.build().parse(
+            """
+            package org.openrewrite.test;
+            
+            public @interface YesOrNo {
+                Status status();
+                enum Status {
+                    YES, NO
+                }
+            }
+        """,
+            """
+            package org.openrewrite.test;
+            
+            import static org.openrewrite.test.YesOrNo.Status.YES;
+            
+            @YesOrNo(status = YES)
+            public class Foo {}
+        """
+        )
+
+        val foo = cus.find { it.classes[0].name.simpleName == "Foo" }!!
+        val foundTypes = foo.typesInUse.variables
+        assertThat(foundTypes.isNotEmpty())
+        assertThat(foundTypes).anyMatch { TypeUtils.asFullyQualified(it.type)!!.fullyQualifiedName.equals("org.openrewrite.test.YesOrNo.Status") }
+
+        assertThat(
+            foundTypes.filterIsInstance<JavaType.FullyQualified>()
+                .map { TypeUtils.asFullyQualified(it)!!.fullyQualifiedName }
+        ).containsExactlyInAnyOrder("org.openrewrite.test.YesOrNo", "org.openrewrite.test.YesOrNo.Status")
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/java/tree/PackageTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/java/tree/PackageTest.kt
index 43bdfab2d50..ebd563cf9b7 100644
--- a/rewrite-test/src/main/kotlin/org/openrewrite/java/tree/PackageTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/java/tree/PackageTest.kt
@@ -1,31 +1,31 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.java.tree
-
-import org.junit.jupiter.api.Test
-import org.openrewrite.java.JavaParser
-import org.openrewrite.java.JavaTreeTest
-import org.openrewrite.java.JavaTreeTest.NestingLevel.CompilationUnit
-
-interface PackageTest : JavaTreeTest {
-    @Test
-    fun packageFormatting(jp: JavaParser) = assertParsePrintAndProcess(
-        jp, CompilationUnit, """
-            /*comment*/package a ;
-            class A {}
-        """
-    )
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.tree
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.java.JavaParser
+import org.openrewrite.java.JavaTreeTest
+import org.openrewrite.java.JavaTreeTest.NestingLevel.CompilationUnit
+
+interface PackageTest : JavaTreeTest {
+    @Test
+    fun packageFormatting(jp: JavaParser) = assertParsePrintAndProcess(
+        jp, CompilationUnit, """
+            /*comment*/package a ;
+            class A {}
+        """
+    )
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/json/JsonRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/json/JsonRecipeTest.kt
index daff638046c..068a363a21e 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/json/JsonRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/json/JsonRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.json
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.json.tree.Json
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface JsonRecipeTest : RecipeTest<Json.Document> {
-    override val parser: JsonParser
-        get() = JsonParser()
-
-    fun assertChanged(
-        parser: JsonParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("json5") before: String,
-        @Language("json5") dependsOn: Array<String> = emptyArray(),
-        @Language("json5") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Json.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: JsonParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("json5") before: File,
-        relativeTo: Path? = null,
-        @Language("json5") dependsOn: Array<File> = emptyArray(),
-        @Language("json5") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Json.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: JsonParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("json5") before: String,
-        @Language("json5") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: JsonParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("json5") before: File,
-        relativeTo: Path? = null,
-        @Language("json5") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.json
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.json.tree.Json
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface JsonRecipeTest : RecipeTest<Json.Document> {
+    override val parser: JsonParser
+        get() = JsonParser()
+
+    fun assertChanged(
+        parser: JsonParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("json5") before: String,
+        @Language("json5") dependsOn: Array<String> = emptyArray(),
+        @Language("json5") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Json.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: JsonParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("json5") before: File,
+        relativeTo: Path? = null,
+        @Language("json5") dependsOn: Array<File> = emptyArray(),
+        @Language("json5") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Json.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: JsonParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("json5") before: String,
+        @Language("json5") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: JsonParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("json5") before: File,
+        relativeTo: Path? = null,
+        @Language("json5") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt
index db03c2b9bf6..4cce51b0eae 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/maven/MavenRecipeTest.kt
@@ -1,102 +1,102 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.maven
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.xml.tree.Xml
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface MavenRecipeTest : RecipeTest<Xml.Document> {
-
-    override val parser: MavenParser
-        get() = MavenParser.builder().build()
-
-    fun assertChanged(
-        parser: MavenParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: String,
-        @Language("xml") dependsOn: Array<String> = emptyArray(),
-        @Language("xml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Xml.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(
-            parser,
-            recipe,
-            executionContext,
-            before,
-            dependsOn,
-            after,
-            cycles,
-            expectedCyclesThatMakeChanges,
-            afterConditions
-        )
-    }
-
-    fun assertChanged(
-        parser: MavenParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: File,
-        relativeTo: Path? = null,
-        @Language("xml") dependsOn: Array<File> = emptyArray(),
-        @Language("xml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Xml.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(
-            parser,
-            recipe,
-            executionContext,
-            before,
-            relativeTo,
-            dependsOn,
-            after,
-            cycles,
-            expectedCyclesThatMakeChanges,
-            afterConditions
-        )
-    }
-
-    fun assertUnchanged(
-        parser: MavenParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: String,
-        @Language("xml") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: MavenParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: File,
-        relativeTo: Path? = null,
-        @Language("xml") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.maven
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.xml.tree.Xml
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface MavenRecipeTest : RecipeTest<Xml.Document> {
+
+    override val parser: MavenParser
+        get() = MavenParser.builder().build()
+
+    fun assertChanged(
+        parser: MavenParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: String,
+        @Language("xml") dependsOn: Array<String> = emptyArray(),
+        @Language("xml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Xml.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(
+            parser,
+            recipe,
+            executionContext,
+            before,
+            dependsOn,
+            after,
+            cycles,
+            expectedCyclesThatMakeChanges,
+            afterConditions
+        )
+    }
+
+    fun assertChanged(
+        parser: MavenParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: File,
+        relativeTo: Path? = null,
+        @Language("xml") dependsOn: Array<File> = emptyArray(),
+        @Language("xml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Xml.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(
+            parser,
+            recipe,
+            executionContext,
+            before,
+            relativeTo,
+            dependsOn,
+            after,
+            cycles,
+            expectedCyclesThatMakeChanges,
+            afterConditions
+        )
+    }
+
+    fun assertUnchanged(
+        parser: MavenParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: String,
+        @Language("xml") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: MavenParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: File,
+        relativeTo: Path? = null,
+        @Language("xml") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/properties/PropertiesRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/properties/PropertiesRecipeTest.kt
index 75cf3459562..08087431351 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/properties/PropertiesRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/properties/PropertiesRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.properties
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.properties.tree.Properties
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface PropertiesRecipeTest : RecipeTest<Properties.File> {
-    override val parser: PropertiesParser
-        get() = PropertiesParser()
-
-    fun assertChanged(
-        parser: PropertiesParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("properties") before: String,
-        @Language("properties") dependsOn: Array<String> = emptyArray(),
-        @Language("properties") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Properties.File) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: PropertiesParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("properties") before: File,
-        relativeTo: Path? = null,
-        @Language("properties") dependsOn: Array<File> = emptyArray(),
-        @Language("properties") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Properties.File) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: PropertiesParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("properties") before: String,
-        @Language("properties") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: PropertiesParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("properties") before: File,
-        relativeTo: Path? = null,
-        @Language("properties") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.properties
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.properties.tree.Properties
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface PropertiesRecipeTest : RecipeTest<Properties.File> {
+    override val parser: PropertiesParser
+        get() = PropertiesParser()
+
+    fun assertChanged(
+        parser: PropertiesParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("properties") before: String,
+        @Language("properties") dependsOn: Array<String> = emptyArray(),
+        @Language("properties") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Properties.File) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: PropertiesParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("properties") before: File,
+        relativeTo: Path? = null,
+        @Language("properties") dependsOn: Array<File> = emptyArray(),
+        @Language("properties") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Properties.File) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: PropertiesParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("properties") before: String,
+        @Language("properties") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: PropertiesParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("properties") before: File,
+        relativeTo: Path? = null,
+        @Language("properties") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/protobuf/ProtoRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/protobuf/ProtoRecipeTest.kt
index db6bcda9aa4..ad2af75781a 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/protobuf/ProtoRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/protobuf/ProtoRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.protobuf
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.protobuf.tree.Proto
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface ProtoRecipeTest : RecipeTest<Proto.Document> {
-    override val parser: ProtoParser
-        get() = ProtoParser()
-
-    fun assertChanged(
-        parser: ProtoParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("protobuf") before: String,
-        @Language("protobuf") dependsOn: Array<String> = emptyArray(),
-        @Language("protobuf") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Proto.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: ProtoParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("protobuf") before: File,
-        relativeTo: Path? = null,
-        @Language("protobuf") dependsOn: Array<File> = emptyArray(),
-        @Language("protobuf") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Proto.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: ProtoParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("protobuf") before: String,
-        @Language("protobuf") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: ProtoParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("protobuf") before: File,
-        relativeTo: Path? = null,
-        @Language("protobuf") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.protobuf
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.protobuf.tree.Proto
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface ProtoRecipeTest : RecipeTest<Proto.Document> {
+    override val parser: ProtoParser
+        get() = ProtoParser()
+
+    fun assertChanged(
+        parser: ProtoParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("protobuf") before: String,
+        @Language("protobuf") dependsOn: Array<String> = emptyArray(),
+        @Language("protobuf") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Proto.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: ProtoParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("protobuf") before: File,
+        relativeTo: Path? = null,
+        @Language("protobuf") dependsOn: Array<File> = emptyArray(),
+        @Language("protobuf") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Proto.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: ProtoParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("protobuf") before: String,
+        @Language("protobuf") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: ProtoParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("protobuf") before: File,
+        relativeTo: Path? = null,
+        @Language("protobuf") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/xml/XmlRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/xml/XmlRecipeTest.kt
index 43c9a117ef3..d20a4d77bc7 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/xml/XmlRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/xml/XmlRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.xml
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.xml.tree.Xml
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface XmlRecipeTest : RecipeTest<Xml.Document> {
-    override val parser: XmlParser
-        get() = XmlParser()
-
-    fun assertChanged(
-        parser: XmlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: String,
-        @Language("xml") dependsOn: Array<String> = emptyArray(),
-        @Language("xml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Xml.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: XmlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: File,
-        relativeTo: Path? = null,
-        @Language("xml") dependsOn: Array<File> = emptyArray(),
-        @Language("xml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Xml.Document) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: XmlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: String,
-        @Language("xml") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser:XmlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("xml") before: File,
-        relativeTo: Path? = null,
-        @Language("xml") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.xml
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.xml.tree.Xml
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface XmlRecipeTest : RecipeTest<Xml.Document> {
+    override val parser: XmlParser
+        get() = XmlParser()
+
+    fun assertChanged(
+        parser: XmlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: String,
+        @Language("xml") dependsOn: Array<String> = emptyArray(),
+        @Language("xml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Xml.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: XmlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: File,
+        relativeTo: Path? = null,
+        @Language("xml") dependsOn: Array<File> = emptyArray(),
+        @Language("xml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Xml.Document) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: XmlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: String,
+        @Language("xml") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser:XmlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("xml") before: File,
+        relativeTo: Path? = null,
+        @Language("xml") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/main/kotlin/org/openrewrite/yaml/YamlRecipeTest.kt b/rewrite-test/src/main/kotlin/org/openrewrite/yaml/YamlRecipeTest.kt
index 5d38cd4b2ea..6ce0a3d99a8 100755
--- a/rewrite-test/src/main/kotlin/org/openrewrite/yaml/YamlRecipeTest.kt
+++ b/rewrite-test/src/main/kotlin/org/openrewrite/yaml/YamlRecipeTest.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.intellij.lang.annotations.Language
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.RecipeTest
-import org.openrewrite.yaml.tree.Yaml
-import java.io.File
-import java.nio.file.Path
-
-@Suppress("unused")
-interface YamlRecipeTest : RecipeTest<Yaml.Documents> {
-    override val parser: YamlParser
-        get() = YamlParser()
-
-    fun assertChanged(
-        parser: YamlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("yaml") before: String,
-        @Language("yaml") dependsOn: Array<String> = emptyArray(),
-        @Language("yaml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Yaml.Documents) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertChanged(
-        parser: YamlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("yaml") before: File,
-        relativeTo: Path? = null,
-        @Language("yaml") dependsOn: Array<File> = emptyArray(),
-        @Language("yaml") after: String,
-        cycles: Int = 2,
-        expectedCyclesThatMakeChanges: Int = cycles - 1,
-        afterConditions: (Yaml.Documents) -> Unit = { }
-    ) {
-        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
-    }
-
-    fun assertUnchanged(
-        parser: YamlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("yaml") before: String,
-        @Language("yaml") dependsOn: Array<String> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
-    }
-
-    fun assertUnchanged(
-        parser: YamlParser = this.parser,
-        recipe: Recipe = this.recipe!!,
-        executionContext: ExecutionContext = this.executionContext,
-        @Language("yaml") before: File,
-        relativeTo: Path? = null,
-        @Language("yaml") dependsOn: Array<File> = emptyArray()
-    ) {
-        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.intellij.lang.annotations.Language
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.RecipeTest
+import org.openrewrite.yaml.tree.Yaml
+import java.io.File
+import java.nio.file.Path
+
+@Suppress("unused")
+interface YamlRecipeTest : RecipeTest<Yaml.Documents> {
+    override val parser: YamlParser
+        get() = YamlParser()
+
+    fun assertChanged(
+        parser: YamlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("yaml") before: String,
+        @Language("yaml") dependsOn: Array<String> = emptyArray(),
+        @Language("yaml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Yaml.Documents) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertChanged(
+        parser: YamlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("yaml") before: File,
+        relativeTo: Path? = null,
+        @Language("yaml") dependsOn: Array<File> = emptyArray(),
+        @Language("yaml") after: String,
+        cycles: Int = 2,
+        expectedCyclesThatMakeChanges: Int = cycles - 1,
+        afterConditions: (Yaml.Documents) -> Unit = { }
+    ) {
+        super.assertChangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn, after, cycles, expectedCyclesThatMakeChanges, afterConditions)
+    }
+
+    fun assertUnchanged(
+        parser: YamlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("yaml") before: String,
+        @Language("yaml") dependsOn: Array<String> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, dependsOn)
+    }
+
+    fun assertUnchanged(
+        parser: YamlParser = this.parser,
+        recipe: Recipe = this.recipe!!,
+        executionContext: ExecutionContext = this.executionContext,
+        @Language("yaml") before: File,
+        relativeTo: Path? = null,
+        @Language("yaml") dependsOn: Array<File> = emptyArray()
+    ) {
+        super.assertUnchangedBase(parser, recipe, executionContext, before, relativeTo, dependsOn)
+    }
+}
diff --git a/rewrite-test/src/test/kotlin/org/openrewrite/text/KotlinDataClassChangeText.kt b/rewrite-test/src/test/kotlin/org/openrewrite/text/KotlinDataClassChangeText.kt
index cb1c24e3973..cf4c2fb9ceb 100755
--- a/rewrite-test/src/test/kotlin/org/openrewrite/text/KotlinDataClassChangeText.kt
+++ b/rewrite-test/src/test/kotlin/org/openrewrite/text/KotlinDataClassChangeText.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.text
-
-import org.openrewrite.ExecutionContext
-import org.openrewrite.Recipe
-import org.openrewrite.Validated
-
-/**
- * Should be equivalent in functionality to org.openrewrite.text.ChangeText
- * Exists only so that a test may be written to guarantee that our serialization/deserialization supports kotlin data classes
- */
-data class KotlinDataClassChangeText (
-    val toText: String?,
-) : Recipe() {
-    override fun getDisplayName(): String = name
-    override fun getTags() = mutableSetOf("plain text")
-    override fun getVisitor(): PlainTextVisitor<ExecutionContext> = ChangeTextVisitor(toText!!)
-    override fun validate(): Validated = Validated.required("toText", toText)
-
-    private class ChangeTextVisitor(val toText: String) : PlainTextVisitor<ExecutionContext>() {
-        override fun preVisit(tree: PlainText, ctx: ExecutionContext?): PlainText {
-            return tree.withText(toText)
-        }
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.text
+
+import org.openrewrite.ExecutionContext
+import org.openrewrite.Recipe
+import org.openrewrite.Validated
+
+/**
+ * Should be equivalent in functionality to org.openrewrite.text.ChangeText
+ * Exists only so that a test may be written to guarantee that our serialization/deserialization supports kotlin data classes
+ */
+data class KotlinDataClassChangeText (
+    val toText: String?,
+) : Recipe() {
+    override fun getDisplayName(): String = name
+    override fun getTags() = mutableSetOf("plain text")
+    override fun getVisitor(): PlainTextVisitor<ExecutionContext> = ChangeTextVisitor(toText!!)
+    override fun validate(): Validated = Validated.required("toText", toText)
+
+    private class ChangeTextVisitor(val toText: String) : PlainTextVisitor<ExecutionContext>() {
+        override fun preVisit(tree: PlainText, ctx: ExecutionContext?): PlainText {
+            return tree.withText(toText)
+        }
+    }
+}
diff --git a/rewrite-test/src/test/resources/META-INF/rewrite/other.yml b/rewrite-test/src/test/resources/META-INF/rewrite/other.yml
index 8aa62c5e340..86beea78265 100755
--- a/rewrite-test/src/test/resources/META-INF/rewrite/other.yml
+++ b/rewrite-test/src/test/resources/META-INF/rewrite/other.yml
@@ -1,25 +1,25 @@
-#
-# Copyright 2021 the original author or authors.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# <p>
-# https://www.apache.org/licenses/LICENSE-2.0
-# <p>
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# The purpose of this YAML document is to contain a declarative recipe which includes a recipe from rewrite.yml
-# in its recipe list. This allows us to test that recipe descriptors for such recipes are correct.
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.HelloJon2
-displayName: Hello Jon 2 - Electric Boogaloo
-description: Also Changes Text to "Hello Jon!", but with extra indirection
-recipeList:
-  - org.openrewrite.HelloJon
+#
+# Copyright 2021 the original author or authors.
+# <p>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# <p>
+# https://www.apache.org/licenses/LICENSE-2.0
+# <p>
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# The purpose of this YAML document is to contain a declarative recipe which includes a recipe from rewrite.yml
+# in its recipe list. This allows us to test that recipe descriptors for such recipes are correct.
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.HelloJon2
+displayName: Hello Jon 2 - Electric Boogaloo
+description: Also Changes Text to "Hello Jon!", but with extra indirection
+recipeList:
+  - org.openrewrite.HelloJon
diff --git a/rewrite-test/src/test/resources/META-INF/rewrite/rewrite.yml b/rewrite-test/src/test/resources/META-INF/rewrite/rewrite.yml
index 231fe40f275..e05d19ea91b 100644
--- a/rewrite-test/src/test/resources/META-INF/rewrite/rewrite.yml
+++ b/rewrite-test/src/test/resources/META-INF/rewrite/rewrite.yml
@@ -1,54 +1,54 @@
-#
-# Copyright 2020 the original author or authors.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# <p>
-# https://www.apache.org/licenses/LICENSE-2.0
-# <p>
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.text.ChangeTextToJon
-displayName: Change Text To Jon
-description: Changes Text to "Hello Jon!"
-tags:
-  - testing
-  - plain text
-recipeList:
-  - org.openrewrite.text.ChangeText:
-      toText: Hello Jon!
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.text.HelloKotlin
-displayName: Hello Kotlin
-description: Changes Text to "Hello Kotlin"
-tags:
-  - testing
-  - plain text
-recipeList:
-  - org.openrewrite.text.KotlinDataClassChangeText:
-      toText: Hello Kotlin
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.HelloJon
-displayName: Hello Jon
-description: Also Changes Text to "Hello Jon!"
-recipeList:
-  - org.openrewrite.text.ChangeTextToJon
----
-type: specs.openrewrite.org/v1beta/style
-name: org.openrewrite.SampleStyle
-displayName: Sample style
-description: Sample test style
-tags:
-  - testing
-styleConfigs:
-  - org.openrewrite.text.TextStyle:
-      charset: 'UTF-8'
+#
+# Copyright 2020 the original author or authors.
+# <p>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# <p>
+# https://www.apache.org/licenses/LICENSE-2.0
+# <p>
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.text.ChangeTextToJon
+displayName: Change Text To Jon
+description: Changes Text to "Hello Jon!"
+tags:
+  - testing
+  - plain text
+recipeList:
+  - org.openrewrite.text.ChangeText:
+      toText: Hello Jon!
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.text.HelloKotlin
+displayName: Hello Kotlin
+description: Changes Text to "Hello Kotlin"
+tags:
+  - testing
+  - plain text
+recipeList:
+  - org.openrewrite.text.KotlinDataClassChangeText:
+      toText: Hello Kotlin
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.HelloJon
+displayName: Hello Jon
+description: Also Changes Text to "Hello Jon!"
+recipeList:
+  - org.openrewrite.text.ChangeTextToJon
+---
+type: specs.openrewrite.org/v1beta/style
+name: org.openrewrite.SampleStyle
+displayName: Sample style
+description: Sample test style
+tags:
+  - testing
+styleConfigs:
+  - org.openrewrite.text.TextStyle:
+      charset: 'UTF-8'
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
index 3c9c07580eb..81d30caca4f 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
@@ -1,96 +1,96 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.xml;
-
-import org.openrewrite.Cursor;
-import org.openrewrite.xml.tree.Xml;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Supports a limited set of XPath expressions, specifically those
- * documented on <a href="https://www.w3schools.com/xml/xpath_syntax.asp">this page</a>.
- * <p>
- * Used for checking whether a visitor's cursor meets a certain XPath expression.
- * <p>
- * The "current node" for XPath evaluation is always the root node of the document.
- * As a result, '.' and '..' are not recognized.
- */
-public class XPathMatcher {
-    private final String expression;
-
-    public XPathMatcher(String expression) {
-        this.expression = expression;
-    }
-
-    public boolean matches(Cursor cursor) {
-        List<Xml.Tag> path = cursor.getPathAsStream()
-                .filter(p -> p instanceof Xml.Tag)
-                .map(Xml.Tag.class::cast)
-                .collect(Collectors.toList());
-
-        if (expression.startsWith("//") || !expression.startsWith("/")) {
-            List<String> parts = new ArrayList<>(Arrays.asList((expression.startsWith("//") ?
-                    expression.substring(2) : expression).split("/")));
-            Collections.reverse(parts);
-
-            int pathIndex = 0;
-            for (int i = 0; i < parts.size(); i++, pathIndex++) {
-                String part = parts.get(i);
-                if (part.startsWith("@")) {
-                    if (!(cursor.getValue() instanceof Xml.Attribute &&
-                            (((Xml.Attribute) cursor.getValue()).getKeyAsString().equals(part.substring(1))) ||
-                            "*".equals(part.substring(1)))) {
-                        return false;
-                    }
-
-                    pathIndex--;
-                    continue;
-                }
-
-                if (path.size() < i + 1 || (!path.get(pathIndex).getName().equals(part) && !"*".equals(part))) {
-                    return false;
-                }
-            }
-
-            return expression.startsWith("/") || path.size() - pathIndex <= 1;
-        } else if (expression.startsWith("/")) {
-            Collections.reverse(path);
-
-            String[] parts = expression.substring(1).split("/");
-            for (int i = 0; i < parts.length; i++) {
-                String part = parts[i];
-                if (part.startsWith("@")) {
-                    return cursor.getValue() instanceof Xml.Attribute &&
-                            (((Xml.Attribute) cursor.getValue()).getKeyAsString().equals(part.substring(1)) ||
-                                    "*".equals(part.substring(1)));
-                }
-
-                if (path.size() < i + 1 || (!path.get(i).getName().equals(part) && !"*".equals(part))) {
-                    return false;
-                }
-            }
-
-            return cursor.getValue() instanceof Xml.Tag && path.size() == parts.length;
-        }
-
-        return false;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.xml;
+
+import org.openrewrite.Cursor;
+import org.openrewrite.xml.tree.Xml;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Supports a limited set of XPath expressions, specifically those
+ * documented on <a href="https://www.w3schools.com/xml/xpath_syntax.asp">this page</a>.
+ * <p>
+ * Used for checking whether a visitor's cursor meets a certain XPath expression.
+ * <p>
+ * The "current node" for XPath evaluation is always the root node of the document.
+ * As a result, '.' and '..' are not recognized.
+ */
+public class XPathMatcher {
+    private final String expression;
+
+    public XPathMatcher(String expression) {
+        this.expression = expression;
+    }
+
+    public boolean matches(Cursor cursor) {
+        List<Xml.Tag> path = cursor.getPathAsStream()
+                .filter(p -> p instanceof Xml.Tag)
+                .map(Xml.Tag.class::cast)
+                .collect(Collectors.toList());
+
+        if (expression.startsWith("//") || !expression.startsWith("/")) {
+            List<String> parts = new ArrayList<>(Arrays.asList((expression.startsWith("//") ?
+                    expression.substring(2) : expression).split("/")));
+            Collections.reverse(parts);
+
+            int pathIndex = 0;
+            for (int i = 0; i < parts.size(); i++, pathIndex++) {
+                String part = parts.get(i);
+                if (part.startsWith("@")) {
+                    if (!(cursor.getValue() instanceof Xml.Attribute &&
+                            (((Xml.Attribute) cursor.getValue()).getKeyAsString().equals(part.substring(1))) ||
+                            "*".equals(part.substring(1)))) {
+                        return false;
+                    }
+
+                    pathIndex--;
+                    continue;
+                }
+
+                if (path.size() < i + 1 || (!path.get(pathIndex).getName().equals(part) && !"*".equals(part))) {
+                    return false;
+                }
+            }
+
+            return expression.startsWith("/") || path.size() - pathIndex <= 1;
+        } else if (expression.startsWith("/")) {
+            Collections.reverse(path);
+
+            String[] parts = expression.substring(1).split("/");
+            for (int i = 0; i < parts.length; i++) {
+                String part = parts[i];
+                if (part.startsWith("@")) {
+                    return cursor.getValue() instanceof Xml.Attribute &&
+                            (((Xml.Attribute) cursor.getValue()).getKeyAsString().equals(part.substring(1)) ||
+                                    "*".equals(part.substring(1)));
+                }
+
+                if (path.size() < i + 1 || (!path.get(i).getName().equals(part) && !"*".equals(part))) {
+                    return false;
+                }
+            }
+
+            return cursor.getValue() instanceof Xml.Tag && path.size() == parts.length;
+        }
+
+        return false;
+    }
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/marker/package-info.java b/rewrite-xml/src/main/java/org/openrewrite/xml/marker/package-info.java
index f2853e0c3bd..9bd4dfc1c05 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/marker/package-info.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/marker/package-info.java
@@ -1,19 +1,19 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-@NonNullApi
-package org.openrewrite.xml.marker;
-
-import org.openrewrite.internal.lang.NonNullApi;
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+package org.openrewrite.xml.marker;
+
+import org.openrewrite.internal.lang.NonNullApi;
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/style/XmlStyle.java b/rewrite-xml/src/main/java/org/openrewrite/xml/style/XmlStyle.java
index 217fe45c89d..463984604a2 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/style/XmlStyle.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/style/XmlStyle.java
@@ -1,21 +1,21 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.xml.style;
-
-import org.openrewrite.style.Style;
-
-public interface XmlStyle extends Style {
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.xml.style;
+
+import org.openrewrite.style.Style;
+
+public interface XmlStyle extends Style {
+}
diff --git a/rewrite-yaml/build.gradle.kts b/rewrite-yaml/build.gradle.kts
index 160877605eb..1a54ff1a790 100755
--- a/rewrite-yaml/build.gradle.kts
+++ b/rewrite-yaml/build.gradle.kts
@@ -1,29 +1,29 @@
-plugins {
-    id("org.openrewrite.java-library")
-    id("org.openrewrite.maven-publish")
-}
-
-// run manually with -x compileKotlin when you need to regenerate
-tasks.register<JavaExec>("generateAntlrSources") {
-    main = "org.antlr.v4.Tool"
-
-    args = listOf(
-        "-o", "src/main/java/org/openrewrite/yaml/internal/grammar",
-        "-package", "org.openrewrite.yaml.internal.grammar",
-        "-visitor"
-    ) + fileTree("src/main/antlr").matching { include("**/*.g4") }.map { it.path }
-
-    classpath = sourceSets["main"].runtimeClasspath
-}
-
-dependencies {
-    api(project(":rewrite-core"))
-    api("org.jetbrains:annotations:latest.release")
-    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
-
-    implementation("org.antlr:antlr4:4.9.+")
-    implementation("org.yaml:snakeyaml:latest.release")
-    implementation("io.micrometer:micrometer-core:1.+")
-
-    testImplementation(project(":rewrite-test"))
-}
+plugins {
+    id("org.openrewrite.java-library")
+    id("org.openrewrite.maven-publish")
+}
+
+// run manually with -x compileKotlin when you need to regenerate
+tasks.register<JavaExec>("generateAntlrSources") {
+    main = "org.antlr.v4.Tool"
+
+    args = listOf(
+        "-o", "src/main/java/org/openrewrite/yaml/internal/grammar",
+        "-package", "org.openrewrite.yaml.internal.grammar",
+        "-visitor"
+    ) + fileTree("src/main/antlr").matching { include("**/*.g4") }.map { it.path }
+
+    classpath = sourceSets["main"].runtimeClasspath
+}
+
+dependencies {
+    api(project(":rewrite-core"))
+    api("org.jetbrains:annotations:latest.release")
+    api("com.fasterxml.jackson.core:jackson-annotations:latest.release")
+
+    implementation("org.antlr:antlr4:4.9.+")
+    implementation("org.yaml:snakeyaml:latest.release")
+    implementation("io.micrometer:micrometer-core:1.+")
+
+    testImplementation(project(":rewrite-test"))
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyKey.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyKey.java
index 0861bba139d..f779c46fc56 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyKey.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyKey.java
@@ -1,241 +1,241 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml;
-
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-import org.openrewrite.*;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.NameCaseConvention;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.yaml.tree.Yaml;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-
-import static java.util.Spliterators.spliteratorUnknownSize;
-import static java.util.stream.StreamSupport.stream;
-import static org.openrewrite.Tree.randomId;
-
-/**
- * Nested YAML mappings are interpreted as dot
- * separated property names, e.g. as Spring Boot
- * interprets application.yml files.
- */
-@Value
-@EqualsAndHashCode(callSuper = true)
-public class ChangePropertyKey extends Recipe {
-
-    @Option(displayName = "Old property key",
-            description = "The property key to rename.",
-            example = "management.metrics.binders.files.enabled")
-    String oldPropertyKey;
-
-    @Option(displayName = "New property key",
-            description = "The new name for the property key.",
-            example = "management.metrics.enable.process.files")
-    String newPropertyKey;
-
-    @Incubating(since = "7.17.0")
-    @Option(displayName = "Use relaxed binding",
-            description = "Whether to match the `oldPropertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
-                    "rules. Default is `true`. Set to `false`  to use exact matching.",
-            required = false)
-    @Nullable
-    Boolean relaxedBinding;
-
-    @Incubating(since = "7.8.0")
-    @Option(displayName = "Optional file matcher",
-            description = "Matching files will be modified. This is a glob expression.",
-            required = false,
-            example = "**/application-*.yml")
-    @Nullable
-    String fileMatcher;
-
-    @Override
-    public String getDisplayName() {
-        return "Change property key";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Change a YAML property key leaving the value intact. Nested YAML mappings are " +
-                "interpreted as dot separated property names, i.e. as Spring Boot interprets " +
-                "application.yml files.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
-        if (fileMatcher != null) {
-            return new HasSourcePath<>(fileMatcher);
-        }
-        return null;
-    }
-
-    @Override
-    public YamlVisitor<ExecutionContext> getVisitor() {
-        return new ChangePropertyKeyVisitor<>();
-    }
-
-    private class ChangePropertyKeyVisitor<P> extends YamlIsoVisitor<P> {
-        @Override
-        public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, P p) {
-            Yaml.Mapping.Entry e = super.visitMappingEntry(entry, p);
-            if (getCursor().firstEnclosing(Yaml.Sequence.class) != null) {
-                return e;
-            }
-            Deque<Yaml.Mapping.Entry> propertyEntries = getCursor().getPathAsStream()
-                    .filter(Yaml.Mapping.Entry.class::isInstance)
-                    .map(Yaml.Mapping.Entry.class::cast)
-                    .collect(Collectors.toCollection(ArrayDeque::new));
-
-            String prop = stream(spliteratorUnknownSize(propertyEntries.descendingIterator(), 0), false)
-                    .map(e2 -> e2.getKey().getValue())
-                    .collect(Collectors.joining("."));
-
-            String propertyToTest = newPropertyKey;
-            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(prop, oldPropertyKey) : prop.equals(oldPropertyKey)) {
-                Iterator<Yaml.Mapping.Entry> propertyEntriesLeftToRight = propertyEntries.descendingIterator();
-                while (propertyEntriesLeftToRight.hasNext()) {
-                    Yaml.Mapping.Entry propertyEntry = propertyEntriesLeftToRight.next();
-                    String value = propertyEntry.getKey().getValue();
-
-                    if (!propertyToTest.startsWith(value) || (propertyToTest.startsWith(value) && !propertyEntriesLeftToRight.hasNext())) {
-                        //noinspection ConstantConditions
-                        if(!nonScalarMappingEntryExists(getCursor().firstEnclosing(Yaml.Document.class), propertyEntry, propertyToTest, p)) {
-                            doAfterVisit(new InsertSubpropertyVisitor<>(propertyEntry, propertyToTest, e));
-                            maybeCoalesceProperties();
-                        }
-                        break;
-                    }
-                    propertyToTest = propertyToTest.substring(value.length() + 1);
-                }
-            }
-
-            return e;
-        }
-
-        private boolean nonScalarMappingEntryExists(Yaml.Mapping.Document document, Yaml.Mapping.Entry entry, String property, P p) {
-            AtomicBoolean exists = new AtomicBoolean(false);
-            String propertyToCheck = Boolean.TRUE.equals(relaxedBinding) ? NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, property) : property;
-            new YamlIsoVisitor<P>() {
-                @Override
-                public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
-                    Yaml.Mapping m = super.visitMapping(mapping, p);
-                    if (m.getEntries().contains(entry)) {
-                        for (Yaml.Mapping.Entry mEntry : m.getEntries()) {
-                            if (!(mEntry.getValue() instanceof Yaml.Scalar)) {
-                                String mKey = Boolean.TRUE.equals(relaxedBinding) ? NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, mEntry.getKey().getValue()) : mEntry.getKey().getValue();
-                                if (propertyToCheck.startsWith(mKey)) {
-                                    exists.set(true);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    return m;
-                }
-            }.visitDocument(document, p);
-            return exists.get();
-        }
-    }
-
-    private static class InsertSubpropertyVisitor<P> extends YamlIsoVisitor<P> {
-        private final Yaml.Mapping.Entry scope;
-        private final String subproperty;
-        private final Yaml.Mapping.Entry entryToReplace;
-
-        private InsertSubpropertyVisitor(Yaml.Mapping.Entry scope, String subproperty, Yaml.Mapping.Entry entryToReplace) {
-            this.scope = scope;
-            this.subproperty = subproperty;
-            this.entryToReplace = entryToReplace;
-        }
-
-        @Override
-        public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
-            Yaml.Mapping m = super.visitMapping(mapping, p);
-            if (m.getEntries().contains(scope)) {
-                String newEntryPrefix = scope.getPrefix();
-                if (newEntryPrefix.isEmpty()) {
-                    newEntryPrefix = "\n";
-                }
-                Yaml.Mapping.Entry newEntry = new Yaml.Mapping.Entry(randomId(),
-                        newEntryPrefix,
-                        Markers.EMPTY,
-                        new Yaml.Scalar(randomId(), "", Markers.EMPTY,
-                                Yaml.Scalar.Style.PLAIN, null, subproperty),
-                        scope.getBeforeMappingValueIndicator(),
-                        entryToReplace.getValue().copyPaste());
-
-                if (m.getEntries().contains(entryToReplace)) {
-                    m = m.withEntries(ListUtils.map(m.getEntries(), e -> {
-                        if (e.equals(entryToReplace)) {
-                            return newEntry.withPrefix(e.getPrefix());
-                        }
-                        return e;
-                    }));
-                } else {
-                    m = m.withEntries(ListUtils.concat(m.getEntries(), newEntry));
-                    doAfterVisit(new DeletePropertyVisitor<>(entryToReplace));
-                }
-            }
-
-            return m;
-        }
-    }
-
-    private static class DeletePropertyVisitor<P> extends YamlIsoVisitor<P> {
-        private final Yaml.Mapping.Entry scope;
-
-        private DeletePropertyVisitor(Yaml.Mapping.Entry scope) {
-            this.scope = scope;
-        }
-
-        @Override
-        public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
-            Yaml.Mapping m = super.visitMapping(mapping, p);
-
-            boolean changed = false;
-            List<Yaml.Mapping.Entry> entries = new ArrayList<>();
-            for (Yaml.Mapping.Entry entry : m.getEntries()) {
-                if (entry == scope || (entry.getValue() instanceof Yaml.Mapping && ((Yaml.Mapping) entry.getValue()).getEntries().isEmpty())) {
-                    changed = true;
-                } else {
-                    entries.add(entry);
-                }
-            }
-
-            if (entries.size() == 1) {
-                entries = ListUtils.map(entries, e -> e.withPrefix(""));
-            }
-
-            if (changed) {
-                m = m.withEntries(entries);
-
-                if (getCursor().getParentOrThrow().getValue() instanceof Yaml.Document) {
-                    Yaml.Document document = getCursor().getParentOrThrow().getValue();
-                    if (!document.isExplicit()) {
-                        m = m.withEntries(m.getEntries());
-                    }
-                }
-            }
-            return m;
-        }
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.openrewrite.*;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.NameCaseConvention;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.yaml.tree.Yaml;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+import static java.util.Spliterators.spliteratorUnknownSize;
+import static java.util.stream.StreamSupport.stream;
+import static org.openrewrite.Tree.randomId;
+
+/**
+ * Nested YAML mappings are interpreted as dot
+ * separated property names, e.g. as Spring Boot
+ * interprets application.yml files.
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+public class ChangePropertyKey extends Recipe {
+
+    @Option(displayName = "Old property key",
+            description = "The property key to rename.",
+            example = "management.metrics.binders.files.enabled")
+    String oldPropertyKey;
+
+    @Option(displayName = "New property key",
+            description = "The new name for the property key.",
+            example = "management.metrics.enable.process.files")
+    String newPropertyKey;
+
+    @Incubating(since = "7.17.0")
+    @Option(displayName = "Use relaxed binding",
+            description = "Whether to match the `oldPropertyKey` using [relaxed binding](https://docs.spring.io/spring-boot/docs/2.5.6/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding) " +
+                    "rules. Default is `true`. Set to `false`  to use exact matching.",
+            required = false)
+    @Nullable
+    Boolean relaxedBinding;
+
+    @Incubating(since = "7.8.0")
+    @Option(displayName = "Optional file matcher",
+            description = "Matching files will be modified. This is a glob expression.",
+            required = false,
+            example = "**/application-*.yml")
+    @Nullable
+    String fileMatcher;
+
+    @Override
+    public String getDisplayName() {
+        return "Change property key";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Change a YAML property key leaving the value intact. Nested YAML mappings are " +
+                "interpreted as dot separated property names, i.e. as Spring Boot interprets " +
+                "application.yml files.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
+        if (fileMatcher != null) {
+            return new HasSourcePath<>(fileMatcher);
+        }
+        return null;
+    }
+
+    @Override
+    public YamlVisitor<ExecutionContext> getVisitor() {
+        return new ChangePropertyKeyVisitor<>();
+    }
+
+    private class ChangePropertyKeyVisitor<P> extends YamlIsoVisitor<P> {
+        @Override
+        public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, P p) {
+            Yaml.Mapping.Entry e = super.visitMappingEntry(entry, p);
+            if (getCursor().firstEnclosing(Yaml.Sequence.class) != null) {
+                return e;
+            }
+            Deque<Yaml.Mapping.Entry> propertyEntries = getCursor().getPathAsStream()
+                    .filter(Yaml.Mapping.Entry.class::isInstance)
+                    .map(Yaml.Mapping.Entry.class::cast)
+                    .collect(Collectors.toCollection(ArrayDeque::new));
+
+            String prop = stream(spliteratorUnknownSize(propertyEntries.descendingIterator(), 0), false)
+                    .map(e2 -> e2.getKey().getValue())
+                    .collect(Collectors.joining("."));
+
+            String propertyToTest = newPropertyKey;
+            if (!Boolean.FALSE.equals(relaxedBinding) ? NameCaseConvention.equalsRelaxedBinding(prop, oldPropertyKey) : prop.equals(oldPropertyKey)) {
+                Iterator<Yaml.Mapping.Entry> propertyEntriesLeftToRight = propertyEntries.descendingIterator();
+                while (propertyEntriesLeftToRight.hasNext()) {
+                    Yaml.Mapping.Entry propertyEntry = propertyEntriesLeftToRight.next();
+                    String value = propertyEntry.getKey().getValue();
+
+                    if (!propertyToTest.startsWith(value) || (propertyToTest.startsWith(value) && !propertyEntriesLeftToRight.hasNext())) {
+                        //noinspection ConstantConditions
+                        if(!nonScalarMappingEntryExists(getCursor().firstEnclosing(Yaml.Document.class), propertyEntry, propertyToTest, p)) {
+                            doAfterVisit(new InsertSubpropertyVisitor<>(propertyEntry, propertyToTest, e));
+                            maybeCoalesceProperties();
+                        }
+                        break;
+                    }
+                    propertyToTest = propertyToTest.substring(value.length() + 1);
+                }
+            }
+
+            return e;
+        }
+
+        private boolean nonScalarMappingEntryExists(Yaml.Mapping.Document document, Yaml.Mapping.Entry entry, String property, P p) {
+            AtomicBoolean exists = new AtomicBoolean(false);
+            String propertyToCheck = Boolean.TRUE.equals(relaxedBinding) ? NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, property) : property;
+            new YamlIsoVisitor<P>() {
+                @Override
+                public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
+                    Yaml.Mapping m = super.visitMapping(mapping, p);
+                    if (m.getEntries().contains(entry)) {
+                        for (Yaml.Mapping.Entry mEntry : m.getEntries()) {
+                            if (!(mEntry.getValue() instanceof Yaml.Scalar)) {
+                                String mKey = Boolean.TRUE.equals(relaxedBinding) ? NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, mEntry.getKey().getValue()) : mEntry.getKey().getValue();
+                                if (propertyToCheck.startsWith(mKey)) {
+                                    exists.set(true);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    return m;
+                }
+            }.visitDocument(document, p);
+            return exists.get();
+        }
+    }
+
+    private static class InsertSubpropertyVisitor<P> extends YamlIsoVisitor<P> {
+        private final Yaml.Mapping.Entry scope;
+        private final String subproperty;
+        private final Yaml.Mapping.Entry entryToReplace;
+
+        private InsertSubpropertyVisitor(Yaml.Mapping.Entry scope, String subproperty, Yaml.Mapping.Entry entryToReplace) {
+            this.scope = scope;
+            this.subproperty = subproperty;
+            this.entryToReplace = entryToReplace;
+        }
+
+        @Override
+        public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
+            Yaml.Mapping m = super.visitMapping(mapping, p);
+            if (m.getEntries().contains(scope)) {
+                String newEntryPrefix = scope.getPrefix();
+                if (newEntryPrefix.isEmpty()) {
+                    newEntryPrefix = "\n";
+                }
+                Yaml.Mapping.Entry newEntry = new Yaml.Mapping.Entry(randomId(),
+                        newEntryPrefix,
+                        Markers.EMPTY,
+                        new Yaml.Scalar(randomId(), "", Markers.EMPTY,
+                                Yaml.Scalar.Style.PLAIN, null, subproperty),
+                        scope.getBeforeMappingValueIndicator(),
+                        entryToReplace.getValue().copyPaste());
+
+                if (m.getEntries().contains(entryToReplace)) {
+                    m = m.withEntries(ListUtils.map(m.getEntries(), e -> {
+                        if (e.equals(entryToReplace)) {
+                            return newEntry.withPrefix(e.getPrefix());
+                        }
+                        return e;
+                    }));
+                } else {
+                    m = m.withEntries(ListUtils.concat(m.getEntries(), newEntry));
+                    doAfterVisit(new DeletePropertyVisitor<>(entryToReplace));
+                }
+            }
+
+            return m;
+        }
+    }
+
+    private static class DeletePropertyVisitor<P> extends YamlIsoVisitor<P> {
+        private final Yaml.Mapping.Entry scope;
+
+        private DeletePropertyVisitor(Yaml.Mapping.Entry scope) {
+            this.scope = scope;
+        }
+
+        @Override
+        public Yaml.Mapping visitMapping(Yaml.Mapping mapping, P p) {
+            Yaml.Mapping m = super.visitMapping(mapping, p);
+
+            boolean changed = false;
+            List<Yaml.Mapping.Entry> entries = new ArrayList<>();
+            for (Yaml.Mapping.Entry entry : m.getEntries()) {
+                if (entry == scope || (entry.getValue() instanceof Yaml.Mapping && ((Yaml.Mapping) entry.getValue()).getEntries().isEmpty())) {
+                    changed = true;
+                } else {
+                    entries.add(entry);
+                }
+            }
+
+            if (entries.size() == 1) {
+                entries = ListUtils.map(entries, e -> e.withPrefix(""));
+            }
+
+            if (changed) {
+                m = m.withEntries(entries);
+
+                if (getCursor().getParentOrThrow().getValue() instanceof Yaml.Document) {
+                    Yaml.Document document = getCursor().getParentOrThrow().getValue();
+                    if (!document.isExplicit()) {
+                        m = m.withEntries(m.getEntries());
+                    }
+                }
+            }
+            return m;
+        }
+    }
+
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/CoalesceProperties.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/CoalesceProperties.java
index 143ca0ef23f..cbf92ac8cda 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/CoalesceProperties.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/CoalesceProperties.java
@@ -1,39 +1,39 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml;
-
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-
-public class CoalesceProperties extends Recipe {
-
-    @Override
-    public String getDisplayName() {
-        return "Coalesce YAML properties";
-    }
-
-    @Override
-    public String getDescription() {
-        return "Simplify nested map hierarchies into their simplest dot separated property form, i.e. as Spring Boot interprets " +
-                "application.yml files.";
-    }
-
-    @Override
-    protected TreeVisitor<?, ExecutionContext> getVisitor() {
-        return new CoalescePropertiesVisitor<>();
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+
+public class CoalesceProperties extends Recipe {
+
+    @Override
+    public String getDisplayName() {
+        return "Coalesce YAML properties";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Simplify nested map hierarchies into their simplest dot separated property form, i.e. as Spring Boot interprets " +
+                "application.yml files.";
+    }
+
+    @Override
+    protected TreeVisitor<?, ExecutionContext> getVisitor() {
+        return new CoalescePropertiesVisitor<>();
+    }
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/FormatPreservingReader.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/FormatPreservingReader.java
index d718e3ceae3..eab2075ada6 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/FormatPreservingReader.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/FormatPreservingReader.java
@@ -1,91 +1,91 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml;
-
-import org.openrewrite.internal.lang.NonNull;
-import org.yaml.snakeyaml.events.Event;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-
-/**
- * Maintains a sliding buffer of characters used to determine format prefixes of
- * YAML AST elements.
- */
-class FormatPreservingReader extends Reader {
-
-    private final Reader delegate;
-
-    private ArrayList<Character> buffer = new ArrayList<>();
-    private int bufferIndex = 0;
-
-    FormatPreservingReader(Reader delegate) {
-        this.delegate = delegate;
-    }
-
-    // VisibleForTesting
-    String prefix(int lastEnd, int startIndex) {
-        assert lastEnd <= startIndex;
-
-        int prefixLen = startIndex - lastEnd;
-        if (prefixLen > 0) {
-            char[] prefix = new char[prefixLen];
-
-            for (int i = 0; i < prefixLen; i++) {
-                prefix[i] = buffer.get(lastEnd - bufferIndex + i);
-            }
-            if (lastEnd > bufferIndex) {
-                buffer = new ArrayList<>(buffer.subList(lastEnd - bufferIndex, buffer.size()));
-                bufferIndex = lastEnd;
-            }
-
-            return new String(prefix);
-        }
-        return "";
-    }
-
-    public String prefix(int lastEnd, Event event) {
-        return prefix(lastEnd, event.getStartMark().getIndex());
-    }
-
-    public String readStringFromBuffer(int start, int end) {
-        int length = end - start + 1;
-        char[] readBuff = new char[length];
-        for (int i = 0; i < length; i++) {
-            int bufferOffset = start + i - bufferIndex;
-            readBuff[i] = buffer.get(bufferOffset);
-        }
-        return new String(readBuff);
-    }
-
-    @Override
-    public int read(@NonNull char[] cbuf, int off, int len) throws IOException {
-        int read = delegate.read(cbuf, off, len);
-        if (read > 0) {
-            buffer.ensureCapacity(buffer.size() + read);
-            for (int i = 0; i < read; i++) {
-                buffer.add(cbuf[i]);
-            }
-        }
-        return read;
-    }
-
-    @Override
-    public void close() throws IOException {
-        delegate.close();
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml;
+
+import org.openrewrite.internal.lang.NonNull;
+import org.yaml.snakeyaml.events.Event;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+
+/**
+ * Maintains a sliding buffer of characters used to determine format prefixes of
+ * YAML AST elements.
+ */
+class FormatPreservingReader extends Reader {
+
+    private final Reader delegate;
+
+    private ArrayList<Character> buffer = new ArrayList<>();
+    private int bufferIndex = 0;
+
+    FormatPreservingReader(Reader delegate) {
+        this.delegate = delegate;
+    }
+
+    // VisibleForTesting
+    String prefix(int lastEnd, int startIndex) {
+        assert lastEnd <= startIndex;
+
+        int prefixLen = startIndex - lastEnd;
+        if (prefixLen > 0) {
+            char[] prefix = new char[prefixLen];
+
+            for (int i = 0; i < prefixLen; i++) {
+                prefix[i] = buffer.get(lastEnd - bufferIndex + i);
+            }
+            if (lastEnd > bufferIndex) {
+                buffer = new ArrayList<>(buffer.subList(lastEnd - bufferIndex, buffer.size()));
+                bufferIndex = lastEnd;
+            }
+
+            return new String(prefix);
+        }
+        return "";
+    }
+
+    public String prefix(int lastEnd, Event event) {
+        return prefix(lastEnd, event.getStartMark().getIndex());
+    }
+
+    public String readStringFromBuffer(int start, int end) {
+        int length = end - start + 1;
+        char[] readBuff = new char[length];
+        for (int i = 0; i < length; i++) {
+            int bufferOffset = start + i - bufferIndex;
+            readBuff[i] = buffer.get(bufferOffset);
+        }
+        return new String(readBuff);
+    }
+
+    @Override
+    public int read(@NonNull char[] cbuf, int off, int len) throws IOException {
+        int read = delegate.read(cbuf, off, len);
+        if (read > 0) {
+            buffer.ensureCapacity(buffer.size() + read);
+            for (int i = 0; i < read; i++) {
+                buffer.add(cbuf[i]);
+            }
+        }
+        return read;
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java
index 08bd6af130f..984cefc5b24 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java
@@ -1,492 +1,492 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml;
-
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Timer;
-import lombok.Getter;
-import org.intellij.lang.annotations.Language;
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.internal.EncodingDetectingInputStream;
-import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.MetricsHelper;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.tree.ParsingEventListener;
-import org.openrewrite.tree.ParsingExecutionContextView;
-import org.openrewrite.yaml.tree.Yaml;
-import org.yaml.snakeyaml.events.*;
-import org.yaml.snakeyaml.parser.Parser;
-import org.yaml.snakeyaml.parser.ParserImpl;
-import org.yaml.snakeyaml.reader.StreamReader;
-import org.yaml.snakeyaml.scanner.Scanner;
-import org.yaml.snakeyaml.scanner.ScannerImpl;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
-import static org.openrewrite.Tree.randomId;
-
-public class YamlParser implements org.openrewrite.Parser<Yaml.Documents> {
-    private static final Pattern VARIABLE_PATTERN = Pattern.compile(":\\s*(@[^\n\r@]+@)");
-
-    @Override
-    public List<Yaml.Documents> parse(@Language("yml") String... sources) {
-        return parse(new InMemoryExecutionContext(), sources);
-    }
-
-    @Override
-    public List<Yaml.Documents> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
-        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
-        return acceptedInputs(sourceFiles).stream()
-                .map(sourceFile -> {
-                    Timer.Builder timer = Timer.builder("rewrite.parse")
-                            .description("The time spent parsing a YAML file")
-                            .tag("file.type", "YAML");
-                    Timer.Sample sample = Timer.start();
-                    try (EncodingDetectingInputStream is = sourceFile.getSource()) {
-                        Yaml.Documents yaml = parseFromInput(sourceFile.getRelativePath(relativeTo), is);
-                        sample.stop(MetricsHelper.successTags(timer).register(Metrics.globalRegistry));
-                        parsingListener.parsed(sourceFile, yaml);
-                        return yaml;
-                    } catch (Throwable t) {
-                        sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
-                        return null;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .map(this::unwrapPrefixedMappings)
-                .map(docs -> {
-                    // ensure there is always at least one Document, even in an empty yaml file
-                    if (docs.getDocuments().isEmpty()) {
-                        return docs.withDocuments(singletonList(new Yaml.Document(randomId(), "", Markers.EMPTY,
-                                false, new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()), null)));
-                    }
-                    return docs;
-                })
-                .collect(toList());
-    }
-
-    private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStream source) {
-        String yamlSource = source.readFully();
-        Map<String, String> variableByUuid = new HashMap<>();
-
-        StringBuilder yamlSourceWithVariablePlaceholders = new StringBuilder();
-        Matcher variableMatcher = VARIABLE_PATTERN.matcher(yamlSource);
-        int pos = 0;
-        while (pos < yamlSource.length() && variableMatcher.find(pos)) {
-            yamlSourceWithVariablePlaceholders.append(yamlSource, pos, variableMatcher.start(1));
-            String uuid = UUID.randomUUID().toString();
-            variableByUuid.put(uuid, variableMatcher.group(1));
-            yamlSourceWithVariablePlaceholders.append(uuid);
-            pos = variableMatcher.end(1);
-        }
-
-        if (pos < yamlSource.length() - 1) {
-            yamlSourceWithVariablePlaceholders.append(yamlSource, pos, yamlSource.length());
-        }
-
-        try (FormatPreservingReader reader = new FormatPreservingReader(
-                new InputStreamReader(new ByteArrayInputStream(yamlSourceWithVariablePlaceholders.toString()
-                        .getBytes(StandardCharsets.UTF_8))))) {
-            StreamReader streamReader = new StreamReader(reader);
-            Scanner scanner = new ScannerImpl(streamReader);
-            Parser parser = new ParserImpl(scanner);
-
-            int lastEnd = 0;
-
-            List<Yaml.Document> documents = new ArrayList<>();
-            // https://yaml.org/spec/1.2.2/#3222-anchors-and-aliases, section: 3.2.2.2. Anchors and Aliases.
-            // An anchor key should always replace the previous value, since an alias refers to the most recent anchor key.
-            Map<String, Yaml.Anchor> anchors = new HashMap<>();
-            Yaml.Document document = null;
-            Stack<BlockBuilder> blockStack = new Stack<>();
-            String newLine = "";
-
-            for (Event event = parser.getEvent(); event != null; event = parser.getEvent()) {
-                switch (event.getEventId()) {
-                    case DocumentEnd: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-
-                        assert document != null;
-                        documents.add(document.withEnd(new Yaml.Document.End(
-                                randomId(),
-                                fmt,
-                                Markers.EMPTY,
-                                ((DocumentEndEvent) event).getExplicit()
-                        )));
-                        lastEnd = event.getEndMark().getIndex();
-                        break;
-                    }
-                    case DocumentStart: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-
-                        document = new Yaml.Document(
-                                randomId(),
-                                fmt,
-                                Markers.EMPTY,
-                                ((DocumentStartEvent) event).getExplicit(),
-                                new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()),
-                                null
-                        );
-                        lastEnd = event.getEndMark().getIndex();
-                        break;
-                    }
-                    case MappingStart: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-                        blockStack.push(new MappingBuilder(fmt));
-                        break;
-                    }
-                    case Scalar: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-
-                        ScalarEvent scalar = (ScalarEvent) event;
-                        String scalarValue = scalar.getValue();
-                        if (variableByUuid.containsKey(scalarValue)) {
-                            scalarValue = variableByUuid.get(scalarValue);
-                        }
-
-                        Yaml.Anchor anchor = null;
-                        if (scalar.getAnchor() != null) {
-                            String whitespaceAndScalar = reader.prefix(
-                                    lastEnd + fmt.length() + scalar.getAnchor().length() + 1,
-                                    event.getEndMark().getIndex());
-
-                            StringBuilder postFix = new StringBuilder();
-                            for (char c : whitespaceAndScalar.toCharArray()) {
-                                if (c != ' ' && c != '\t') {
-                                    break;
-                                }
-                                postFix.append(c);
-                            }
-                            anchor = new Yaml.Anchor(randomId(), "", postFix.toString(), Markers.EMPTY, scalar.getAnchor());
-                            anchors.put(scalar.getAnchor(), anchor);
-                        }
-
-                        Yaml.Scalar.Style style;
-                        switch (scalar.getScalarStyle()) {
-                            case DOUBLE_QUOTED:
-                                style = Yaml.Scalar.Style.DOUBLE_QUOTED;
-                                break;
-                            case SINGLE_QUOTED:
-                                style = Yaml.Scalar.Style.SINGLE_QUOTED;
-                                break;
-                            case LITERAL:
-                                style = Yaml.Scalar.Style.LITERAL;
-                                scalarValue = reader.readStringFromBuffer(event.getStartMark().getIndex() + 1, event.getEndMark().getIndex() - 1);
-                                if (scalarValue.endsWith("\n")) {
-                                    newLine = "\n";
-                                    scalarValue = scalarValue.substring(0, scalarValue.length() - 1);
-                                }
-                                break;
-                            case FOLDED:
-                                style = Yaml.Scalar.Style.FOLDED;
-                                scalarValue = reader.readStringFromBuffer(event.getStartMark().getIndex() + 1, event.getEndMark().getIndex() - 1);
-                                break;
-                            case PLAIN:
-                            default:
-                                style = Yaml.Scalar.Style.PLAIN;
-                                break;
-                        }
-                        BlockBuilder builder = blockStack.isEmpty() ? null : blockStack.peek();
-                        if (builder instanceof SequenceBuilder) {
-                            // Inline sequences like [1, 2] need to keep track of any whitespace between the element
-                            // and its trailing comma.
-                            SequenceBuilder sequenceBuilder = (SequenceBuilder) builder;
-                            String betweenEvents = reader.readStringFromBuffer(event.getEndMark().getIndex(), parser.peekEvent().getStartMark().getIndex() - 1);
-                            int commaIndex = commentAwareIndexOf(',', betweenEvents);
-                            String commaPrefix = null;
-                            if (commaIndex != -1) {
-                                commaPrefix = betweenEvents.substring(0, commaIndex);
-
-                            }
-                            lastEnd = event.getEndMark().getIndex() + commaIndex + 1;
-                            sequenceBuilder.push(new Yaml.Scalar(randomId(), fmt, Markers.EMPTY, style, anchor, scalarValue), commaPrefix);
-
-                        } else if (builder != null) {
-                            builder.push(new Yaml.Scalar(randomId(), fmt, Markers.EMPTY, style, anchor, scalarValue));
-                            lastEnd = event.getEndMark().getIndex();
-                        }
-                        break;
-                    }
-                    case SequenceEnd:
-                    case MappingEnd: {
-                        Yaml.Block mappingOrSequence = blockStack.pop().build();
-                        if (mappingOrSequence instanceof Yaml.Sequence) {
-                            Yaml.Sequence seq = (Yaml.Sequence) mappingOrSequence;
-                            if (seq.getOpeningBracketPrefix() != null) {
-                                String s = reader.readStringFromBuffer(lastEnd, event.getStartMark().getIndex());
-                                int closingBracketIndex = commentAwareIndexOf(']', s);
-                                lastEnd = lastEnd + closingBracketIndex + 1;
-                                mappingOrSequence = seq.withClosingBracketPrefix(s.substring(0, closingBracketIndex));
-                            }
-                        }
-                        if (blockStack.isEmpty()) {
-                            assert document != null;
-                            document = document.withBlock(mappingOrSequence);
-                        } else {
-                            blockStack.peek().push(mappingOrSequence);
-                        }
-                        break;
-                    }
-                    case SequenceStart: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-
-                        String fullPrefix = reader.readStringFromBuffer(lastEnd, event.getEndMark().getIndex() - 1);
-                        String startBracketPrefix = null;
-                        int openingBracketIndex = commentAwareIndexOf('[', fullPrefix);
-                        if (openingBracketIndex != -1) {
-                            int startIndex = commentAwareIndexOf(':', fullPrefix) + 1;
-                            startBracketPrefix = fullPrefix.substring(startIndex, openingBracketIndex);
-                            lastEnd = event.getEndMark().getIndex();
-                        }
-                        blockStack.push(new SequenceBuilder(fmt, startBracketPrefix));
-                        break;
-                    }
-                    case Alias: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        newLine = "";
-
-                        AliasEvent alias = (AliasEvent) event;
-                        Yaml.Anchor anchor = anchors.get(alias.getAnchor());
-                        BlockBuilder builder = blockStack.peek();
-                        builder.push(new Yaml.Alias(randomId(), fmt, Markers.EMPTY, anchor));
-                        lastEnd = event.getEndMark().getIndex();
-                        break;
-                    }
-                    case StreamEnd: {
-                        String fmt = newLine + reader.prefix(lastEnd, event);
-                        if (document == null && !fmt.isEmpty()) {
-                            documents.add(
-                                    new Yaml.Document(
-                                            randomId(), fmt, Markers.EMPTY, false,
-                                            new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()),
-                                            new Yaml.Document.End(randomId(), "", Markers.EMPTY, false)
-                                    ));
-                        }
-                        break;
-                    }
-                    case StreamStart:
-                        break;
-                }
-            }
-
-            return new Yaml.Documents(randomId(), Markers.EMPTY, sourceFile, source.getCharset().name(), source.isCharsetBomMarked(), documents);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    /**
-     * Return the index of the target character if it appears in a non-comment portion of the String, or -1 if it does not appear.
-     */
-    private static int commentAwareIndexOf(char target, String s) {
-        boolean inComment = false;
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            if (inComment) {
-                if (c == '\n') {
-                    inComment = false;
-                }
-            } else {
-                if (c == target) {
-                    return i;
-                } else if (c == '#') {
-                    inComment = true;
-                }
-            }
-        }
-        return -1;
-    }
-
-    @Override
-    public boolean accept(Path path) {
-        String fileName = path.toString();
-        return fileName.endsWith(".yml") || fileName.endsWith(".yaml");
-    }
-
-    @Override
-    public Path sourcePathFromSourceText(Path prefix, String sourceCode) {
-        return prefix.resolve("file.yaml");
-    }
-
-    private interface BlockBuilder {
-        Yaml.Block build();
-
-        void push(Yaml.Block block);
-    }
-
-    private static class MappingBuilder implements BlockBuilder {
-        private final String prefix;
-
-        private final List<Yaml.Mapping.Entry> entries = new ArrayList<>();
-
-        @Nullable
-        private Yaml.Scalar key;
-
-        private MappingBuilder(String prefix) {
-            this.prefix = prefix;
-        }
-
-        @Override
-        public void push(Yaml.Block block) {
-            if (key == null && block instanceof Yaml.Scalar) {
-                key = (Yaml.Scalar) block;
-            } else {
-                String keySuffix = block.getPrefix();
-                block = block.withPrefix(keySuffix.substring(commentAwareIndexOf(':', keySuffix) + 1));
-
-                // Begin moving whitespace from the key to the entry that contains the key
-                String originalKeyPrefix = key.getPrefix();
-                key = key.withPrefix("");
-
-                // When a dash, indicating the beginning of a sequence, is present whitespace before it will be handled by the SequenceEntry
-                // Similarly if the prefix includes a ':', it will be owned by the mapping that contains this mapping
-                // So this entry's prefix begins after any such delimiter
-                int entryPrefixStartIndex = Math.max(
-                        commentAwareIndexOf('-', originalKeyPrefix),
-                        commentAwareIndexOf(':', originalKeyPrefix)) + 1;
-                String entryPrefix = originalKeyPrefix.substring(entryPrefixStartIndex);
-                String beforeMappingValueIndicator = keySuffix.substring(0,
-                        Math.max(commentAwareIndexOf(':', keySuffix), 0));
-                entries.add(new Yaml.Mapping.Entry(randomId(), entryPrefix, Markers.EMPTY, key, beforeMappingValueIndicator, block));
-                key = null;
-            }
-        }
-
-        @Override
-        public MappingWithPrefix build() {
-            return new MappingWithPrefix(prefix, entries);
-        }
-    }
-
-    private static class SequenceBuilder implements BlockBuilder {
-        private final String prefix;
-        @Nullable
-        private final String startBracketPrefix;
-
-        private final List<Yaml.Sequence.Entry> entries = new ArrayList<>();
-
-        private SequenceBuilder(String prefix, @Nullable String startBracketPrefix) {
-            this.prefix = prefix;
-            this.startBracketPrefix = startBracketPrefix;
-        }
-
-        @Override
-        public void push(Yaml.Block block) {
-            push(block, null);
-        }
-
-        public void push(Yaml.Block block, @Nullable String commaPrefix) {
-            String rawPrefix = block.getPrefix();
-            int dashIndex = commentAwareIndexOf('-', rawPrefix);
-            String entryPrefix;
-            String blockPrefix;
-            boolean hasDash = dashIndex != -1;
-            if (hasDash) {
-                entryPrefix = rawPrefix.substring(0, dashIndex);
-                blockPrefix = rawPrefix.substring(dashIndex + 1);
-            } else {
-                entryPrefix = "";
-                blockPrefix = rawPrefix;
-            }
-            entries.add(new Yaml.Sequence.Entry(randomId(), entryPrefix, Markers.EMPTY, block.withPrefix(blockPrefix), hasDash, commaPrefix));
-        }
-
-        @Override
-        public SequenceWithPrefix build() {
-            return new SequenceWithPrefix(prefix, startBracketPrefix, entries, null);
-        }
-    }
-
-    @Getter
-    private static class MappingWithPrefix extends Yaml.Mapping {
-        private String prefix;
-
-        public MappingWithPrefix(String prefix, List<Yaml.Mapping.Entry> entries) {
-            super(randomId(), Markers.EMPTY, entries);
-            this.prefix = prefix;
-        }
-
-        @Override
-        public Mapping withPrefix(String prefix) {
-            this.prefix = prefix;
-            return this;
-        }
-    }
-
-    @Getter
-    private static class SequenceWithPrefix extends Yaml.Sequence {
-        private String prefix;
-
-        public SequenceWithPrefix(String prefix, @Nullable String startBracketPrefix, List<Yaml.Sequence.Entry> entries, @Nullable String endBracketPrefix) {
-            super(randomId(), Markers.EMPTY, startBracketPrefix, entries, endBracketPrefix);
-            this.prefix = prefix;
-        }
-
-        @Override
-        public Sequence withPrefix(String prefix) {
-            this.prefix = prefix;
-            return this;
-        }
-    }
-
-    private Yaml.Documents unwrapPrefixedMappings(Yaml.Documents y) {
-        //noinspection ConstantConditions
-        return (Yaml.Documents) new YamlIsoVisitor<Integer>() {
-            @Override
-            public Yaml.Sequence visitSequence(Yaml.Sequence sequence, Integer p) {
-                if (sequence instanceof SequenceWithPrefix) {
-                    SequenceWithPrefix sequenceWithPrefix = (SequenceWithPrefix) sequence;
-                    return super.visitSequence(
-                            new Yaml.Sequence(
-                                    sequenceWithPrefix.getId(),
-                                    sequenceWithPrefix.getMarkers(),
-                                    sequenceWithPrefix.getOpeningBracketPrefix(),
-                                    ListUtils.mapFirst(sequenceWithPrefix.getEntries(), e -> e.withPrefix(sequenceWithPrefix.getPrefix())),
-                                    sequenceWithPrefix.getClosingBracketPrefix()
-                            ), p);
-                }
-                return super.visitSequence(sequence, p);
-            }
-
-            @Override
-            public Yaml.Mapping visitMapping(Yaml.Mapping mapping, Integer p) {
-                if (mapping instanceof MappingWithPrefix) {
-                    MappingWithPrefix mappingWithPrefix = (MappingWithPrefix) mapping;
-                    return super.visitMapping(new Yaml.Mapping(mappingWithPrefix.getId(),
-                            mappingWithPrefix.getMarkers(), mappingWithPrefix.getEntries()), p);
-                }
-                return super.visitMapping(mapping, p);
-            }
-        }.visit(y, 0);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml;
+
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import lombok.Getter;
+import org.intellij.lang.annotations.Language;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.internal.EncodingDetectingInputStream;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.MetricsHelper;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.tree.ParsingEventListener;
+import org.openrewrite.tree.ParsingExecutionContextView;
+import org.openrewrite.yaml.tree.Yaml;
+import org.yaml.snakeyaml.events.*;
+import org.yaml.snakeyaml.parser.Parser;
+import org.yaml.snakeyaml.parser.ParserImpl;
+import org.yaml.snakeyaml.reader.StreamReader;
+import org.yaml.snakeyaml.scanner.Scanner;
+import org.yaml.snakeyaml.scanner.ScannerImpl;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+import static org.openrewrite.Tree.randomId;
+
+public class YamlParser implements org.openrewrite.Parser<Yaml.Documents> {
+    private static final Pattern VARIABLE_PATTERN = Pattern.compile(":\\s*(@[^\n\r@]+@)");
+
+    @Override
+    public List<Yaml.Documents> parse(@Language("yml") String... sources) {
+        return parse(new InMemoryExecutionContext(), sources);
+    }
+
+    @Override
+    public List<Yaml.Documents> parseInputs(Iterable<Input> sourceFiles, @Nullable Path relativeTo, ExecutionContext ctx) {
+        ParsingEventListener parsingListener = ParsingExecutionContextView.view(ctx).getParsingListener();
+        return acceptedInputs(sourceFiles).stream()
+                .map(sourceFile -> {
+                    Timer.Builder timer = Timer.builder("rewrite.parse")
+                            .description("The time spent parsing a YAML file")
+                            .tag("file.type", "YAML");
+                    Timer.Sample sample = Timer.start();
+                    try (EncodingDetectingInputStream is = sourceFile.getSource()) {
+                        Yaml.Documents yaml = parseFromInput(sourceFile.getRelativePath(relativeTo), is);
+                        sample.stop(MetricsHelper.successTags(timer).register(Metrics.globalRegistry));
+                        parsingListener.parsed(sourceFile, yaml);
+                        return yaml;
+                    } catch (Throwable t) {
+                        sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
+                        ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .map(this::unwrapPrefixedMappings)
+                .map(docs -> {
+                    // ensure there is always at least one Document, even in an empty yaml file
+                    if (docs.getDocuments().isEmpty()) {
+                        return docs.withDocuments(singletonList(new Yaml.Document(randomId(), "", Markers.EMPTY,
+                                false, new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()), null)));
+                    }
+                    return docs;
+                })
+                .collect(toList());
+    }
+
+    private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStream source) {
+        String yamlSource = source.readFully();
+        Map<String, String> variableByUuid = new HashMap<>();
+
+        StringBuilder yamlSourceWithVariablePlaceholders = new StringBuilder();
+        Matcher variableMatcher = VARIABLE_PATTERN.matcher(yamlSource);
+        int pos = 0;
+        while (pos < yamlSource.length() && variableMatcher.find(pos)) {
+            yamlSourceWithVariablePlaceholders.append(yamlSource, pos, variableMatcher.start(1));
+            String uuid = UUID.randomUUID().toString();
+            variableByUuid.put(uuid, variableMatcher.group(1));
+            yamlSourceWithVariablePlaceholders.append(uuid);
+            pos = variableMatcher.end(1);
+        }
+
+        if (pos < yamlSource.length() - 1) {
+            yamlSourceWithVariablePlaceholders.append(yamlSource, pos, yamlSource.length());
+        }
+
+        try (FormatPreservingReader reader = new FormatPreservingReader(
+                new InputStreamReader(new ByteArrayInputStream(yamlSourceWithVariablePlaceholders.toString()
+                        .getBytes(StandardCharsets.UTF_8))))) {
+            StreamReader streamReader = new StreamReader(reader);
+            Scanner scanner = new ScannerImpl(streamReader);
+            Parser parser = new ParserImpl(scanner);
+
+            int lastEnd = 0;
+
+            List<Yaml.Document> documents = new ArrayList<>();
+            // https://yaml.org/spec/1.2.2/#3222-anchors-and-aliases, section: 3.2.2.2. Anchors and Aliases.
+            // An anchor key should always replace the previous value, since an alias refers to the most recent anchor key.
+            Map<String, Yaml.Anchor> anchors = new HashMap<>();
+            Yaml.Document document = null;
+            Stack<BlockBuilder> blockStack = new Stack<>();
+            String newLine = "";
+
+            for (Event event = parser.getEvent(); event != null; event = parser.getEvent()) {
+                switch (event.getEventId()) {
+                    case DocumentEnd: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+
+                        assert document != null;
+                        documents.add(document.withEnd(new Yaml.Document.End(
+                                randomId(),
+                                fmt,
+                                Markers.EMPTY,
+                                ((DocumentEndEvent) event).getExplicit()
+                        )));
+                        lastEnd = event.getEndMark().getIndex();
+                        break;
+                    }
+                    case DocumentStart: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+
+                        document = new Yaml.Document(
+                                randomId(),
+                                fmt,
+                                Markers.EMPTY,
+                                ((DocumentStartEvent) event).getExplicit(),
+                                new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()),
+                                null
+                        );
+                        lastEnd = event.getEndMark().getIndex();
+                        break;
+                    }
+                    case MappingStart: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+                        blockStack.push(new MappingBuilder(fmt));
+                        break;
+                    }
+                    case Scalar: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+
+                        ScalarEvent scalar = (ScalarEvent) event;
+                        String scalarValue = scalar.getValue();
+                        if (variableByUuid.containsKey(scalarValue)) {
+                            scalarValue = variableByUuid.get(scalarValue);
+                        }
+
+                        Yaml.Anchor anchor = null;
+                        if (scalar.getAnchor() != null) {
+                            String whitespaceAndScalar = reader.prefix(
+                                    lastEnd + fmt.length() + scalar.getAnchor().length() + 1,
+                                    event.getEndMark().getIndex());
+
+                            StringBuilder postFix = new StringBuilder();
+                            for (char c : whitespaceAndScalar.toCharArray()) {
+                                if (c != ' ' && c != '\t') {
+                                    break;
+                                }
+                                postFix.append(c);
+                            }
+                            anchor = new Yaml.Anchor(randomId(), "", postFix.toString(), Markers.EMPTY, scalar.getAnchor());
+                            anchors.put(scalar.getAnchor(), anchor);
+                        }
+
+                        Yaml.Scalar.Style style;
+                        switch (scalar.getScalarStyle()) {
+                            case DOUBLE_QUOTED:
+                                style = Yaml.Scalar.Style.DOUBLE_QUOTED;
+                                break;
+                            case SINGLE_QUOTED:
+                                style = Yaml.Scalar.Style.SINGLE_QUOTED;
+                                break;
+                            case LITERAL:
+                                style = Yaml.Scalar.Style.LITERAL;
+                                scalarValue = reader.readStringFromBuffer(event.getStartMark().getIndex() + 1, event.getEndMark().getIndex() - 1);
+                                if (scalarValue.endsWith("\n")) {
+                                    newLine = "\n";
+                                    scalarValue = scalarValue.substring(0, scalarValue.length() - 1);
+                                }
+                                break;
+                            case FOLDED:
+                                style = Yaml.Scalar.Style.FOLDED;
+                                scalarValue = reader.readStringFromBuffer(event.getStartMark().getIndex() + 1, event.getEndMark().getIndex() - 1);
+                                break;
+                            case PLAIN:
+                            default:
+                                style = Yaml.Scalar.Style.PLAIN;
+                                break;
+                        }
+                        BlockBuilder builder = blockStack.isEmpty() ? null : blockStack.peek();
+                        if (builder instanceof SequenceBuilder) {
+                            // Inline sequences like [1, 2] need to keep track of any whitespace between the element
+                            // and its trailing comma.
+                            SequenceBuilder sequenceBuilder = (SequenceBuilder) builder;
+                            String betweenEvents = reader.readStringFromBuffer(event.getEndMark().getIndex(), parser.peekEvent().getStartMark().getIndex() - 1);
+                            int commaIndex = commentAwareIndexOf(',', betweenEvents);
+                            String commaPrefix = null;
+                            if (commaIndex != -1) {
+                                commaPrefix = betweenEvents.substring(0, commaIndex);
+
+                            }
+                            lastEnd = event.getEndMark().getIndex() + commaIndex + 1;
+                            sequenceBuilder.push(new Yaml.Scalar(randomId(), fmt, Markers.EMPTY, style, anchor, scalarValue), commaPrefix);
+
+                        } else if (builder != null) {
+                            builder.push(new Yaml.Scalar(randomId(), fmt, Markers.EMPTY, style, anchor, scalarValue));
+                            lastEnd = event.getEndMark().getIndex();
+                        }
+                        break;
+                    }
+                    case SequenceEnd:
+                    case MappingEnd: {
+                        Yaml.Block mappingOrSequence = blockStack.pop().build();
+                        if (mappingOrSequence instanceof Yaml.Sequence) {
+                            Yaml.Sequence seq = (Yaml.Sequence) mappingOrSequence;
+                            if (seq.getOpeningBracketPrefix() != null) {
+                                String s = reader.readStringFromBuffer(lastEnd, event.getStartMark().getIndex());
+                                int closingBracketIndex = commentAwareIndexOf(']', s);
+                                lastEnd = lastEnd + closingBracketIndex + 1;
+                                mappingOrSequence = seq.withClosingBracketPrefix(s.substring(0, closingBracketIndex));
+                            }
+                        }
+                        if (blockStack.isEmpty()) {
+                            assert document != null;
+                            document = document.withBlock(mappingOrSequence);
+                        } else {
+                            blockStack.peek().push(mappingOrSequence);
+                        }
+                        break;
+                    }
+                    case SequenceStart: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+
+                        String fullPrefix = reader.readStringFromBuffer(lastEnd, event.getEndMark().getIndex() - 1);
+                        String startBracketPrefix = null;
+                        int openingBracketIndex = commentAwareIndexOf('[', fullPrefix);
+                        if (openingBracketIndex != -1) {
+                            int startIndex = commentAwareIndexOf(':', fullPrefix) + 1;
+                            startBracketPrefix = fullPrefix.substring(startIndex, openingBracketIndex);
+                            lastEnd = event.getEndMark().getIndex();
+                        }
+                        blockStack.push(new SequenceBuilder(fmt, startBracketPrefix));
+                        break;
+                    }
+                    case Alias: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        newLine = "";
+
+                        AliasEvent alias = (AliasEvent) event;
+                        Yaml.Anchor anchor = anchors.get(alias.getAnchor());
+                        BlockBuilder builder = blockStack.peek();
+                        builder.push(new Yaml.Alias(randomId(), fmt, Markers.EMPTY, anchor));
+                        lastEnd = event.getEndMark().getIndex();
+                        break;
+                    }
+                    case StreamEnd: {
+                        String fmt = newLine + reader.prefix(lastEnd, event);
+                        if (document == null && !fmt.isEmpty()) {
+                            documents.add(
+                                    new Yaml.Document(
+                                            randomId(), fmt, Markers.EMPTY, false,
+                                            new Yaml.Mapping(randomId(), Markers.EMPTY, emptyList()),
+                                            new Yaml.Document.End(randomId(), "", Markers.EMPTY, false)
+                                    ));
+                        }
+                        break;
+                    }
+                    case StreamStart:
+                        break;
+                }
+            }
+
+            return new Yaml.Documents(randomId(), Markers.EMPTY, sourceFile, source.getCharset().name(), source.isCharsetBomMarked(), documents);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    /**
+     * Return the index of the target character if it appears in a non-comment portion of the String, or -1 if it does not appear.
+     */
+    private static int commentAwareIndexOf(char target, String s) {
+        boolean inComment = false;
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            if (inComment) {
+                if (c == '\n') {
+                    inComment = false;
+                }
+            } else {
+                if (c == target) {
+                    return i;
+                } else if (c == '#') {
+                    inComment = true;
+                }
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public boolean accept(Path path) {
+        String fileName = path.toString();
+        return fileName.endsWith(".yml") || fileName.endsWith(".yaml");
+    }
+
+    @Override
+    public Path sourcePathFromSourceText(Path prefix, String sourceCode) {
+        return prefix.resolve("file.yaml");
+    }
+
+    private interface BlockBuilder {
+        Yaml.Block build();
+
+        void push(Yaml.Block block);
+    }
+
+    private static class MappingBuilder implements BlockBuilder {
+        private final String prefix;
+
+        private final List<Yaml.Mapping.Entry> entries = new ArrayList<>();
+
+        @Nullable
+        private Yaml.Scalar key;
+
+        private MappingBuilder(String prefix) {
+            this.prefix = prefix;
+        }
+
+        @Override
+        public void push(Yaml.Block block) {
+            if (key == null && block instanceof Yaml.Scalar) {
+                key = (Yaml.Scalar) block;
+            } else {
+                String keySuffix = block.getPrefix();
+                block = block.withPrefix(keySuffix.substring(commentAwareIndexOf(':', keySuffix) + 1));
+
+                // Begin moving whitespace from the key to the entry that contains the key
+                String originalKeyPrefix = key.getPrefix();
+                key = key.withPrefix("");
+
+                // When a dash, indicating the beginning of a sequence, is present whitespace before it will be handled by the SequenceEntry
+                // Similarly if the prefix includes a ':', it will be owned by the mapping that contains this mapping
+                // So this entry's prefix begins after any such delimiter
+                int entryPrefixStartIndex = Math.max(
+                        commentAwareIndexOf('-', originalKeyPrefix),
+                        commentAwareIndexOf(':', originalKeyPrefix)) + 1;
+                String entryPrefix = originalKeyPrefix.substring(entryPrefixStartIndex);
+                String beforeMappingValueIndicator = keySuffix.substring(0,
+                        Math.max(commentAwareIndexOf(':', keySuffix), 0));
+                entries.add(new Yaml.Mapping.Entry(randomId(), entryPrefix, Markers.EMPTY, key, beforeMappingValueIndicator, block));
+                key = null;
+            }
+        }
+
+        @Override
+        public MappingWithPrefix build() {
+            return new MappingWithPrefix(prefix, entries);
+        }
+    }
+
+    private static class SequenceBuilder implements BlockBuilder {
+        private final String prefix;
+        @Nullable
+        private final String startBracketPrefix;
+
+        private final List<Yaml.Sequence.Entry> entries = new ArrayList<>();
+
+        private SequenceBuilder(String prefix, @Nullable String startBracketPrefix) {
+            this.prefix = prefix;
+            this.startBracketPrefix = startBracketPrefix;
+        }
+
+        @Override
+        public void push(Yaml.Block block) {
+            push(block, null);
+        }
+
+        public void push(Yaml.Block block, @Nullable String commaPrefix) {
+            String rawPrefix = block.getPrefix();
+            int dashIndex = commentAwareIndexOf('-', rawPrefix);
+            String entryPrefix;
+            String blockPrefix;
+            boolean hasDash = dashIndex != -1;
+            if (hasDash) {
+                entryPrefix = rawPrefix.substring(0, dashIndex);
+                blockPrefix = rawPrefix.substring(dashIndex + 1);
+            } else {
+                entryPrefix = "";
+                blockPrefix = rawPrefix;
+            }
+            entries.add(new Yaml.Sequence.Entry(randomId(), entryPrefix, Markers.EMPTY, block.withPrefix(blockPrefix), hasDash, commaPrefix));
+        }
+
+        @Override
+        public SequenceWithPrefix build() {
+            return new SequenceWithPrefix(prefix, startBracketPrefix, entries, null);
+        }
+    }
+
+    @Getter
+    private static class MappingWithPrefix extends Yaml.Mapping {
+        private String prefix;
+
+        public MappingWithPrefix(String prefix, List<Yaml.Mapping.Entry> entries) {
+            super(randomId(), Markers.EMPTY, entries);
+            this.prefix = prefix;
+        }
+
+        @Override
+        public Mapping withPrefix(String prefix) {
+            this.prefix = prefix;
+            return this;
+        }
+    }
+
+    @Getter
+    private static class SequenceWithPrefix extends Yaml.Sequence {
+        private String prefix;
+
+        public SequenceWithPrefix(String prefix, @Nullable String startBracketPrefix, List<Yaml.Sequence.Entry> entries, @Nullable String endBracketPrefix) {
+            super(randomId(), Markers.EMPTY, startBracketPrefix, entries, endBracketPrefix);
+            this.prefix = prefix;
+        }
+
+        @Override
+        public Sequence withPrefix(String prefix) {
+            this.prefix = prefix;
+            return this;
+        }
+    }
+
+    private Yaml.Documents unwrapPrefixedMappings(Yaml.Documents y) {
+        //noinspection ConstantConditions
+        return (Yaml.Documents) new YamlIsoVisitor<Integer>() {
+            @Override
+            public Yaml.Sequence visitSequence(Yaml.Sequence sequence, Integer p) {
+                if (sequence instanceof SequenceWithPrefix) {
+                    SequenceWithPrefix sequenceWithPrefix = (SequenceWithPrefix) sequence;
+                    return super.visitSequence(
+                            new Yaml.Sequence(
+                                    sequenceWithPrefix.getId(),
+                                    sequenceWithPrefix.getMarkers(),
+                                    sequenceWithPrefix.getOpeningBracketPrefix(),
+                                    ListUtils.mapFirst(sequenceWithPrefix.getEntries(), e -> e.withPrefix(sequenceWithPrefix.getPrefix())),
+                                    sequenceWithPrefix.getClosingBracketPrefix()
+                            ), p);
+                }
+                return super.visitSequence(sequence, p);
+            }
+
+            @Override
+            public Yaml.Mapping visitMapping(Yaml.Mapping mapping, Integer p) {
+                if (mapping instanceof MappingWithPrefix) {
+                    MappingWithPrefix mappingWithPrefix = (MappingWithPrefix) mapping;
+                    return super.visitMapping(new Yaml.Mapping(mappingWithPrefix.getId(),
+                            mappingWithPrefix.getMarkers(), mappingWithPrefix.getEntries()), p);
+                }
+                return super.visitMapping(mapping, p);
+            }
+        }.visit(y, 0);
+    }
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
index f34687bf519..82648100d27 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
@@ -1,155 +1,155 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml.internal;
-
-import org.openrewrite.PrintOutputCapture;
-import org.openrewrite.marker.Marker;
-import org.openrewrite.marker.SearchResult;
-import org.openrewrite.yaml.YamlVisitor;
-import org.openrewrite.yaml.tree.Yaml;
-
-public class YamlPrinter<P> extends YamlVisitor<PrintOutputCapture<P>> {
-
-    @Override
-    public Yaml visitDocument(Yaml.Document document, PrintOutputCapture<P> p) {
-        p.out.append(document.getPrefix());
-        visitMarkers(document.getMarkers(), p);
-        if (document.isExplicit()) {
-            p.out.append("---");
-        }
-        visit(document.getBlock(), p);
-        if (document.getEnd() != null) {
-            p.out.append(document.getEnd().getPrefix());
-            if (document.getEnd().isExplicit()) {
-                p.out.append("...");
-            }
-        }
-        return document;
-    }
-
-    @Override
-    public Yaml visitDocuments(Yaml.Documents documents, PrintOutputCapture<P> p) {
-        visitMarkers(documents.getMarkers(), p);
-        visit(documents.getDocuments(), p);
-        return documents;
-    }
-
-    @Override
-    public Yaml visitSequenceEntry(Yaml.Sequence.Entry entry, PrintOutputCapture<P> p) {
-        p.out.append(entry.getPrefix());
-        if(entry.isDash()) {
-            p.out.append('-');
-        }
-        visit(entry.getBlock(), p);
-        if(entry.getTrailingCommaPrefix() != null) {
-            p.out.append(entry.getTrailingCommaPrefix()).append(',');
-        }
-        return entry;
-    }
-
-    @Override
-    public Yaml visitSequence(Yaml.Sequence sequence, PrintOutputCapture<P> p) {
-        visitMarkers(sequence.getMarkers(), p);
-        if(sequence.getOpeningBracketPrefix() != null) {
-            p.out.append(sequence.getOpeningBracketPrefix()).append('[');
-        }
-        Yaml result = super.visitSequence(sequence, p);
-        if(sequence.getClosingBracketPrefix() != null) {
-            p.out.append(sequence.getClosingBracketPrefix()).append(']');
-        }
-
-        return result;
-    }
-
-    @Override
-    public Yaml visitMappingEntry(Yaml.Mapping.Entry entry, PrintOutputCapture<P> p) {
-        p.out.append(entry.getPrefix());
-        visitMarkers(entry.getMarkers(), p);
-        visit(entry.getKey(), p);
-        p.out.append(entry.getBeforeMappingValueIndicator()).append(':');
-        visit(entry.getValue(), p);
-        return entry;
-    }
-
-    @Override
-    public Yaml visitMapping(Yaml.Mapping mapping, PrintOutputCapture<P> p) {
-        visitMarkers(mapping.getMarkers(), p);
-        return super.visitMapping(mapping, p);
-    }
-
-    @Override
-    public Yaml visitScalar(Yaml.Scalar scalar, PrintOutputCapture<P> p) {
-        p.out.append(scalar.getPrefix());
-        visitMarkers(scalar.getMarkers(), p);
-        if (scalar.getAnchor() != null) {
-            visit(scalar.getAnchor(), p);
-        }
-        switch (scalar.getStyle()) {
-            case DOUBLE_QUOTED:
-                p.out.append('"')
-                        .append(scalar.getValue().replaceAll("\\n", "\\\\n"))
-                        .append('"');
-                break;
-            case SINGLE_QUOTED:
-                p.out.append('\'')
-                        .append(scalar.getValue().replaceAll("\\n", "\\\\n"))
-                        .append('\'');
-                break;
-            case LITERAL:
-                p.out.append('|')
-                        .append(scalar.getValue());
-                break;
-            case FOLDED:
-                p.out.append('>')
-                        .append(scalar.getValue());
-                break;
-            case PLAIN:
-            default:
-                p.out.append(scalar.getValue());
-                break;
-
-        }
-        return scalar;
-    }
-
-    public Yaml visitAnchor(Yaml.Anchor anchor, PrintOutputCapture<P> p) {
-        visitMarkers(anchor.getMarkers(), p);
-        p.out.append("&");
-        p.out.append(anchor.getKey());
-        p.out.append(anchor.getPostfix());
-        return anchor;
-    }
-
-    public Yaml visitAlias(Yaml.Alias alias, PrintOutputCapture<P> p) {
-        p.out.append(alias.getPrefix());
-        visitMarkers(alias.getMarkers(), p);
-        p.out.append("*");
-        p.out.append(alias.getAnchor().getKey());
-        return alias;
-    }
-
-    @Override
-    public <M extends Marker> M visitMarker(Marker marker, PrintOutputCapture<P> p) {
-        if(marker instanceof SearchResult) {
-            String description = ((SearchResult) marker).getDescription();
-            p.out.append("~~")
-                    .append(description == null ? "" : "(" + description + ")~~")
-                    .append(">");
-        }
-        //noinspection unchecked
-        return (M) marker;
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml.internal;
+
+import org.openrewrite.PrintOutputCapture;
+import org.openrewrite.marker.Marker;
+import org.openrewrite.marker.SearchResult;
+import org.openrewrite.yaml.YamlVisitor;
+import org.openrewrite.yaml.tree.Yaml;
+
+public class YamlPrinter<P> extends YamlVisitor<PrintOutputCapture<P>> {
+
+    @Override
+    public Yaml visitDocument(Yaml.Document document, PrintOutputCapture<P> p) {
+        p.out.append(document.getPrefix());
+        visitMarkers(document.getMarkers(), p);
+        if (document.isExplicit()) {
+            p.out.append("---");
+        }
+        visit(document.getBlock(), p);
+        if (document.getEnd() != null) {
+            p.out.append(document.getEnd().getPrefix());
+            if (document.getEnd().isExplicit()) {
+                p.out.append("...");
+            }
+        }
+        return document;
+    }
+
+    @Override
+    public Yaml visitDocuments(Yaml.Documents documents, PrintOutputCapture<P> p) {
+        visitMarkers(documents.getMarkers(), p);
+        visit(documents.getDocuments(), p);
+        return documents;
+    }
+
+    @Override
+    public Yaml visitSequenceEntry(Yaml.Sequence.Entry entry, PrintOutputCapture<P> p) {
+        p.out.append(entry.getPrefix());
+        if(entry.isDash()) {
+            p.out.append('-');
+        }
+        visit(entry.getBlock(), p);
+        if(entry.getTrailingCommaPrefix() != null) {
+            p.out.append(entry.getTrailingCommaPrefix()).append(',');
+        }
+        return entry;
+    }
+
+    @Override
+    public Yaml visitSequence(Yaml.Sequence sequence, PrintOutputCapture<P> p) {
+        visitMarkers(sequence.getMarkers(), p);
+        if(sequence.getOpeningBracketPrefix() != null) {
+            p.out.append(sequence.getOpeningBracketPrefix()).append('[');
+        }
+        Yaml result = super.visitSequence(sequence, p);
+        if(sequence.getClosingBracketPrefix() != null) {
+            p.out.append(sequence.getClosingBracketPrefix()).append(']');
+        }
+
+        return result;
+    }
+
+    @Override
+    public Yaml visitMappingEntry(Yaml.Mapping.Entry entry, PrintOutputCapture<P> p) {
+        p.out.append(entry.getPrefix());
+        visitMarkers(entry.getMarkers(), p);
+        visit(entry.getKey(), p);
+        p.out.append(entry.getBeforeMappingValueIndicator()).append(':');
+        visit(entry.getValue(), p);
+        return entry;
+    }
+
+    @Override
+    public Yaml visitMapping(Yaml.Mapping mapping, PrintOutputCapture<P> p) {
+        visitMarkers(mapping.getMarkers(), p);
+        return super.visitMapping(mapping, p);
+    }
+
+    @Override
+    public Yaml visitScalar(Yaml.Scalar scalar, PrintOutputCapture<P> p) {
+        p.out.append(scalar.getPrefix());
+        visitMarkers(scalar.getMarkers(), p);
+        if (scalar.getAnchor() != null) {
+            visit(scalar.getAnchor(), p);
+        }
+        switch (scalar.getStyle()) {
+            case DOUBLE_QUOTED:
+                p.out.append('"')
+                        .append(scalar.getValue().replaceAll("\\n", "\\\\n"))
+                        .append('"');
+                break;
+            case SINGLE_QUOTED:
+                p.out.append('\'')
+                        .append(scalar.getValue().replaceAll("\\n", "\\\\n"))
+                        .append('\'');
+                break;
+            case LITERAL:
+                p.out.append('|')
+                        .append(scalar.getValue());
+                break;
+            case FOLDED:
+                p.out.append('>')
+                        .append(scalar.getValue());
+                break;
+            case PLAIN:
+            default:
+                p.out.append(scalar.getValue());
+                break;
+
+        }
+        return scalar;
+    }
+
+    public Yaml visitAnchor(Yaml.Anchor anchor, PrintOutputCapture<P> p) {
+        visitMarkers(anchor.getMarkers(), p);
+        p.out.append("&");
+        p.out.append(anchor.getKey());
+        p.out.append(anchor.getPostfix());
+        return anchor;
+    }
+
+    public Yaml visitAlias(Yaml.Alias alias, PrintOutputCapture<P> p) {
+        p.out.append(alias.getPrefix());
+        visitMarkers(alias.getMarkers(), p);
+        p.out.append("*");
+        p.out.append(alias.getAnchor().getKey());
+        return alias;
+    }
+
+    @Override
+    public <M extends Marker> M visitMarker(Marker marker, PrintOutputCapture<P> p) {
+        if(marker instanceof SearchResult) {
+            String description = ((SearchResult) marker).getDescription();
+            p.out.append("~~")
+                    .append(description == null ? "" : "(" + description + ")~~")
+                    .append(">");
+        }
+        //noinspection unchecked
+        return (M) marker;
+    }
+}
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
index 800cfea9b5e..97f7c601277 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
@@ -1,467 +1,467 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml.tree;
-
-import lombok.*;
-import lombok.experimental.FieldDefaults;
-import org.openrewrite.*;
-import org.openrewrite.internal.lang.Nullable;
-import org.openrewrite.marker.Markers;
-import org.openrewrite.yaml.YamlVisitor;
-import org.openrewrite.yaml.internal.YamlPrinter;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.UUID;
-
-import static java.util.stream.Collectors.toList;
-import static org.openrewrite.Tree.randomId;
-
-public interface Yaml extends Tree {
-
-    @SuppressWarnings("unchecked")
-    @Override
-    default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
-        return (R) acceptYaml((YamlVisitor<P>) v, p);
-    }
-
-    @Override
-    default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
-        return v instanceof YamlVisitor;
-    }
-
-    @Nullable
-    default <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-        return v.defaultValue(this, p);
-    }
-
-    /**
-     * @return A new deep copy of this block with different IDs.
-     */
-    Yaml copyPaste();
-
-    String getPrefix();
-
-    Yaml withPrefix(String prefix);
-
-    <Y extends Yaml> Y withMarkers(Markers markers);
-
-    Markers getMarkers();
-
-    @Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Documents implements Yaml, SourceFile {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        Markers markers;
-        Path sourcePath;
-
-        @Nullable // for backwards compatibility
-        @With(AccessLevel.PRIVATE)
-        String charsetName;
-
-        @With
-        @Getter
-        boolean charsetBomMarked;
-
-        @Override
-        public Charset getCharset() {
-            return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
-        }
-
-        @Override
-        public SourceFile withCharset(Charset charset) {
-            return withCharsetName(charset.name());
-        }
-
-        List<? extends Document> documents;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitDocuments(this, p);
-        }
-
-        @Override
-        public Documents copyPaste() {
-            return new Documents(randomId(), Markers.EMPTY,
-                    sourcePath, charsetName, charsetBomMarked, documents.stream().map(Document::copyPaste).collect(toList()));
-        }
-
-        /**
-         * Prefixes will always be on {@link Mapping.Entry}.
-         *
-         * @return The empty string.
-         */
-        @Override
-        public String getPrefix() {
-            return "";
-        }
-
-        @Override
-        public Documents withPrefix(String prefix) {
-            if (!prefix.isEmpty()) {
-                throw new UnsupportedOperationException("Yaml.Documents may not have a non-empty prefix");
-            }
-            return this;
-        }
-
-        @Override
-        public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
-            return new YamlPrinter<>();
-        }
-    }
-
-    @Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Document implements Yaml {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        boolean explicit;
-        Block block;
-        End end;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitDocument(this, p);
-        }
-
-        @Override
-        public Document copyPaste() {
-            return new Document(
-                    randomId(),
-                    prefix,
-                    Markers.EMPTY,
-                    explicit,
-                    block.copyPaste(),
-                    end == null ? null : end.copyPaste()
-            );
-        }
-
-        /**
-         * https://yaml.org/spec/1.1/#c-document-end
-         */
-        @Value
-        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-        @With
-        public static class End implements Yaml {
-            @EqualsAndHashCode.Include
-            UUID id;
-
-            String prefix;
-            Markers markers;
-
-            /**
-             * Yaml documents may be explicitly ended with "..."
-             * When this is set to "true" the "..." will be printed out.
-             * When this is set to "false" no "..." will be printed, but a comment at the end of the document still will be
-             * See: https://yaml.org/spec/1.2/spec.html#id2800401
-             */
-            boolean explicit;
-
-            @Override
-            public End copyPaste() {
-                return new End(randomId(), prefix, Markers.EMPTY, explicit);
-            }
-        }
-    }
-
-    @Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Scalar implements Block {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        String prefix;
-        Markers markers;
-        Style style;
-
-        @Nullable
-        Anchor anchor;
-
-        String value;
-
-        public enum Style {
-            DOUBLE_QUOTED,
-            SINGLE_QUOTED,
-            LITERAL,
-            FOLDED,
-            PLAIN
-        }
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitScalar(this, p);
-        }
-
-        @Override
-        public Scalar copyPaste() {
-            return new Scalar(randomId(), prefix, Markers.EMPTY, style, anchor, value);
-        }
-
-        public String toString() {
-            return "Yaml.Scalar(" + value + ")";
-        }
-    }
-
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @Data
-    @With
-    class Mapping implements Block {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        Markers markers;
-        List<Entry> entries;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitMapping(this, p);
-        }
-
-        @Override
-        public Mapping copyPaste() {
-            return new Mapping(randomId(), Markers.EMPTY, entries.stream().map(Entry::copyPaste)
-                    .collect(toList()));
-        }
-
-        /**
-         * Prefixes will always be on {@link Entry}.
-         *
-         * @return The empty string.
-         */
-        @Override
-        public String getPrefix() {
-            return "";
-        }
-
-        @Override
-        public Mapping withPrefix(String prefix) {
-            if (!prefix.isEmpty()) {
-                throw new UnsupportedOperationException("Yaml.Mapping may not have a non-empty prefix");
-            }
-            return this;
-        }
-
-        @Value
-        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-        @With
-        public static class Entry implements Yaml {
-            @EqualsAndHashCode.Include
-            UUID id;
-
-            String prefix;
-            Markers markers;
-            Scalar key;
-
-            // https://yaml.org/spec/1.2/spec.html#:%20mapping%20value//
-            String beforeMappingValueIndicator;
-
-            Block value;
-
-            @Override
-            public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-                return v.visitMappingEntry(this, p);
-            }
-
-            @Override
-            public Entry copyPaste() {
-                return new Entry(randomId(), prefix, Markers.EMPTY, key.copyPaste(),
-                        beforeMappingValueIndicator, value.copyPaste());
-            }
-        }
-    }
-
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @Data
-    @With
-    class Sequence implements Block {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        Markers markers;
-
-        /**
-         * Will contain the whitespace preceding the '[' in an inline sequence like [a, b].
-         * Will be null if the sequence is not an inline sequence, e.g.:
-         *  - foo
-         *  - bar
-         */
-        @Nullable
-        String openingBracketPrefix;
-
-        List<Entry> entries;
-
-        @Nullable
-        String closingBracketPrefix;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitSequence(this, p);
-        }
-
-        @Override
-        public Sequence copyPaste() {
-            return new Sequence(randomId(), Markers.EMPTY, openingBracketPrefix,
-                    entries.stream().map(Entry::copyPaste).collect(toList()), closingBracketPrefix);
-        }
-
-        @Override
-        public String getPrefix() {
-            return "";
-        }
-
-        @Override
-        public Sequence withPrefix(String prefix) {
-            if (!prefix.isEmpty()) {
-                throw new UnsupportedOperationException("Yaml.Sequence may not have a non-empty prefix");
-            }
-            return this;
-        }
-
-        @Value
-        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-        @With
-        public static class Entry implements Yaml {
-            @EqualsAndHashCode.Include
-            UUID id;
-
-            @With
-            String prefix;
-
-            @With
-            Markers markers;
-
-            @With
-            Block block;
-
-            /**
-             * Set to true when this entry is part of a sequence like:
-             * - 1
-             * - 2
-             *
-             * And false when this entry is part of a sequence like:
-             * [1, 2]
-             */
-            boolean dash;
-
-            /**
-             * Holds the whitespace between this entry and its trailing comma, if any.
-             *   v
-             * [1 , 2]
-             * null if there is no trailing comma.
-             */
-            @Nullable
-            @With
-            String trailingCommaPrefix;
-
-            @Override
-            public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-                return v.visitSequenceEntry(this, p);
-            }
-
-            @Override
-            public Entry copyPaste() {
-                return new Entry(randomId(), prefix, Markers.EMPTY,
-                        block.copyPaste(), dash, trailingCommaPrefix);
-            }
-        }
-    }
-
-    @Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Alias implements Block {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        @With
-        String prefix;
-
-        @With
-        Markers markers;
-
-        @With
-        Anchor anchor;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitAlias(this, p);
-        }
-
-        @Override
-        public Alias copyPaste() {
-            return new Alias(randomId(), prefix, Markers.EMPTY, anchor);
-        }
-
-        public String toString() {
-            return "Yaml.Alias(" + anchor + ")";
-        }
-    }
-
-    @Value
-    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
-    @With
-    class Anchor implements Yaml {
-        @EqualsAndHashCode.Include
-        UUID id;
-
-        @With
-        String prefix;
-
-        @With
-        String postfix;
-
-        @With
-        Markers markers;
-
-        @With
-        String key;
-
-        @Override
-        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
-            return v.visitAnchor(this, p);
-        }
-
-        @Override
-        public Anchor copyPaste() {
-            return new Anchor(randomId(), prefix, postfix, Markers.EMPTY, key);
-        }
-
-        public String toString() {
-            return "Yaml.Anchor(" + key + ")";
-        }
-    }
-
-    interface Block extends Yaml {
-        /**
-         * @return A new deep copy of this block with different IDs.
-         */
-        Block copyPaste();
-
-        Block withPrefix(String prefix);
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml.tree;
+
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import org.openrewrite.*;
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.marker.Markers;
+import org.openrewrite.yaml.YamlVisitor;
+import org.openrewrite.yaml.internal.YamlPrinter;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.UUID;
+
+import static java.util.stream.Collectors.toList;
+import static org.openrewrite.Tree.randomId;
+
+public interface Yaml extends Tree {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
+        return (R) acceptYaml((YamlVisitor<P>) v, p);
+    }
+
+    @Override
+    default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
+        return v instanceof YamlVisitor;
+    }
+
+    @Nullable
+    default <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+        return v.defaultValue(this, p);
+    }
+
+    /**
+     * @return A new deep copy of this block with different IDs.
+     */
+    Yaml copyPaste();
+
+    String getPrefix();
+
+    Yaml withPrefix(String prefix);
+
+    <Y extends Yaml> Y withMarkers(Markers markers);
+
+    Markers getMarkers();
+
+    @Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Documents implements Yaml, SourceFile {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        Markers markers;
+        Path sourcePath;
+
+        @Nullable // for backwards compatibility
+        @With(AccessLevel.PRIVATE)
+        String charsetName;
+
+        @With
+        @Getter
+        boolean charsetBomMarked;
+
+        @Override
+        public Charset getCharset() {
+            return charsetName == null ? StandardCharsets.UTF_8 : Charset.forName(charsetName);
+        }
+
+        @Override
+        public SourceFile withCharset(Charset charset) {
+            return withCharsetName(charset.name());
+        }
+
+        List<? extends Document> documents;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitDocuments(this, p);
+        }
+
+        @Override
+        public Documents copyPaste() {
+            return new Documents(randomId(), Markers.EMPTY,
+                    sourcePath, charsetName, charsetBomMarked, documents.stream().map(Document::copyPaste).collect(toList()));
+        }
+
+        /**
+         * Prefixes will always be on {@link Mapping.Entry}.
+         *
+         * @return The empty string.
+         */
+        @Override
+        public String getPrefix() {
+            return "";
+        }
+
+        @Override
+        public Documents withPrefix(String prefix) {
+            if (!prefix.isEmpty()) {
+                throw new UnsupportedOperationException("Yaml.Documents may not have a non-empty prefix");
+            }
+            return this;
+        }
+
+        @Override
+        public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
+            return new YamlPrinter<>();
+        }
+    }
+
+    @Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Document implements Yaml {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        boolean explicit;
+        Block block;
+        End end;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitDocument(this, p);
+        }
+
+        @Override
+        public Document copyPaste() {
+            return new Document(
+                    randomId(),
+                    prefix,
+                    Markers.EMPTY,
+                    explicit,
+                    block.copyPaste(),
+                    end == null ? null : end.copyPaste()
+            );
+        }
+
+        /**
+         * https://yaml.org/spec/1.1/#c-document-end
+         */
+        @Value
+        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+        @With
+        public static class End implements Yaml {
+            @EqualsAndHashCode.Include
+            UUID id;
+
+            String prefix;
+            Markers markers;
+
+            /**
+             * Yaml documents may be explicitly ended with "..."
+             * When this is set to "true" the "..." will be printed out.
+             * When this is set to "false" no "..." will be printed, but a comment at the end of the document still will be
+             * See: https://yaml.org/spec/1.2/spec.html#id2800401
+             */
+            boolean explicit;
+
+            @Override
+            public End copyPaste() {
+                return new End(randomId(), prefix, Markers.EMPTY, explicit);
+            }
+        }
+    }
+
+    @Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Scalar implements Block {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        String prefix;
+        Markers markers;
+        Style style;
+
+        @Nullable
+        Anchor anchor;
+
+        String value;
+
+        public enum Style {
+            DOUBLE_QUOTED,
+            SINGLE_QUOTED,
+            LITERAL,
+            FOLDED,
+            PLAIN
+        }
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitScalar(this, p);
+        }
+
+        @Override
+        public Scalar copyPaste() {
+            return new Scalar(randomId(), prefix, Markers.EMPTY, style, anchor, value);
+        }
+
+        public String toString() {
+            return "Yaml.Scalar(" + value + ")";
+        }
+    }
+
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @Data
+    @With
+    class Mapping implements Block {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        Markers markers;
+        List<Entry> entries;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitMapping(this, p);
+        }
+
+        @Override
+        public Mapping copyPaste() {
+            return new Mapping(randomId(), Markers.EMPTY, entries.stream().map(Entry::copyPaste)
+                    .collect(toList()));
+        }
+
+        /**
+         * Prefixes will always be on {@link Entry}.
+         *
+         * @return The empty string.
+         */
+        @Override
+        public String getPrefix() {
+            return "";
+        }
+
+        @Override
+        public Mapping withPrefix(String prefix) {
+            if (!prefix.isEmpty()) {
+                throw new UnsupportedOperationException("Yaml.Mapping may not have a non-empty prefix");
+            }
+            return this;
+        }
+
+        @Value
+        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+        @With
+        public static class Entry implements Yaml {
+            @EqualsAndHashCode.Include
+            UUID id;
+
+            String prefix;
+            Markers markers;
+            Scalar key;
+
+            // https://yaml.org/spec/1.2/spec.html#:%20mapping%20value//
+            String beforeMappingValueIndicator;
+
+            Block value;
+
+            @Override
+            public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+                return v.visitMappingEntry(this, p);
+            }
+
+            @Override
+            public Entry copyPaste() {
+                return new Entry(randomId(), prefix, Markers.EMPTY, key.copyPaste(),
+                        beforeMappingValueIndicator, value.copyPaste());
+            }
+        }
+    }
+
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @Data
+    @With
+    class Sequence implements Block {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        Markers markers;
+
+        /**
+         * Will contain the whitespace preceding the '[' in an inline sequence like [a, b].
+         * Will be null if the sequence is not an inline sequence, e.g.:
+         *  - foo
+         *  - bar
+         */
+        @Nullable
+        String openingBracketPrefix;
+
+        List<Entry> entries;
+
+        @Nullable
+        String closingBracketPrefix;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitSequence(this, p);
+        }
+
+        @Override
+        public Sequence copyPaste() {
+            return new Sequence(randomId(), Markers.EMPTY, openingBracketPrefix,
+                    entries.stream().map(Entry::copyPaste).collect(toList()), closingBracketPrefix);
+        }
+
+        @Override
+        public String getPrefix() {
+            return "";
+        }
+
+        @Override
+        public Sequence withPrefix(String prefix) {
+            if (!prefix.isEmpty()) {
+                throw new UnsupportedOperationException("Yaml.Sequence may not have a non-empty prefix");
+            }
+            return this;
+        }
+
+        @Value
+        @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+        @With
+        public static class Entry implements Yaml {
+            @EqualsAndHashCode.Include
+            UUID id;
+
+            @With
+            String prefix;
+
+            @With
+            Markers markers;
+
+            @With
+            Block block;
+
+            /**
+             * Set to true when this entry is part of a sequence like:
+             * - 1
+             * - 2
+             *
+             * And false when this entry is part of a sequence like:
+             * [1, 2]
+             */
+            boolean dash;
+
+            /**
+             * Holds the whitespace between this entry and its trailing comma, if any.
+             *   v
+             * [1 , 2]
+             * null if there is no trailing comma.
+             */
+            @Nullable
+            @With
+            String trailingCommaPrefix;
+
+            @Override
+            public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+                return v.visitSequenceEntry(this, p);
+            }
+
+            @Override
+            public Entry copyPaste() {
+                return new Entry(randomId(), prefix, Markers.EMPTY,
+                        block.copyPaste(), dash, trailingCommaPrefix);
+            }
+        }
+    }
+
+    @Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Alias implements Block {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        @With
+        String prefix;
+
+        @With
+        Markers markers;
+
+        @With
+        Anchor anchor;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitAlias(this, p);
+        }
+
+        @Override
+        public Alias copyPaste() {
+            return new Alias(randomId(), prefix, Markers.EMPTY, anchor);
+        }
+
+        public String toString() {
+            return "Yaml.Alias(" + anchor + ")";
+        }
+    }
+
+    @Value
+    @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
+    @With
+    class Anchor implements Yaml {
+        @EqualsAndHashCode.Include
+        UUID id;
+
+        @With
+        String prefix;
+
+        @With
+        String postfix;
+
+        @With
+        Markers markers;
+
+        @With
+        String key;
+
+        @Override
+        public <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+            return v.visitAnchor(this, p);
+        }
+
+        @Override
+        public Anchor copyPaste() {
+            return new Anchor(randomId(), prefix, postfix, Markers.EMPTY, key);
+        }
+
+        public String toString() {
+            return "Yaml.Anchor(" + key + ")";
+        }
+    }
+
+    interface Block extends Yaml {
+        /**
+         * @return A new deep copy of this block with different IDs.
+         */
+        Block copyPaste();
+
+        Block withPrefix(String prefix);
+    }
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeKeyTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeKeyTest.kt
index cfd19e4dca8..d3ec6794e75 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeKeyTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeKeyTest.kt
@@ -1,142 +1,142 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import org.openrewrite.Issue
-import java.nio.file.Path
-
-class ChangeKeyTest : YamlRecipeTest {
-    @Issue("https://github.com/openrewrite/rewrite/issues/434")
-    @Test
-    fun simpleChangeRootKey() = assertChanged(
-        recipe = ChangeKey(
-            "$.description",
-            "newDescription",
-            null
-        ),
-        before = """
-            id: something
-            description: desc
-            other: whatever
-        """,
-        after = """
-            id: something
-            newDescription: desc
-            other: whatever
-        """
-    )
-
-    @Test
-    fun changeNestedKey() = assertChanged(
-        recipe = ChangeKey(
-            "$.metadata.name",
-            "name2",
-            null
-        ),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              name2: monitoring-tools
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeRelativeKey() = assertChanged(
-        recipe = ChangeKey(
-            ".name",
-            "name2",
-            null
-        ),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              name2: monitoring-tools
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeSequenceKeyByWildcard() = assertChanged(
-        recipe = ChangeKey(
-            "$.subjects[*].kind",
-            "kind2",
-            null
-        ),
-        before = """
-            subjects:
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind2: ServiceAccount
-                name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeSequenceKeyByExactMatch() = assertChanged(
-        recipe = ChangeKey(
-            "$.subjects[?(@.kind == 'ServiceAccount')].kind",
-            "kind2",
-            null
-        ),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind2: ServiceAccount
-                name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
-        val matchingFile = tempDir.resolve("a.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("description: desc")
-        }.toFile()
-        val nonMatchingFile = tempDir.resolve("b.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("description: desc")
-        }.toFile()
-        val recipe = ChangeKey("$.description", "newDescription", "**/a.yml")
-        assertChanged(recipe = recipe, before = matchingFile, after = "newDescription: desc")
-        assertUnchanged(recipe = recipe, before = nonMatchingFile)
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import org.openrewrite.Issue
+import java.nio.file.Path
+
+class ChangeKeyTest : YamlRecipeTest {
+    @Issue("https://github.com/openrewrite/rewrite/issues/434")
+    @Test
+    fun simpleChangeRootKey() = assertChanged(
+        recipe = ChangeKey(
+            "$.description",
+            "newDescription",
+            null
+        ),
+        before = """
+            id: something
+            description: desc
+            other: whatever
+        """,
+        after = """
+            id: something
+            newDescription: desc
+            other: whatever
+        """
+    )
+
+    @Test
+    fun changeNestedKey() = assertChanged(
+        recipe = ChangeKey(
+            "$.metadata.name",
+            "name2",
+            null
+        ),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              name2: monitoring-tools
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeRelativeKey() = assertChanged(
+        recipe = ChangeKey(
+            ".name",
+            "name2",
+            null
+        ),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              name2: monitoring-tools
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeSequenceKeyByWildcard() = assertChanged(
+        recipe = ChangeKey(
+            "$.subjects[*].kind",
+            "kind2",
+            null
+        ),
+        before = """
+            subjects:
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind2: ServiceAccount
+                name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeSequenceKeyByExactMatch() = assertChanged(
+        recipe = ChangeKey(
+            "$.subjects[?(@.kind == 'ServiceAccount')].kind",
+            "kind2",
+            null
+        ),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind2: ServiceAccount
+                name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
+        val matchingFile = tempDir.resolve("a.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("description: desc")
+        }.toFile()
+        val nonMatchingFile = tempDir.resolve("b.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("description: desc")
+        }.toFile()
+        val recipe = ChangeKey("$.description", "newDescription", "**/a.yml")
+        assertChanged(recipe = recipe, before = matchingFile, after = "newDescription: desc")
+        assertUnchanged(recipe = recipe, before = nonMatchingFile)
+    }
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangePropertyKeyTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangePropertyKeyTest.kt
index 9d239758c50..e559d65cce6 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangePropertyKeyTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangePropertyKeyTest.kt
@@ -1,270 +1,270 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.ValueSource
-import org.openrewrite.Issue
-import org.openrewrite.Recipe
-import java.nio.file.Path
-
-class ChangePropertyKeyTest : YamlRecipeTest {
-    override val recipe: Recipe
-        get() = ChangePropertyKey(
-            "management.metrics.binders.files.enabled",
-            "management.metrics.enable.process.files",
-            null,
-            null
-        )
-
-    @Test
-    fun singleEntry() = assertChanged(
-        before = "management.metrics.binders.files.enabled: true",
-        after = "management.metrics.enable.process.files: true"
-    )
-
-    @Test
-    fun nestedEntry() = assertChanged(
-        before = """
-            unrelated.property: true
-            management.metrics:
-                binders:
-                    jvm.enabled: true
-                    files.enabled: true
-        """,
-        after = """
-            unrelated.property: true
-            management.metrics:
-                binders.jvm.enabled: true
-                enable.process.files: true
-        """
-    )
-
-    @Test
-    fun nestedEntryEmptyPartialPathRemoved() = assertChanged(
-        before = """
-            unrelated.property: true
-            management.metrics:
-                binders:
-                    files.enabled: true
-        """,
-        after = """
-            unrelated.property: true
-            management.metrics.enable.process.files: true
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1114")
-    fun `change path to one path longer`() = assertChanged(
-        recipe = ChangePropertyKey("a.b.c", "a.b.c.d", null, null),
-        before = "a.b.c: true",
-        after = "a.b.c.d: true"
-    )
-
-    @Test
-    fun `change path to one path shorter`() = assertChanged(
-        recipe = ChangePropertyKey("a.b.c.d", "a.b.c", null, null),
-        before = "a.b.c.d: true",
-        after = "a.b.c: true"
-    )
-
-    @Test
-    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
-        val matchingFile = tempDir.resolve("a.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("management.metrics.binders.files.enabled: true")
-        }.toFile()
-        val nonMatchingFile = tempDir.resolve("b.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("management.metrics.binders.files.enabled: true")
-        }.toFile()
-        val recipe = ChangePropertyKey(
-            "management.metrics.binders.files.enabled",
-            "management.metrics.enable.process.files",
-            null,
-            "**/a.yml"
-        )
-        assertChanged(recipe = recipe, before = matchingFile, after = "management.metrics.enable.process.files: true")
-        assertUnchanged(recipe = recipe, before = nonMatchingFile)
-    }
-
-    @ParameterizedTest
-    @ValueSource(
-        strings = [
-            "acme.my-project.person.first-name",
-            "acme.myProject.person.firstName",
-            "acme.my_project.person.first_name",
-        ]
-    )
-    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
-    fun relaxedBinding(propertyKey: String) = assertChanged(
-        recipe = ChangePropertyKey(propertyKey, "acme.my-project.person.changed-first-name-key", true, null),
-        before = """
-            unrelated.root: true
-            acme.my-project:
-                unrelated: true
-                person:
-                    unrelated: true
-                    first-name: example
-        """,
-        after = """
-            unrelated.root: true
-            acme.my-project:
-                unrelated: true
-                person:
-                    unrelated: true
-                    changed-first-name-key: example
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
-    fun exactMatch() = assertChanged(
-        recipe = ChangePropertyKey(
-            "acme.my-project.person.first-name",
-            "acme.my-project.person.changed-first-name-key",
-            false,
-            null
-        ),
-        before = """
-            acme.myProject.person.firstName: example
-            acme.my_project.person.first_name: example
-            acme.my-project.person.first-name: example
-        """,
-        after = """
-            acme.myProject.person.firstName: example
-            acme.my_project.person.first_name: example
-            acme.my-project.person.changed-first-name-key: example
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1249")
-    @Test
-    fun doesNotMergeToSibling() = assertUnchanged(
-        recipe = ChangePropertyKey(
-            "i",
-            "a.b.c",
-            false,
-            null
-        ),
-        before = """
-            a:
-              b:
-                f0: v0
-                f1: v1
-            i:
-              f0: v0
-              f1: v1
-        """
-    )
-
-    @Test
-    fun doesNotMergeToSiblingWithCoalescedProperty() = assertUnchanged(
-        recipe = ChangePropertyKey(
-            "old-property",
-            "new-property.sub-property.super-sub",
-            true,
-            null
-        ),
-        before = """
-            newProperty.subProperty:
-                superSub:
-                  f0: v0
-                  f1: v1
-            oldProperty:
-              f0: v0
-              f1: v1
-        """
-    )
-
-    @Test
-    fun doesNotChangeKeyWhithSequenceInPath() = assertUnchanged(
-        recipe = ChangePropertyKey(
-            "a.b.c.a0",
-            "a.b.a0",
-            true,
-            null
-        ),
-        before = """
-            a:
-              b:
-                c:
-                  - a0: x
-                    a1: 'y'
-                  - aa1: x
-                    a1: 'y'
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/434")
-    fun doesNotChangePropertyOrdering() = assertChanged(
-        recipe = ChangePropertyKey(
-            "description",
-            "newDescription",
-            false,
-            null
-        ),
-        before = """
-        id: something
-        description: desc
-        other: whatever
-    """,
-        after = """
-        id: something
-        newDescription: desc
-        other: whatever
-    """
-    )
-
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-    @Test
-    fun checkValidation() {
-        var recipe = ChangePropertyKey(null, null, null, null)
-        var valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(2)
-        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
-        assertThat(valid.failures()[1].property).isEqualTo("oldPropertyKey")
-
-        recipe = ChangePropertyKey(null, "management.metrics.enable.process.files", null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("oldPropertyKey")
-
-        recipe = ChangePropertyKey("management.metrics.binders.files.enabled", null, null, null)
-        valid = recipe.validate()
-        assertThat(valid.isValid).isFalse
-        assertThat(valid.failures()).hasSize(1)
-        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
-
-        recipe =
-            ChangePropertyKey(
-                "management.metrics.binders.files.enabled",
-                "management.metrics.enable.process.files",
-                null,
-                null
-            )
-        valid = recipe.validate()
-        assertThat(valid.isValid).isTrue
-    }
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
+import org.openrewrite.Issue
+import org.openrewrite.Recipe
+import java.nio.file.Path
+
+class ChangePropertyKeyTest : YamlRecipeTest {
+    override val recipe: Recipe
+        get() = ChangePropertyKey(
+            "management.metrics.binders.files.enabled",
+            "management.metrics.enable.process.files",
+            null,
+            null
+        )
+
+    @Test
+    fun singleEntry() = assertChanged(
+        before = "management.metrics.binders.files.enabled: true",
+        after = "management.metrics.enable.process.files: true"
+    )
+
+    @Test
+    fun nestedEntry() = assertChanged(
+        before = """
+            unrelated.property: true
+            management.metrics:
+                binders:
+                    jvm.enabled: true
+                    files.enabled: true
+        """,
+        after = """
+            unrelated.property: true
+            management.metrics:
+                binders.jvm.enabled: true
+                enable.process.files: true
+        """
+    )
+
+    @Test
+    fun nestedEntryEmptyPartialPathRemoved() = assertChanged(
+        before = """
+            unrelated.property: true
+            management.metrics:
+                binders:
+                    files.enabled: true
+        """,
+        after = """
+            unrelated.property: true
+            management.metrics.enable.process.files: true
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1114")
+    fun `change path to one path longer`() = assertChanged(
+        recipe = ChangePropertyKey("a.b.c", "a.b.c.d", null, null),
+        before = "a.b.c: true",
+        after = "a.b.c.d: true"
+    )
+
+    @Test
+    fun `change path to one path shorter`() = assertChanged(
+        recipe = ChangePropertyKey("a.b.c.d", "a.b.c", null, null),
+        before = "a.b.c.d: true",
+        after = "a.b.c: true"
+    )
+
+    @Test
+    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
+        val matchingFile = tempDir.resolve("a.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("management.metrics.binders.files.enabled: true")
+        }.toFile()
+        val nonMatchingFile = tempDir.resolve("b.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("management.metrics.binders.files.enabled: true")
+        }.toFile()
+        val recipe = ChangePropertyKey(
+            "management.metrics.binders.files.enabled",
+            "management.metrics.enable.process.files",
+            null,
+            "**/a.yml"
+        )
+        assertChanged(recipe = recipe, before = matchingFile, after = "management.metrics.enable.process.files: true")
+        assertUnchanged(recipe = recipe, before = nonMatchingFile)
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+        strings = [
+            "acme.my-project.person.first-name",
+            "acme.myProject.person.firstName",
+            "acme.my_project.person.first_name",
+        ]
+    )
+    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
+    fun relaxedBinding(propertyKey: String) = assertChanged(
+        recipe = ChangePropertyKey(propertyKey, "acme.my-project.person.changed-first-name-key", true, null),
+        before = """
+            unrelated.root: true
+            acme.my-project:
+                unrelated: true
+                person:
+                    unrelated: true
+                    first-name: example
+        """,
+        after = """
+            unrelated.root: true
+            acme.my-project:
+                unrelated: true
+                person:
+                    unrelated: true
+                    changed-first-name-key: example
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1168")
+    fun exactMatch() = assertChanged(
+        recipe = ChangePropertyKey(
+            "acme.my-project.person.first-name",
+            "acme.my-project.person.changed-first-name-key",
+            false,
+            null
+        ),
+        before = """
+            acme.myProject.person.firstName: example
+            acme.my_project.person.first_name: example
+            acme.my-project.person.first-name: example
+        """,
+        after = """
+            acme.myProject.person.firstName: example
+            acme.my_project.person.first_name: example
+            acme.my-project.person.changed-first-name-key: example
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1249")
+    @Test
+    fun doesNotMergeToSibling() = assertUnchanged(
+        recipe = ChangePropertyKey(
+            "i",
+            "a.b.c",
+            false,
+            null
+        ),
+        before = """
+            a:
+              b:
+                f0: v0
+                f1: v1
+            i:
+              f0: v0
+              f1: v1
+        """
+    )
+
+    @Test
+    fun doesNotMergeToSiblingWithCoalescedProperty() = assertUnchanged(
+        recipe = ChangePropertyKey(
+            "old-property",
+            "new-property.sub-property.super-sub",
+            true,
+            null
+        ),
+        before = """
+            newProperty.subProperty:
+                superSub:
+                  f0: v0
+                  f1: v1
+            oldProperty:
+              f0: v0
+              f1: v1
+        """
+    )
+
+    @Test
+    fun doesNotChangeKeyWhithSequenceInPath() = assertUnchanged(
+        recipe = ChangePropertyKey(
+            "a.b.c.a0",
+            "a.b.a0",
+            true,
+            null
+        ),
+        before = """
+            a:
+              b:
+                c:
+                  - a0: x
+                    a1: 'y'
+                  - aa1: x
+                    a1: 'y'
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/434")
+    fun doesNotChangePropertyOrdering() = assertChanged(
+        recipe = ChangePropertyKey(
+            "description",
+            "newDescription",
+            false,
+            null
+        ),
+        before = """
+        id: something
+        description: desc
+        other: whatever
+    """,
+        after = """
+        id: something
+        newDescription: desc
+        other: whatever
+    """
+    )
+
+    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
+    @Test
+    fun checkValidation() {
+        var recipe = ChangePropertyKey(null, null, null, null)
+        var valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(2)
+        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
+        assertThat(valid.failures()[1].property).isEqualTo("oldPropertyKey")
+
+        recipe = ChangePropertyKey(null, "management.metrics.enable.process.files", null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("oldPropertyKey")
+
+        recipe = ChangePropertyKey("management.metrics.binders.files.enabled", null, null, null)
+        valid = recipe.validate()
+        assertThat(valid.isValid).isFalse
+        assertThat(valid.failures()).hasSize(1)
+        assertThat(valid.failures()[0].property).isEqualTo("newPropertyKey")
+
+        recipe =
+            ChangePropertyKey(
+                "management.metrics.binders.files.enabled",
+                "management.metrics.enable.process.files",
+                null,
+                null
+            )
+        valid = recipe.validate()
+        assertThat(valid.isValid).isTrue
+    }
+
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeValueTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeValueTest.kt
index 60ff73c1101..e0505a36bd8 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeValueTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/ChangeValueTest.kt
@@ -1,146 +1,146 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import java.nio.file.Path
-
-class ChangeValueTest : YamlRecipeTest {
-    @Test
-    fun changeNestedKeyValue() = assertChanged(
-        recipe = ChangeValue(
-            "$.metadata.name",
-            "monitoring",
-            null
-        ),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              name: monitoring
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeSequenceValue() = assertChanged(
-        recipe = ChangeValue(
-            "$.metadata.name",
-            "monitoring",
-            null
-        ),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: [monitoring-tools]
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              name: monitoring
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeRelativeKey() = assertChanged(
-        recipe = ChangeValue(
-            ".name",
-            "monitoring",
-            null
-        ),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              name: monitoring
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeSequenceKeyByWildcard() = assertChanged(
-        recipe = ChangeValue(
-            "$.subjects[*].kind",
-            "Deployment",
-            null
-        ),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind: Deployment
-                name: some-user
-              - kind: Deployment
-                name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeSequenceKeyByExactMatch() = assertChanged(
-        recipe = ChangeValue(
-            "$.subjects[?(@.kind == 'ServiceAccount')].kind",
-            "Deployment",
-            null
-        ),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: Deployment
-                name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
-        val matchingFile = tempDir.resolve("a.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("metadata: monitoring-tools")
-        }.toFile()
-        val nonMatchingFile = tempDir.resolve("b.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("metadata: monitoring-tools")
-        }.toFile()
-        val recipe = ChangeValue(".metadata", "monitoring", "**/a.yml")
-        assertChanged(recipe = recipe, before = matchingFile, after = "metadata: monitoring")
-        assertUnchanged(recipe = recipe, before = nonMatchingFile)
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Path
+
+class ChangeValueTest : YamlRecipeTest {
+    @Test
+    fun changeNestedKeyValue() = assertChanged(
+        recipe = ChangeValue(
+            "$.metadata.name",
+            "monitoring",
+            null
+        ),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              name: monitoring
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeSequenceValue() = assertChanged(
+        recipe = ChangeValue(
+            "$.metadata.name",
+            "monitoring",
+            null
+        ),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: [monitoring-tools]
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              name: monitoring
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeRelativeKey() = assertChanged(
+        recipe = ChangeValue(
+            ".name",
+            "monitoring",
+            null
+        ),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              name: monitoring
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeSequenceKeyByWildcard() = assertChanged(
+        recipe = ChangeValue(
+            "$.subjects[*].kind",
+            "Deployment",
+            null
+        ),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind: Deployment
+                name: some-user
+              - kind: Deployment
+                name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeSequenceKeyByExactMatch() = assertChanged(
+        recipe = ChangeValue(
+            "$.subjects[?(@.kind == 'ServiceAccount')].kind",
+            "Deployment",
+            null
+        ),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: Deployment
+                name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
+        val matchingFile = tempDir.resolve("a.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("metadata: monitoring-tools")
+        }.toFile()
+        val nonMatchingFile = tempDir.resolve("b.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("metadata: monitoring-tools")
+        }.toFile()
+        val recipe = ChangeValue(".metadata", "monitoring", "**/a.yml")
+        assertChanged(recipe = recipe, before = matchingFile, after = "metadata: monitoring")
+        assertUnchanged(recipe = recipe, before = nonMatchingFile)
+    }
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/CoalescePropertiesTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/CoalescePropertiesTest.kt
index 0bbdef63ccd..abe3c69e74d 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/CoalescePropertiesTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/CoalescePropertiesTest.kt
@@ -1,228 +1,228 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
-import org.openrewrite.Recipe
-
-class CoalescePropertiesTest : YamlRecipeTest {
-    override val recipe: Recipe
-        get() = CoalesceProperties()
-
-    @Test
-    fun fold() = assertChanged(
-        before = """
-            management:
-                metrics:
-                    enable.process.files: true
-                endpoint:
-                    health:
-                        show-components: always
-                        show-details: always
-        """,
-        after = """
-            management:
-                metrics.enable.process.files: true
-                endpoint.health:
-                    show-components: always
-                    show-details: always
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1103")
-    @Test
-    fun foldSequenceOfObjects() = assertChanged(
-        before = """
-          foo:
-            bar:
-              sequence:
-                - name: name
-                  propertyA: fieldA
-                  propertyB: fieldB
-                - name: name
-                  propertyA: fieldA
-                  propertyB: fieldB
-              scalar: value
-        """,
-        after = """
-          foo.bar:
-            sequence:
-              - name: name
-                propertyA: fieldA
-                propertyB: fieldB
-              - name: name
-                propertyA: fieldA
-                propertyB: fieldB
-            scalar: value
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1133")
-    fun foldSequenceOfObjectsFormattedWithDashDirectlyUnderMappingKey() = assertChanged(
-        before = """
-          matrix:
-            include:
-            # comment-a
-            # comment-b
-            - name: entry-0-name # comment-c
-                # comment-d
-              value: entry-0-value
-              # comment-e
-            - name: entry-1-name
-              value: entry-1-value
-        """,
-        after = """
-          matrix.include:
-          # comment-a
-          # comment-b
-          - name: entry-0-name # comment-c
-              # comment-d
-            value: entry-0-value
-            # comment-e
-          - name: entry-1-name
-            value: entry-1-value
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1103")
-    @Test
-    fun foldSequence() = assertChanged(
-        before = """
-          foo:
-            bar:
-              buz:
-                - item1
-                - item2
-                - item3
-              baz: value
-        """,
-        after = """
-          foo.bar:
-            buz:
-              - item1
-              - item2
-              - item3
-            baz: value
-        """
-    )
-
-    @Test
-    @Disabled
-    fun group() = assertChanged(
-        before = """
-            management.metrics.enable.process.files: true
-            management.metrics.enable.jvm: true
-        """,
-        after = """
-            management.metrics.enable:
-                process.files: true
-                jvm: true
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
-    fun foldWithCommentsInPrefix() = assertChanged(
-        before = """
-            a:
-              b:
-                # d-comment
-                d:
-                  e.f: true
-                c: c-value
-        """,
-        after = """
-            a.b:
-              # d-comment
-              d.e.f: true
-              c: c-value
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
-    fun foldWithCommentsInPrefixWhenCommentsHaveDifferentIndentThanTheirElement() = assertChanged(
-        before = """
-            a:
-              b:
-              # d-comment
-                d:
-                  e.f: true
-               # c-comment
-                c:
-                  d: d-value
-        """,
-        after = """
-            a.b:
-            # d-comment
-              d.e.f: true
-             # c-comment
-              c.d: d-value
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
-    fun doNotFoldKeysWithCommentsInPrefix() = assertChanged(
-        before = """
-            a:
-              b:
-                d: # d-comment
-                  e:
-                    f: f-value # f-comment
-                c:
-                  # g-comment
-                  g: 
-                    h: h-value
-        """,
-        after = """
-            a.b:
-              d: # d-comment
-                e.f: f-value # f-comment
-              c:
-                # g-comment
-                g.h: h-value
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1142")
-    fun doNotShiftYamlCommentsInPrefixFollowingPreviousYamlObject() = assertChanged(
-        before = """
-          a:
-            b:
-              c: c-value  # c-comment
-              d: d-value # d-comment
-              e: e-value   # e-comment
-              f: f-value
-
-              g: g-value
-        """,
-        after = """
-            a.b:
-              c: c-value  # c-comment
-              d: d-value # d-comment
-              e: e-value   # e-comment
-              f: f-value
-
-              g: g-value
-        """
-    )
-
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.openrewrite.Issue
+import org.openrewrite.Recipe
+
+class CoalescePropertiesTest : YamlRecipeTest {
+    override val recipe: Recipe
+        get() = CoalesceProperties()
+
+    @Test
+    fun fold() = assertChanged(
+        before = """
+            management:
+                metrics:
+                    enable.process.files: true
+                endpoint:
+                    health:
+                        show-components: always
+                        show-details: always
+        """,
+        after = """
+            management:
+                metrics.enable.process.files: true
+                endpoint.health:
+                    show-components: always
+                    show-details: always
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1103")
+    @Test
+    fun foldSequenceOfObjects() = assertChanged(
+        before = """
+          foo:
+            bar:
+              sequence:
+                - name: name
+                  propertyA: fieldA
+                  propertyB: fieldB
+                - name: name
+                  propertyA: fieldA
+                  propertyB: fieldB
+              scalar: value
+        """,
+        after = """
+          foo.bar:
+            sequence:
+              - name: name
+                propertyA: fieldA
+                propertyB: fieldB
+              - name: name
+                propertyA: fieldA
+                propertyB: fieldB
+            scalar: value
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1133")
+    fun foldSequenceOfObjectsFormattedWithDashDirectlyUnderMappingKey() = assertChanged(
+        before = """
+          matrix:
+            include:
+            # comment-a
+            # comment-b
+            - name: entry-0-name # comment-c
+                # comment-d
+              value: entry-0-value
+              # comment-e
+            - name: entry-1-name
+              value: entry-1-value
+        """,
+        after = """
+          matrix.include:
+          # comment-a
+          # comment-b
+          - name: entry-0-name # comment-c
+              # comment-d
+            value: entry-0-value
+            # comment-e
+          - name: entry-1-name
+            value: entry-1-value
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1103")
+    @Test
+    fun foldSequence() = assertChanged(
+        before = """
+          foo:
+            bar:
+              buz:
+                - item1
+                - item2
+                - item3
+              baz: value
+        """,
+        after = """
+          foo.bar:
+            buz:
+              - item1
+              - item2
+              - item3
+            baz: value
+        """
+    )
+
+    @Test
+    @Disabled
+    fun group() = assertChanged(
+        before = """
+            management.metrics.enable.process.files: true
+            management.metrics.enable.jvm: true
+        """,
+        after = """
+            management.metrics.enable:
+                process.files: true
+                jvm: true
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
+    fun foldWithCommentsInPrefix() = assertChanged(
+        before = """
+            a:
+              b:
+                # d-comment
+                d:
+                  e.f: true
+                c: c-value
+        """,
+        after = """
+            a.b:
+              # d-comment
+              d.e.f: true
+              c: c-value
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
+    fun foldWithCommentsInPrefixWhenCommentsHaveDifferentIndentThanTheirElement() = assertChanged(
+        before = """
+            a:
+              b:
+              # d-comment
+                d:
+                  e.f: true
+               # c-comment
+                c:
+                  d: d-value
+        """,
+        after = """
+            a.b:
+            # d-comment
+              d.e.f: true
+             # c-comment
+              c.d: d-value
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1125")
+    fun doNotFoldKeysWithCommentsInPrefix() = assertChanged(
+        before = """
+            a:
+              b:
+                d: # d-comment
+                  e:
+                    f: f-value # f-comment
+                c:
+                  # g-comment
+                  g: 
+                    h: h-value
+        """,
+        after = """
+            a.b:
+              d: # d-comment
+                e.f: f-value # f-comment
+              c:
+                # g-comment
+                g.h: h-value
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1142")
+    fun doNotShiftYamlCommentsInPrefixFollowingPreviousYamlObject() = assertChanged(
+        before = """
+          a:
+            b:
+              c: c-value  # c-comment
+              d: d-value # d-comment
+              e: e-value   # e-comment
+              f: f-value
+
+              g: g-value
+        """,
+        after = """
+            a.b:
+              c: c-value  # c-comment
+              d: d-value # d-comment
+              e: e-value   # e-comment
+              f: f-value
+
+              g: g-value
+        """
+    )
+
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/DeleteKeyTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/DeleteKeyTest.kt
index 1abcde6840d..a1ca7d39de5 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/DeleteKeyTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/DeleteKeyTest.kt
@@ -1,206 +1,206 @@
-/*
- * Copyright 2021 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.io.TempDir
-import org.openrewrite.Issue
-import java.nio.file.Path
-
-class DeleteKeyTest : YamlRecipeTest {
-    @Test
-    fun deleteNestedKey() = assertChanged(
-        recipe = DeleteKey("$.metadata.name", null),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun deleteRelativeKey() = assertChanged(
-        recipe = DeleteKey(".name", null),
-        before = """
-            apiVersion: v1
-            metadata:
-              name: monitoring-tools
-              namespace: monitoring-tools
-        """,
-        after = """
-            apiVersion: v1
-            metadata:
-              namespace: monitoring-tools
-        """
-    )
-
-    @Test
-    fun deleteSequenceEntry() = assertChanged(
-        recipe = DeleteKey("$.subjects[?(@.kind == 'User')]", null),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-                restore-keys: |
-                  gradle
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun deleteScalarSequenceEntry() = assertChanged(
-        recipe = DeleteKey("$.widget.list[?(@ == 'item 2')]", null),
-        before = """
-            widget:
-              on: yes
-              list:
-                - item 1
-                - item 2
-                - item 3
-        """,
-        after = """
-            widget:
-              on: yes
-              list:
-                - item 1
-                - item 3
-        """
-    )
-
-    @Test
-    fun deleteSequenceKeyByWildcard() = assertChanged(
-        recipe = DeleteKey("$.subjects[*].kind", null),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - name: some-user
-              - name: monitoring-tools
-        """
-    )
-
-    @Test
-    fun deleteSubSequenceKeyByExactMatch() = assertChanged(
-        recipe = DeleteKey("$.subjects[?(@.kind == 'ServiceAccount')].kind", null),
-        before = """
-            subjects:
-              - kind: User
-                name: some-user
-              - kind: ServiceAccount
-                name: monitoring-tools
-        """,
-        after = """
-            subjects:
-              - kind: User
-                name: some-user
-              - name: monitoring-tools
-        """
-    )
-
-    @Test
-    @Issue("https://github.com/openrewrite/rewrite/issues/1175")
-    fun deleteNestedKeyRemovingUnusedKeysRecursively() = assertChanged(
-        recipe = DeleteKey("$.b.c.d", null),
-        before = """
-            a: a-value
-            b:
-              c:
-                d: d-value
-        """,
-        after = """
-            a: a-value
-        """
-    )
-
-    @Issue("https://github.com/openrewrite/rewrite/issues/1175")
-    @Test
-    fun deleteKeyKeepingUnrelatedUnusedKeys() = assertChanged(
-        recipe = DeleteKey("$.jobs.build.strategy.fail-fast", null),
-        before = """
-            on:
-              push:
-                branches:
-                  - main
-                tags-ignore:
-                  - "*"
-              pull_request:
-                branches:
-                  - main
-              workflow_dispatch: {}
-              schedule:
-                - cron: 0 18 * * *
-            jobs:
-              build:
-                strategy:
-                  fail-fast: false
-                  matrix:
-                    java: ["11"]
-                    os: ["ubuntu-latest"]
-        """,
-        after = """
-            on:
-              push:
-                branches:
-                  - main
-                tags-ignore:
-                  - "*"
-              pull_request:
-                branches:
-                  - main
-              workflow_dispatch: {}
-              schedule:
-                - cron: 0 18 * * *
-            jobs:
-              build:
-                strategy:
-                  matrix:
-                    java: ["11"]
-                    os: ["ubuntu-latest"]
-        """
-    )
-
-    @Test
-    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
-        val matchingFile = tempDir.resolve("a.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("apiVersion: v1")
-        }.toFile()
-        val nonMatchingFile = tempDir.resolve("b.yml").apply {
-            toFile().parentFile.mkdirs()
-            toFile().writeText("apiVersion: v1")
-        }.toFile()
-        val recipe = DeleteKey(".apiVersion", "**/a.yml")
-        assertChanged(recipe = recipe, before = matchingFile, after = "")
-        assertUnchanged(recipe = recipe, before = nonMatchingFile)
-    }
-}
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import org.openrewrite.Issue
+import java.nio.file.Path
+
+class DeleteKeyTest : YamlRecipeTest {
+    @Test
+    fun deleteNestedKey() = assertChanged(
+        recipe = DeleteKey("$.metadata.name", null),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun deleteRelativeKey() = assertChanged(
+        recipe = DeleteKey(".name", null),
+        before = """
+            apiVersion: v1
+            metadata:
+              name: monitoring-tools
+              namespace: monitoring-tools
+        """,
+        after = """
+            apiVersion: v1
+            metadata:
+              namespace: monitoring-tools
+        """
+    )
+
+    @Test
+    fun deleteSequenceEntry() = assertChanged(
+        recipe = DeleteKey("$.subjects[?(@.kind == 'User')]", null),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+                restore-keys: |
+                  gradle
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun deleteScalarSequenceEntry() = assertChanged(
+        recipe = DeleteKey("$.widget.list[?(@ == 'item 2')]", null),
+        before = """
+            widget:
+              on: yes
+              list:
+                - item 1
+                - item 2
+                - item 3
+        """,
+        after = """
+            widget:
+              on: yes
+              list:
+                - item 1
+                - item 3
+        """
+    )
+
+    @Test
+    fun deleteSequenceKeyByWildcard() = assertChanged(
+        recipe = DeleteKey("$.subjects[*].kind", null),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - name: some-user
+              - name: monitoring-tools
+        """
+    )
+
+    @Test
+    fun deleteSubSequenceKeyByExactMatch() = assertChanged(
+        recipe = DeleteKey("$.subjects[?(@.kind == 'ServiceAccount')].kind", null),
+        before = """
+            subjects:
+              - kind: User
+                name: some-user
+              - kind: ServiceAccount
+                name: monitoring-tools
+        """,
+        after = """
+            subjects:
+              - kind: User
+                name: some-user
+              - name: monitoring-tools
+        """
+    )
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/1175")
+    fun deleteNestedKeyRemovingUnusedKeysRecursively() = assertChanged(
+        recipe = DeleteKey("$.b.c.d", null),
+        before = """
+            a: a-value
+            b:
+              c:
+                d: d-value
+        """,
+        after = """
+            a: a-value
+        """
+    )
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/1175")
+    @Test
+    fun deleteKeyKeepingUnrelatedUnusedKeys() = assertChanged(
+        recipe = DeleteKey("$.jobs.build.strategy.fail-fast", null),
+        before = """
+            on:
+              push:
+                branches:
+                  - main
+                tags-ignore:
+                  - "*"
+              pull_request:
+                branches:
+                  - main
+              workflow_dispatch: {}
+              schedule:
+                - cron: 0 18 * * *
+            jobs:
+              build:
+                strategy:
+                  fail-fast: false
+                  matrix:
+                    java: ["11"]
+                    os: ["ubuntu-latest"]
+        """,
+        after = """
+            on:
+              push:
+                branches:
+                  - main
+                tags-ignore:
+                  - "*"
+              pull_request:
+                branches:
+                  - main
+              workflow_dispatch: {}
+              schedule:
+                - cron: 0 18 * * *
+            jobs:
+              build:
+                strategy:
+                  matrix:
+                    java: ["11"]
+                    os: ["ubuntu-latest"]
+        """
+    )
+
+    @Test
+    fun changeOnlyMatchingFile(@TempDir tempDir: Path) {
+        val matchingFile = tempDir.resolve("a.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("apiVersion: v1")
+        }.toFile()
+        val nonMatchingFile = tempDir.resolve("b.yml").apply {
+            toFile().parentFile.mkdirs()
+            toFile().writeText("apiVersion: v1")
+        }.toFile()
+        val recipe = DeleteKey(".apiVersion", "**/a.yml")
+        assertChanged(recipe = recipe, before = matchingFile, after = "")
+        assertUnchanged(recipe = recipe, before = nonMatchingFile)
+    }
+}
diff --git a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/FormatPreservingReaderTest.kt b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/FormatPreservingReaderTest.kt
index 925e7d1cacd..1a017d99a45 100755
--- a/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/FormatPreservingReaderTest.kt
+++ b/rewrite-yaml/src/test/kotlin/org/openrewrite/yaml/FormatPreservingReaderTest.kt
@@ -1,60 +1,60 @@
-/*
- * Copyright 2020 the original author or authors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.openrewrite.yaml
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-
-class FormatPreservingReaderTest {
-    @Test
-    fun allInCurrentBuffer() {
-        val text = "0123456789"
-        val reader = text.reader()
-        val formatPreservingReader = FormatPreservingReader(reader)
-
-        val charArray = CharArray(10)
-        formatPreservingReader.read(charArray, 0, 10)
-        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
-    }
-
-    @Test
-    fun allInPreviousBuffer() {
-        val text = "0123456789"
-        val reader = text.reader()
-        val formatPreservingReader = FormatPreservingReader(reader)
-
-        val charArray = CharArray(10)
-
-        formatPreservingReader.read(charArray, 0, 5)
-        formatPreservingReader.read(charArray, 0, 5)
-
-        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
-    }
-
-    @Test
-    fun splitBetweenPrevAndCurrentBuffer() {
-        val text = "0123456789"
-        val reader = text.reader()
-        val formatPreservingReader = FormatPreservingReader(reader)
-
-        val charArray = CharArray(10)
-
-        formatPreservingReader.read(charArray, 0, 1)
-        formatPreservingReader.read(charArray, 0, 9)
-
-        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
-    }
-}
+/*
+ * Copyright 2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.yaml
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class FormatPreservingReaderTest {
+    @Test
+    fun allInCurrentBuffer() {
+        val text = "0123456789"
+        val reader = text.reader()
+        val formatPreservingReader = FormatPreservingReader(reader)
+
+        val charArray = CharArray(10)
+        formatPreservingReader.read(charArray, 0, 10)
+        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
+    }
+
+    @Test
+    fun allInPreviousBuffer() {
+        val text = "0123456789"
+        val reader = text.reader()
+        val formatPreservingReader = FormatPreservingReader(reader)
+
+        val charArray = CharArray(10)
+
+        formatPreservingReader.read(charArray, 0, 5)
+        formatPreservingReader.read(charArray, 0, 5)
+
+        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
+    }
+
+    @Test
+    fun splitBetweenPrevAndCurrentBuffer() {
+        val text = "0123456789"
+        val reader = text.reader()
+        val formatPreservingReader = FormatPreservingReader(reader)
+
+        val charArray = CharArray(10)
+
+        formatPreservingReader.read(charArray, 0, 1)
+        formatPreservingReader.read(charArray, 0, 9)
+
+        assertThat(formatPreservingReader.prefix(0, 3)).isEqualTo("012")
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 015b80330c5..341fe1710ca 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,66 +1,66 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
-includeBuild(
-    "build-src"
-)
-
-include(
-    "rewrite-core",
-    "rewrite-gradle",
-    "rewrite-groovy",
-    "rewrite-hcl",
-    "rewrite-java",
-    "rewrite-java-8",
-    "rewrite-java-11",
-    "rewrite-json",
-    "rewrite-maven",
-    "rewrite-properties",
-    "rewrite-protobuf",
-    "rewrite-xml",
-    "rewrite-yaml",
-    "rewrite-test",
-    "rewrite-bom",
-    "rewrite-benchmarks"
-)
-
-plugins {
-    id("com.gradle.enterprise") version "latest.release"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "latest.release"
-}
-
-gradleEnterprise {
-    val isCiServer = System.getenv("CI")?.equals("true") ?: false
-    server = "https://ge.openrewrite.org/"
-    val gradleCacheRemoteUsername: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
-    val gradleCacheRemotePassword: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
-
-    buildCache {
-        remote(HttpBuildCache::class) {
-            url = uri("https://ge.openrewrite.org/cache/")
-            isPush = isCiServer
-            if (!gradleCacheRemoteUsername.isNullOrBlank() && !gradleCacheRemotePassword.isNullOrBlank()) {
-                credentials {
-                    username = gradleCacheRemoteUsername
-                    password = gradleCacheRemotePassword
-                }
-            }
-        }
-    }
-
-    buildScan {
-        capture {
-            isTaskInputFiles = true
-        }
-
-        isUploadInBackground = !isCiServer
-
-        publishAlways()
-        this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
-        publishIfAuthenticated()
-    }
-}
+pluginManagement {
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+    }
+}
+
+includeBuild(
+    "build-src"
+)
+
+include(
+    "rewrite-core",
+    "rewrite-gradle",
+    "rewrite-groovy",
+    "rewrite-hcl",
+    "rewrite-java",
+    "rewrite-java-8",
+    "rewrite-java-11",
+    "rewrite-json",
+    "rewrite-maven",
+    "rewrite-properties",
+    "rewrite-protobuf",
+    "rewrite-xml",
+    "rewrite-yaml",
+    "rewrite-test",
+    "rewrite-bom",
+    "rewrite-benchmarks"
+)
+
+plugins {
+    id("com.gradle.enterprise") version "latest.release"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "latest.release"
+}
+
+gradleEnterprise {
+    val isCiServer = System.getenv("CI")?.equals("true") ?: false
+    server = "https://ge.openrewrite.org/"
+    val gradleCacheRemoteUsername: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
+    val gradleCacheRemotePassword: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
+
+    buildCache {
+        remote(HttpBuildCache::class) {
+            url = uri("https://ge.openrewrite.org/cache/")
+            isPush = isCiServer
+            if (!gradleCacheRemoteUsername.isNullOrBlank() && !gradleCacheRemotePassword.isNullOrBlank()) {
+                credentials {
+                    username = gradleCacheRemoteUsername
+                    password = gradleCacheRemotePassword
+                }
+            }
+        }
+    }
+
+    buildScan {
+        capture {
+            isTaskInputFiles = true
+        }
+
+        isUploadInBackground = !isCiServer
+
+        publishAlways()
+        this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
+        publishIfAuthenticated()
+    }
+}