From 623ba4c92e7c342b6ce9af355c0e2dda9920ccba Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 17 Apr 2020 20:41:54 +0200
Subject: [PATCH] [javascript] Internalize AST constructors

---
 docs/pages/release_notes.md                   |  3 +-
 .../ecmascript/ast/ASTArrayComprehension.java |  9 ++---
 .../ast/ASTArrayComprehensionLoop.java        | 10 +++---
 .../lang/ecmascript/ast/ASTArrayLiteral.java  | 18 +++++++---
 .../lang/ecmascript/ast/ASTAssignment.java    |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTAstRoot.java   |  8 ++---
 .../pmd/lang/ecmascript/ast/ASTBlock.java     |  9 ++---
 .../ecmascript/ast/ASTBreakStatement.java     |  9 ++---
 .../lang/ecmascript/ast/ASTCatchClause.java   |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTComment.java   |  9 ++---
 .../ast/ASTConditionalExpression.java         |  9 ++---
 .../ecmascript/ast/ASTContinueStatement.java  |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTDoLoop.java    |  9 ++---
 .../lang/ecmascript/ast/ASTElementGet.java    |  9 ++---
 .../ecmascript/ast/ASTEmptyExpression.java    |  9 ++---
 .../ecmascript/ast/ASTEmptyStatement.java     |  6 +++-
 .../ast/ASTExpressionStatement.java           |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTForInLoop.java |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTForLoop.java   |  9 ++---
 .../lang/ecmascript/ast/ASTFunctionCall.java  |  9 ++---
 .../lang/ecmascript/ast/ASTFunctionNode.java  |  9 ++---
 .../lang/ecmascript/ast/ASTIfStatement.java   |  9 ++---
 .../ecmascript/ast/ASTInfixExpression.java    |  9 ++---
 .../ecmascript/ast/ASTKeywordLiteral.java     |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTLabel.java     |  9 ++---
 .../ecmascript/ast/ASTLabeledStatement.java   |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTLetNode.java   |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTName.java      |  9 ++---
 .../lang/ecmascript/ast/ASTNewExpression.java |  9 ++---
 .../lang/ecmascript/ast/ASTNumberLiteral.java |  9 ++---
 .../lang/ecmascript/ast/ASTObjectLiteral.java | 18 +++++++---
 .../ecmascript/ast/ASTObjectProperty.java     |  9 ++---
 .../ast/ASTParenthesizedExpression.java       |  9 ++---
 .../lang/ecmascript/ast/ASTPropertyGet.java   |  9 ++---
 .../lang/ecmascript/ast/ASTRegExpLiteral.java |  9 ++---
 .../ecmascript/ast/ASTReturnStatement.java    |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTScope.java     |  9 ++---
 .../lang/ecmascript/ast/ASTStringLiteral.java |  9 ++---
 .../lang/ecmascript/ast/ASTSwitchCase.java    |  9 ++---
 .../ecmascript/ast/ASTSwitchStatement.java    |  9 ++---
 .../ecmascript/ast/ASTThrowStatement.java     |  9 ++---
 .../lang/ecmascript/ast/ASTTryStatement.java  |  9 ++---
 .../ecmascript/ast/ASTUnaryExpression.java    |  9 ++---
 .../ast/ASTVariableDeclaration.java           |  9 ++---
 .../ast/ASTVariableInitializer.java           |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTWhileLoop.java |  9 ++---
 .../lang/ecmascript/ast/ASTWithStatement.java |  9 ++---
 .../lang/ecmascript/ast/ASTXmlDotQuery.java   |  9 ++---
 .../lang/ecmascript/ast/ASTXmlExpression.java |  9 ++---
 .../lang/ecmascript/ast/ASTXmlMemberGet.java  |  9 ++---
 .../pmd/lang/ecmascript/ast/ASTXmlString.java |  9 ++---
 .../ast/AbstractEcmascriptNode.java           | 16 ++++++---
 .../ast/AbstractInfixEcmascriptNode.java      |  6 +++-
 .../ecmascript/ast/DestructuringNode.java     |  2 +-
 .../lang/ecmascript/ast/EcmascriptNode.java   |  4 ++-
 .../lang/ecmascript/ast/EcmascriptParser.java |  2 +-
 .../ast/EcmascriptParserVisitor.java          |  2 +-
 .../ast/EcmascriptParserVisitorAdapter.java   |  2 +-
 .../ecmascript/ast/EcmascriptTreeBuilder.java | 36 ++++++++++---------
 .../ecmascript/ast/TrailingCommaNode.java     |  6 +++-
 60 files changed, 315 insertions(+), 229 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 320b997bb8..fa98c0332a 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -80,7 +80,7 @@ You can identify them with the `@InternalApi` annotation. You'll also get a depr
 
 As part of the changes we'd like to do to AST classes for 7.0.0, we would like to
 hide some methods and constructors that rule writers should not have access to.
