phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-5151

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2024-08-24 00:14:55 -03:00
committed by GitHub
parent 96f60e9b0e dcee6e6900
commit 8ecc21c06f
9 changed files with 80 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/pages/release_notes.md
View File

@ -18,6 +18,7 @@ This is a {{ site.pmd.release_type }} release.
* apex-performance
* [#5139](https://github.com/pmd/pmd/issues/5139): \[apex] OperationWithHighCostInLoop not firing in triggers
* java-bestpractices
* [#5145](https://github.com/pmd/pmd/issues/5145): \[java] False positive UnusedPrivateMethod
* [#5151](https://github.com/pmd/pmd/issues/5151): \[java] GuardLogStatement: Should not need to guard parameterized log messages where the replacement arg is a constant from another class
* [#5152](https://github.com/pmd/pmd/issues/5152): \[java] GuardLogStatement: Should not need to guard parameterized log messages where the replacement arg is "this"
* [#5153](https://github.com/pmd/pmd/issues/5153): \[java] GuardLogStatement: Should not need to guard parameterized log messages where the replacement arg is an array element

19
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/internal/infer/ast/BaseInvocMirror.java
View File

@ -31,9 +31,17 @@ abstract class BaseInvocMirror<T extends InvocationNode> extends BasePolyMirror<
private MethodCtDecl ctDecl;
private List<ExprMirror> args;
/**
* Some method invocations may appear to be poly expressions,
* but they have no context type (for instance because they
* are in the initializer of a local with inferred type).
* These must be treated as standalone expressions.
*/
protected final boolean mayBePoly;
BaseInvocMirror(JavaExprMirrors mirrors, T call, @Nullable ExprMirror parent, MirrorMaker subexprMaker) {
BaseInvocMirror(JavaExprMirrors mirrors, T call, boolean mustBeStandalone, @Nullable ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, parent, subexprMaker);
mayBePoly = !mustBeStandalone;
}
@Override
@ -61,8 +69,13 @@ abstract class BaseInvocMirror<T extends InvocationNode> extends BasePolyMirror<
protected MethodCtDecl getStandaloneCtdecl() {
MethodCallSite site = factory.infer.newCallSite(this, null);
// this is cached for later anyway
return factory.infer.getCompileTimeDecl(site);
if (mayBePoly) {
// this is cached for later anyway
return factory.infer.getCompileTimeDecl(site);
} else {
factory.infer.inferInvocationRecursively(site);
return site.getExpr().getCtDecl();
}
}
@Override

19
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/internal/infer/ast/ConditionalMirrorImpl.java
View File

@ -19,7 +19,6 @@ import net.sourceforge.pmd.lang.java.types.JTypeMirror;
import net.sourceforge.pmd.lang.java.types.TypeConversion;
import net.sourceforge.pmd.lang.java.types.internal.infer.ExprMirror;
import net.sourceforge.pmd.lang.java.types.internal.infer.ExprMirror.BranchingMirror;
import net.sourceforge.pmd.lang.java.types.internal.infer.MethodCallSite;
import net.sourceforge.pmd.lang.java.types.internal.infer.ast.JavaExprMirrors.MirrorMaker;
class ConditionalMirrorImpl extends BasePolyMirror<ASTConditionalExpression> implements BranchingMirror {
@ -135,23 +134,7 @@ class ConditionalMirrorImpl extends BasePolyMirror<ASTConditionalExpression> imp
}
if (e instanceof ASTMethodCall) {
/*
A method invocation expression (§15.12) for which the chosen most specific method (§15.12.2.5) has return type boolean or Boolean.
Note that, for a generic method, this is the type before instantiating the method's type arguments.
*/
JTypeMirror current = InternalApiBridge.getTypeMirrorInternal(e);
if (current != null) {
// don't redo the compile-time decl resolution
// The CTDecl is cached on the mirror, not the node
return current;
}
MethodCallSite site = factory.infer.newCallSite((InvocationMirror) mirror, null);
return factory.infer.getCompileTimeDecl(site)
.getMethodType()
.getReturnType();
return mirror.getStandaloneType();
}
return null;

11
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/internal/infer/ast/CtorInvocMirror.java
View File

@ -29,8 +29,9 @@ import net.sourceforge.pmd.util.IteratorUtil;
class CtorInvocMirror extends BaseInvocMirror<ASTConstructorCall> implements CtorInvocationMirror {
CtorInvocMirror(JavaExprMirrors mirrors, ASTConstructorCall call, ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, parent, subexprMaker);
CtorInvocMirror(JavaExprMirrors mirrors, ASTConstructorCall call,
boolean mustBeStandalone, ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, mustBeStandalone, parent, subexprMaker);
}
@Override
@ -47,6 +48,8 @@ class CtorInvocMirror extends BaseInvocMirror<ASTConstructorCall> implements Cto
@Override
public JTypeMirror getStandaloneType() {
if (isDiamond()) {
// todo if the expr must be standalone then we
// should infer this from the provided arguments.
return null;
}
return getNewType();
@ -130,7 +133,7 @@ class CtorInvocMirror extends BaseInvocMirror<ASTConstructorCall> implements Cto
EnumCtorInvocMirror(JavaExprMirrors mirrors, ASTEnumConstant call, ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, parent, subexprMaker);
super(mirrors, call, false, parent, subexprMaker);
}
@Override
@ -163,7 +166,7 @@ class CtorInvocMirror extends BaseInvocMirror<ASTConstructorCall> implements Cto
ExplicitCtorInvocMirror(JavaExprMirrors mirrors, ASTExplicitConstructorInvocation call, ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, parent, subexprMaker);
super(mirrors, call, false, parent, subexprMaker);
}
@Override

19
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/internal/infer/ast/JavaExprMirrors.java
View File

@ -68,7 +68,7 @@ public final class JavaExprMirrors {
ExprMirror makeSubexprDefault(ASTExpression e, @Nullable ExprMirror parent, MirrorMaker subexprMaker) {
if (e instanceof InvocationNode) {
return getInvocationMirror((InvocationNode) e, parent, subexprMaker);
return getInvocationMirror((InvocationNode) e, parent, false, subexprMaker);
} else if (e instanceof ASTLambdaExpression || e instanceof ASTMethodReference) {
return getFunctionalMirror(e, parent, subexprMaker);
} else if (e instanceof ASTConditionalExpression) {
@ -81,11 +81,13 @@ public final class JavaExprMirrors {
}
}
ExprMirror getBranchMirrorSubexpression(ASTExpression e, boolean isStandalone, @NonNull BranchingMirror parent, MirrorMaker subexprMaker) {
ExprMirror getBranchMirrorSubexpression(ASTExpression e, boolean mustBeStandalone, @NonNull BranchingMirror parent, MirrorMaker subexprMaker) {
if (e instanceof ASTConditionalExpression) {
return new ConditionalMirrorImpl(this, (ASTConditionalExpression) e, isStandalone, parent, subexprMaker);
return new ConditionalMirrorImpl(this, (ASTConditionalExpression) e, mustBeStandalone, parent, subexprMaker);
} else if (e instanceof ASTSwitchExpression) {
return new SwitchMirror(this, (ASTSwitchExpression) e, isStandalone, parent, subexprMaker);
return new SwitchMirror(this, (ASTSwitchExpression) e, mustBeStandalone, parent, subexprMaker);
} else if (e instanceof InvocationNode) {
return getInvocationMirror((InvocationNode) e, parent, mustBeStandalone, subexprMaker);
} else {
return subexprMaker.createMirrorForSubexpression(e, parent, subexprMaker);
}
@ -96,14 +98,15 @@ public final class JavaExprMirrors {
}
public InvocationMirror getInvocationMirror(InvocationNode e, MirrorMaker subexprMaker) {
return getInvocationMirror(e, null, subexprMaker);
return getInvocationMirror(e, null, false, subexprMaker);
}
private InvocationMirror getInvocationMirror(InvocationNode e, @Nullable ExprMirror parent, MirrorMaker subexprMaker) {
private InvocationMirror getInvocationMirror(InvocationNode e, @Nullable ExprMirror parent,
boolean mustBeStandalone, MirrorMaker subexprMaker) {
if (e instanceof ASTMethodCall) {
return new MethodInvocMirror(this, (ASTMethodCall) e, parent, subexprMaker);
return new MethodInvocMirror(this, (ASTMethodCall) e, mustBeStandalone, parent, subexprMaker);
} else if (e instanceof ASTConstructorCall) {
return new CtorInvocMirror(this, (ASTConstructorCall) e, parent, subexprMaker);
return new CtorInvocMirror(this, (ASTConstructorCall) e, mustBeStandalone, parent, subexprMaker);
} else if (e instanceof ASTExplicitConstructorInvocation) {
return new CtorInvocMirror.ExplicitCtorInvocMirror(this, (ASTExplicitConstructorInvocation) e, parent, subexprMaker);
} else if (e instanceof ASTEnumConstant) {

8
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/internal/infer/ast/MethodInvocMirror.java
View File

@ -26,14 +26,16 @@ import net.sourceforge.pmd.lang.java.types.internal.infer.ast.JavaExprMirrors.Mi
class MethodInvocMirror extends BaseInvocMirror<ASTMethodCall> {
MethodInvocMirror(JavaExprMirrors mirrors, ASTMethodCall call, @Nullable ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, parent, subexprMaker);
MethodInvocMirror(JavaExprMirrors mirrors, ASTMethodCall call,
boolean isStandalone,
@Nullable ExprMirror parent, MirrorMaker subexprMaker) {
super(mirrors, call, isStandalone, parent, subexprMaker);
}
@Override
public @Nullable JTypeMirror getStandaloneType() {
JMethodSig ctdecl = getStandaloneCtdecl().getMethodType();
return isContextDependent(ctdecl) ? null : ctdecl.getReturnType();
return mayBePoly && isContextDependent(ctdecl) ? null : ctdecl.getReturnType();
}
private static boolean isContextDependent(JMethodSig m) {

2
pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/BranchingExprsTests.kt
View File

@ -279,7 +279,7 @@ class Scratch {
val (ternary1, ternary2) = acu.descendants(ASTConditionalExpression::class.java).toList()
spy.shouldBeOk {
ternary1 shouldHaveType gen.t_Collection[captureMatcher(`?`)] // java.util.Collection<capture#534 of ?>
ternary1 shouldHaveType gen.t_Collection[ts.OBJECT] // java.util.Collection<Object>
ternary2 shouldHaveType gen.`t_Collection{String}` // java.util.Collection<java.lang.String>
}
}

38
pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/LocalVarInferenceTest.kt
View File

@ -4,10 +4,11 @@
package net.sourceforge.pmd.lang.java.types.internal.infer
import net.sourceforge.pmd.lang.test.ast.shouldMatchN
import net.sourceforge.pmd.lang.java.ast.ProcessorTestSpec
import net.sourceforge.pmd.lang.java.ast.variableAccess
import net.sourceforge.pmd.lang.java.types.*
import net.sourceforge.pmd.lang.test.ast.component6
import net.sourceforge.pmd.lang.test.ast.shouldMatchN
/**
*
@ -101,4 +102,39 @@ class Scratch {
acu.varId("k") shouldHaveType Runnable::class.decl
}
}
parserTest("Local var with conditional and 2 poly expressions") {
val (acu, spy) = parser.parseWithTypeInferenceSpy(
"""
interface Collector<T, A, R> {}
interface Stream<T> {
<R, A> R collect(Collector<? super T, A, R> collector);
}
interface List<T> {}
interface Function<T,R> { R apply(T t); }
public class Scratch {
static <T, R> Collector<T, ?, List<List<T>>> groupingByNullable(Function<? super T, ? extends R> key){}
static {
var lookup = System.currentTimeMillis() > 100L // permission based
? Dao.source1().collect(groupingByNullable(Data::parent)) // DAO call #1
: Dao.source2().collect(groupingByNullable(Data::parent)); // DAO call #2
}
interface Data {
Integer parent();
}
static class Dao {
static Stream<Data> source1(){}
static Stream<Data> source2(){}
}
}
""".trimIndent()
)
spy.shouldBeOk {
val (_, _, list, _, _, data) = acu.declaredTypeSignatures()
// not the anon type
acu.varId("lookup") shouldHaveType list[list[data]]
}
}
})

2
pom.xml
View File

@ -988,7 +988,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.12</version>
<version>1.14.19</version>
<scope>test</scope>
</dependency>