Skip to content

Commit 5a5fbd1

Browse files
committed
Avoid changing javax.annotation.processing and concurrent
- Fixes #731
1 parent 276c44b commit 5a5fbd1

File tree

2 files changed

+35
-8
lines changed

2 files changed

+35
-8
lines changed

src/main/resources/META-INF/rewrite/jakarta-ee-9.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ recipeList:
116116
groupId: jakarta.annotation
117117
artifactId: jakarta.annotation-api
118118
newVersion: 2.0.x
119-
- org.openrewrite.java.ChangePackage:
120-
oldPackageName: javax.annotation.processing
121-
newPackageName: jakarta.annotation.processing
122-
- org.openrewrite.java.ChangePackage:
123-
oldPackageName: javax.annotation.concurrent
124-
newPackageName: jakarta.annotation.concurrent
125119
- org.openrewrite.java.ChangePackage:
126120
oldPackageName: javax.annotation
127121
newPackageName: jakarta.annotation
128-
recursive: true
129-
122+
# Avoid changing javax.annotation.concurrent and javax.annotation.processing
123+
recursive: false
124+
- org.openrewrite.java.ChangePackage:
125+
oldPackageName: javax.annotation.security
126+
newPackageName: jakarta.annotation.security
127+
- org.openrewrite.java.ChangePackage:
128+
oldPackageName: javax.annotation.sql
129+
newPackageName: jakarta.annotation.sql
130130
---
131131
type: specs.openrewrite.org/v1beta/recipe
132132
name: org.openrewrite.java.migrate.jakarta.JavaxAuthenticationMigrationToJakartaAuthentication

src/test/java/org/openrewrite/java/migrate/jakarta/JavaxToJakartaTest.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.intellij.lang.annotations.Language;
1919
import org.junit.jupiter.api.Test;
2020
import org.openrewrite.DocumentExample;
21+
import org.openrewrite.Issue;
2122
import org.openrewrite.config.Environment;
2223
import org.openrewrite.java.JavaParser;
2324
import org.openrewrite.test.RecipeSpec;
@@ -656,4 +657,30 @@ void shouldRefactorSpringBeanXml() {
656657
)
657658
);
658659
}
660+
661+
@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/731")
662+
@Test
663+
void doNotChangeImportsOfJavaAnnotationProcessorApi() {
664+
rewriteRun(
665+
java(
666+
"""
667+
import java.util.Set;
668+
import javax.annotation.processing.AbstractProcessor;
669+
import javax.annotation.processing.RoundEnvironment;
670+
import javax.annotation.processing.SupportedAnnotationTypes;
671+
import javax.lang.model.element.TypeElement;
672+
673+
@SupportedAnnotationTypes("MyAnnotation")
674+
public class MyAnnotationProcessor extends AbstractProcessor {
675+
676+
@Override
677+
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
678+
return false;
679+
}
680+
681+
}
682+
"""
683+
)
684+
);
685+
}
659686
}

0 commit comments

Comments
 (0)