From a22d95f0247b896e315d00467a15d4cd99408a9c Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 5 Aug 2026 09:20:28 +0200 Subject: [PATCH] Make subpackage recursion explicit in the Micronaut LDAP rename `io.micronaut.configuration.security.ldap` -> `io.micronaut.security.ldap` omits `recursive` while depending on it, so types in its subpackages were never migrated. Verified against the published artifacts: micronaut-security-ldap 1.4.0 -> 4.13.0 io.micronaut.configuration.security.ldap.configuration -> io.micronaut.security.ldap.configuration io.micronaut.configuration.security.ldap.context -> io.micronaut.security.ldap.context io.micronaut.configuration.security.ldap.group -> io.micronaut.security.ldap.group All three map exactly under prefix substitution, so recursion is both safe and required here. The sibling `io.micronaut.configuration.cassandra` rule is left alone: that package has no subpackages in micronaut-cassandra 1.2.0. This had no test coverage at all. `ChangePackage.recursive` is `@Nullable` with no documented default, and a null was read as non-recursive by the recipe's preconditions but as recursive by its visitor, so a subpackage type was renamed only for files that also referenced a type sitting directly in `oldPackageName`. The new test covers both the direct and the subpackage type; the subpackage case fails without this change. --- .../META-INF/rewrite/micronaut2-to-3.yml | 1 + .../Micronaut2to3PackageMigrationTest.java | 87 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 src/test/java/org/openrewrite/java/micronaut/Micronaut2to3PackageMigrationTest.java diff --git a/src/main/resources/META-INF/rewrite/micronaut2-to-3.yml b/src/main/resources/META-INF/rewrite/micronaut2-to-3.yml index aab44e4..400a7ec 100644 --- a/src/main/resources/META-INF/rewrite/micronaut2-to-3.yml +++ b/src/main/resources/META-INF/rewrite/micronaut2-to-3.yml @@ -46,6 +46,7 @@ recipeList: - org.openrewrite.java.ChangePackage: oldPackageName: io.micronaut.configuration.security.ldap newPackageName: io.micronaut.security.ldap + recursive: true - org.openrewrite.java.ChangeMethodName: methodPattern: io.micronaut.context.ApplicationContext build(..) newMethodName: builder diff --git a/src/test/java/org/openrewrite/java/micronaut/Micronaut2to3PackageMigrationTest.java b/src/test/java/org/openrewrite/java/micronaut/Micronaut2to3PackageMigrationTest.java new file mode 100644 index 0000000..478dbac --- /dev/null +++ b/src/test/java/org/openrewrite/java/micronaut/Micronaut2to3PackageMigrationTest.java @@ -0,0 +1,87 @@ +/* + * Copyright 2026 the original author or authors. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * https://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS 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.micronaut; + +import org.junit.jupiter.api.Test; +import org.openrewrite.java.JavaParser; +import org.openrewrite.test.RecipeSpec; +import org.openrewrite.test.RewriteTest; + +import static org.openrewrite.java.Assertions.java; + +class Micronaut2to3PackageMigrationTest implements RewriteTest { + + @Override + public void defaults(RecipeSpec spec) { + spec.recipeFromResources("org.openrewrite.java.micronaut.Micronaut2to3Migration") + .parser(JavaParser.fromJavaVersion().dependsOn( + """ + package io.micronaut.configuration.security.ldap; + public class LdapAuthenticationProvider {} + """, + """ + package io.micronaut.configuration.security.ldap.context; + public class LdapSearchService {} + """ + )); + } + + @Test + void migrateLdapType() { + rewriteRun( + //language=java + java( + """ + import io.micronaut.configuration.security.ldap.LdapAuthenticationProvider; + + class A { + LdapAuthenticationProvider provider; + } + """, + """ + import io.micronaut.security.ldap.LdapAuthenticationProvider; + + class A { + LdapAuthenticationProvider provider; + } + """ + ) + ); + } + + @Test + void migrateLdapTypeInSubpackage() { + rewriteRun( + //language=java + java( + """ + import io.micronaut.configuration.security.ldap.context.LdapSearchService; + + class A { + LdapSearchService service; + } + """, + """ + import io.micronaut.security.ldap.context.LdapSearchService; + + class A { + LdapSearchService service; + } + """ + ) + ); + } +}