From 301cb8ca338c7b269cca5e07a8fe169b0dcc2416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Fri, 1 May 2020 16:20:05 +0200 Subject: [PATCH] Fix merge --- .../pmd/lang/plsql/ast/ASTFetchStatement.java | 15 +++------------ .../pmd/lang/plsql/ast/ASTSqlStatement.java | 14 ++------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatement.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatement.java index 710d5ef64b..af8a000777 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatement.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFetchStatement.java @@ -4,22 +4,13 @@ package net.sourceforge.pmd.lang.plsql.ast; -import net.sourceforge.pmd.annotation.InternalApi; - -public class ASTFetchStatement extends AbstractPLSQLNode { +public final class ASTFetchStatement extends AbstractPLSQLNode { private boolean bulkcollect; private boolean limit; - @Deprecated - @InternalApi - public ASTFetchStatement(int id) { - super(id); - } - @Deprecated - @InternalApi - public ASTFetchStatement(PLSQLParser p, int id) { - super(p, id); + ASTFetchStatement(int id) { + super(id); } void setBulkCollect(boolean bulkcollect) { diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatement.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatement.java index 1c74f07ad9..d39ee7d55b 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatement.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTSqlStatement.java @@ -4,26 +4,16 @@ package net.sourceforge.pmd.lang.plsql.ast; -import net.sourceforge.pmd.annotation.InternalApi; - -public class ASTSqlStatement extends AbstractPLSQLNode { +public final class ASTSqlStatement extends AbstractPLSQLNode { private Type type; public enum Type { COMMIT, ROLLBACK, SAVEPOINT, SET_TRANSACTION, LOCK_TABLE, MERGE } - @Deprecated - @InternalApi - public ASTSqlStatement(int id) { + ASTSqlStatement(int id) { super(id); } - @Deprecated - @InternalApi - public ASTSqlStatement(PLSQLParser p, int id) { - super(p, id); - } - void setType(Type type) { this.type = type; }