style: drop underscore prefix from parameters

Author: spannm

src/main/java/net/ucanaccess/commands/AddColumnCommand.java

@@ -16,15 +16,15 @@ public class AddColumnCommand implements ICommand {
     private final Map<String, String> columnMap;
     private final String              columnName;
 
-    public AddColumnCommand(String _tableName, String _columnName, String _execId, Map<String, String> _columnMap,
-            String[] _types, String[] _defaults, Boolean[] _notNulls) {
-        tableName = _tableName;
-        columnName = _columnName;
-        types = _types;
-        defaults = _defaults;
-        notNulls = _notNulls;
-        columnMap = _columnMap;
-        execId = _execId;
+    public AddColumnCommand(String tableName, String columnName, String execId, Map<String, String> columnMap,
+            String[] types, String[] defaults, Boolean[] notNulls) {
+        this.tableName = tableName;
+        this.columnName = columnName;
+        this.types = types;
+        this.defaults = defaults;
+        this.notNulls = notNulls;
+        this.columnMap = columnMap;
+        this.execId = execId;
     }
 
     @Override

src/main/java/net/ucanaccess/commands/AlterRenameCommand.java

@@ -11,10 +11,10 @@ public class AlterRenameCommand implements ICommand {
     private final String oldTableName;
     private final String newTableName;
 
-    public AlterRenameCommand(String _oldTableName, String _newTableName, String _execId) {
-        oldTableName = _oldTableName;
-        newTableName = _newTableName;
-        execId = _execId;
+    public AlterRenameCommand(String oldTableName, String newTableName, String execId) {
+        this.oldTableName = oldTableName;
+        this.newTableName = newTableName;
+        this.execId = execId;
     }
 
     @Override

src/main/java/net/ucanaccess/commands/AutoNumberAction.java

@@ -16,11 +16,11 @@ public class AutoNumberAction implements IFeedbackAction {
     private final Map<String, Object> oldAutoValues = new HashMap<>();
     private final Table               table;
 
-    public AutoNumberAction(Table _table, Object[] memento, Object[] byAccess) throws SQLException {
-        table = _table;
+    public AutoNumberAction(Table table, Object[] memento, Object[] byAccess) throws SQLException {
+        this.table = table;
         int i = 0;
 
-        for (Column col : _table.getColumns()) {
+        for (Column col : table.getColumns()) {
             if (col.isAutoNumber()) {
                 UcanaccessConnection conn = UcanaccessConnection.getCtxConnection();
                 Connection connHsqldb = conn.getHSQLDBConnection();
@@ -34,7 +34,7 @@ public AutoNumberAction(Table _table, Object[] memento, Object[] byAccess) throw
                 newAutoValues.put(col.getName(), cnNew);
                 conn.setFeedbackState(true);
                 String sql = String.format("UPDATE %s SET %s=? WHERE %s=?",
-                    SQLConverter.escapeIdentifier(_table.getName(), connHsqldb), hsqlColName, hsqlColName);
+                    SQLConverter.escapeIdentifier(table.getName(), connHsqldb), hsqlColName, hsqlColName);
 
                 try (PreparedStatement ps = connHsqldb.prepareStatement(sql)) {
                     ps.setObject(1, cnNew);

src/main/java/net/ucanaccess/commands/BlobAction.java

@@ -19,21 +19,21 @@ public class BlobAction implements IFeedbackAction {
     private boolean            containsBlob;
     private final Set<BlobKey> keys = new HashSet<>();
 
-    public BlobAction(Table _table, Object[] newValues) {
-        table = _table;
+    public BlobAction(Table table, Object[] newValues) {
+        this.table = table;
 
-        if (!BlobKey.hasPrimaryKey(_table)) {
+        if (!BlobKey.hasPrimaryKey(table)) {
             return;
         }
-        Index pk = _table.getPrimaryKeyIndex();
+        Index pk = table.getPrimaryKeyIndex();
         HashSet<String> hsKey = new HashSet<>();
         for (Index.Column icl : pk.getColumns()) {
             hsKey.add(icl.getName());
         }
         HashSet<String> hsBlob = new HashSet<>();
         int i = 0;
         Map<String, Object> keyMap = new HashMap<>();
-        for (Column col : _table.getColumns()) {
+        for (Column col : table.getColumns()) {
             if (col.getType().equals(DataType.OLE) && newValues[i] != null) {
                 containsBlob = true;
                 hsBlob.add(col.getName());
@@ -44,7 +44,7 @@ public BlobAction(Table _table, Object[] newValues) {
             ++i;
         }
         for (String cln : hsBlob) {
-            keys.add(new BlobKey(keyMap, table.getName(), cln));
+            keys.add(new BlobKey(keyMap, this.table.getName(), cln));
         }
 
     }

src/main/java/net/ucanaccess/commands/CreateForeignKeyCommand.java

@@ -13,11 +13,11 @@ public class CreateForeignKeyCommand implements ICommand {
     private final String execId;
     private final String relationshipName;
 
-    public CreateForeignKeyCommand(String _tableName, String _referencedTable, String _execId, String _relationshipName) {
-        tableName = _tableName;
-        referencedTable = _referencedTable;
-        execId = _execId;
-        relationshipName = _relationshipName;
+    public CreateForeignKeyCommand(String tableName, String referencedTable, String execId, String relationshipName) {
+        this.tableName = tableName;
+        this.referencedTable = referencedTable;
+        this.execId = execId;
+        this.relationshipName = relationshipName;
     }
 
     public String getRelationshipName() {

src/main/java/net/ucanaccess/commands/CreateIndexCommand.java

@@ -11,10 +11,10 @@ public class CreateIndexCommand implements ICommand {
     private final String tableName;
     private final String execId;
 
-    public CreateIndexCommand(String _indexName, String _tableName, String _execId) {
-        indexName = _indexName;
-        tableName = _tableName;
-        execId = _execId;
+    public CreateIndexCommand(String indexName, String tableName, String execId) {
+        this.indexName = indexName;
+        this.tableName = tableName;
+        this.execId = execId;
     }
 
     @Override

src/main/java/net/ucanaccess/commands/CreatePrimaryKeyCommand.java

@@ -10,9 +10,9 @@ public class CreatePrimaryKeyCommand implements ICommand {
     private final String tableName;
     private final String execId;
 
-    public CreatePrimaryKeyCommand(String _tableName, String _execId) {
-        tableName = _tableName;
-        execId = _execId;
+    public CreatePrimaryKeyCommand(String tableName, String execId) {
+        this.tableName = tableName;
+        this.execId = execId;
     }
 
     @Override

src/main/java/net/ucanaccess/commands/CreateTableCommand.java

@@ -16,18 +16,18 @@ public class CreateTableCommand implements ICommand {
     private Boolean[]           notNulls;
     private Map<String, String> columnMap;
 
-    public CreateTableCommand(String _tableName, String _execId) {
-        tableName = _tableName;
-        execId = _execId;
+    public CreateTableCommand(String tableName, String execId) {
+        this.tableName = tableName;
+        this.execId = execId;
     }
 
-    public CreateTableCommand(String tn, String execId2, Map<String, String> _columnMap, String[] _types,
-            String[] _defaults, Boolean[] _notNulls) {
+    public CreateTableCommand(String tn, String execId2, Map<String, String> columnMap, String[] types,
+            String[] defaults, Boolean[] notNulls) {
         this(tn, execId2);
-        types = _types;
-        defaults = _defaults;
-        notNulls = _notNulls;
-        columnMap = _columnMap;
+        this.types = types;
+        this.defaults = defaults;
+        this.notNulls = notNulls;
+        this.columnMap = columnMap;
     }
 
     public CreateTableCommand(String tn, String execId2, Map<String, String> columnMap2) {
@@ -74,8 +74,8 @@ public IFeedbackAction persist() throws SQLException {
         try {
             Persist2Jet p2a = new Persist2Jet();
             p2a.createTable(tableName, columnMap, types, defaults, notNulls);
-        } catch (IOException _ex) {
-            throw new UcanaccessSQLException(_ex);
+        } catch (IOException ex) {
+            throw new UcanaccessSQLException(ex);
         }
         return null;
     }

src/main/java/net/ucanaccess/commands/DDLCommandEnlist.java

@@ -26,8 +26,8 @@ public class DDLCommandEnlist {
     private Boolean[]           notNulls;
     private Map<String, String> columnMap = new HashMap<>();
 
-    private void enlistCreateTable(String _sql, DDLType _ddlType) throws SQLException {
-        String tn = _ddlType.getDBObjectName();
+    private void enlistCreateTable(String sql, DDLType ddlType) throws SQLException {
+        String tn = ddlType.getDBObjectName();
         UcanaccessConnection ac = UcanaccessConnection.getCtxConnection();
         String execId = UcanaccessConnection.getCtxExcId();
         Connection hsqlConn = ac.getHSQLDBConnection();
@@ -40,12 +40,12 @@ private void enlistCreateTable(String _sql, DDLType _ddlType) throws SQLExceptio
 
         lfa.synchronisationTriggers(ntn, true, true);
         CreateTableCommand c4io;
-        if (_ddlType.equals(DDLType.CREATE_TABLE)) {
-            parseTypesFromCreateStatement(_sql);
+        if (ddlType.equals(DDLType.CREATE_TABLE)) {
+            parseTypesFromCreateStatement(sql);
             c4io = new CreateTableCommand(tn, execId, columnMap, types, defaults, notNulls);
         } else {
             try (UcanaccessStatement st = ac.createStatement()) {
-                ResultSet rs = st.executeQuery(_ddlType.getSelect(_sql));
+                ResultSet rs = st.executeQuery(ddlType.getSelect(sql));
                 ResultSetMetaData rsmd = rs.getMetaData();
                 Metadata mt = new Metadata(ac.getHSQLDBConnection());
                 for (int i = 1; i <= rsmd.getColumnCount(); i++) {
@@ -58,7 +58,7 @@ private void enlistCreateTable(String _sql, DDLType _ddlType) throws SQLExceptio
                     }
                 }
                 c4io = new CreateTableCommand(tn, execId, columnMap);
-            } catch (Exception _ignored) {
+            } catch (Exception ignored) {
                 c4io = new CreateTableCommand(tn, execId);
             }
 
@@ -102,10 +102,10 @@ public void enlistDDLCommand(String sql, DDLType ddlType) throws SQLException {
         }
     }
 
-    private void enlistCreateForeignKey(DDLType _ddlType) throws SQLException {
-        String tableName = _ddlType.getDBObjectName();
-        String relationshipName = _ddlType.getSecondDBObjectName();
-        String referencedTable = _ddlType.getThirdDBObjectName();
+    private void enlistCreateForeignKey(DDLType ddlType) throws SQLException {
+        String tableName = ddlType.getDBObjectName();
+        String relationshipName = ddlType.getSecondDBObjectName();
+        String referencedTable = ddlType.getThirdDBObjectName();
         String execId = UcanaccessConnection.getCtxExcId();
         CreateForeignKeyCommand c4io =
                 new CreateForeignKeyCommand(tableName, referencedTable, execId, relationshipName);
@@ -202,34 +202,34 @@ private void enlistAlterRename(DDLType ddlType) throws SQLException {
         }
     }
 
-    private String[] checkEscaped(String _ll, String _rl, String[] _colDecls, String _tknt) {
-        if (_colDecls[0].startsWith(_ll) && _tknt.indexOf(_rl, 1) > 0) {
-            for (int k = 0; k < _colDecls.length; k++) {
-                if (_colDecls[k].endsWith(_rl)) {
-                    String[] colDecls0 = new String[_colDecls.length - k];
-                    colDecls0[0] = _tknt.substring(1, _tknt.substring(1).indexOf(_rl) + 1);
-                    System.arraycopy(_colDecls, 1 + k, colDecls0, 1, colDecls0.length - 1);
-                    _colDecls = colDecls0;
+    private String[] checkEscaped(String ll, String rl, String[] colDecls, String tknt) {
+        if (colDecls[0].startsWith(ll) && tknt.indexOf(rl, 1) > 0) {
+            for (int k = 0; k < colDecls.length; k++) {
+                if (colDecls[k].endsWith(rl)) {
+                    String[] colDecls0 = new String[colDecls.length - k];
+                    colDecls0[0] = tknt.substring(1, tknt.substring(1).indexOf(rl) + 1);
+                    System.arraycopy(colDecls, 1 + k, colDecls0, 1, colDecls0.length - 1);
+                    colDecls = colDecls0;
                     break;
                 }
             }
         }
-        return _colDecls;
+        return colDecls;
     }
 
-    private void parseColumnTypes(List<String> _typeList, List<String> _defaultList, List<Boolean> _notNullList, String _tknt) {
-        String[] colDecls = _tknt.split("\\s+");
-        colDecls = checkEscaped("[", "]", colDecls, _tknt);
-        colDecls = checkEscaped("`", "`", colDecls, _tknt);
+    private void parseColumnTypes(List<String> typeList, List<String> defaultList, List<Boolean> notNullList, String tknt) {
+        String[] colDecls = tknt.split("\\s+");
+        colDecls = checkEscaped("[", "]", colDecls, tknt);
+        colDecls = checkEscaped("`", "`", colDecls, tknt);
         String escaped = SQLConverter.isListedAsKeyword(colDecls[0]) ? colDecls[0].toUpperCase()
                 : SQLConverter.basicEscapingIdentifier(colDecls[0]);
         columnMap.put(escaped, colDecls[0]);
 
         boolean reset = false;
-        if (_tknt.matches("\\s*\\d+\\s*\\).*")) {
+        if (tknt.matches("\\s*\\d+\\s*\\).*")) {
             reset = true;
-            _tknt = _tknt.substring(_tknt.indexOf(')') + 1).trim();
-            colDecls = _tknt.split("\\s+");
+            tknt = tknt.substring(tknt.indexOf(')') + 1).trim();
+            colDecls = tknt.split("\\s+");
         }
 
         if (!reset && colDecls.length < 2) {
@@ -241,31 +241,31 @@ private void parseColumnTypes(List<String> _typeList, List<String> _defaultList,
                 colDecls[1] = "NUMERIC";
                 decDef = true;
             }
-            _typeList.add(colDecls[1]);
+            typeList.add(colDecls[1]);
 
         }
 
         if ((colDecls.length > 2 || reset && colDecls.length == 2)
                 && "not".equalsIgnoreCase(colDecls[colDecls.length - 2])
                 && "null".equalsIgnoreCase(colDecls[colDecls.length - 1])) {
-            _notNullList.add(true);
+            notNullList.add(true);
         } else if (!decDef) {
-            _notNullList.add(false);
+            notNullList.add(false);
         }
 
         if (!decDef) {
-            _defaultList.add(value(SQLConverter.getDDLDefault(_tknt)));
+            defaultList.add(value(SQLConverter.getDDLDefault(tknt)));
         }
 
-        types = _typeList.toArray(new String[0]);
-        defaults = _defaultList.toArray(new String[0]);
-        notNulls = _notNullList.toArray(new Boolean[0]);
+        types = typeList.toArray(new String[0]);
+        defaults = defaultList.toArray(new String[0]);
+        notNulls = notNullList.toArray(new Boolean[0]);
     }
 
     // getting AUTOINCREMENT and GUID
-    private void parseTypesFromCreateStatement(String _sql) throws SQLException {
+    private void parseTypesFromCreateStatement(String inputSql) throws SQLException {
         Pattern pat = Pattern.compile("(\\s+)(?:DECIMAL|NUMERIC)\\s*\\(", Pattern.CASE_INSENSITIVE);
-        String sql = pat.matcher(_sql).replaceAll("$1NUMERIC(");
+        String sql = pat.matcher(inputSql).replaceAll("$1NUMERIC(");
         int startDecl = sql.indexOf('(');
         int endDecl = sql.lastIndexOf(')');
 
@@ -286,17 +286,17 @@ private void parseTypesFromCreateStatement(String _sql) throws SQLException {
         }
     }
 
-    private String value(String _value) {
-        if (_value == null) {
+    private String value(String value) {
+        if (value == null) {
             return null;
         }
-        if (_value.startsWith("\"") && _value.endsWith("\"")) {
-            return _value.substring(1, _value.length() - 1).replace("\"\"", "\"");
+        if (value.startsWith("\"") && value.endsWith("\"")) {
+            return value.substring(1, value.length() - 1).replace("\"\"", "\"");
         }
-        if (_value.startsWith("'") && _value.endsWith("'")) {
-            return _value.substring(1, _value.length() - 1).replace("''", "'");
+        if (value.startsWith("'") && value.endsWith("'")) {
+            return value.substring(1, value.length() - 1).replace("''", "'");
         }
-        return _value;
+        return value;
     }
 
 }

src/main/java/net/ucanaccess/commands/DeleteCommand.java

@@ -16,11 +16,11 @@ public class DeleteCommand extends AbstractCursorCommand {
     private final Map<String, Object> rowPattern;
     private final Table               table;
 
-    public DeleteCommand(Table _table, Map<String, Object> _rowPattern, String _execId) {
-        indexSelector = new IndexSelector(_table);
-        rowPattern = _rowPattern;
-        execId = _execId;
-        table = _table;
+    public DeleteCommand(Table table, Map<String, Object> rowPattern, String execId) {
+        indexSelector = new IndexSelector(table);
+        this.rowPattern = rowPattern;
+        this.execId = execId;
+        this.table = table;
     }
 
     @Override