Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not fail ParameterizedLogging for Kotlin String templates #187

Merged
merged 3 commits into from
Nov 29, 2024
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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-params:latest.release")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:latest.release")

testImplementation("org.openrewrite:rewrite-kotlin:${rewriteVersion}")
testImplementation("org.openrewrite:rewrite-maven")
testImplementation("org.openrewrite:rewrite-test")
testImplementation("org.openrewrite:rewrite-java-tck")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;
import org.openrewrite.java.tree.TypeUtils;
import org.openrewrite.staticanalysis.kotlin.KotlinFileChecker;

import java.util.*;

Expand Down Expand Up @@ -68,7 +69,10 @@ public Set<String> getTags() {

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
return Preconditions.check(new UsesMethod<>(methodPattern, true), new JavaIsoVisitor<ExecutionContext>() {
TreeVisitor<?, ExecutionContext> preconditions = Preconditions.and(
new UsesMethod<>(methodPattern, true),
Preconditions.not(new KotlinFileChecker<>()));
return Preconditions.check(preconditions, new JavaIsoVisitor<ExecutionContext>() {
private final MethodMatcher matcher = new MethodMatcher(methodPattern, true);
private final RemoveToStringVisitor removeToStringVisitor = new RemoveToStringVisitor();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.Issue;
import org.openrewrite.java.JavaParser;
import org.openrewrite.kotlin.KotlinParser;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;

import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.kotlin.Assertions.kotlin;

@SuppressWarnings({
"EmptyTryBlock",
Expand Down Expand Up @@ -613,15 +615,35 @@ static void method(Logger logger, Marker marker, String name) {
}
""",
"""
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.Logger;
import org.slf4j.Marker;

class Test {
static void method(Logger logger, Marker marker, String name) {
logger.info(marker, "Hello {}, nice to meet you {}", name, name);
}
}
"""
class Test {
static void method(Logger logger, Marker marker, String name) {
logger.info(marker, "Hello {}, nice to meet you {}", name, name);
}
}
"""
)
);
}

@Test
void kotlinStringTemplateSkipped() {
rewriteRun(
spec -> spec
.recipe(new ParameterizedLogging("org.slf4j.Logger info(..)", false))
.parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "slf4j-api-2.1")),
//language=kotlin
kotlin(
"""
import org.slf4j.Logger

fun main(logger: Logger, name: String) {
logger.info("Hello $name")
logger.info("Hello " + name)
}
"""
)
);
}
Expand Down