Skip to content

Commit 3113a03

Browse files
committed
Verify ChangeDependencyArtifactId works with .kts
1 parent d8bced4 commit 3113a03

2 files changed

Lines changed: 45 additions & 10 deletions

File tree

rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,19 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
8383
GradleProject gradleProject;
8484

8585
@Override
86-
public @org.jspecify.annotations.Nullable J visit(@org.jspecify.annotations.Nullable Tree tree, ExecutionContext ctx) {
86+
public @Nullable J visit(@Nullable Tree tree, ExecutionContext ctx) {
8787
if (tree instanceof JavaSourceFile) {
8888
JavaSourceFile sf = (JavaSourceFile) tree;
8989
Optional<GradleProject> maybeGp = sf.getMarkers().findFirst(GradleProject.class);
90-
if (!maybeGp.isPresent()) {
91-
return (J) tree;
92-
}
93-
gradleProject = maybeGp.get();
94-
J result = super.visit(tree, ctx);
95-
if (result != tree && result instanceof JavaSourceFile) {
96-
JavaSourceFile updated = (JavaSourceFile) result;
97-
result = updated.withMarkers(updated.getMarkers().setByType(updateGradleModel(gradleProject)));
90+
if (maybeGp.isPresent()) {
91+
gradleProject = maybeGp.get();
92+
J result = super.visit(tree, ctx);
93+
if (result != tree && result instanceof JavaSourceFile) {
94+
JavaSourceFile updated = (JavaSourceFile) result;
95+
return updated.withMarkers(updated.getMarkers().setByType(updateGradleModel(gradleProject)));
96+
}
9897
}
99-
return result;
98+
return sf;
10099
}
101100
return super.visit(tree, ctx);
102101
}

rewrite-gradle/src/test/java/org/openrewrite/gradle/ChangeDependencyArtifactIdTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import static org.assertj.core.api.Assertions.assertThat;
2828
import static org.openrewrite.gradle.Assertions.buildGradle;
29+
import static org.openrewrite.gradle.Assertions.buildGradleKts;
2930
import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
3031

3132
class ChangeDependencyArtifactIdTest implements RewriteTest {
@@ -450,6 +451,41 @@ void worksWithDependencyDefinedInBuildScript() {
450451
);
451452
}
452453

454+
@Test
455+
void worksWithEmptyStringConfigKts() {
456+
rewriteRun(
457+
spec -> spec.recipe(new ChangeDependencyArtifactId("org.springframework.boot", "spring-boot-starter", "new-starter", "")),
458+
buildGradleKts(
459+
"""
460+
plugins {
461+
id("java-library")
462+
}
463+
464+
repositories {
465+
mavenCentral()
466+
}
467+
468+
dependencies {
469+
implementation("org.springframework.boot:spring-boot-starter:2.5.4")
470+
}
471+
""",
472+
"""
473+
plugins {
474+
id("java-library")
475+
}
476+
477+
repositories {
478+
mavenCentral()
479+
}
480+
481+
dependencies {
482+
implementation("org.springframework.boot:new-starter:2.5.4")
483+
}
484+
"""
485+
)
486+
);
487+
}
488+
453489
@Test
454490
void dependenciesBlockInFreestandingScript() {
455491
rewriteRun(

0 commit comments

Comments
 (0)