Consistent recipe and visitor naming

jkschneider · jkschneider · commit 77ff98c0680a · 2020-09-06T17:07:51.000-07:00
diff --git a/src/main/resources/META-INF/rewrite/mockito.yml b/src/main/resources/META-INF/rewrite/mockito.yml
@@ -15,14 +15,14 @@
 #
 ---
 type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.mockito.MockAsOuterClass
+name: org.openrewrite.java.mockito.MockAsOuterClass
 visitors:
   - org.openrewrite.java.ChangeType:
       type: org.mockito.MockitoAnnotations.Mock
       targetType: org.mockito.Mock
 ---
 type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.mockito.ArgumentMatchersAny
+name: org.openrewrite.java.mockito.ArgumentMatchersAny
 visitors:
   - org.openrewrite.java.ChangeMethodName:
       method: org.mockito.Matchers anyVararg()
@@ -32,13 +32,13 @@ visitors:
       targetType: org.mockito.ArgumentMatchers
 ---
 type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.mockito.InvocationOnMockGetArgument
+name: org.openrewrite.java.mockito.InvocationOnMockGetArgument
 visitors:
   - org.openrewrite.java.ChangeMethodName:
       method: org.mockito.invocation.InvocationOnMock getArgumentAt(int, java.lang.Class)
       name: getArgument
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.mockito
+name: org.openrewrite.java.Mockito
 include:
-  - 'org.openrewrite.mockito.*'
+  - 'org.openrewrite.java.mockito.*'
diff --git a/src/main/resources/META-INF/rewrite/rewrite-spring-boot2.yml b/src/main/resources/META-INF/rewrite/rewrite-spring-boot2.yml
@@ -15,15 +15,15 @@
 #
 ---
 type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.spring.boot.SpringBootServletInitializerPackage
+name: org.openrewrite.java.spring.boot.SpringBootServletInitializerPackage
 
 visitors:
   - org.openrewrite.java.ChangeType:
       type: org.springframework.boot.web.support.SpringBootServletInitializer
       targetType: org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 ---
 type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.spring.boot.UpgradeDependencies
+name: org.openrewrite.java.spring.boot.UpgradeDependencies
 visitors:
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: org.springframework.boot
@@ -37,8 +37,14 @@ visitors:
       toVersion: 3.x
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.spring-boot2-migration
+name: org.openrewrite.java.SpringBoot2Migration
 include:
-  - org.openrewrite.spring.boot.*
-  - org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_3
-  - org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_3
+  - org.openrewrite.java.spring.boot.*
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationYaml.2_0
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationProperties.2_0
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationYaml.2_1
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationProperties.2_1
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationYaml.2_2
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationProperties.2_2
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationYaml.2_3
+  - org.openrewrite.java.spring.boot.config.SpringBootConfigurationProperties.2_3
diff --git a/src/main/resources/META-INF/rewrite/rewrite-spring.yml b/src/main/resources/META-INF/rewrite/rewrite-spring.yml
@@ -15,7 +15,7 @@
 #
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.spring
+name: org.openrewrite.java.Spring
 include:
   - 'org.openrewrite.spring.*'
 
diff --git a/src/main/resources/META-INF/rewrite/spring-boot-configuration-migration.yml b/src/main/resources/META-INF/rewrite/spring-boot-configuration-migration.yml
@@ -1036,7 +1036,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_1
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_0
 visitors:
   - org.openrewrite.properties.ChangePropertyKey:
       property: management.metrics.binders.files.enabled
@@ -1114,7 +1113,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_1
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_0
 visitors:
   - org.openrewrite.yaml.ChangePropertyKey:
       property: management.metrics.binders.files.enabled
@@ -1192,7 +1190,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_2
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_1
 visitors:
   - org.openrewrite.properties.ChangePropertyKey:
       property: logging.file
@@ -1243,7 +1240,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_2
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_1
 visitors:
   - org.openrewrite.yaml.ChangePropertyKey:
       property: logging.file
@@ -1294,7 +1290,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_3
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.2_2
 visitors:
   - org.openrewrite.properties.ChangePropertyKey:
       property: management.metrics.web.client.requests-metric-name
