Skip to content
Draft
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 @@ -25,6 +25,7 @@ recipeDependencies {
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.jws:jakarta.jws-api:3.0.0")
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 Expand Up @@ -93,6 +94,7 @@ dependencies {
testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-jaxb-annotations")
testRuntimeOnly("commons-logging:commons-logging:1.3.2")
testRuntimeOnly("org.apache.logging.log4j:log4j-api:2.23.1")
testRuntimeOnly("jakarta.jws:jakarta.jws-api:3.0.0")
testRuntimeOnly("org.apache.johnzon:johnzon-core:1.2.18")
testRuntimeOnly("org.apache.groovy:groovy:4.+")
testRuntimeOnly("org.jboss.logging:jboss-logging:3.6.0.Final")
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/META-INF/rewrite/jakarta-ee-10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ recipeList:
version: 4.0.x
onlyIfUsing: jakarta.jws..*
acceptTransitive: true

---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.migrate.jakarta.UpdateJerseyDependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@

import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.java.JavaParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;

import static org.assertj.core.api.Assertions.assertThat;
import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.java.Assertions.mavenProject;
import static org.openrewrite.java.Assertions.srcMainJava;
import static org.openrewrite.maven.Assertions.pomXml;

class ReplaceJakartaJwsWithJakartaXmlWsTest implements RewriteTest {
Expand Down Expand Up @@ -61,6 +65,82 @@ void replacesJakartaJwsApiInPlaceWithJakartaXmlWsApi() {
);
}

@Test
void avoidDuplicateWsApi() {
rewriteRun(
//language=xml
pomXml(
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>
</project>
""",
spec -> spec.after(pom -> assertThat(pom)
.doesNotContain("jakarta.jws")
// Verify only one entry of `jakarta.xml.ws-api` exists
.containsOnlyOnce("jakarta.xml.ws-api")
// Verify the dependency was upgraded to a 4.x version, without pinning the exact patch
.contains("<version>4")
.actual())
)
);
}

@Test
void addsJakartaXmlWsApiWhenJwsIsOnlyTransitive() {
rewriteRun(
spec -> spec.parser(JavaParser.fromJavaVersion().classpath("jakarta.jws-api")),
mavenProject(
"demo",
//language=java
srcMainJava(
java(
"""
import jakarta.jws.WebService;

@WebService
public class HelloService {
public String sayHello(String name) {
return "Hello, " + name;
}
}
"""
)
),
//language=xml
pomXml(
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>demo</artifactId>
<version>0.0.1-SNAPSHOT</version>
</project>
""",
spec -> spec.after(pom -> assertThat(pom)
.containsOnlyOnce("jakarta.xml.ws-api")
.contains("<version>4")
.actual())
)
)
);
}

@Test
void noChangeWhenJakartaJwsApiNotPresent() {
rewriteRun(
Expand Down
Loading