issue80: better handling of Lambdas and FunctionInterface

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFacade.java

@@ -237,7 +237,7 @@ private TypeUsage getTypeConcrete(Node node, boolean solveLambdas) {
                 int pos = JavaParserSymbolDeclaration.getParamPos(node);
                 SymbolReference<MethodDeclaration> refMethod = JavaParserFacade.get(typeSolver).solve(callExpr);
                 if (!refMethod.isSolved()) {
-                    throw new UnsolvedSymbolException(callExpr.getName());
+                    throw new UnsolvedSymbolException(node.getParentNode().toString(), callExpr.getName());
                 }
                 logger.finest("getType on lambda expr " + refMethod.getCorrespondingDeclaration().getName());
                 //logger.finest("Method param " + refMethod.getCorrespondingDeclaration().getParam(pos));
@@ -536,8 +536,7 @@ public TypeDeclaration getTypeDeclaration(ClassOrInterfaceDeclaration classOrInt
     public TypeUsage getTypeOfThisIn(Node node) {
         // TODO consider static methods
         if (node instanceof ClassOrInterfaceDeclaration) {
-            JavaParserClassDeclaration classDeclaration = new JavaParserClassDeclaration((ClassOrInterfaceDeclaration) node, typeSolver);
-            return new ReferenceTypeUsageImpl(classDeclaration, typeSolver);
+            return new ReferenceTypeUsageImpl(getTypeDeclaration((ClassOrInterfaceDeclaration) node), typeSolver);
         } else if (node instanceof EnumDeclaration) {
             JavaParserEnumDeclaration enumDeclaration = new JavaParserEnumDeclaration((EnumDeclaration) node, typeSolver);
             return new ReferenceTypeUsageImpl(enumDeclaration, typeSolver);

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java

@@ -129,6 +129,11 @@ public ClassDeclaration asClass() {
 		return this;
 	}
 
+	@Override
+	public boolean hasDirectlyAnnotation(String canonicalName) {
+		throw new UnsupportedOperationException();
+	}
+
 	@Override
 	public boolean isInterface() {
 		return wrappedNode.isInterface();

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java

@@ -88,6 +88,11 @@ public boolean isType() {
         return true;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public boolean canBeAssignedTo(TypeDeclaration other) {
         // Enums cannot be extended

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java

@@ -89,6 +89,11 @@ public InterfaceDeclaration asInterface() {
         return this;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     public boolean isInterface() {
         return true;
     }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java

@@ -155,6 +155,11 @@ public boolean isTypeVariable() {
         return true;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<TypeParameter> getTypeParameters() {
         return Collections.emptyList();
@@ -174,4 +179,9 @@ public com.github.javaparser.ast.TypeParameter getWrappedNode()
 	{
 		return wrappedNode;
 	}
+
+    @Override
+    public String toString() {
+        return "JPTypeParameter(" + wrappedNode.getName() +", bounds=" + wrappedNode.getTypeBound()+ ")";
+    }
 }

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java

@@ -139,6 +139,11 @@ public boolean isType() {
         return true;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public boolean isClass() {
         return false;

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java

@@ -42,6 +42,11 @@ public ClassDeclaration asClass() {
         return this;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Set<MethodDeclaration> getDeclaredMethods() {
         return Arrays.stream(ctClass.getDeclaredMethods())

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java

@@ -240,6 +240,23 @@ public Set<MethodDeclaration> getDeclaredMethods() {
                 .collect(Collectors.toSet());
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        try {
+            for (Object annotationRaw : ctClass.getAnnotations()) {
+                if (annotationRaw.getClass().getCanonicalName().equals(canonicalName)) {
+                    return true;
+                }
+                if (Arrays.stream(annotationRaw.getClass().getInterfaces()).anyMatch(it -> it.getCanonicalName().equals(canonicalName))) {
+                    return true;
+                }
+            }
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        return false;
+    }
+
     @Override
     public String getName() {
         throw new UnsupportedOperationException();

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsageImpl.java

@@ -1,18 +1,16 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
+import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
 import me.tomassetti.symbolsolver.model.invokations.MethodUsage;
 import me.tomassetti.symbolsolver.model.resolution.TypeParameter;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
-import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder;
-import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
 
 // TODO Remove references to typeSolver: it is needed to instantiate other instances of ReferenceTypeUsage
 //      and to get the Object type declaration
@@ -62,7 +60,7 @@ public boolean isAssignableBy(TypeUsage other) {
             }
         }
         if (other instanceof LambdaArgumentTypeUsagePlaceholder) {
-            return this.getQualifiedName().equals(Predicate.class.getCanonicalName()) || this.getQualifiedName().equals(Function.class.getCanonicalName());
+            return this.getTypeDeclaration().hasAnnotation(FunctionalInterface.class.getCanonicalName());
         } else if (other instanceof ReferenceTypeUsageImpl) {
             ReferenceTypeUsageImpl otherRef = (ReferenceTypeUsageImpl) other;
             if (compareConsideringTypeParameters(otherRef)) {

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java

@@ -277,6 +277,11 @@ public ClassDeclaration asClass() {
         return this;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        throw new UnsupportedOperationException();
+    }
+
     /*@Override
     public boolean canBeAssignedTo(TypeDeclaration other, TypeSolver typeSolver) {
         if (getQualifiedName().equals(other.getQualifiedName())) {

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java

@@ -18,6 +18,7 @@
 import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder;
 import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.TypeVariable;
@@ -303,6 +304,16 @@ public InterfaceDeclaration asInterface() {
         return this;
     }
 
+    @Override
+    public boolean hasDirectlyAnnotation(String canonicalName) {
+        for (Annotation a : clazz.getDeclaredAnnotations()) {
+            if (a.annotationType().getCanonicalName().equals(canonicalName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public List<TypeParameter> getTypeParameters() {
         List<TypeParameter> params = new ArrayList<>();

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/AbstractTest.java

@@ -0,0 +1,23 @@
+package me.tomassetti.symbolsolver;
+
+import java.io.File;
+
+public abstract class AbstractTest {
+
+    protected static File adaptPath(File path) {
+        if (path.exists()) {
+            return path;
+        } else {
+            File underJavaParserCore = new File("java-symbol-solver-core/" + path.getPath());
+            if (underJavaParserCore.exists()) {
+                return underJavaParserCore;
+            } else {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    protected static String adaptPath(String path) {
+        return adaptPath(new File(path)).getPath();
+    }
+}

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/FindingAllFields.java

@@ -8,15 +8,15 @@
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 import me.tomassetti.symbolsolver.model.declarations.Declaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
-import me.tomassetti.symbolsolver.resolution.AbstractTest;
+import me.tomassetti.symbolsolver.resolution.AbstractResolutionTest;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 import org.junit.Test;
 
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.*;
 
-public class FindingAllFields extends AbstractTest {
+public class FindingAllFields extends AbstractResolutionTest {
 
     @Test
     public void findAllInheritedFields() throws ParseException {

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/Issue18.java

@@ -9,13 +9,13 @@
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.AbstractTest;
+import me.tomassetti.symbolsolver.resolution.AbstractResolutionTest;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class Issue18 extends AbstractTest {
+public class Issue18 extends AbstractResolutionTest {
 
     @Test
     public void typeDeclarationSuperClassImplicitlyIncludeObject() throws ParseException {

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java

@@ -1,6 +1,7 @@
 package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.google.common.collect.ImmutableSet;
+import me.tomassetti.symbolsolver.AbstractTest;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
@@ -13,17 +14,17 @@
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaParserClassDeclarationTest {
+public class JavaParserClassDeclarationTest extends AbstractTest {
 
     private TypeSolver typeSolver;
 
     @Before
     public void setup() {
-        File src = new File("src/test/resources/javaparser_src/proper_source");
+        File src = adaptPath(new File("src/test/resources/javaparser_src/proper_source"));
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new JreTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(new File("src/test/resources/javaparser_src/generated")));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_src/generated"))));
         typeSolver = combinedTypeSolver;
     }
 

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclarationTest.java

@@ -1,6 +1,7 @@
 package me.tomassetti.symbolsolver.javassistmodel;
 
 import com.google.common.collect.ImmutableSet;
+import me.tomassetti.symbolsolver.AbstractTest;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JarTypeSolver;
@@ -13,13 +14,13 @@
 
 import static org.junit.Assert.*;
 
-public class JavassistClassDeclarationTest {
+public class JavassistClassDeclarationTest extends AbstractTest {
 
     private TypeSolver typeSolver;
 
     @Before
     public void setup() throws IOException {
-        String pathToJar = "src/test/resources/javaparser-core-2.1.0.jar";
+        String pathToJar = adaptPath("src/test/resources/javaparser-core-2.1.0.jar");
         typeSolver = new CombinedTypeSolver(new JarTypeSolver(pathToJar), new JreTypeSolver());
     }
 

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AbstractTest.java → java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AbstractResolutionTest.java

@@ -3,13 +3,14 @@
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseException;
 import com.github.javaparser.ast.CompilationUnit;
+import me.tomassetti.symbolsolver.AbstractTest;
 
 import java.io.InputStream;
 
 /**
  * @author Federico Tomassetti
  */
-public abstract class AbstractTest {
+public abstract class AbstractResolutionTest extends AbstractTest {
 
     protected CompilationUnit parseSample(String sampleName) throws ParseException {
         InputStream is = this.getClass().getClassLoader().getResourceAsStream(sampleName + ".java.txt");

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseJavaParserTest.java

@@ -1,6 +1,7 @@
 package me.tomassetti.symbolsolver.resolution;
 
 import com.github.javaparser.ParseException;
+import me.tomassetti.symbolsolver.AbstractTest;
 import me.tomassetti.symbolsolver.SourceFileInfoExtractor;
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
@@ -15,15 +16,15 @@
 
 import static org.junit.Assert.*;
 
-public class AnalyseJavaParserTest {
+public class AnalyseJavaParserTest extends AbstractTest {
 
-    private static final File src = new File("src/test/resources/javaparser_src/proper_source");
+    private static final File src = adaptPath(new File("src/test/resources/javaparser_src/proper_source"));
 
     private SourceFileInfoExtractor getSourceFileInfoExtractor() {
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new JreTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(new File("src/test/resources/javaparser_src/generated")));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_src/generated"))));
         SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor();
         sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver);
         sourceFileInfoExtractor.setPrintFileName(false);
@@ -51,7 +52,7 @@ private void parse(String fileName) throws IOException, ParseException {
         String output = outErrStream.toString();
 
         String path = "src/test/resources/javaparser_expected_output/" + fileName.replaceAll("/", "_")+ ".txt";
-        File dstFile = new File(path);
+        File dstFile = adaptPath(new File(path));
 
         if (DEBUG && (sourceFileInfoExtractor.getKo() != 0 || sourceFileInfoExtractor.getUnsupported() != 0)){
             System.err.println(output);

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseNewJavaParserTest.java

@@ -1,7 +1,7 @@
 package me.tomassetti.symbolsolver.resolution;
 
 import com.github.javaparser.ParseException;
-import me.tomassetti.symbolsolver.SourceFileInfoExtractor;
+import me.tomassetti.symbolsolver.*;
 import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
@@ -19,23 +19,10 @@
 /**
  * We analize a more recent version of JavaParser, after the project moved to Java 8.
  */
-public class AnalyseNewJavaParserTest {
+public class AnalyseNewJavaParserTest extends AbstractResolutionTest {
 
     private static final File src = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
 
-    private static File adaptPath(File path) {
-        if (path.exists()) {
-            return path;
-        } else {
-            File underJavaParserCore = new File("java-symbol-solver-core/" + path.getPath());
-            if (underJavaParserCore.exists()) {
-                return underJavaParserCore;
-            } else {
-                throw new IllegalArgumentException();
-            }
-        }
-    }
-
     private static SourceFileInfoExtractor getSourceFileInfoExtractor() {
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new JreTypeSolver());