Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ recipeDependencies {
parserClasspath("com.google.errorprone:error_prone_core:2.+")

testParserClasspath("com.sun.faces:jsf-api:2.1.29-11")
testParserClasspath("com.sun.istack:istack-commons-runtime:4.1.2")
testParserClasspath("jakarta.el:jakarta.el-api:4.0.0")
testParserClasspath("jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1")
testParserClasspath("jakarta.faces:jakarta.faces-api:3.0.0")
testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.0-M6")
testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.1")
testParserClasspath("jakarta.servlet:jakarta.servlet-api:4.0.2")
testParserClasspath("jakarta.servlet:jakarta.servlet-api:5.0.0")
testParserClasspath("jakarta.validation:jakarta.validation-api:3.0.2")
testParserClasspath("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
testParserClasspath("jakarta.xml.soap:jakarta.xml.soap-api:2.0.1")
testParserClasspath("javax.enterprise:cdi-api:2.0.SP1")
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/META-INF/rewrite/jakarta-ee-9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ recipeList:
version: 3.0.x
onlyIfUsing: javax.validation..*
acceptTransitive: true
- org.openrewrite.java.dependencies.AddDependency:
groupId: jakarta.validation
artifactId: jakarta.validation-api
version: 3.0.x
onlyIfUsing: com.sun.istack.NotNull
acceptTransitive: true
- org.openrewrite.java.ChangePackage:
oldPackageName: javax.validation
newPackageName: jakarta.validation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.Issue;
import org.openrewrite.config.Environment;
import org.openrewrite.java.JavaParser;
import org.openrewrite.test.RecipeSpec;
Expand Down Expand Up @@ -96,61 +95,68 @@ public class Example {
);
}

@Issue("https://github.com/moderneinc/customer-requests/issues/1526")
@Test
void sunIstackNotNullToJakartaValidation() {
void sunIstackNotNullToJakartaValidationAddsDependency() {
rewriteRun(
spec -> spec.parser(JavaParser.fromJavaVersion().dependsOn(
//language=java
"""
package com.sun.istack;
import java.lang.annotation.*;
@Documented
@Retention(RetentionPolicy.CLASS)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
public @interface NotNull {
}
""",
//language=java
"""
package jakarta.validation.constraints;
import java.lang.annotation.*;
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE})
public @interface NotNull {
String message() default "{jakarta.validation.constraints.NotNull.message}";
Class<?>[] groups() default {};
Class<?>[] payload() default {};
}
"""
)),
//language=java
java(
"""
import com.sun.istack.NotNull;
spec -> spec.parser(JavaParser.fromJavaVersion()
.classpathFromResources(new InMemoryExecutionContext(), "istack-commons-runtime-4.1.2", "jakarta.validation-api-3.0.2")),
mavenProject(
"Sample",
srcMainJava(
//language=java
java(
"""
import com.sun.istack.NotNull;

public class Example {
@NotNull
private String name;
public class Example {
@NotNull
private String name;

public void setName(@NotNull String name) {
this.name = name;
public void setName(@NotNull String name) {
this.name = name;
}
}
}
""",
"""
import jakarta.validation.constraints.NotNull;
""",
"""
import jakarta.validation.constraints.NotNull;

public class Example {
@NotNull
private String name;
public class Example {
@NotNull
private String name;

public void setName(@NotNull String name) {
this.name = name;
public void setName(@NotNull String name) {
this.name = name;
}
}
}
"""
)
),
//language=xml
pomXml(
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
</project>
""",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>
</project>
"""
)
)
);
}
Expand Down
Binary file modified src/test/resources/META-INF/rewrite/classpath.tsv.gz
Binary file not shown.
Loading