addressing Matazoid comments

2 files changed, 10 insertions, 7 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
index 1d4277504..13c6a0cf8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
@@ -45,6 +45,7 @@ import com.github.javaparser.resolution.SymbolResolver;
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
+import java.util.Optional;
 
 import static com.github.javaparser.ParseStart.*;
 import static com.github.javaparser.Problem.PROBLEM_BY_BEGIN_POSITION;
@@ -340,7 +341,6 @@ public final class JavaParser {
     private static <T extends Node> T simplifiedParse(ParseStart<T> context, Provider provider) {
         ParseResult<T> result = new JavaParser(staticConfiguration).parse(context, provider);
         if (result.isSuccessful()) {
-            considerInjectingSymbolResolver(result, staticConfiguration);
             return result.getResult().get();
         }
         throw new ParseProblemException(result.getProblems());
@@ -527,10 +527,10 @@ public final class JavaParser {
     }
 
     private static void considerInjectingSymbolResolver(ParseResult<?> parseResult, ParserConfiguration parserConfiguration) {
-        SymbolResolver symbolResolver = parserConfiguration.getSymbolResolver();
-        if (symbolResolver != null && parseResult.getResult().get() instanceof CompilationUnit) {
+        Optional<SymbolResolver> symbolResolver = parserConfiguration.getSymbolResolver();
+        if (symbolResolver.isPresent() && parseResult.getResult().get() instanceof CompilationUnit) {
             CompilationUnit compilationUnit = (CompilationUnit)parseResult.getResult().get();
-            compilationUnit.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver);
+            compilationUnit.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver.get());
         }
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
index 45bfc2373..f722eca7a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
@@ -25,6 +25,8 @@ import com.github.javaparser.ast.validator.Java8Validator;
 import com.github.javaparser.ast.validator.Validator;
 import com.github.javaparser.resolution.SymbolResolver;
 
+import java.util.Optional;
+
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
@@ -129,14 +131,15 @@ public class ParserConfiguration {
     /**
      * Retrieve the SymbolResolver to be used while parsing, if any.
      */
-    public SymbolResolver getSymbolResolver() {
-        return symbolResolver;
+    public Optional<SymbolResolver> getSymbolResolver() {
+        return Optional.ofNullable(symbolResolver);
     }
 
     /**
      * Set the SymbolResolver to be injected while parsing.
      */
-    public void setSymbolResolver(SymbolResolver symbolResolver) {
+    public ParserConfiguration setSymbolResolver(SymbolResolver symbolResolver) {
         this.symbolResolver = symbolResolver;
+        return this;
     }
 }