refact: Statements extends List<Statement>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/statement/Statements.java

@@ -11,21 +11,19 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
-public class Statements implements Serializable {
-
-    private List<Statement> statements;
+public class Statements extends ArrayList<Statement> implements Serializable {
 
+    @Deprecated
     public List<Statement> getStatements() {
-        return statements;
+        return this;
     }
 
+    @Deprecated
     public void setStatements(List<Statement> statements) {
-        this.statements = statements;
+        this.clear();
+        this.addAll(statements);
     }
 
     public void accept(StatementVisitor statementVisitor) {
@@ -35,7 +33,7 @@ public void accept(StatementVisitor statementVisitor) {
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
-        for (Statement stmt : statements) {
+        for (Statement stmt : this) {
             // IfElseStatements and Blocks control the Semicolons by themselves
             if (stmt instanceof IfElseStatement || stmt instanceof Block) {
                 b.append(stmt).append("\n");
@@ -45,21 +43,4 @@ public String toString() {
         }
         return b.toString();
     }
-
-    public Statements withStatements(List<Statement> statements) {
-        this.setStatements(statements);
-        return this;
-    }
-
-    public Statements addStatements(Statement... statements) {
-        List<Statement> collection = Optional.ofNullable(getStatements()).orElseGet(ArrayList::new);
-        Collections.addAll(collection, statements);
-        return this.withStatements(collection);
-    }
-
-    public Statements addStatements(Collection<? extends Statement> statements) {
-        List<Statement> collection = Optional.ofNullable(getStatements()).orElseGet(ArrayList::new);
-        collection.addAll(statements);
-        return this.withStatements(collection);
-    }
 }

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

@@ -737,8 +737,6 @@ Block Block() #Block : {
 
 Statements Statements() #Statements: {
     Statements stmts = new Statements();
-    List<Statement> list = new ArrayList<Statement>();
-    
     IfElseStatement ifElseStatement = null;
     Statement stm = null;
     Statement stm2 = null;
@@ -756,18 +754,18 @@ Statements Statements() #Statements: {
                      <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
                  ]
 
-                 { list.add( ifElseStatement ); }
+                 { stmts.add( ifElseStatement ); }
             )
             |
             (
                  stm = SingleStatement() 
                  | stm = Block()
 
                  [ LOOKAHEAD(2)  <ST_SEMICOLON> ]
-            ) { list.add(stm); }
+            ) { stmts.add(stm); }
             |
             LOOKAHEAD( { getAsBoolean(Feature.allowUnsupportedStatements) } ) stm = UnsupportedStatement()
-            { if ( !((UnsupportedStatement) stm).isEmpty() ) list.add(stm); }
+            { if ( !((UnsupportedStatement) stm).isEmpty() ) stmts.add(stm); }
         )
 
         (
@@ -784,20 +782,20 @@ Statements Statements() #Statements: {
                         <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2);  }
                     ]
 
-                    { list.add( ifElseStatement ); }
+                    { stmts.add( ifElseStatement ); }
                )
                |
                (
                     stm = SingleStatement()
                     | stm = Block()
 
                     [ LOOKAHEAD(2)  <ST_SEMICOLON> ]
-               ) { list.add(stm); }
+               ) { stmts.add(stm); }
                |
                // For any reason, we can't LOOKAHEAD( { getAsBoolean(Feature.allowUnsupportedStatements) } ) here
                // As it will result in a Stack Overflow
                stm = UnsupportedStatement()
-               { if ( !((UnsupportedStatement) stm).isEmpty() ) list.add(stm); }
+               { if ( !((UnsupportedStatement) stm).isEmpty() ) stmts.add(stm); }
             ]
         )*
         <EOF>
@@ -810,7 +808,7 @@ Statements Statements() #Statements: {
         }
     }
     {
-        return stmts.withStatements(list);
+        return stmts;
     }
 }