@@ -1360,7 +1355,6 @@ visitors:
 ---
 type: specs.openrewrite.org/v1beta/visitor
 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_3
-extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.2_2
 visitors:
   - org.openrewrite.yaml.ChangePropertyKey:
       property: management.metrics.web.client.requests-metric-name
diff --git a/src/test/kotlin/org/openrewrite/spring/GeneratePropertiesMigratorConfiguration.kt b/src/test/kotlin/org/openrewrite/spring/GeneratePropertiesMigratorConfiguration.kt
@@ -47,7 +47,6 @@ object GeneratePropertiesMigratorConfiguration {
         val config = File("src/main/resources/META-INF/rewrite/spring-boot-configuration-migration.yml")
         config.writeText("\n${File("gradle/licenseHeader.txt").readText()}\n".prependIndent("# "))
 
-        var previousVersion: String? = null
         val alreadyDefined = mutableSetOf<String>()
         latestPatchReleases.filter { v -> v.startsWith("2") }.forEach { version ->
             val versionDir = File(releasesDir, version)
@@ -87,7 +86,6 @@ object GeneratePropertiesMigratorConfiguration {
                                 ---
                                 type: specs.openrewrite.org/v1beta/visitor
                                 name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$majorMinor
-                                ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$previousVersion" } ?: ""}
                                 visitors:
                             """.trimIndent())
 
@@ -106,7 +104,6 @@ object GeneratePropertiesMigratorConfiguration {
                                 ---
                                 type: specs.openrewrite.org/v1beta/visitor
                                 name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$majorMinor
-                                ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$previousVersion" } ?: ""}
                                 visitors:
                             """.trimIndent())
 
@@ -119,8 +116,6 @@ object GeneratePropertiesMigratorConfiguration {
                                         """.trimIndent().prependIndent("  ")
                                     }
                             )
-
-                            previousVersion = majorMinor
                         }
                     }
         }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#`
`16`	`16`	`---`
`17`	`17`	`type: specs.openrewrite.org/v1beta/recipe`
`18`		`-name: org.openrewrite.spring`
	`18`	`+name: org.openrewrite.java.Spring`
`19`	`19`	`include:`
`20`	`20`	`- 'org.openrewrite.spring.*'`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ object GeneratePropertiesMigratorConfiguration {`
`47`	`47`	`val config = File("src/main/resources/META-INF/rewrite/spring-boot-configuration-migration.yml")`
`48`	`48`	`config.writeText("\n${File("gradle/licenseHeader.txt").readText()}\n".prependIndent("# "))`
`49`	`49`
`50`		`- var previousVersion: String? = null`
`51`	`50`	`val alreadyDefined = mutableSetOf<String>()`
`52`	`51`	`latestPatchReleases.filter { v -> v.startsWith("2") }.forEach { version ->`
`53`	`52`	`val versionDir = File(releasesDir, version)`
`@@ -87,7 +86,6 @@ object GeneratePropertiesMigratorConfiguration {`
`87`	`86`	`---`
`88`	`87`	`type: specs.openrewrite.org/v1beta/visitor`
`89`	`88`	`name: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$majorMinor`
`90`		`- ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationProperties.$previousVersion" } ?: ""}`
`91`	`89`	`visitors:`
`92`	`90`	`""".trimIndent())`
`93`	`91`
`@@ -106,7 +104,6 @@ object GeneratePropertiesMigratorConfiguration {`
`106`	`104`	`---`
`107`	`105`	`type: specs.openrewrite.org/v1beta/visitor`
`108`	`106`	`name: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$majorMinor`
`109`		`- ${previousVersion?.let { "extends: org.openrewrite.spring.boot.config.SpringBootConfigurationYaml.$previousVersion" } ?: ""}`
`110`	`107`	`visitors:`
`111`	`108`	`""".trimIndent())`
`112`	`109`
`@@ -119,8 +116,6 @@ object GeneratePropertiesMigratorConfiguration {`
`119`	`116`	`""".trimIndent().prependIndent(" ")`
`120`	`117`	`}`
`121`	`118`	`)`
`122`		`-`
`123`		`- previousVersion = majorMinor`
`124`	`119`	`}`
`125`	`120`	`}`
`126`	`121`	`}`