Cleanup

Author: JohannesRabauer

src/main/java/xdev/db/db2i/jdbc/DB2iConnectionInformation.java

@@ -17,33 +17,11 @@
  */
 package xdev.db.db2i.jdbc;
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
+import java.sql.Connection;
 
 import com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation;
-import xdev.db.ConnectionInformation;
 
-import java.sql.Connection;
+import xdev.db.ConnectionInformation;
 public class DB2iConnectionInformation extends ConnectionInformation<DB2iDbms>
 {
 	// /////////////////////////////////////////////////////////////////////////
@@ -108,8 +86,8 @@ public void setSchema(final String schema)
 	@Override
 	public String createJdbcConnectionUrl()
 	{
-		String url = "jdbc:as400://" + getHost() + ":" + getPort() + "/" + getSchema();
-		return appendUrlExtension(url);
+		final String url = "jdbc:as400://" + this.getHost() + ":" + this.getPort() + "/" + this.getSchema();
+		return this.appendUrlExtension(url);
 	}
 
 
@@ -122,15 +100,14 @@ public String getJdbcDriverClassName()
 		return "com.ibm.as400.access.AS400JDBCDriver";
 	}
 
-	
 	@Override
-	public boolean isConnectionValid(Connection connection)
+	public boolean isConnectionValid(final Connection connection)
 	{
 		try
 		{
 			return !connection.isClosed();
 		}
-		catch(Exception ignored)
+		catch(final Exception ignored)
 		{
 			// We'll just ignore the exception here.
 			// If the try throws an exception, we know, that we have no valid connection.

src/main/java/xdev/db/db2i/jdbc/DB2iDDLMapper.java

@@ -17,27 +17,7 @@
  */
 package xdev.db.db2i.jdbc;
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
+
 
 import com.xdev.jadoth.sqlengine.dbms.standard.StandardDDLMapper;
 

src/main/java/xdev/db/db2i/jdbc/DB2iDMLAssembler.java

@@ -21,27 +21,7 @@
 import com.xdev.jadoth.sqlengine.dbms.standard.StandardDMLAssembler;
 
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
+
 public class DB2iDMLAssembler extends StandardDMLAssembler<DB2iDbms>
 {
 	protected static final String	_FETCH_FIRST_	= " FETCH FIRST ";

src/main/java/xdev/db/db2i/jdbc/DB2iDbms.java

@@ -23,27 +23,7 @@
 import com.xdev.jadoth.sqlengine.internal.tables.SqlTableIdentity;
 
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
+
 public class DB2iDbms
 		extends
 		DbmsAdaptor.Implementation<DB2iDbms, DB2iDMLAssembler, DB2iDDLMapper, DB2iRetrospectionAccessor, DB2iSyntax>

src/main/java/xdev/db/db2i/jdbc/DB2iExceptionParser.java

@@ -17,38 +17,15 @@
  */
 package xdev.db.db2i.jdbc;
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
+import java.sql.SQLException;
 
 import com.xdev.jadoth.sqlengine.dbms.SQLExceptionParser;
 import com.xdev.jadoth.sqlengine.exceptions.SQLEngineException;
 
-import java.sql.SQLException;
-
 public class DB2iExceptionParser implements SQLExceptionParser
 {
 	@Override
-	public SQLEngineException parseSQLException(SQLException e)
+	public SQLEngineException parseSQLException(final SQLException e)
 	{
 		return new SQLEngineException(e);
 	}

src/main/java/xdev/db/db2i/jdbc/DB2iJDBCConnection.java

@@ -17,40 +17,17 @@
  */
 package xdev.db.db2i.jdbc;
 
-/*-
- * #%L
- * DB2i
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
-
-import xdev.db.DBException;
-import xdev.db.jdbc.JDBCConnection;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
+
+import xdev.db.DBException;
+import xdev.db.jdbc.JDBCConnection;
 public class DB2iJDBCConnection extends JDBCConnection<DB2iJDBCDataSource, DB2iDbms>
 {
-	public DB2iJDBCConnection(DB2iJDBCDataSource dataSource)
+	public DB2iJDBCConnection(final DB2iJDBCDataSource dataSource)
 	{
 		super(dataSource);
 	}
@@ -59,71 +36,70 @@ public DB2iJDBCConnection(DB2iJDBCDataSource dataSource)
 	@Override
 	protected Connection establishConnection() throws DBException
 	{
-		Connection con = super.establishConnection();
+		final Connection con = super.establishConnection();
 
 		try
 		{
-			String schema = dataSource.getSchema();
-			if(schema != null && schema.length() > 0 && !schema.equals(dataSource.getUserName()))
+			final String schema = this.dataSource.getSchema();
+			if(schema != null && schema.length() > 0 && !schema.equals(this.dataSource.getUserName()))
 			{
 				con.createStatement().execute("SET SCHEMA " + schema); //$NON-NLS-1$
 			}
 		}
-		catch(SQLException e)
+		catch(final SQLException e)
 		{
-			throw new DBException(dataSource,e);
+			throw new DBException(this.dataSource, e);
 		}
 
 		return con;
 	}
 
-	
 	@Override
-	public int getQueryRowCount(String select) throws DBException
+	public int getQueryRowCount(final String select) throws DBException
 	{
-		StringBuilder sb = new StringBuilder();
+		final StringBuilder sb = new StringBuilder();
 		sb.append("SELECT COUNT(*) FROM ("); //$NON-NLS-1$
 		sb.append(select);
 		sb.append(")"); //$NON-NLS-1$
 
 		try
 		{
-			ResultSet result = queryJDBC(sb.toString());
+			final ResultSet result = this.queryJDBC(sb.toString());
 			try
 			{
 				result.next();
-				int rowCount = result.getInt(1);
+				final int rowCount = result.getInt(1);
 				return rowCount;
 			}
 			finally
 			{
 				result.close();
 			}
 		}
-		catch(DBException e)
+		catch(final DBException e)
 		{
 			throw e;
 		}
-		catch(Exception e)
+		catch(final Exception e)
 		{
-			throw new DBException(dataSource,e);
+			throw new DBException(this.dataSource, e);
 		}
 	}
 
-	
 	@Override
-	public void createTable(String tableName, String primaryKey, Map<String, String> columnMap,
-			boolean isAutoIncrement, Map<String, String> foreignKeys) throws Exception
+	public void createTable(
+		final String tableName, final String primaryKey, final Map<String, String> columnMap,
+		final boolean isAutoIncrement, final Map<String, String> foreignKeys) throws Exception
 	{
-		Connection connection = super.getConnection();
-		Statement statement = connection.createStatement();
+		final Connection connection = super.getConnection();
+		final Statement statement = connection.createStatement();
 		try
 		{
-			if(!checkIfTableExists(connection.createStatement(),tableName))
+			if(!this.checkIfTableExists(connection.createStatement(), tableName))
 			{
 				if(!columnMap.containsKey(primaryKey))
 				{
-					columnMap.put(primaryKey,"INTEGER"); //$NON-NLS-1$
+					columnMap.put(primaryKey, "INTEGER"); //$NON-NLS-1$
 				}
 				StringBuffer createStatement = null;
 
@@ -142,14 +118,14 @@ public void createTable(String tableName, String primaryKey, Map<String, String>
 				}
 
 				int i = 0;
-				for(String keySet : columnMap.keySet())
+				for(final String keySet : columnMap.keySet())
 				{
 					if(!keySet.equals(primaryKey))
 					{
 						if(i <= columnMap.size())
 						{
-							createStatement.append(keySet + " " + columnMap.get(keySet) + ","); //$NON-NLS-1$ //$NON-NLS-2$
-							
+							createStatement.append(
+								keySet + " " + columnMap.get(keySet) + ","); //$NON-NLS-1$ //$NON-NLS-2$
 						}
 						else
 						{
@@ -169,7 +145,7 @@ public void createTable(String tableName, String primaryKey, Map<String, String>
 				statement.execute(createStatement.toString());
 			}
 		}
-		catch(Exception e)
+		catch(final Exception e)
 		{
 			throw e;
 		}
@@ -180,19 +156,19 @@ public void createTable(String tableName, String primaryKey, Map<String, String>
 		}
 	}
 
-	
-	private boolean checkIfTableExists(Statement statement, String tableName) throws Exception
+	private boolean checkIfTableExists(final Statement statement, final String tableName) throws Exception
 	{
 
-		String sql = "SELECT NAME FROM SYSIBM.SYSTABLES WHERE NAME='" + tableName + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+		final String sql =
+			"SELECT NAME FROM SYSIBM.SYSTABLES WHERE NAME='" + tableName + "'"; //$NON-NLS-1$ //$NON-NLS-2$
 
 		ResultSet resultSet = null;
 		try
 		{
 			statement.execute(sql);
 			resultSet = statement.getResultSet();
 		}
-		catch(Exception e)
+		catch(final Exception e)
 		{
 			if(resultSet != null)
 			{