Update for compatibility with rewrite 4.0.0

Author: sambsnyd

README.md

@@ -20,7 +20,7 @@ This project implements a [Rewrite module](https://github.com/openrewrite/rewrit
 
 ## How to use?
 
-Turn on the `spring` profile in the [Rewrite Maven](https://github.com/openrewrite/rewrite-maven-plugin) plugin.
+Turn on the `org.openrewrite.spring` recipe in the [Rewrite Maven](https://github.com/openrewrite/rewrite-maven-plugin) plugin.
 
 ## Spring XML to annotation-based configuration
 

src/main/resources/META-INF/rewrite/mockito.yml

@@ -14,14 +14,14 @@
 # limitations under the License.
 #
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.mockito.MockAsOuterClass
 visitors:
   - org.openrewrite.java.ChangeType:
       type: org.mockito.MockitoAnnotations.Mock
       targetType: org.mockito.Mock
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.mockito.ArgumentMatchersAny
 visitors:
   - org.openrewrite.java.ChangeMethodName:
@@ -31,14 +31,14 @@ visitors:
       type: org.mockito.Matchers
       targetType: org.mockito.ArgumentMatchers
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.mockito.InvocationOnMockGetArgument
 visitors:
   - org.openrewrite.java.ChangeMethodName:
       method: org.mockito.invocation.InvocationOnMock getArgumentAt(int, java.lang.Class)
       name: getArgument
 ---
-type: beta.openrewrite.org/v1/profile
-name: mockito
+type: openrewrite.org/v1beta/recipe
+name: org.openrewrite.mockito
 include:
   - 'org.openrewrite.mockito.*'

src/main/resources/META-INF/rewrite/rewrite-spring-boot2.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.UpgradeDependencies
 visitors:
   - org.openrewrite.maven.UpgradeVersion:
@@ -28,9 +28,8 @@ visitors:
       groupId: org.mockito
       toVersion: 3.x
 ---
-type: beta.openrewrite.org/v1/profile
-name: spring-boot2-migration
-extend: spring
+type: openrewrite.org/v1beta/recipe
+name: org.openrewrite.spring-boot2-migration
 include:
   - org.openrewrite.spring.boot.*
   - org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_3

src/main/resources/META-INF/rewrite/rewrite-spring.yml

@@ -14,16 +14,16 @@
 # limitations under the License.
 #
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.SpringBootServletInitializerPackage
 
 visitors:
   - org.openrewrite.java.ChangeType:
       type: org.springframework.boot.web.support.SpringBootServletInitializer
       targetType: org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 ---
-type: beta.openrewrite.org/v1/profile
-name: spring
+type: openrewrite.org/v1beta/recipe
+name: org.openrewrite.spring
 include:
   - 'org.openrewrite.spring.*'
 
@@ -34,4 +34,4 @@ exclude:
   - org.openrewrite.spring.ConstructorInjection
   # not always preferable, but when you prefer to be more
   # declarative and rely less on component scanning
-  - org.openrewrite.spring.ComponentToBeanConfiguration
+  - org.openrewrite.spring.ComponentToBeanConfiguration

src/main/resources/META-INF/rewrite/spring-boot-configuration-migration.yml

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright 2020 the original author or authors.
 # <p>
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,9 +12,9 @@
 # WITHOUT 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: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_0
 
 visitors:
@@ -524,7 +524,7 @@ visitors:
       toProperty: spring.thymeleaf.servlet.content-type
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_0
 
 visitors:
@@ -1034,7 +1034,7 @@ visitors:
       toProperty: spring.thymeleaf.servlet.content-type
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_1
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_0
 visitors:
@@ -1112,7 +1112,7 @@ visitors:
       toProperty: spring.resources.chain.compressed
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_1
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_0
 visitors:
@@ -1190,7 +1190,7 @@ visitors:
       toProperty: spring.resources.chain.compressed
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_2
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_1
 visitors:
@@ -1241,7 +1241,7 @@ visitors:
       toProperty: spring.reactor.debug-agent.enabled
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_2
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_1
 visitors:
@@ -1292,7 +1292,7 @@ visitors:
       toProperty: spring.reactor.debug-agent.enabled
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_3
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_2
 visitors:
@@ -1358,7 +1358,7 @@ visitors:
       toProperty: spring.mvc.log-request-details
 
 ---
-type: beta.openrewrite.org/v1/visitor
+type: openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_3
 extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_2
 visitors:

src/test/kotlin/org/openrewrite/mockito/MockUtilsToStaticTest.kt

@@ -15,13 +15,11 @@
  */
 package org.openrewrite.mockito
 
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.openrewrite.RefactorVisitor
 import org.openrewrite.RefactorVisitorTestForParser
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
-import org.openrewrite.loadVisitors
 
 class MockUtilsToStaticTest : RefactorVisitorTestForParser<J.CompilationUnit> {
 

src/test/kotlin/org/openrewrite/mockito/MockitoUpgrade1To3Tests.kt

@@ -17,18 +17,17 @@ package org.openrewrite.mockito
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.*
-import org.openrewrite.java.ChangeMethodName
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
 
 /**
- * Validates the profiles related to upgrading from Mockito 1 to Mockito 3
+ * Validates the recipes related to upgrading from Mockito 1 to Mockito 3
  */
 class MockitoUpgrade1To3Tests : RefactorVisitorTestForParser<J.CompilationUnit> {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
             .classpath("mockito-all", "junit")
             .build()
-    override val visitors: Iterable<RefactorVisitor<*>> = loadVisitors("mockito")
+    override val visitors: Iterable<RefactorVisitor<*>> = loadVisitors("org.openrewrite.mockito")
 
     /**
      * Replace org.mockito.MockitoAnnotations.Mock with org.mockito.Mock

src/test/kotlin/org/openrewrite/spring/GeneratePropertiesMigratorConfiguration.kt

@@ -85,7 +85,7 @@ object GeneratePropertiesMigratorConfiguration {
                             config.appendText("""
 
                                 ---
-                                type: beta.openrewrite.org/v1/visitor
+                                type: openrewrite.org/v1beta/visitor
                                 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$majorMinor
                                 ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$previousVersion" } ?: ""}
                                 visitors:
@@ -104,7 +104,7 @@ object GeneratePropertiesMigratorConfiguration {
                             config.appendText("""
                                 
                                 ---
-                                type: beta.openrewrite.org/v1/visitor
+                                type: openrewrite.org/v1beta/visitor
                                 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$majorMinor
                                 ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$previousVersion" } ?: ""}
                                 visitors:

src/test/kotlin/org/openrewrite/spring/SpringBootServletInitializerTest.kt

@@ -27,7 +27,7 @@ class SpringBootServletInitializerTest : RefactorVisitorTestForParser<J.Compilat
     override val parser: JavaParser = JavaParser.fromJavaVersion()
             .classpath("spring-boot")
             .build()
-    override val visitors: Iterable<RefactorVisitor<*>> = loadVisitors("spring")
+    override val visitors: Iterable<RefactorVisitor<*>> = loadVisitors("org.openrewrite.spring")
 
     @Test
     fun changeType() = assertRefactored(