Merge remote-tracking branch 'javaparser/master' into issue_799_name_parser

# Conflicts:
#	javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
#	javaparser-core/src/main/java/com/github/javaparser/ParseStart.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java

1 files changed, 6 insertions, 8 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 1f89e75da..5ff39f50b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
@@ -53,7 +53,7 @@ public final class JavaParser {
     private final CommentsInserter commentsInserter;
     private final ParserConfiguration configuration;
 
-    private ASTParser astParser = null;
+    private GeneratedJavaParser astParser = null;
 
     /**
      * Instantiate the parser with default configuration. Note that parsing can also be done with the static methods on
@@ -73,9 +73,9 @@ public final class JavaParser {
         commentsInserter = new CommentsInserter(configuration);
     }
 
-    private ASTParser getParserForProvider(Provider provider) {
+    private GeneratedJavaParser getParserForProvider(Provider provider) {
         if (astParser == null) {
-            astParser = new ASTParser(provider);
+            astParser = new GeneratedJavaParser(provider);
         } else {
             astParser.reset(provider);
         }
@@ -97,7 +97,7 @@ public final class JavaParser {
         assertNotNull(start);
         assertNotNull(provider);
         try {
-            final ASTParser parser = getParserForProvider(provider);
+            final GeneratedJavaParser parser = getParserForProvider(provider);
             N resultNode = start.parse(parser);
             if (configuration.isAttributeComments()) {
                 final CommentsCollection comments = parser.getCommentsCollection();
@@ -294,10 +294,7 @@ public final class JavaParser {
 
     private static <T extends Node> T simplifiedParse(ParseStart<T> context, Provider provider) {
         ParseResult<T> result = new JavaParser(new ParserConfiguration()).parse(context, provider);
-        if (result.isSuccessful()) {
-            return result.getResult().get();
-        }
-        throw new ParseProblemException(result.getProblems());
+        return result.getResult().orElseThrow(() -> new ParseProblemException(result.getProblems()));
     }
 
     /**
@@ -427,4 +424,5 @@ public final class JavaParser {
     public static Name parseName(String qualifiedName) {
         return simplifiedParse(NAME, provider(qualifiedName));
     }
+
 }