modern template included

Author: wumpz

pom.xml

@@ -85,10 +85,10 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.7.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                     <showWarnings>true</showWarnings>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
@@ -115,7 +115,7 @@
                     <dependency>
                         <groupId>net.java.dev.javacc</groupId>
                         <artifactId>javacc</artifactId>
-                        <version>7.0.2</version>
+                        <version>7.0.3</version>
                     </dependency>
                 </dependencies>
             </plugin>

src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java

@@ -23,7 +23,6 @@
 
 import java.io.InputStream;
 import java.io.Reader;
-import java.io.StringReader;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.Statement;

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -403,15 +403,16 @@ Statement SingleStatement() :
         |
         stm = Commit() 
         )
+		{ return stm; }
     } catch (ParseException e) {
         if (errorRecovery) {
             parseErrors.add(e);
             error_skipto(ST_SEMICOLON);
+			return null;
         }
         else 
             throw e;
     }
-    { return stm; }
 }
 
 Statements Statements() #Statements : 

src/test/java/net/sf/jsqlparser/statement/StatementsTest.java

@@ -1,10 +1,10 @@
 package net.sf.jsqlparser.statement;
 
-import java.io.StringReader;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParser;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.parser.ParseException;
+import net.sf.jsqlparser.parser.StringProvider;
 import net.sf.jsqlparser.statement.select.Select;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -63,7 +63,7 @@ public void testStatementsProblem() throws JSQLParserException {
     @Test
     public void testStatementsErrorRecovery() throws JSQLParserException, ParseException {
         String sqls = "select * from mytable; select * from;";
-        CCJSqlParser parser = new CCJSqlParser(new StringReader(sqls));
+        CCJSqlParser parser = new CCJSqlParser(new StringProvider(sqls));
         parser.setErrorRecovery(true);
         Statements parseStatements = parser.Statements();
 
@@ -76,7 +76,7 @@ public void testStatementsErrorRecovery() throws JSQLParserException, ParseExcep
     @Test
     public void testStatementsErrorRecovery2() throws JSQLParserException, ParseException {
         String sqls = "select * from1 table;";
-        CCJSqlParser parser = new CCJSqlParser(new StringReader(sqls));
+        CCJSqlParser parser = new CCJSqlParser(new StringProvider(sqls));
         parser.setErrorRecovery(true);
         Statements parseStatements = parser.Statements();
 
@@ -89,7 +89,7 @@ public void testStatementsErrorRecovery2() throws JSQLParserException, ParseExce
     @Test
     public void testStatementsErrorRecovery3() throws JSQLParserException, ParseException {
         String sqls = "select * from mytable; select * from;select * from mytable2";
-        CCJSqlParser parser = new CCJSqlParser(new StringReader(sqls));
+        CCJSqlParser parser = new CCJSqlParser(new StringProvider(sqls));
         parser.setErrorRecovery(true);
         Statements parseStatements = parser.Statements();
 

src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java

@@ -25,7 +25,6 @@
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.parser.TokenMgrError;
 
 import static net.sf.jsqlparser.test.TestUtils.*;
 import org.apache.commons.io.FileUtils;
@@ -66,9 +65,6 @@ public void testAllSqlsParseDeparse() throws IOException {
                 } catch (JSQLParserException ex) {
                     //LOG.log(Level.SEVERE, null, ex);
                     LOG.log(Level.INFO, "   -> PROBLEM {0}", ex.toString());
-                } catch (TokenMgrError ex) {
-                    //LOG.log(Level.SEVERE, null, ex);
-                    LOG.log(Level.INFO, "   -> PROBLEM {0}", ex.toString());
                 } catch (Exception ex) {
                     LOG.log(Level.INFO, "   -> PROBLEM {0}", ex.toString());
                 } catch (ComparisonFailure ex) {