From ea20871b3533b2bcf04e2110b141e0ef81b9da9a Mon Sep 17 00:00:00 2001 From: daans Date: Thu, 5 Apr 2018 09:48:40 +0200 Subject: [PATCH] send errors to Log, completed javadoc and removed abbreviations from class names --- ...rategyTest.java => ParserCollectionStrategyTest.java} | 6 +++--- ...ectionStrategy.java => ParserCollectionStrategy.java} | 8 ++++---- .../java/com/github/javaparser/utils/ProjectRoot.java | 4 ++-- ...Strategy.java => SymbolSolverCollectionStrategy.java} | 9 +++++---- ...Test.java => SymbolSolverCollectionStrategyTest.java} | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) rename javaparser-core-testing/src/test/java/com/github/javaparser/utils/{JPCollectionStrategyTest.java => ParserCollectionStrategyTest.java} (89%) rename javaparser-core/src/main/java/com/github/javaparser/utils/{JPCollectionStrategy.java => ParserCollectionStrategy.java} (89%) rename javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/{JSSCollectionStrategy.java => SymbolSolverCollectionStrategy.java} (91%) rename javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/{JSSCollectionStrategyTest.java => SymbolSolverCollectionStrategyTest.java} (90%) diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/JPCollectionStrategyTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java similarity index 89% rename from javaparser-core-testing/src/test/java/com/github/javaparser/utils/JPCollectionStrategyTest.java rename to javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java index da816dbc45..f078c5e5e5 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/JPCollectionStrategyTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java @@ -9,10 +9,10 @@ import static org.junit.Assert.assertNotEquals; -public class JPCollectionStrategyTest { +public class ParserCollectionStrategyTest { - private final Path root = CodeGenerationUtils.mavenModuleRoot(JPCollectionStrategyTest.class).resolve("").getParent(); - private final ProjectRoot projectRoot = new CollectionContext(new JPCollectionStrategy()).collect(root); + private final Path root = CodeGenerationUtils.mavenModuleRoot(ParserCollectionStrategyTest.class).resolve("").getParent(); + private final ProjectRoot projectRoot = new CollectionContext(new ParserCollectionStrategy()).collect(root); @Test public void getSourceRoots() { diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/JPCollectionStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java similarity index 89% rename from javaparser-core/src/main/java/com/github/javaparser/utils/JPCollectionStrategy.java rename to javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java index c96a76dbd7..86e5ac9c9e 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/JPCollectionStrategy.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java @@ -11,15 +11,15 @@ /** * Strategy which collects all SourceRoots and returns them in a ProjectRoot object. */ -public class JPCollectionStrategy implements CollectionStrategy { +public class ParserCollectionStrategy implements CollectionStrategy { private final ParserConfiguration parserConfiguration; - public JPCollectionStrategy() { + public ParserCollectionStrategy() { this(new ParserConfiguration()); } - public JPCollectionStrategy(ParserConfiguration parserConfiguration) { + public ParserCollectionStrategy(ParserConfiguration parserConfiguration) { this.parserConfiguration = parserConfiguration; } @@ -60,7 +60,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e) { } }); } catch (IOException e) { - e.printStackTrace(); + Log.error(e, "Unable to walk %s", path); } return projectRoot; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java index b7488d8637..5d86a1f8f3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ProjectRoot.java @@ -3,7 +3,6 @@ import com.github.javaparser.ParserConfiguration; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -11,7 +10,8 @@ import java.util.concurrent.ConcurrentHashMap; /** - * A collection of SourceRoots. Provide the path to the root of the project, and + * A collection of SourceRoots. The ProjectRoot can be provided and populated with a CollectionContext together with + * a CollectionStrategy. */ public class ProjectRoot { diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategy.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java similarity index 91% rename from javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategy.java rename to javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java index 4acb561e90..7373cb8052 100644 --- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategy.java +++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java @@ -7,6 +7,7 @@ import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver; import com.github.javaparser.utils.CollectionStrategy; +import com.github.javaparser.utils.Log; import com.github.javaparser.utils.ProjectRoot; import java.io.IOException; @@ -20,16 +21,16 @@ * Strategy which collects all SourceRoots and initialises the TypeSolver and returns the SourceRoots configured * with the TypeSolver in a ProjectRoot object. */ -public class JSSCollectionStrategy implements CollectionStrategy { +public class SymbolSolverCollectionStrategy implements CollectionStrategy { private final ParserConfiguration parserConfiguration; private final CombinedTypeSolver typeSolver = new CombinedTypeSolver(new ReflectionTypeSolver(false)); - public JSSCollectionStrategy() { + public SymbolSolverCollectionStrategy() { this(new ParserConfiguration()); } - public JSSCollectionStrategy(ParserConfiguration parserConfiguration) { + public SymbolSolverCollectionStrategy(ParserConfiguration parserConfiguration) { this.parserConfiguration = parserConfiguration.setSymbolResolver(new JavaSymbolSolver(typeSolver)); } @@ -73,7 +74,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e) { } }); } catch (IOException e) { - e.printStackTrace(); + Log.error(e, "Unable to walk %s", path); } return projectRoot; } diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategyTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java similarity index 90% rename from javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategyTest.java rename to javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java index d94b44c9f6..7c69b418e1 100644 --- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/JSSCollectionStrategyTest.java +++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java @@ -12,10 +12,10 @@ import static org.junit.Assert.assertTrue; -public class JSSCollectionStrategyTest { +public class SymbolSolverCollectionStrategyTest { - private final Path root = CodeGenerationUtils.mavenModuleRoot(JSSCollectionStrategyTest.class).resolve("").getParent(); - private final ProjectRoot projectRoot = new CollectionContext(new JSSCollectionStrategy()).collect(root); + private final Path root = CodeGenerationUtils.mavenModuleRoot(SymbolSolverCollectionStrategyTest.class).resolve("").getParent(); + private final ProjectRoot projectRoot = new CollectionContext(new SymbolSolverCollectionStrategy()).collect(root); @Test public void resolveExpressions() throws IOException {