Skip to content

Use receiver type for unbound instance method reference in ReplaceLambdaWithMethodReference #909

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
timtebeek merged 1 commit into from
May 28, 2026
Merged

Use receiver type for unbound instance method reference in ReplaceLambdaWithMethodReference #909

Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion src/main/java/org/openrewrite/staticanalysis/ReplaceLambdaWithMethodReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,14 @@ public J visitLambda(J.Lambda lambda, ExecutionContext ctx) {
if (isLambdaInGenericAndOverloadedContext()) {
return l;
}
J.MemberReference updated = newStaticMethodReference(methodType, true, lambda.getType()).withPrefix(lambda.getPrefix());
JavaType.FullyQualified containingType = methodType.getDeclaringType();
if (!methodType.hasFlags(Flag.Static) && select != null) {
JavaType.FullyQualified selectType = TypeUtils.asFullyQualified(select.getType());
if (selectType != null) {
containingType = selectType;
}
}
J.MemberReference updated = newInstanceMethodReference(className(containingType, true), methodType, lambda.getType()).withPrefix(lambda.getPrefix());
doAfterVisit(service(ImportService.class).shortenFullyQualifiedTypeReferencesIn(updated));
return updated;
}
Expand Down
56 changes: 56 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/ReplaceLambdaWithMethodReferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,62 @@ record R(String s) {}
);
}

@Issue("https://github.com/openrewrite/rewrite-static-analysis/issues/906")
@Test
void useReceiverTypeWhenDeclaringTypeIsPackagePrivate() {
rewriteRun(
//language=java
java(
"""
package com.helloworld.internal;

import java.util.Optional;

abstract class Base {
public Optional<String> getValue() {
return Optional.empty();
}
}
"""
),
//language=java
java(
"""
package com.helloworld.internal;

public class Child extends Base {}
"""
),
//language=java
java(
"""
package com.helloworld;

import com.helloworld.internal.Child;
import java.util.Optional;

public class Main {
String get(final Optional<Child> opt) {
return opt.flatMap(s -> s.getValue()).orElse("");
}
}
""",
"""
package com.helloworld;

import com.helloworld.internal.Child;
import java.util.Optional;

public class Main {
String get(final Optional<Child> opt) {
return opt.flatMap(Child::getValue).orElse("");
}
}
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite-static-analysis/issues/20")
@Test
void castToTypeParameterInLambda() {
Expand Down
Loading