Skip to content

Preserve receiver effects when retargeting methods to static calls #8467

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.

Sign up for GitHub

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

Draft
martinfrancois wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Preserve receiver effects when retargeting methods to static calls #8467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 89 additions & 0 deletions rewrite-java-test/src/test/java/org/openrewrite/java/ChangeMethodTargetToStaticTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.Issue;
import org.openrewrite.test.RewriteTest;

Expand Down Expand Up @@ -185,6 +186,94 @@ public void test() {
);
}

@ExpectedToFail("Deleting the read of a statically imported field also deletes the class initialization of its declaring class (JLS 12.4.1)")
@Test
void staticallyImportedFieldReceiverNotChanged() {
rewriteRun(
spec -> spec.recipe(new ChangeMethodTargetToStatic("a.A stat()", "b.B", null, null, false)),
java(
"""
package a;
public class A {
public void stat() {}
}
"""
),
java(
"""
package b;
public class B {
public static void stat() {}
}
"""
),
java(
"""
package holder;
import a.A;
public class Holder {
public static final A INSTANCE = new A();
static {
System.setProperty("holder.initialized", "true");
}
}
"""
),
java(
"""
import static holder.Holder.INSTANCE;

class C {
public void test() {
INSTANCE.stat();
}
}
"""
)
);
}

@ExpectedToFail("Collapsing a chain where the pattern matches both calls drops the intermediate call's arguments and their side effects")
@Test
void chainedCallsNotCollapsedWhenArgumentsWouldBeDropped() {
rewriteRun(
spec -> spec.recipe(new ChangeMethodTargetToStatic("a.A *(..)", "b.B", null, null, false)),
java(
"""
package a;
public class A {
public A combine(String s) { return this; }
public String value() { return "x"; }
}
"""
),
java(
"""
package b;
public class B {
public static B combine(String s) { return null; }
public static String value() { return "x"; }
}
"""
),
java(
"""
import a.A;

class C {
String test(A legacy) {
return legacy.combine(argument()).value();
}

String argument() {
return "arg";
}
}
"""
)
);
}

@Test
void memberReferenceTargetToStatic() {
rewriteRun(
Expand Down