remove references to old JavaParser versions
diff --git a/java-symbol-solver-core/build.gradle b/java-symbol-solver-core/build.gradle
index 60ee85a..158fca1 100644
--- a/java-symbol-solver-core/build.gradle
+++ b/java-symbol-solver-core/build.gradle
@@ -15,5 +15,7 @@
module {
excludeDirs += file('src/test/resources/javaparser_expected_output')
excludeDirs += file('src/test/resources/javaparser_src')
+ excludeDirs += file('src/test/resources/javaparser_new_src')
+ excludeDirs += file('src/test/resources/javaparser_methodcalls_expected_output')
}
}
diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
index 2b4d81c..892aed8 100644
--- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
+++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
@@ -129,9 +129,9 @@
private String toString(SymbolReference<me.tomassetti.symbolsolver.model.declarations.MethodDeclaration> methodDeclarationSymbolReference) {
if (methodDeclarationSymbolReference.isSolved()) {
- return "UNSOLVED";
- } else {
return methodDeclarationSymbolReference.getCorrespondingDeclaration().getQualifiedSignature();
+ } else {
+ return "UNSOLVED";
}
}
diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
index 18ef6cc..7c96338 100644
--- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
+++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
@@ -58,6 +58,10 @@
@Override
public SymbolReference<TypeDeclaration> tryToSolveType(String name) {
+ if (!srcDir.exists() || !srcDir.isDirectory()) {
+ throw new IllegalStateException("SrcDir does not exist or is not a directory: " + srcDir.getAbsolutePath());
+ }
+
// TODO support enums
// TODO support interfaces
diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseNewJavaParserTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseNewJavaParserTest.java
index ae51b23..73d546d 100644
--- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseNewJavaParserTest.java
+++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/AnalyseNewJavaParserTest.java
@@ -68,7 +68,7 @@
sourceFileInfoExtractor.solveMethodCalls(sourceFile);
String output = outErrStream.toString();
- String path = "src/test/resources/javaparser_methodcalls_expected_output/" + fileName.replaceAll("/", "_")+ ".txt";
+ String path = adaptPath(new File("src/test/resources/javaparser_methodcalls_expected_output")).getPath()+ "/" + fileName.replaceAll("/", "_")+ ".txt";
File dstFile = new File(path);
if (DEBUG && (sourceFileInfoExtractor.getKo() != 0 || sourceFileInfoExtractor.getUnsupported() != 0)){
diff --git a/java-symbol-solver-core/src/test/resources/javaparser_methodcalls_expected_output/com_github_javaparser_CommentsInserter.txt b/java-symbol-solver-core/src/test/resources/javaparser_methodcalls_expected_output/com_github_javaparser_CommentsInserter.txt
index 8ad27ff..22f3088 100644
--- a/java-symbol-solver-core/src/test/resources/javaparser_methodcalls_expected_output/com_github_javaparser_CommentsInserter.txt
+++ b/java-symbol-solver-core/src/test/resources/javaparser_methodcalls_expected_output/com_github_javaparser_CommentsInserter.txt
@@ -1,49 +1,49 @@
- * L52 comments.isEmpty() -> java.util.TreeSet.isEmpty()
- * L63 cu.getChildrenNodes() -> com.github.javaparser.ast.Node.getChildrenNodes()
- * L64 PositionUtils.sortByBeginPosition(children) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L66 comments.iterator().next() -> java.util.Iterator.next()
- * L66 comments.iterator() -> java.util.TreeSet.iterator()
- * L67 cu.getPackage() -> com.github.javaparser.ast.CompilationUnit.getPackage()
- * L68 children.isEmpty() -> java.util.List.isEmpty()
- * L68 PositionUtils.areInOrder(firstComment, children.get(0)) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L69 children.get(0) -> java.util.List.get(int)
- * L70 cu.setComment(firstComment) -> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
- * L71 comments.remove(firstComment) -> java.util.TreeSet.remove(java.lang.Object)
- * L80 commentsToAttribute.isEmpty() -> java.util.TreeSet.isEmpty()
- * L84 insertComments((CompilationUnit) node, commentsToAttribute) -> com.github.javaparser.CommentsInserter.insertComments(com.github.javaparser.ast.CompilationUnit, java.util.TreeSet<com.github.javaparser.ast.comments.Comment>)
- * L95 node.getChildrenNodes() -> com.github.javaparser.ast.Node.getChildrenNodes()
- * L96 PositionUtils.sortByBeginPosition(children) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L101 PositionUtils.nodeContains(child, c, configuration.doNotConsiderAnnotationsAsNodeStartForCodeAttribution) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L103 commentsInsideChild.add(c) -> java.util.TreeSet.add(E)
- * L106 commentsToAttribute.removeAll(commentsInsideChild) -> java.util.AbstractSet.removeAll(java.util.Collection<? extends java.lang.Object>)
- * L107 insertComments(child, commentsInsideChild) -> com.github.javaparser.CommentsInserter.insertComments(com.github.javaparser.ast.Node, java.util.TreeSet<com.github.javaparser.ast.comments.Comment>)
- * L114 comment.isLineComment() -> com.github.javaparser.ast.comments.Comment.isLineComment()
- * L116 child.getEnd() -> com.github.javaparser.ast.Node.getEnd()
- * L116 comment.getBegin() -> com.github.javaparser.ast.Node.getBegin()
- * L117 attributeLineCommentToNodeOrChild(child, comment.asLineComment()) -> com.github.javaparser.CommentsInserter.attributeLineCommentToNodeOrChild(com.github.javaparser.ast.Node, com.github.javaparser.ast.comments.LineComment)
- * L118 comment.asLineComment() -> com.github.javaparser.ast.comments.Comment.asLineComment()
- * L119 attributedComments.add(comment) -> java.util.List.add(E)
- * L130 childrenAndComments.addAll(children) -> java.util.List.addAll(java.util.Collection<? extends E>)
- * L131 childrenAndComments.addAll(commentsToAttribute) -> java.util.List.addAll(java.util.Collection<? extends E>)
- * L132 PositionUtils.sortByBeginPosition(childrenAndComments, configuration.doNotConsiderAnnotationsAsNodeStartForCodeAttribution) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L138 previousComment.isOrphan() -> com.github.javaparser.ast.comments.Comment.isOrphan()
- * L142 thing.hasComment() -> com.github.javaparser.ast.Node.hasComment()
- * L144 thereAreLinesBetween(previousComment, thing) -> com.github.javaparser.CommentsInserter.thereAreLinesBetween(com.github.javaparser.ast.Node, com.github.javaparser.ast.Node)
- * L145 thing.setComment(previousComment) -> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
- * L146 attributedComments.add(previousComment) -> java.util.List.add(E)
- * L153 commentsToAttribute.removeAll(attributedComments) -> java.util.AbstractSet.removeAll(java.util.Collection<? extends java.lang.Object>)
- * L157 c.isOrphan() -> com.github.javaparser.ast.comments.Comment.isOrphan()
- * L158 node.addOrphanComment(c) -> com.github.javaparser.ast.Node.addOrphanComment(com.github.javaparser.ast.comments.Comment)
- * L166 node.getBegin() -> com.github.javaparser.ast.Node.getBegin()
- * L166 lineComment.getBegin() -> com.github.javaparser.ast.Node.getBegin()
- * L167 node.hasComment() -> com.github.javaparser.ast.Node.hasComment()
- * L169 node.setComment(lineComment) -> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
- * L176 children.addAll(node.getChildrenNodes()) -> java.util.List.addAll(java.util.Collection<? extends E>)
- * L176 node.getChildrenNodes() -> com.github.javaparser.ast.Node.getChildrenNodes()
- * L177 PositionUtils.sortByBeginPosition(children) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L178 Collections.reverse(children) ERR Unsolved symbol in FOO Solving Collections : Collections
- * L181 attributeLineCommentToNodeOrChild(child, lineComment) -> com.github.javaparser.CommentsInserter.attributeLineCommentToNodeOrChild(com.github.javaparser.ast.Node, com.github.javaparser.ast.comments.LineComment)
- * L191 PositionUtils.areInOrder(a, b) ERR Unsolved symbol in FOO Solving PositionUtils : PositionUtils
- * L192 thereAreLinesBetween(b, a) -> com.github.javaparser.CommentsInserter.thereAreLinesBetween(com.github.javaparser.ast.Node, com.github.javaparser.ast.Node)
- * L194 a.getEnd() -> com.github.javaparser.ast.Node.getEnd()
- * L195 b.getBegin() -> com.github.javaparser.ast.Node.getBegin()
\ No newline at end of file
+ Line 52) comments.isEmpty() ==> java.util.TreeSet.isEmpty()
+ Line 63) cu.getChildrenNodes() ==> com.github.javaparser.ast.Node.getChildrenNodes()
+ Line 64) PositionUtils.sortByBeginPosition(children) ==> ERROR
+ Line 66) comments.iterator().next() ==> java.util.Iterator.next()
+ Line 66) comments.iterator() ==> java.util.TreeSet.iterator()
+ Line 67) cu.getPackage() ==> com.github.javaparser.ast.CompilationUnit.getPackage()
+ Line 68) children.isEmpty() ==> java.util.List.isEmpty()
+ Line 68) PositionUtils.areInOrder(firstComment, children.get(0)) ==> ERROR
+ Line 69) children.get(0) ==> java.util.List.get(int)
+ Line 70) cu.setComment(firstComment) ==> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
+ Line 71) comments.remove(firstComment) ==> java.util.TreeSet.remove(java.lang.Object)
+ Line 80) commentsToAttribute.isEmpty() ==> java.util.TreeSet.isEmpty()
+ Line 84) insertComments((CompilationUnit) node, commentsToAttribute) ==> com.github.javaparser.CommentsInserter.insertComments(com.github.javaparser.ast.CompilationUnit, java.util.TreeSet<com.github.javaparser.ast.comments.Comment>)
+ Line 95) node.getChildrenNodes() ==> com.github.javaparser.ast.Node.getChildrenNodes()
+ Line 96) PositionUtils.sortByBeginPosition(children) ==> ERROR
+ Line 101) PositionUtils.nodeContains(child, c, configuration.doNotConsiderAnnotationsAsNodeStartForCodeAttribution) ==> ERROR
+ Line 103) commentsInsideChild.add(c) ==> java.util.TreeSet.add(E)
+ Line 106) commentsToAttribute.removeAll(commentsInsideChild) ==> java.util.AbstractSet.removeAll(java.util.Collection<? extends java.lang.Object>)
+ Line 107) insertComments(child, commentsInsideChild) ==> com.github.javaparser.CommentsInserter.insertComments(com.github.javaparser.ast.Node, java.util.TreeSet<com.github.javaparser.ast.comments.Comment>)
+ Line 114) comment.isLineComment() ==> com.github.javaparser.ast.comments.Comment.isLineComment()
+ Line 116) child.getEnd() ==> com.github.javaparser.ast.Node.getEnd()
+ Line 116) comment.getBegin() ==> com.github.javaparser.ast.Node.getBegin()
+ Line 117) attributeLineCommentToNodeOrChild(child, comment.asLineComment()) ==> com.github.javaparser.CommentsInserter.attributeLineCommentToNodeOrChild(com.github.javaparser.ast.Node, com.github.javaparser.ast.comments.LineComment)
+ Line 118) comment.asLineComment() ==> com.github.javaparser.ast.comments.Comment.asLineComment()
+ Line 119) attributedComments.add(comment) ==> java.util.List.add(E)
+ Line 130) childrenAndComments.addAll(children) ==> java.util.List.addAll(java.util.Collection<? extends E>)
+ Line 131) childrenAndComments.addAll(commentsToAttribute) ==> java.util.List.addAll(java.util.Collection<? extends E>)
+ Line 132) PositionUtils.sortByBeginPosition(childrenAndComments, configuration.doNotConsiderAnnotationsAsNodeStartForCodeAttribution) ==> ERROR
+ Line 138) previousComment.isOrphan() ==> com.github.javaparser.ast.comments.Comment.isOrphan()
+ Line 142) thing.hasComment() ==> com.github.javaparser.ast.Node.hasComment()
+ Line 144) thereAreLinesBetween(previousComment, thing) ==> com.github.javaparser.CommentsInserter.thereAreLinesBetween(com.github.javaparser.ast.Node, com.github.javaparser.ast.Node)
+ Line 145) thing.setComment(previousComment) ==> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
+ Line 146) attributedComments.add(previousComment) ==> java.util.List.add(E)
+ Line 153) commentsToAttribute.removeAll(attributedComments) ==> java.util.AbstractSet.removeAll(java.util.Collection<? extends java.lang.Object>)
+ Line 157) c.isOrphan() ==> com.github.javaparser.ast.comments.Comment.isOrphan()
+ Line 158) node.addOrphanComment(c) ==> com.github.javaparser.ast.Node.addOrphanComment(com.github.javaparser.ast.comments.Comment)
+ Line 166) node.getBegin() ==> com.github.javaparser.ast.Node.getBegin()
+ Line 166) lineComment.getBegin() ==> com.github.javaparser.ast.Node.getBegin()
+ Line 167) node.hasComment() ==> com.github.javaparser.ast.Node.hasComment()
+ Line 169) node.setComment(lineComment) ==> com.github.javaparser.ast.Node.setComment(com.github.javaparser.ast.comments.Comment)
+ Line 176) children.addAll(node.getChildrenNodes()) ==> java.util.List.addAll(java.util.Collection<? extends E>)
+ Line 176) node.getChildrenNodes() ==> com.github.javaparser.ast.Node.getChildrenNodes()
+ Line 177) PositionUtils.sortByBeginPosition(children) ==> ERROR
+ Line 178) Collections.reverse(children) ==> ERROR
+ Line 181) attributeLineCommentToNodeOrChild(child, lineComment) ==> com.github.javaparser.CommentsInserter.attributeLineCommentToNodeOrChild(com.github.javaparser.ast.Node, com.github.javaparser.ast.comments.LineComment)
+ Line 191) PositionUtils.areInOrder(a, b) ==> ERROR
+ Line 192) thereAreLinesBetween(b, a) ==> com.github.javaparser.CommentsInserter.thereAreLinesBetween(com.github.javaparser.ast.Node, com.github.javaparser.ast.Node)
+ Line 194) a.getEnd() ==> com.github.javaparser.ast.Node.getEnd()
+ Line 195) b.getBegin() ==> com.github.javaparser.ast.Node.getBegin()
diff --git a/java-symbol-solver-examples/build.gradle b/java-symbol-solver-examples/build.gradle
index 0e72e42..2951252 100644
--- a/java-symbol-solver-examples/build.gradle
+++ b/java-symbol-solver-examples/build.gradle
@@ -1,7 +1,7 @@
description = ''
dependencies {
- compile group: 'com.github.javaparser', name: 'javaparser-core', version:'2.3.0'
+ compile group: 'com.github.javaparser', name: 'javaparser-core', version:'3.0.0-alpha.2'
compile group: 'org.javassist', name: 'javassist', version:'3.19.0-GA'
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile project(':java-symbol-solver-core')
diff --git a/java-symbol-solver-examples/pom.xml b/java-symbol-solver-examples/pom.xml
index b55fd7b..b81a838 100644
--- a/java-symbol-solver-examples/pom.xml
+++ b/java-symbol-solver-examples/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
- <version>2.3.0</version>
+ <version>3.0.0-alpha.2</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
diff --git a/java-symbol-solver-logic/build.gradle b/java-symbol-solver-logic/build.gradle
index a69683c..686edc3 100644
--- a/java-symbol-solver-logic/build.gradle
+++ b/java-symbol-solver-logic/build.gradle
@@ -1,7 +1,7 @@
description = ''
dependencies {
- compile group: 'com.github.javaparser', name: 'javaparser-core', version:'2.3.0'
+ compile group: 'com.github.javaparser', name: 'javaparser-core', version:'3.0.0-alpha.2'
compile group: 'org.javassist', name: 'javassist', version:'3.19.0-GA'
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile project(':java-symbol-solver-model')
diff --git a/java-symbol-solver-logic/pom.xml b/java-symbol-solver-logic/pom.xml
index 2a28b24..c3295fc 100644
--- a/java-symbol-solver-logic/pom.xml
+++ b/java-symbol-solver-logic/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
- <version>2.3.0</version>
+ <version>3.0.0-alpha.2</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
diff --git a/java-symbol-solver-model/build.gradle b/java-symbol-solver-model/build.gradle
index f30d9ca..2197e06 100644
--- a/java-symbol-solver-model/build.gradle
+++ b/java-symbol-solver-model/build.gradle
@@ -1,7 +1,7 @@
description = ''
dependencies {
- compile group: 'com.github.javaparser', name: 'javaparser-core', version:'2.3.0'
+ compile group: 'com.github.javaparser', name: 'javaparser-core', version:'3.0.0-alpha.2'
compile group: 'org.javassist', name: 'javassist', version:'3.19.0-GA'
compile group: 'com.google.guava', name: 'guava', version:'18.0'
compile group: 'com.javaslang', name: 'javaslang', version:'2.0.0-beta'
diff --git a/java-symbol-solver-model/pom.xml b/java-symbol-solver-model/pom.xml
index 45fcfd6..0a81af9 100644
--- a/java-symbol-solver-model/pom.xml
+++ b/java-symbol-solver-model/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
- <version>2.3.0</version>
+ <version>3.0.0-alpha.2</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>