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

Java, typres: make MethodType immutable, remove getApplicableMethods overload

Browse Source
This commit is contained in:
Bendegúz Nagy
2017-07-05 21:19:45 +02:00
parent 2fd1c89ede
commit 0c483205da
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver.java
View File

@ -432,8 +432,8 @@ public class ClassTypeResolver extends JavaParserVisitorAdapter {
for (node = getEnclosingTypeDeclaration(node); node != null;
node = getEnclosingTypeDeclaration(node.jjtGetParent())) {
getApplicableMethods(node.getTypeDefinition(), methodName, typeArguments, argArity, accessingClass,
foundMethods);
foundMethods.addAll(getApplicableMethods(node.getTypeDefinition(), methodName, typeArguments,
argArity, accessingClass));
}
// TODO: search static methods
@ -444,24 +444,12 @@ public class ClassTypeResolver extends JavaParserVisitorAdapter {
public List<MethodType> getApplicableMethods(JavaTypeDefinition context,
String methodName,
List<JavaTypeDefinition> typeArguments,
int arity,
int argArity,
Class<?> accessingClass) {
List<MethodType> result = new ArrayList<>();
getApplicableMethods(context, methodName, typeArguments, arity, accessingClass, result);
return result;
}
public void getApplicableMethods(JavaTypeDefinition context,
String methodName,
List<JavaTypeDefinition> typeArguments,
int argArity,
Class<?> accessingClass,
List<MethodType> result) {
if (context == null) {
return;
return result;
}
// TODO: shadowing, overriding
@ -476,7 +464,7 @@ public class ClassTypeResolver extends JavaParserVisitorAdapter {
// TODO: do generic methods
// this disables invocations which could match generic methods
result.clear();
return;
return result;
}
result.add(getTypeDefOfMethod(context, method));
@ -485,15 +473,17 @@ public class ClassTypeResolver extends JavaParserVisitorAdapter {
// search it's supertype
if (!contextClass.equals(Object.class)) {
getApplicableMethods(context.resolveTypeDefinition(contextClass.getGenericSuperclass()),
methodName, typeArguments, argArity, accessingClass, result);
result.addAll(getApplicableMethods(context.resolveTypeDefinition(contextClass.getGenericSuperclass()),
methodName, typeArguments, argArity, accessingClass));
}
// search it's interfaces
for (Type interfaceType : contextClass.getGenericInterfaces()) {
getApplicableMethods(context.resolveTypeDefinition(interfaceType),
methodName, typeArguments, argArity, accessingClass, result);
result.addAll(getApplicableMethods(context.resolveTypeDefinition(interfaceType),
methodName, typeArguments, argArity, accessingClass));
}
return result;
}
public boolean isMethodApplicable(Method method, String methodName, int argArity,

10
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/MethodType.java
View File

@ -5,6 +5,8 @@
package net.sourceforge.pmd.lang.java.typeresolution;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefinition;
@ -14,13 +16,13 @@ import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefin
*/
public class MethodType {
private JavaTypeDefinition returnType;
private List<JavaTypeDefinition> argTypes;
private Method method;
private final JavaTypeDefinition returnType;
private final List<JavaTypeDefinition> argTypes;
private final Method method;
public MethodType(JavaTypeDefinition returnType, List<JavaTypeDefinition> argTypes, Method method) {
this.returnType = returnType;
this.argTypes = argTypes;
this.argTypes = Collections.unmodifiableList(new ArrayList<JavaTypeDefinition>(argTypes));
this.method = method;
}