Skip to content

LombokValueToRecord should rewrite method references too #469

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

Merged
merged 11 commits into from
Jul 18, 2025
Merged

LombokValueToRecord should rewrite method references too #469

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
038637c
try to rewrite method references
holgpar May 1, 2024
6047491
Merge branch 'main' into main
timtebeek Apr 9, 2025
a878f6d
Apply suggestions from code review
timtebeek Jul 16, 2025
4004540
Merge branch 'main' into main
timtebeek Jul 17, 2025
5644f4b
Alter implementation and polish tests
timtebeek Jul 17, 2025
5e78969
Stop ignoring type validation issues
timtebeek Jul 17, 2025
905a26f
Also update method type
timtebeek Jul 17, 2025
dd7b274
Light polish
timtebeek Jul 18, 2025
93bb699
Minimize test
timtebeek Jul 18, 2025
ff1a26b
Fix annotation order
timtebeek Jul 18, 2025
e4af006
Pull up suppressions
timtebeek Jul 18, 2025
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
26 changes: 26 additions & 0 deletions src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,32 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
);
}

@Override
public J.MemberReference visitMemberReference(J.MemberReference memberRef, ExecutionContext ctx) {
J.MemberReference memberReference = super.visitMemberReference(memberRef, ctx);

Expression containing = memberReference.getContaining();
if (containing.getType() instanceof JavaType.Class) {
String classFqn = ((JavaType.Class) containing.getType()).getFullyQualifiedName();
J.Identifier reference = memberReference.getReference();
String methodName = reference.getSimpleName();
String newSimpleName = getterMethodNameToFluentMethodName(methodName);
if (recordTypeToMembers.containsKey(classFqn) &&
methodName.startsWith(STANDARD_GETTER_PREFIX) &&
recordTypeToMembers.get(classFqn).contains(newSimpleName)) {

JavaType.Method methodType = memberReference.getMethodType();
if (methodType != null) {
methodType = methodType.withName(newSimpleName);
}
return memberReference
.withReference(reference.withSimpleName(newSimpleName))
.withMethodType(methodType);
}
}
return memberReference;
}

private boolean isMethodInvocationOnRecordTypeClassMember(J.MethodInvocation methodInvocation) {
Expression expression = methodInvocation.getSelect();
if (!isClassExpression(expression)) {
Expand Down
53 changes: 44 additions & 9 deletions src/test/java/org/openrewrite/java/migrate/lombok/LombokValueToRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

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

@SuppressWarnings("NullableProblems")
class LombokValueToRecordTest implements RewriteTest {

@Override
Expand All @@ -46,8 +47,6 @@ public void defaults(RecipeSpec spec) {
void convertOnlyValueAnnotatedClassWithoutDefaultValuesToRecord() {
//language=java
rewriteRun(
// TODO: find a way to please type validation so this workaround is not required anymore
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand Down Expand Up @@ -142,7 +141,6 @@ public String toString() {
void onlyRemoveAnnotationFromRecords() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand Down Expand Up @@ -185,7 +183,6 @@ public class B {
void innerRecordsNotStatic() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand Down Expand Up @@ -218,7 +215,6 @@ record B(
void interfaceIsImplementedThatDoesNotDefineFieldGetter() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand Down Expand Up @@ -248,13 +244,13 @@ public record A(
void plainLombokBuilder() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;

import lombok.Value;
import lombok.Builder;
import java.io.Serializable;

@Value
@Builder
Expand All @@ -266,6 +262,7 @@ public class A implements Serializable {
package example;

import lombok.Builder;
import java.io.Serializable;

@Builder
public record A(
Expand All @@ -274,9 +271,49 @@ public record A(
"""
)
);
}

@Test
@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/449")
void methodReferences() {
//language=java
rewriteRun(
java(
"""
import lombok.Value;
import java.util.function.Supplier;

@Value
class A {
String test;
}

class Using {
Supplier<String> usingMethodReference() {
A a = new A("foo");
return a::getTest;
}
}
""",
"""
import java.util.function.Supplier;

record A(
String test) {
}

class Using {
Supplier<String> usingMethodReference() {
A a = new A("foo");
return a::test;
}
}
"""
)
);
}

@SuppressWarnings({"TypeParameterExplicitlyExtendsObject", "ClassCanBeRecord", "LombokGetterMayBeUsed"})
@Nested
class Unchanged {
@Test
Expand Down Expand Up @@ -304,7 +341,7 @@ public A() {
void classWithFieldAnnotations() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
s -> s.typeValidationOptions(TypeValidation.all().identifiers(false)),
java(
"""
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -433,7 +470,6 @@ public class A {
void nonStaticInnerClass() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand All @@ -455,7 +491,6 @@ class B {
void staticConstructor() {
//language=java
rewriteRun(
s -> s.typeValidationOptions(TypeValidation.none()),
java(
"""
package example;
Expand Down
Loading