-The following usages are now deprecated in the **Visualforce** and **PLSQL** ASTs:
+The following usages are now deprecated in the **Javascript**, **Visualforce** and **PLSQL** ASTs:
 
 *   Manual instantiation of nodes. **Constructors of node classes are deprecated** and
     marked {% jdoc core::annotation.InternalApi %}. Nodes should only be obtained from the parser,
@@ -101,6 +101,7 @@ The following usages are now deprecated in the **Visualforce** and **PLSQL** AST
 
 These deprecations are added to the following language modules in this release.
 Please look at the package documentation to find out the full list of deprecations.
+* Javascript: **{% jdoc_package javascript::lang.ecmascript.ast %}**
 * Visualforce: **{% jdoc_package visualforce::lang.vf.ast %}**
 * PL/SQL: **{% jdoc_package plsql::lang.plsql.ast %}**
 
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
index bac1b7ce85..c19b626cd5 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ArrayComprehension;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTArrayComprehension extends AbstractEcmascriptNode<ArrayComprehension> {
+    @Deprecated
+    @InternalApi
     public ASTArrayComprehension(ArrayComprehension arrayComprehension) {
         super(arrayComprehension);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
index c815518225..c7007f5982 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ArrayComprehensionLoop;
 
-public class ASTArrayComprehensionLoop extends AbstractEcmascriptNode<ArrayComprehensionLoop> {
+import net.sourceforge.pmd.annotation.InternalApi;
 
+public class ASTArrayComprehensionLoop extends AbstractEcmascriptNode<ArrayComprehensionLoop> {
+    @Deprecated
+    @InternalApi
     public ASTArrayComprehensionLoop(ArrayComprehensionLoop arrayComprehensionLoop) {
         super(arrayComprehensionLoop);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
index 0365dce7b2..eb70858d21 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,17 +6,18 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ArrayLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTArrayLiteral extends AbstractEcmascriptNode<ArrayLiteral>
         implements DestructuringNode, TrailingCommaNode {
     private boolean trailingComma;
 
+    @Deprecated
+    @InternalApi
     public ASTArrayLiteral(ArrayLiteral arrayLiteral) {
         super(arrayLiteral);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -33,7 +34,14 @@ public class ASTArrayLiteral extends AbstractEcmascriptNode<ArrayLiteral>
     }
 
     @Override
+    @Deprecated
+    @InternalApi
     public void setTrailingComma(boolean trailingComma) {
-        this.trailingComma = trailingComma;
+        setTrailingCommaExists(trailingComma);
+    }
+
+    @Override
+    protected void setTrailingCommaExists(boolean b) {
+        this.trailingComma = b;
     }
 }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAssignment.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAssignment.java
index df21972ad1..802e9a729f 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAssignment.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAssignment.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Assignment;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTAssignment extends AbstractInfixEcmascriptNode<Assignment> {
+    @Deprecated
+    @InternalApi
     public ASTAssignment(Assignment asssignment) {
         super(asssignment);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
index 7d752fbbb1..f019aebd23 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,16 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.AstRoot;
 
+import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.RootNode;
 
 public class ASTAstRoot extends AbstractEcmascriptNode<AstRoot> implements RootNode {
+    @Deprecated
+    @InternalApi
     public ASTAstRoot(AstRoot astRoot) {
         super(astRoot);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBlock.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBlock.java
index 0664e036ee..20d29018fa 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBlock.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBlock.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Block;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTBlock extends AbstractEcmascriptNode<Block> {
+    @Deprecated
+    @InternalApi
     public ASTBlock(Block block) {
         super(block);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBreakStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBreakStatement.java
index 0553a6d88d..6c976b370c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBreakStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTBreakStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.BreakStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTBreakStatement extends AbstractEcmascriptNode<BreakStatement> {
+    @Deprecated
+    @InternalApi
     public ASTBreakStatement(BreakStatement breakStatement) {
         super(breakStatement);
         super.setImage(breakStatement.getBreakLabel() != null ? breakStatement.getBreakLabel().getIdentifier() : null);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTCatchClause.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTCatchClause.java
index c9986c6a2d..6ddfd31e55 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTCatchClause.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTCatchClause.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.CatchClause;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTCatchClause extends AbstractEcmascriptNode<CatchClause> {
+    @Deprecated
+    @InternalApi
     public ASTCatchClause(CatchClause catchClause) {
         super(catchClause);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTComment.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTComment.java
index 35d8f676a0..bc509a043d 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTComment.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTComment.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Comment;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTComment extends AbstractEcmascriptNode<Comment> {
+    @Deprecated
+    @InternalApi
     public ASTComment(Comment comment) {
         super(comment);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTConditionalExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTConditionalExpression.java
index 9168d32d97..379b05676e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTConditionalExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTConditionalExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ConditionalExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTConditionalExpression extends AbstractEcmascriptNode<ConditionalExpression> {
+    @Deprecated
+    @InternalApi
     public ASTConditionalExpression(ConditionalExpression conditionalExpression) {
         super(conditionalExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTContinueStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTContinueStatement.java
index fa0f1e818d..5c133dd09c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTContinueStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTContinueStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ContinueStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTContinueStatement extends AbstractEcmascriptNode<ContinueStatement> {
+    @Deprecated
+    @InternalApi
     public ASTContinueStatement(ContinueStatement continueStatement) {
         super(continueStatement);
         super.setImage(continueStatement.getLabel() != null ? continueStatement.getLabel().getIdentifier() : null);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTDoLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTDoLoop.java
index a3030807ff..532b5edd98 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTDoLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTDoLoop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.DoLoop;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTDoLoop extends AbstractEcmascriptNode<DoLoop> {
+    @Deprecated
+    @InternalApi
     public ASTDoLoop(DoLoop doLoop) {
         super(doLoop);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTElementGet.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTElementGet.java
index c7f735e682..b41998c1f9 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTElementGet.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTElementGet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ElementGet;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTElementGet extends AbstractEcmascriptNode<ElementGet> {
+    @Deprecated
+    @InternalApi
     public ASTElementGet(ElementGet elementGet) {
         super(elementGet);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyExpression.java
index e6c8a9ab40..afcab8437c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.EmptyExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTEmptyExpression extends AbstractEcmascriptNode<EmptyExpression> {
+    @Deprecated
+    @InternalApi
     public ASTEmptyExpression(EmptyExpression emptyExpression) {
         super(emptyExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyStatement.java
index 7972311bc0..1b53091ad8 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTEmptyStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,7 +6,11 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.EmptyStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTEmptyStatement extends AbstractEcmascriptNode<EmptyStatement> {
+    @Deprecated
+    @InternalApi
     public ASTEmptyStatement(EmptyStatement emptyStatement) {
         super(emptyStatement);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTExpressionStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTExpressionStatement.java
index 0757f9329d..de2a5acb65 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTExpressionStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTExpressionStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -7,14 +7,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 import org.mozilla.javascript.Token;
 import org.mozilla.javascript.ast.ExpressionStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTExpressionStatement extends AbstractEcmascriptNode<ExpressionStatement> {
+    @Deprecated
+    @InternalApi
     public ASTExpressionStatement(ExpressionStatement expressionStatement) {
         super(expressionStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
index beba25df6b..d148c56ff7 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ForInLoop;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTForInLoop extends AbstractEcmascriptNode<ForInLoop> {
+    @Deprecated
+    @InternalApi
     public ASTForInLoop(ForInLoop forInLoop) {
         super(forInLoop);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
index d81b640e63..d2d4cc3b78 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ForLoop;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTForLoop extends AbstractEcmascriptNode<ForLoop> {
+    @Deprecated
+    @InternalApi
     public ASTForLoop(ForLoop forLoop) {
         super(forLoop);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
index 2e975149e9..b527d45747 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.FunctionCall;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTFunctionCall extends AbstractEcmascriptNode<FunctionCall> {
+    @Deprecated
+    @InternalApi
     public ASTFunctionCall(FunctionCall functionCall) {
         super(functionCall);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
index 19de0add06..599fddae59 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.FunctionNode;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTFunctionNode extends AbstractEcmascriptNode<FunctionNode> {
+    @Deprecated
+    @InternalApi
     public ASTFunctionNode(FunctionNode functionNode) {
         super(functionNode);
         super.setImage(functionNode.getName());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
index 06541a5b4f..82eb5ad242 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.IfStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTIfStatement extends AbstractEcmascriptNode<IfStatement> {
+    @Deprecated
+    @InternalApi
     public ASTIfStatement(IfStatement ifStatement) {
         super(ifStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
index bbf8842263..31213ab076 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.InfixExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTInfixExpression extends AbstractInfixEcmascriptNode<InfixExpression> {
+    @Deprecated
+    @InternalApi
     public ASTInfixExpression(InfixExpression infixExpression) {
         super(infixExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTKeywordLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTKeywordLiteral.java
index 9d797fe6d4..c32c3f5470 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTKeywordLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTKeywordLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -9,15 +9,16 @@ import java.util.Locale;
 import org.mozilla.javascript.Token;
 import org.mozilla.javascript.ast.KeywordLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTKeywordLiteral extends AbstractEcmascriptNode<KeywordLiteral> {
+    @Deprecated
+    @InternalApi
     public ASTKeywordLiteral(KeywordLiteral keywordLiteral) {
         super(keywordLiteral);
         super.setImage(Token.typeToName(keywordLiteral.getType()).toLowerCase(Locale.ROOT));
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
index 6cd6466a67..0280e58c1b 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Label;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTLabel extends AbstractEcmascriptNode<Label> {
+    @Deprecated
+    @InternalApi
     public ASTLabel(Label label) {
         super(label);
         super.setImage(label.getName());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
index 5f9cc456c3..80b8e576ad 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.LabeledStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTLabeledStatement extends AbstractEcmascriptNode<LabeledStatement> {
+    @Deprecated
+    @InternalApi
     public ASTLabeledStatement(LabeledStatement labeledStatement) {
         super(labeledStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
index 5100a39f30..db51803ac2 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.LetNode;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTLetNode extends AbstractEcmascriptNode<LetNode> {
+    @Deprecated
+    @InternalApi
     public ASTLetNode(LetNode letNode) {
         super(letNode);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTName.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTName.java
index 063020844a..be306b16fb 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTName.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Name;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTName extends AbstractEcmascriptNode<Name> {
+    @Deprecated
+    @InternalApi
     public ASTName(Name name) {
         super(name);
         super.setImage(name.getIdentifier());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
index 173e04f54d..71b193a31a 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.NewExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTNewExpression extends AbstractEcmascriptNode<NewExpression> {
+    @Deprecated
+    @InternalApi
     public ASTNewExpression(NewExpression newExpression) {
         super(newExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
index 02e77d3fbe..0eda685238 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.NumberLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTNumberLiteral extends AbstractEcmascriptNode<NumberLiteral> {
+    @Deprecated
+    @InternalApi
     public ASTNumberLiteral(NumberLiteral numberLiteral) {
         super(numberLiteral);
         super.setImage(numberLiteral.getValue());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
index 38368aec5b..7bdeb09bb8 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,17 +6,18 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ObjectLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTObjectLiteral extends AbstractEcmascriptNode<ObjectLiteral>
         implements DestructuringNode, TrailingCommaNode {
     private boolean trailingComma;
 
+    @Deprecated
+    @InternalApi
     public ASTObjectLiteral(ObjectLiteral objectLiteral) {
         super(objectLiteral);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
@@ -37,7 +38,14 @@ public class ASTObjectLiteral extends AbstractEcmascriptNode<ObjectLiteral>
     }
 
     @Override
+    @Deprecated
+    @InternalApi
     public void setTrailingComma(boolean trailingComma) {
-        this.trailingComma = trailingComma;
+        setTrailingCommaExists(trailingComma);
+    }
+
+    @Override
+    protected void setTrailingCommaExists(boolean b) {
+        this.trailingComma = b;
     }
 }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
index 86a7bf8b47..370c899b23 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ObjectProperty;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTObjectProperty extends AbstractInfixEcmascriptNode<ObjectProperty> {
+    @Deprecated
+    @InternalApi
     public ASTObjectProperty(ObjectProperty objectProperty) {
         super(objectProperty);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
index 170f0a9c7b..0925277d23 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ParenthesizedExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTParenthesizedExpression extends AbstractEcmascriptNode<ParenthesizedExpression> {
+    @Deprecated
+    @InternalApi
     public ASTParenthesizedExpression(ParenthesizedExpression parenthesizedExpression) {
         super(parenthesizedExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
index cf8b3a5570..2aa9838df3 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.PropertyGet;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTPropertyGet extends AbstractInfixEcmascriptNode<PropertyGet> {
+    @Deprecated
+    @InternalApi
     public ASTPropertyGet(PropertyGet propertyGet) {
         super(propertyGet, false);
         super.setImage(".");
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
index 485537794e..bbc90f4a7c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.RegExpLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTRegExpLiteral extends AbstractEcmascriptNode<RegExpLiteral> {
+    @Deprecated
+    @InternalApi
     public ASTRegExpLiteral(RegExpLiteral regExpLiteral) {
         super(regExpLiteral);
         super.setImage(regExpLiteral.getValue());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
index 78dcbf1f9e..3efaa5cbea 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ReturnStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTReturnStatement extends AbstractEcmascriptNode<ReturnStatement> {
+    @Deprecated
+    @InternalApi
     public ASTReturnStatement(ReturnStatement returnStatement) {
         super(returnStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
index 54dd0a5bc3..36b76b39f0 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.Scope;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTScope extends AbstractEcmascriptNode<Scope> {
+    @Deprecated
+    @InternalApi
     public ASTScope(Scope scope) {
         super(scope);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
index 2d10e25d86..d81dd79a4b 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.StringLiteral;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTStringLiteral extends AbstractEcmascriptNode<StringLiteral> {
+    @Deprecated
+    @InternalApi
     public ASTStringLiteral(StringLiteral stringLiteral) {
         super(stringLiteral);
         super.setImage(stringLiteral.getValue());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
index 102d590e4a..574199f1fd 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.SwitchCase;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTSwitchCase extends AbstractEcmascriptNode<SwitchCase> {
+    @Deprecated
+    @InternalApi
     public ASTSwitchCase(SwitchCase switchCase) {
         super(switchCase);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
index 47cd55f1a2..fd61692c49 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.SwitchStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTSwitchStatement extends AbstractEcmascriptNode<SwitchStatement> {
+    @Deprecated
+    @InternalApi
     public ASTSwitchStatement(SwitchStatement switchStatement) {
         super(switchStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
index eb380fbb17..822908504c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.ThrowStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTThrowStatement extends AbstractEcmascriptNode<ThrowStatement> {
+    @Deprecated
+    @InternalApi
     public ASTThrowStatement(ThrowStatement throwStatement) {
         super(throwStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
index 467da01b46..8d796f4abd 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.TryStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTTryStatement extends AbstractEcmascriptNode<TryStatement> {
+    @Deprecated
+    @InternalApi
     public ASTTryStatement(TryStatement tryStatement) {
         super(tryStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTUnaryExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTUnaryExpression.java
index 9d20b5adce..d409f2ca6e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTUnaryExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTUnaryExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -8,7 +8,11 @@ import org.mozilla.javascript.Token;
 import org.mozilla.javascript.ast.AstRoot;
 import org.mozilla.javascript.ast.UnaryExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTUnaryExpression extends AbstractEcmascriptNode<UnaryExpression> {
+    @Deprecated
+    @InternalApi
     public ASTUnaryExpression(UnaryExpression unaryExpression) {
         super(unaryExpression);
         if (unaryExpression.getOperator() == Token.VOID) {
@@ -18,9 +22,6 @@ public class ASTUnaryExpression extends AbstractEcmascriptNode<UnaryExpression>
         }
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
index 36ef8a6ca8..1eb176df1d 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -9,15 +9,16 @@ import java.util.Locale;
 import org.mozilla.javascript.Token;
 import org.mozilla.javascript.ast.VariableDeclaration;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTVariableDeclaration extends AbstractEcmascriptNode<VariableDeclaration> {
+    @Deprecated
+    @InternalApi
     public ASTVariableDeclaration(VariableDeclaration variableDeclaration) {
         super(variableDeclaration);
         super.setImage(Token.typeToName(variableDeclaration.getType()).toLowerCase(Locale.ROOT));
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
index f23d685c55..63e9debe0d 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.VariableInitializer;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTVariableInitializer extends AbstractEcmascriptNode<VariableInitializer> implements DestructuringNode {
+    @Deprecated
+    @InternalApi
     public ASTVariableInitializer(VariableInitializer variableInitializer) {
         super(variableInitializer);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
index 03b01de2e6..0bea757ef9 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.WhileLoop;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTWhileLoop extends AbstractEcmascriptNode<WhileLoop> {
+    @Deprecated
+    @InternalApi
     public ASTWhileLoop(WhileLoop whileLoop) {
         super(whileLoop);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
index 7577348a6d..e3468cdd7e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.WithStatement;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTWithStatement extends AbstractEcmascriptNode<WithStatement> {
+    @Deprecated
+    @InternalApi
     public ASTWithStatement(WithStatement withStatement) {
         super(withStatement);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
index 0d20ad94a7..d731d9c567 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.XmlDotQuery;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTXmlDotQuery extends AbstractInfixEcmascriptNode<XmlDotQuery> {
+    @Deprecated
+    @InternalApi
     public ASTXmlDotQuery(XmlDotQuery xmlDotQuery) {
         super(xmlDotQuery);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
index 058d8abdbb..d443b74a46 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.XmlExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTXmlExpression extends AbstractEcmascriptNode<XmlExpression> {
+    @Deprecated
+    @InternalApi
     public ASTXmlExpression(XmlExpression xmlExpression) {
         super(xmlExpression);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
index 70b2a81001..cc943c2579 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,14 +6,15 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.XmlMemberGet;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTXmlMemberGet extends AbstractInfixEcmascriptNode<XmlMemberGet> {
+    @Deprecated
+    @InternalApi
     public ASTXmlMemberGet(XmlMemberGet xmlMemberGet) {
         super(xmlMemberGet);
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
index fd17127064..c2728cd153 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,15 +6,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.XmlString;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class ASTXmlString extends AbstractEcmascriptNode<XmlString> {
+    @Deprecated
+    @InternalApi
     public ASTXmlString(XmlString xmlString) {
         super(xmlString);
         super.setImage(xmlString.getXml());
     }
 
-    /**
-     * Accept the visitor.
-     */
     @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
index 671b83b2e7..a06ca13d62 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -6,13 +6,18 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.AstNode;
 
+import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.AbstractNode;
 import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
 
+@Deprecated
+@InternalApi
 public abstract class AbstractEcmascriptNode<T extends AstNode> extends AbstractNode implements EcmascriptNode<T> {
 
     protected final T node;
 
+    @Deprecated
+    @InternalApi
     public AbstractEcmascriptNode(T node) {
         super(node.getType());
         this.node = node;
@@ -59,6 +64,7 @@ public abstract class AbstractEcmascriptNode<T extends AstNode> extends Abstract
     }
 
     @Override
+    @Deprecated
     public T getNode() {
         return node;
     }
@@ -73,11 +79,13 @@ public abstract class AbstractEcmascriptNode<T extends AstNode> extends Abstract
         return node.hasSideEffects();
     }
 
-
-
-
     @Override
     public String getXPathNodeName() {
         return node.shortName();
     }
+
+    protected void setTrailingCommaExists(boolean b) {
+        // empty. Only needed for ASTArrayLiteral and ASTObjectLiteral
+        // This method is protected to not clutter the public API via a interface
+    }
 }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractInfixEcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractInfixEcmascriptNode.java
index 8efc1abf92..bf72057b26 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractInfixEcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractInfixEcmascriptNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -8,8 +8,12 @@ import org.mozilla.javascript.Token;
 import org.mozilla.javascript.ast.AstRoot;
 import org.mozilla.javascript.ast.InfixExpression;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public class AbstractInfixEcmascriptNode<T extends InfixExpression> extends AbstractEcmascriptNode<T> {
 
+    @Deprecated
+    @InternalApi
     public AbstractInfixEcmascriptNode(T infixExpression) {
         this(infixExpression, true);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/DestructuringNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/DestructuringNode.java
index b264a9f78f..4c68bbbc41 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/DestructuringNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/DestructuringNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
index a4b8668bd0..b42a23672d 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -26,7 +26,9 @@ public interface EcmascriptNode<T extends AstNode> extends Node {
 
     /**
      * Get the underlying Rhino AST node.
+     * @deprecated The underlying Rhino node should not be used directly.
      */
+    @Deprecated
     T getNode();
 
     /**
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java
index 0ef196dbb7..7d43bf91f0 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitor.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitor.java
index 7defae402f..2b1abfc343 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitor.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
index 50cf23cff5..b8ee75de59 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptTreeBuilder.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptTreeBuilder.java
index 86cd811622..45d3fc066e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptTreeBuilder.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptTreeBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
@@ -66,12 +66,15 @@ import org.mozilla.javascript.ast.XmlExpression;
 import org.mozilla.javascript.ast.XmlMemberGet;
 import org.mozilla.javascript.ast.XmlString;
 
+import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
 
+@Deprecated
+@InternalApi
 public final class EcmascriptTreeBuilder implements NodeVisitor {
 
-    private static final Map<Class<? extends AstNode>, Constructor<? extends EcmascriptNode<?>>> NODE_TYPE_TO_NODE_ADAPTER_TYPE = new HashMap<>();
+    private static final Map<Class<? extends AstNode>, Constructor<? extends AbstractEcmascriptNode<?>>> NODE_TYPE_TO_NODE_ADAPTER_TYPE = new HashMap<>();
 
     static {
         register(ArrayComprehension.class, ASTArrayComprehension.class);
@@ -127,7 +130,7 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
     }
 
     private List<ParseProblem> parseProblems;
-    private Map<ParseProblem, TrailingCommaNode> parseProblemToNode = new HashMap<>();
+    private Map<ParseProblem, AbstractEcmascriptNode<?>> parseProblemToNode = new HashMap<>();
 
     // The nodes having children built.
     private Stack<Node> nodes = new Stack<>();
@@ -143,7 +146,7 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
     }
 
     private static <T extends AstNode> void register(Class<T> nodeType,
-            Class<? extends EcmascriptNode<T>> nodeAdapterType) {
+            Class<? extends AbstractEcmascriptNode<T>> nodeAdapterType) {
         try {
             NODE_TYPE_TO_NODE_ADAPTER_TYPE.put(nodeType, nodeAdapterType.getConstructor(nodeType));
         } catch (SecurityException | NoSuchMethodException e) {
@@ -151,12 +154,12 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
         }
     }
 
-    static <T extends AstNode> EcmascriptNode<T> createNodeAdapter(T node) {
+    static <T extends AstNode> AbstractEcmascriptNode<T> createNodeAdapter(T node) {
         try {
-            // the register function makes sure only EcmascriptNode<T> can be
+            // the register function makes sure only AbstractEcmascriptNode<T> can be
             // added, where T is "T extends AstNode".
             @SuppressWarnings("unchecked")
-            Constructor<? extends EcmascriptNode<T>> constructor = (Constructor<? extends EcmascriptNode<T>>) NODE_TYPE_TO_NODE_ADAPTER_TYPE
+            Constructor<? extends AbstractEcmascriptNode<T>> constructor = (Constructor<? extends AbstractEcmascriptNode<T>>) NODE_TYPE_TO_NODE_ADAPTER_TYPE
                     .get(node.getClass());
             if (constructor == null) {
                 throw new IllegalArgumentException(
@@ -176,8 +179,8 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
         calculateLineNumbers(node);
 
         // Set all the trailing comma nodes
-        for (TrailingCommaNode trailingCommaNode : parseProblemToNode.values()) {
-            trailingCommaNode.setTrailingComma(true);
+        for (AbstractEcmascriptNode<?> trailingCommaNode : parseProblemToNode.values()) {
+            trailingCommaNode.setTrailingCommaExists(true);
         }
 
         return node;
@@ -185,7 +188,7 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
 
     private <T extends AstNode> EcmascriptNode<T> buildInternal(T astNode) {
         // Create a Node
-        EcmascriptNode<T> node = createNodeAdapter(astNode);
+        AbstractEcmascriptNode<T> node = createNodeAdapter(astNode);
 
         // Append to parent
         Node parent = nodes.isEmpty() ? null : nodes.peek();
@@ -216,11 +219,10 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
         }
     }
 
-    private void handleParseProblems(EcmascriptNode<? extends AstNode> node) {
+    private void handleParseProblems(AbstractEcmascriptNode<? extends AstNode> node) {
         if (node instanceof TrailingCommaNode) {
-            TrailingCommaNode trailingCommaNode = (TrailingCommaNode) node;
-            int nodeStart = node.getNode().getAbsolutePosition();
-            int nodeEnd = nodeStart + node.getNode().getLength() - 1;
+            int nodeStart = node.node.getAbsolutePosition();
+            int nodeEnd = nodeStart + node.node.getLength() - 1;
 
             // This will fetch the localized message
             // See https://github.com/pmd/pmd/issues/384
@@ -235,9 +237,9 @@ public final class EcmascriptTreeBuilder implements NodeVisitor {
                     if (trailingCommaLocalizedMessage.equals(parseProblem.getMessage())) {
                         // Report on the shortest code block containing the
                         // problem (i.e. inner most code in nested structures).
-                        EcmascriptNode<?> currentNode = (EcmascriptNode<?>) parseProblemToNode.get(parseProblem);
-                        if (currentNode == null || node.getNode().getLength() < currentNode.getNode().getLength()) {
-                            parseProblemToNode.put(parseProblem, trailingCommaNode);
+                        AbstractEcmascriptNode<?> currentNode = (AbstractEcmascriptNode<?>) parseProblemToNode.get(parseProblem);
+                        if (currentNode == null || node.node.getLength() < currentNode.node.getLength()) {
+                            parseProblemToNode.put(parseProblem, node);
                         }
                     }
                 }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaNode.java
index a811ebcc9e..c6682f5ceb 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaNode.java
@@ -1,11 +1,15 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
 package net.sourceforge.pmd.lang.ecmascript.ast;
 
+import net.sourceforge.pmd.annotation.InternalApi;
+
 public interface TrailingCommaNode {
     boolean isTrailingComma();
 
+    @Deprecated
+    @InternalApi
     void setTrailingComma(boolean tailingComma);
 }