Cleanup

Author: JohannesRabauer

src/main/java/xdev/db/firebird/jdbc/FirebirdConnectionInformation.java

@@ -17,29 +17,8 @@
  */
 package xdev.db.firebird.jdbc;
 
-/*-
- * #%L
- * Firebird
- * %%
- * 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.DbmsConnectionInformation;
+
 import xdev.db.ConnectionInformation;
 
 
@@ -50,68 +29,62 @@ public class FirebirdConnectionInformation extends ConnectionInformation<Firebir
 	// ///////////////////
 
 	/**
-	 * @param user
-	 *            the user
-	 * @param password
-	 *            the password
-	 * @param database
-	 *            the database
-	 * @param urlExtension
-	 *            the extended url properties
-	 * @param dbmsAdaptor
-	 *            the dbms adaptor
+	 * @param user         the user
+	 * @param password     the password
+	 * @param database     the database
+	 * @param urlExtension the extended url properties
+	 * @param dbmsAdaptor  the dbms adaptor
 	 */
-	public FirebirdConnectionInformation(final String host, final int port, final String user,
-			final String password, final String database, final String urlExtension,
-			final FirebirdDbms dbmsAdaptor)
+	public FirebirdConnectionInformation(
+		final String host, final int port, final String user,
+		final String password, final String database, final String urlExtension,
+		final FirebirdDbms dbmsAdaptor)
 	{
-		super(host,port,user,password,database,urlExtension,dbmsAdaptor);
+		super(host, port, user, password, database, urlExtension, dbmsAdaptor);
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// getters //
 	// ///////////////////
+	
 	/**
 	 * Gets the database.
-	 * 
+	 *
 	 * @return the database
 	 */
 	public String getDatabase()
 	{
 		return this.getCatalog();
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// setters //
 	// ///////////////////
+	
 	/**
 	 * Sets the database.
-	 * 
-	 * @param database
-	 *            the database to set
+	 *
+	 * @param database the database to set
 	 */
 	public void setDatabase(final String database)
 	{
 		this.setCatalog(database);
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// override methods //
 	// ///////////////////
+	
 	/**
 	 * @see DbmsConnectionInformation#createJdbcConnectionUrl()
 	 */
 	@Override
 	public String createJdbcConnectionUrl()
 	{
-		String url = "jdbc:firebirdsql:" + getHost() + "/" + getPort() + ":" + getCatalog();
-		return appendUrlExtension(url);
+		final String url = "jdbc:firebirdsql:" + this.getHost() + "/" + this.getPort() + ":" + this.getCatalog();
+		return this.appendUrlExtension(url);
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation#getJdbcDriverClassName()
 	 */
@@ -120,5 +93,4 @@ public String getJdbcDriverClassName()
 	{
 		return "org.firebirdsql.jdbc.FBDriver";
 	}
-	
 }

src/main/java/xdev/db/firebird/jdbc/FirebirdDDLMapper.java

@@ -17,28 +17,6 @@
  */
 package xdev.db.firebird.jdbc;
 
-/*-
- * #%L
- * Firebird
- * %%
- * 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/firebird/jdbc/FirebirdDMLAssembler.java

@@ -21,39 +21,17 @@
 import com.xdev.jadoth.sqlengine.dbms.standard.StandardDMLAssembler;
 
 
-/*-
- * #%L
- * Firebird
- * %%
- * 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 FirebirdDMLAssembler extends StandardDMLAssembler<FirebirdDbms>
 {
 	public FirebirdDMLAssembler(final FirebirdDbms dbms)
 	{
 		super(dbms);
 	}
 
-	
 	@Override
 	protected StringBuilder assembleSelectRowLimit(
 		SELECT query, StringBuilder sb, int flags,
-			String clauseSeperator, String newLine, int indentLevel)
+		String clauseSeperator, String newLine, int indentLevel)
 	{
 		Integer skip = query.getOffsetSkipCount();
 		Integer range = query.getFetchFirstRowCount();
@@ -63,7 +41,7 @@ protected StringBuilder assembleSelectRowLimit(
 			if(skip != null)
 			{
 				sb.append(newLine).append(clauseSeperator).append("ROWS ").append(skip)
-						.append(" TO ").append(skip + range - 1);
+					.append(" TO ").append(skip + range - 1);
 			}
 			else
 			{
@@ -73,7 +51,7 @@ protected StringBuilder assembleSelectRowLimit(
 		else if(skip != null)
 		{
 			sb.append(newLine).append(clauseSeperator).append("ROWS ").append(skip).append(" TO ")
-					.append(Integer.MAX_VALUE);
+				.append(Integer.MAX_VALUE);
 		}
 
 		return sb;

src/main/java/xdev/db/firebird/jdbc/FirebirdDbms.java

@@ -17,49 +17,27 @@
  */
 package xdev.db.firebird.jdbc;
 
-/*-
- * #%L
- * Firebird
- * %%
- * 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.DbmsAdaptor;
 import com.xdev.jadoth.sqlengine.dbms.SQLExceptionParser;
 import com.xdev.jadoth.sqlengine.internal.DatabaseGateway;
 import com.xdev.jadoth.sqlengine.internal.tables.SqlTableIdentity;
 
 
 public class FirebirdDbms
-		extends
-		DbmsAdaptor.Implementation<FirebirdDbms, FirebirdDMLAssembler, FirebirdDDLMapper, FirebirdRetrospectionAccessor, FirebirdSyntax>
+	extends
+	DbmsAdaptor.Implementation<FirebirdDbms, FirebirdDMLAssembler, FirebirdDDLMapper, FirebirdRetrospectionAccessor,
+		FirebirdSyntax>
 {
 	// /////////////////////////////////////////////////////////////////////////
 	// constants //
 	// ///////////////////
 
-	/** The Constant MAX_VARCHAR_LENGTH. */
-	protected static final int			MAX_VARCHAR_LENGTH		= Integer.MAX_VALUE;
-	
-	protected static final char			IDENTIFIER_DELIMITER	= '"';
-	
-	public static final FirebirdSyntax	SYNTAX					= new FirebirdSyntax();
-	
+	public static final FirebirdSyntax SYNTAX = new FirebirdSyntax();
+	/**
+	 * The Constant MAX_VARCHAR_LENGTH.
+	 */
+	protected static final int MAX_VARCHAR_LENGTH = Integer.MAX_VALUE;
+	protected static final char IDENTIFIER_DELIMITER = '"';
 
 	// /////////////////////////////////////////////////////////////////////////
 	// constructors //
@@ -70,37 +48,32 @@ public FirebirdDbms()
 		this(new SQLExceptionParser.Body());
 	}
 
-	
 	/**
-	 * @param sqlExceptionParser
-	 *            the sql exception parser
+	 * @param sqlExceptionParser the sql exception parser
 	 */
 	public FirebirdDbms(final SQLExceptionParser sqlExceptionParser)
 	{
-		super(sqlExceptionParser,false);
+		super(sqlExceptionParser, false);
 		this.setRetrospectionAccessor(new FirebirdRetrospectionAccessor(this));
 		this.setDMLAssembler(new FirebirdDMLAssembler(this));
 		this.setSyntax(SYNTAX);
 	}
 
-	
 	/**
 	 * @see DbmsAdaptor#createConnectionInformation(String, int, String, String, String, String)
 	 */
 	@Override
-	public FirebirdConnectionInformation createConnectionInformation(final String host,
-			final int port, final String user, final String password, final String catalog, final String properties)
+	public FirebirdConnectionInformation createConnectionInformation(
+		final String host,
+		final int port, final String user, final String password, final String catalog, final String properties)
 	{
-		return new FirebirdConnectionInformation(host,port,user,password,catalog,properties, this);
+		return new FirebirdConnectionInformation(host, port, user, password, catalog, properties, this);
 	}
 
-	
 	/**
-	 * HSQL does not support any means of calculating table columns selectivity
-	 * as far as it is known.
-	 * 
-	 * @param table
-	 *            the table
+	 * HSQL does not support any means of calculating table columns selectivity as far as it is known.
+	 *
+	 * @param table the table
 	 * @return the object
 	 */
 	@Override
@@ -109,7 +82,6 @@ public Object updateSelectivity(final SqlTableIdentity table)
 		return null;
 	}
 
-	
 	/**
 	 * @see DbmsAdaptor#assembleTransformBytes(byte[], StringBuilder)
 	 */
@@ -119,7 +91,6 @@ public StringBuilder assembleTransformBytes(final byte[] bytes, final StringBuil
 		return null;
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor.Implementation#getRetrospectionAccessor()
 	 */
@@ -129,7 +100,6 @@ public FirebirdRetrospectionAccessor getRetrospectionAccessor()
 		throw new RuntimeException("HSQL Retrospection not implemented yet!");
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#initialize(com.xdev.jadoth.sqlengine.internal.DatabaseGateway)
 	 */
@@ -138,7 +108,6 @@ public void initialize(final DatabaseGateway<FirebirdDbms> dbc)
 	{
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#rebuildAllIndices(java.lang.String)
 	 */
@@ -148,14 +117,12 @@ public Object rebuildAllIndices(final String fullQualifiedTableName)
 		return null;
 	}
 
-	
 	@Override
 	public boolean supportsOFFSET_ROWS()
 	{
 		return true;
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#getMaxVARCHARlength()
 	 */
@@ -165,7 +132,6 @@ public int getMaxVARCHARlength()
 		return MAX_VARCHAR_LENGTH;
 	}
 
-	
 	@Override
 	public char getIdentifierDelimiter()
 	{