Spring cleaning

javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java

@@ -72,7 +72,7 @@ public static Javadoc parse(String commentContent) {
             //then needs to be added again so that the block parsers handles everything correctly.
             blockLines = BLOCK_PATTERN
                 .splitAsStream(tagBlock)
-                .filter(STRING_NOT_EMPTY)
+                .filter(s1 -> !s1.isEmpty())
                 .map(s -> BLOCK_TAG_PREFIX + s)
                 .collect(Collectors.toList());
         }

javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java

@@ -6,7 +6,7 @@
  * An implementation of interface CharStream, where the stream is assumed to
  * contain only ASCII characters (with java-like unicode escape processing).
  */
-public class UnicodeEscapeProcessingProvider implements Provider {
+class UnicodeEscapeProcessingProvider implements Provider {
     private static int hexval(char c) throws java.io.IOException {
         switch (c) {
             case '0':

javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java

@@ -8,6 +8,9 @@
 import static com.github.javaparser.utils.Utils.capitalize;
 import static com.github.javaparser.utils.Utils.decapitalize;
 
+/**
+ * Utilities that can be useful when generating code.
+ */
 public final class CodeGenerationUtils {
     private CodeGenerationUtils() {
     }

javaparser-core/src/main/java/com/github/javaparser/utils/Log.java

@@ -8,6 +8,8 @@
 
 /**
  * To avoid dependencies on logging frameworks, we have invented yet another logging framework :-)
+ * <p>
+ * See <a href="http://javaparser.org/javaparsers-logging-framework-in-one-file/">a blog about this</a>
  */
 public class Log {
     /**

javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java

@@ -21,6 +21,8 @@
 
 package com.github.javaparser.utils;
 
+import java.util.Objects;
+
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 
 /**
@@ -45,8 +47,8 @@ public boolean equals(Object o) {
 
         Pair<?, ?> pair = (Pair<?, ?>) o;
 
-        if (a != null ? !a.equals(pair.a) : pair.a != null) return false;
-        if (b != null ? !b.equals(pair.b) : pair.b != null) return false;
+        if (!Objects.equals(a, pair.a)) return false;
+        if (!Objects.equals(b, pair.b)) return false;
 
         return true;
     }

javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java

@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.function.Function;
@@ -37,11 +38,10 @@
 public class Utils {
     public static final String EOL = System.getProperty("line.separator");
 
-    public static final Predicate<String> STRING_NOT_EMPTY = s -> !s.isEmpty();
-
     /**
      * @deprecated This is no longer in use by JavaParser, please write your own replacement.
      */
+    @Deprecated
     public static <T> List<T> ensureNotNull(List<T> list) {
         return list == null ? new ArrayList<>() : list;
     }

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java

@@ -36,47 +36,49 @@
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.LinkedList;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.github.javaparser.symbolsolver.javaparser.Navigator.requireParentNode;
+import static java.util.Comparator.comparing;
 
 /**
- * It prints information extracted from a source file. It is mainly intended as an example usage of JavaSymbolSolver.
+ * Resolves resolvable nodes from one or more source files, and reports the results.
+ * It is mainly intended as an example usage of JavaSymbolSolver.
  *
  * @author Federico Tomassetti
  */
 public class SourceFileInfoExtractor {
 
-    private TypeSolver typeSolver;
+    private final TypeSolver typeSolver;
 
-    private int ok = 0;
-    private int ko = 0;
+    private int successes = 0;
+    private int failures = 0;
     private int unsupported = 0;
     private boolean printFileName = true;
     private PrintStream out = System.out;
     private PrintStream err = System.err;
+    private boolean verbose = false;
+
+    public SourceFileInfoExtractor(TypeSolver typeSolver) {
+        this.typeSolver = typeSolver;
+    }
 
     public void setVerbose(boolean verbose) {
         this.verbose = verbose;
     }
 
-    private boolean verbose = false;
-
     public void setPrintFileName(boolean printFileName) {
         this.printFileName = printFileName;
     }
 
-    public void clear() {
-        ok = 0;
-        ko = 0;
-        unsupported = 0;
-    }
-
     public void setOut(PrintStream out) {
         this.out = out;
     }
@@ -85,17 +87,16 @@ public void setErr(PrintStream err) {
         this.err = err;
     }
 
-    public int getOk() {
-        return ok;
-
+    public int getSuccesses() {
+        return successes;
     }
 
     public int getUnsupported() {
         return unsupported;
     }
 
-    public int getKo() {
-        return ko;
+    public int getFailures() {
+        return failures;
     }
 
     private void solveTypeDecl(ClassOrInterfaceDeclaration node) {
@@ -115,23 +116,27 @@ private void solve(Node node) {
         if (node instanceof ClassOrInterfaceDeclaration) {
             solveTypeDecl((ClassOrInterfaceDeclaration) node);
         } else if (node instanceof Expression) {
-            if ((requireParentNode(node) instanceof ImportDeclaration) || (requireParentNode(node) instanceof Expression)
-                    || (requireParentNode(node) instanceof MethodDeclaration)
-                    || (requireParentNode(node) instanceof PackageDeclaration)) {
+            Node parentNode = requireParentNode(node);
+            if (parentNode instanceof ImportDeclaration ||
+                    parentNode instanceof Expression ||
+                    parentNode instanceof MethodDeclaration ||
+                    parentNode instanceof PackageDeclaration) {
                 // skip
-            } else if ((requireParentNode(node) instanceof Statement) || 
-                    (requireParentNode(node) instanceof VariableDeclarator) ||
-                    (requireParentNode(node) instanceof SwitchEntry)) {
+                return;
+            }
+            if (parentNode instanceof Statement ||
+                    parentNode instanceof VariableDeclarator ||
+                    parentNode instanceof SwitchEntry) {
                 try {
                     ResolvedType ref = JavaParserFacade.get(typeSolver).getType(node);
-                    out.println("  Line " + node.getRange().get().begin.line + ") " + node + " ==> " + ref.describe());
-                    ok++;
+                    out.println("  Line " + lineNr(node) + ") " + node + " ==> " + ref.describe());
+                    successes++;
                 } catch (UnsupportedOperationException upe) {
                     unsupported++;
                     err.println(upe.getMessage());
                     throw upe;
                 } catch (RuntimeException re) {
-                    ko++;
+                    failures++;
                     err.println(re.getMessage());
                     throw re;
                 }
@@ -141,7 +146,7 @@ private void solve(Node node) {
 
     private void solveMethodCalls(Node node) {
         if (node instanceof MethodCallExpr) {
-            out.println("  Line " + node.getBegin().get().line + ") " + node + " ==> " + toString((MethodCallExpr) node));
+            out.println("  Line " + lineNr(node) + ") " + node + " ==> " + toString((MethodCallExpr) node));
         }
         for (Node child : node.getChildNodes()) {
             solveMethodCalls(child);
@@ -153,7 +158,7 @@ private String toString(MethodCallExpr node) {
             return toString(JavaParserFacade.get(typeSolver).solve(node));
         } catch (Exception e) {
             if (verbose) {
-                System.err.println("Error resolving call at L" + node.getBegin().get().line + ": " + node);
+                System.err.println("Error resolving call at L" + lineNr(node) + ": " + node);
                 e.printStackTrace();
             }
             return "ERROR";
@@ -169,54 +174,46 @@ private String toString(SymbolReference<ResolvedMethodDeclaration> methodDeclara
     }
 
     private List<Node> collectAllNodes(Node node) {
-        List<Node> nodes = new LinkedList<>();
-        collectAllNodes(node, nodes);
-        nodes.sort((n1, n2) -> n1.getBegin().get().compareTo(n2.getBegin().get()));
+        List<Node> nodes = new ArrayList<>();
+        node.walk(nodes::add);
+        nodes.sort(comparing(n -> n.getBegin().get()));
         return nodes;
     }
 
-    private void collectAllNodes(Node node, List<Node> nodes) {
-        nodes.add(node);
-        node.getChildNodes().forEach(c -> collectAllNodes(c, nodes));
-    }
-
     public void solve(Path path) throws IOException {
-        File file = path.toFile();
-        if (file.isDirectory()) {
-            for (File f : file.listFiles()) {
-                solve(f.toPath());
-            }
-        } else {
-            if (file.getName().endsWith(".java")) {
-                if (printFileName) {
-                    out.println("- parsing " + file.getAbsolutePath());
+        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                if (file.toString().endsWith(".java")) {
+                    if (printFileName) {
+                        out.println("- parsing " + file.toAbsolutePath());
+                    }
+                    CompilationUnit cu = JavaParser.parse(file);
+                    List<Node> nodes = collectAllNodes(cu);
+                    nodes.forEach(n -> solve(n));
                 }
-                CompilationUnit cu = JavaParser.parse(file);
-                List<Node> nodes = collectAllNodes(cu);
-                nodes.forEach(n -> solve(n));
+                return FileVisitResult.CONTINUE;
             }
-        }
+        });
     }
 
     public void solveMethodCalls(Path path) throws IOException {
-        File file = path.toFile();
-        if (file.isDirectory()) {
-            for (File f : file.listFiles()) {
-                solveMethodCalls(f.toPath());
-            }
-        } else {
-            if (file.getName().endsWith(".java")) {
-                if (printFileName) {
-                    out.println("- parsing " + file.getAbsolutePath());
+        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                if (file.toString().endsWith(".java")) {
+                    if (printFileName) {
+                        out.println("- parsing " + file.toAbsolutePath());
+                    }
+                    CompilationUnit cu = JavaParser.parse(file);
+                    solveMethodCalls(cu);
                 }
-                CompilationUnit cu = JavaParser.parse(file);
-                solveMethodCalls(cu);
+                return FileVisitResult.CONTINUE;
             }
-        }
+        });
     }
 
-    public void setTypeSolver(TypeSolver typeSolver) {
-        this.typeSolver = typeSolver;
+    private int lineNr(Node node) {
+        return node.getRange().map(range -> range.begin.line).orElseThrow(IllegalStateException::new);
     }
-
 }

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java

@@ -51,7 +51,7 @@ public int getNumberOfParams() {
 
     @Override
     public ResolvedParameterDeclaration getParam(int i) {
-        throw new UnsupportedOperationException("The default constructor has not parameters");
+        throw new UnsupportedOperationException("The default constructor has no parameters");
     }
 
     @Override

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java

@@ -110,7 +110,7 @@ public String getPackageName() {
     public String getClassName() {
         String className = ctClass.getName().replace('$', '.');
         if (getPackageName() != null) {
-            return className.substring(getPackageName().length() + 1, className.length());
+            return className.substring(getPackageName().length() + 1);
         }
         return className;
     }
@@ -120,6 +120,7 @@ public String getQualifiedName() {
         return ctClass.getName().replace('$', '.');
     }
 
+    @Deprecated
     public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> argumentsTypes,
                                                     Context invokationContext, List<ResolvedType> typeParameterValues) {
         return JavassistUtils.getMethodUsage(ctClass, name, argumentsTypes, typeSolver, invokationContext);

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java

@@ -35,8 +35,8 @@
  * @author Fred Lefévère-Laoide
  */
 public class JavassistConstructorDeclaration implements ResolvedConstructorDeclaration {
-    private CtConstructor ctConstructor;
-    private TypeSolver typeSolver;
+    private final CtConstructor ctConstructor;
+    private final TypeSolver typeSolver;
 
     public JavassistConstructorDeclaration(CtConstructor ctConstructor, TypeSolver typeSolver) {
         this.ctConstructor = ctConstructor;
@@ -45,8 +45,9 @@ public JavassistConstructorDeclaration(CtConstructor ctConstructor, TypeSolver t
 
     @Override
     public String toString() {
-        return "JavassistMethodDeclaration{" +
-                "CtConstructor=" + ctConstructor +
+        return getClass().getSimpleName() + "{" +
+                "ctConstructor=" + ctConstructor.getName() +
+                ", typeSolver=" + typeSolver +
                 '}';
     }
 

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java

@@ -59,4 +59,13 @@ public ResolvedType getType() {
         }
         return type;
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+                "ctField=" + ctField.getName() +
+                ", typeSolver=" + typeSolver +
+                '}';
+    }
+
 }

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java

@@ -282,4 +282,12 @@ public List<ResolvedEnumConstantDeclaration> getEnumConstants() {
     public List<ResolvedConstructorDeclaration> getConstructors() {
         return javassistTypeDeclarationAdapter.getConstructors();
     }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+                "ctClass=" + ctClass.getName() +
+                ", typeSolver=" + typeSolver +
+                '}';
+    }
 }

javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java

@@ -49,9 +49,7 @@ public ResolvedType getType() {
             } else {
                 return JavassistFactory.typeUsageFor(ctField.getType(), typeSolver);
             }
-        } catch (NotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (BadBytecode e) {
+        } catch (NotFoundException | BadBytecode e) {
             throw new RuntimeException(e);
         }
     }