diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/AbstractDatabaseAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/AbstractDatabaseAdminDAO.java
index 35f17a4728f48838a07f7d8aa08d01d27020ccef..5cede966bee3f8efa58c870f5da192c455de3813 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/AbstractDatabaseAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/AbstractDatabaseAdminDAO.java
@@ -77,16 +77,19 @@ public abstract class AbstractDatabaseAdminDAO extends SimpleJdbcDaoSupport impl
setDataSource(dataSource);
}
+ @Override
public String getDatabaseName()
{
return databaseName;
}
+ @Override
public String getDatabaseURL()
{
return databaseURL;
}
+ @Override
public DatabaseDefinition getDatabaseDefinition()
{
DatabaseDefinition databaseDefinition = new DatabaseDefinition();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java
index a70b7c4e4fb531a97d0b8f7eb2f3b2e31d73568b..0e9135dd2b17aa4865fdb045aa936f21fb2a3ed1 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/BasicDataSourceFactory.java
@@ -43,6 +43,7 @@ public class BasicDataSourceFactory implements IDataSourceFactory
// IDataSourceFactory
//
+ @Override
public final DataSource createDataSource(final String driver, final String url,
final String owner, final String password)
{
@@ -57,16 +58,19 @@ public class BasicDataSourceFactory implements IDataSourceFactory
return dataSource;
}
+ @Override
public void setMaxWait(long maxWait)
{
this.maxWait = maxWait;
}
+ @Override
public void setMaxIdle(int maxIdle)
{
this.maxIdle = maxIdle;
}
+ @Override
public void setMaxActive(int maxActive)
{
this.maxActive = maxActive;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBScriptFormatter.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBScriptFormatter.java
index ef58b8baf32efddb34e2f2fb913aeac952dadd6a..c1655ff559eaba6b4e85535c3d5389977df35973 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBScriptFormatter.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBScriptFormatter.java
@@ -55,6 +55,7 @@ public class DBScriptFormatter
"CREATE TABLE "), CREATE_SEQUENCE("Creating sequences", "CREATE SEQUENCE ",
new ILineProcessor()
{
+ @Override
public String process(String line)
{
return StringUtils.replace(line, " NO MAXVALUE NO MINVALUE NO CYCLE",
@@ -63,12 +64,14 @@ public class DBScriptFormatter
}), PRIMARY_KEY_CONSTRAINTS("Creating primary key constraints",
new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return Pattern.matches("ALTER TABLE .+ PRIMARY KEY.+", line);
}
}, null), UNIQUE_CONSTRAINTS("Creating unique constraints", new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return Pattern.matches("ALTER TABLE .+ UNIQUE.+", line);
@@ -76,12 +79,14 @@ public class DBScriptFormatter
}, null), FOREIGN_KEY_CONSTRAINTS("Creating foreign key constraints",
new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return Pattern.matches("ALTER TABLE .+ FOREIGN KEY.+", line);
}
}, null), CHECK_CONSTRAINTS("Creating check constraints", new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return Pattern.matches("ALTER TABLE .+ CHECK.+", line);
@@ -89,6 +94,7 @@ public class DBScriptFormatter
}, null), CREATE_INDEX("Creating indices", "CREATE INDEX "), MISC("Miscellaneous",
new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return true;
@@ -111,6 +117,7 @@ public class DBScriptFormatter
{
this(comment, new ILineMatcher()
{
+ @Override
public boolean match(String line)
{
return line.startsWith(prefix);
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
index 7adecb4b78a8d6ba0b8768d32cc0776d29839e83..b7580dec6249d1b55c4bfa85a195d27d998834b0 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
@@ -651,6 +651,7 @@ public class DatabaseConfigurationContext implements DisposableBean
// DisposableBean
//
+ @Override
public final void destroy() throws Exception
{
closeConnections();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseDefinition.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseDefinition.java
index 571ffeb68dc30658af5165cc63df1de22e2f984f..367ccf8e866dbc4e596c69b7606efacd54576cbb 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseDefinition.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseDefinition.java
@@ -82,6 +82,7 @@ public final class DatabaseDefinition implements Iterable<TableDefinition>
/**
* Creates an iterator over all table definitions.
*/
+ @Override
public Iterator<TableDefinition> iterator()
{
return tableDefinitions.values().iterator();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
index 12d27069eb7271258879f4c17b3e1b5df634682f..d13500cd5474cb4df515b2f2be358ab73e195f7f 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
@@ -78,6 +78,7 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
this.lobHandler = lobHandler;
}
+ @Override
public LogEntry mapRow(ResultSet rs, int rowNum) throws SQLException
{
final LogEntry logEntry = new LogEntry();
@@ -119,6 +120,7 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
this.lobHandler = lobHandler;
}
+ @Override
public boolean canConnectToDatabase()
{
try
@@ -134,12 +136,14 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
}
}
+ @Override
public void createTable(Script script)
{
JdbcTemplate template = getJdbcTemplate();
template.execute(script.getContent());
}
+ @Override
public LogEntry getLastEntry()
{
SimpleJdbcTemplate template = getSimpleJdbcTemplate();
@@ -154,6 +158,7 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
*
* @param moduleScript The script of the module to be logged.
*/
+ @Override
public void logStart(final Script moduleScript)
{
JdbcTemplate template = getJdbcTemplate();
@@ -182,6 +187,7 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
*
* @param moduleScript The script of the successfully applied module.
*/
+ @Override
public void logSuccess(final Script moduleScript)
{
SimpleJdbcTemplate template = getSimpleJdbcTemplate();
@@ -197,6 +203,7 @@ public class DatabaseVersionLogDAO extends SimpleJdbcDaoSupport implements IData
* @param moduleScript Script of the failed module.
* @param runException Exception causing the failure.
*/
+ @Override
public void logFailure(final Script moduleScript, Throwable runException)
{
final StringWriter stringWriter = new StringWriter();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SimpleDatabaseConfigurationContext.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SimpleDatabaseConfigurationContext.java
index 80888183d8f6c607f1f1a70fbd236c03c6387c83..2a1840fb236e58aaa1225546803f9040fc9b205e 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SimpleDatabaseConfigurationContext.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SimpleDatabaseConfigurationContext.java
@@ -128,6 +128,7 @@ public class SimpleDatabaseConfigurationContext implements DisposableBean
// DisposableBean
//
+ @Override
public final void destroy() throws Exception
{
closeConnections();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
index 05a4dcbbaedd95ef6c61037d50561d5b921d55e0..5785edea664d5ea0bafe182ae67d392de930918d 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
@@ -53,6 +53,7 @@ public class SqlScriptExecutor extends JdbcDaoSupport implements ISqlScriptExecu
this.singleStepMode = singleStepMode;
}
+ @Override
public void execute(final Script sqlScript, final boolean honorSingleStepMode,
final ISqlScriptExecutionLogger loggerOrNull)
{
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
index d711e6ba084f0459b5e05a5b3cac579b65b43250..7fe9f3a3c8b852ab16f788517e847df69fc8cf8b 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
@@ -73,11 +73,13 @@ public class SqlScriptProvider implements ISqlScriptProvider
* Returns <code>true</code> if a <finish script> is found and <code>false</code>
* otherwise.
*/
+ @Override
public boolean isDumpRestore(final String version)
{
return getDumprestoreFile(version).exists();
}
+ @Override
public void markAsDumpRestorable(final String version)
{
try
@@ -97,6 +99,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
/**
* Returns the folder where all dump files for <var>version</var> reside.
*/
+ @Override
public File getDumpFolder(final String version)
{
return new File(getSpecificScriptFolder(schemaScriptRootFolders.get(schemaScriptRootFolders
@@ -110,6 +113,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <schema script folder>/<version>/schema-<version>.sql
* </pre>
*/
+ @Override
public Script tryGetSchemaScript(final String version)
{
return tryLoadScript("schema-" + version + SQL_FILE_TYPE, version);
@@ -123,6 +127,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <data script folder>/<version>/function-<version>.sql
* </pre>
*/
+ @Override
public Script tryGetFunctionScript(final String version)
{
return tryLoadScript("function-" + version + SQL_FILE_TYPE, version);
@@ -136,6 +141,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <schema script folder>/<version>/domains-<version>.sql
* </pre>
*/
+ @Override
public Script tryGetDomainsScript(final String version)
{
return tryLoadScript("domains-" + version + SQL_FILE_TYPE, version);
@@ -149,6 +155,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <schema script folder>/<version>/grants-<version>.sql
* </pre>
*/
+ @Override
public Script tryGetGrantsScript(final String version)
{
return tryLoadScript("grants-" + version + SQL_FILE_TYPE, version);
@@ -161,6 +168,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <data script folder>/<version>/data-<version>.sql
* </pre>
*/
+ @Override
public Script tryGetDataScript(final String version)
{
return tryLoadScript("data-" + version + SQL_FILE_TYPE, version);
@@ -174,6 +182,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
* <schema script folder>/migration/migration-<fromVersion>-<toVersion>.sql
* </pre>
*/
+ @Override
public Script tryGetMigrationScript(final String fromVersion, final String toVersion)
{
final String scriptName = "migration-" + fromVersion + "-" + toVersion + SQL_FILE_TYPE;
@@ -190,6 +199,7 @@ public class SqlScriptProvider implements ISqlScriptProvider
*
* The function migration will always be called <i>after</i> the regular migration script.
*/
+ @Override
public Script tryGetFunctionMigrationScript(final String fromVersion, final String toVersion)
{
final String scriptName =
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableColumnDefinition.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableColumnDefinition.java
index f3b9b307edf6691797f90f6c4e672ea83a80bb6c..f22153b6db6fb00cca9b6ee387afb5d7a8abe3d7 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableColumnDefinition.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableColumnDefinition.java
@@ -78,6 +78,7 @@ public final class TableColumnDefinition implements Iterable<TableColumnDefiniti
connections.add(foreignKeyColumn);
}
+ @Override
public Iterator<TableColumnDefinition> iterator()
{
return connections.iterator();
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableDefinition.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableDefinition.java
index 0c431c8dd5bb5d364a21fee54b477af4d3969556..f934f5f0a84987fe8f836be23d5b318d7f7a1a1e 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableDefinition.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/TableDefinition.java
@@ -73,11 +73,13 @@ public final class TableDefinition implements Iterable<TableColumnDefinition>,
return columnDefinition;
}
+ @Override
public Iterator<TableColumnDefinition> iterator()
{
return columns.values().iterator();
}
+ @Override
public int compareTo(TableDefinition tableDefinition)
{
return tableName.compareTo(tableDefinition.getTableName());
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
index a147da624f2c1c2f2a53a80e5dfaa978c5497d63..ab46b094d66e23a6a2cf712147c13b4f3af94d61 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
@@ -89,16 +89,19 @@ public class H2AdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void createOwner()
{
// Creation of the user happens "on the fly" with H2
}
+ @Override
public void createGroups()
{
// Creation of the user happens "on the fly" with H2
}
+ @Override
public void createDatabase()
{
// Creation of databases happens "on the fly" with H2, we only need to create the
@@ -119,6 +122,7 @@ public class H2AdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void dropDatabase()
{
scriptExecutor.execute(new Script("drop database", DROP_ALL_OBJECTS_SQL), true, null);
@@ -131,6 +135,7 @@ public class H2AdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void restoreDatabaseFromDump(File dumpFolder, String version)
{
createDatabaseVersionLogsTable();
@@ -169,6 +174,7 @@ public class H2AdminDAO extends AbstractDatabaseAdminDAO
}
String[] csvFiles = dumpFolder.list(new FilenameFilter()
{
+ @Override
public boolean accept(File dir, String name)
{
return MassUploadFileType.CSV.isOfType(name)
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2DAOFactory.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2DAOFactory.java
index 5b8f95da3c5a5ad108a49c5c5903be8873f374a4..7acaed458901cc6f01d1499fbc83baf5b298de6b 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2DAOFactory.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2DAOFactory.java
@@ -73,31 +73,37 @@ public class H2DAOFactory implements IDAOFactory
context.getDatabaseName(), context.getDatabaseURL());
}
+ @Override
public IDatabaseAdminDAO getDatabaseDAO()
{
return databaseDAO;
}
+ @Override
public ISqlScriptExecutor getSqlScriptExecutor()
{
return sqlScriptExecutor;
}
+ @Override
public IDatabaseVersionLogDAO getDatabaseVersionLogDAO()
{
return databaseVersionLogDAO;
}
+ @Override
public IMassUploader getMassUploader()
{
return massUploader;
}
+ @Override
public IMigrationStepExecutor getMigrationStepExecutor()
{
return migrationStepExecutor;
}
+ @Override
public IMigrationStepExecutor getMigrationStepExecutorAdmin()
{
return migrationStepExecutorAdmin;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2MassUploader.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2MassUploader.java
index 02ec5898f6ea668780d35e8539f346c1b6880612..eaacad63b4fa93f5a8e4a1b45e7a21e6c41c3597 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2MassUploader.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2MassUploader.java
@@ -111,6 +111,7 @@ public class H2MassUploader extends SimpleJdbcDaoSupport implements IMassUploade
}
}
+ @Override
public void performMassUpload(String tableName, String data)
{
try
@@ -132,6 +133,7 @@ public class H2MassUploader extends SimpleJdbcDaoSupport implements IMassUploade
}
}
+ @Override
public void performMassUpload(String tableName, String[] columnNames, String data)
{
try
@@ -153,6 +155,7 @@ public class H2MassUploader extends SimpleJdbcDaoSupport implements IMassUploade
}
}
+ @Override
public final void performMassUpload(final File[] massUploadFiles)
{
String task = "Get database metadata";
@@ -244,11 +247,13 @@ public class H2MassUploader extends SimpleJdbcDaoSupport implements IMassUploade
insertSql.append(')');
getJdbcTemplate().batchUpdate(insertSql.toString(), new BatchPreparedStatementSetter()
{
+ @Override
public int getBatchSize()
{
return numberOfRows;
}
+ @Override
public void setValues(final PreparedStatement ps, final int rowNo)
throws SQLException
{
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdapter.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdapter.java
index 599dcbab6e84ae43eed347bc159d41a7896584f0..4e5374c0c653f63fb49221e8a883202998802246 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdapter.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdapter.java
@@ -36,11 +36,13 @@ public class MigrationStepAdapter implements IMigrationStep
// IMigrationStep
//
+ @Override
public void performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
}
+ @Override
public void performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
index 97445fe63d04ec9bb8c30f24bda96b8613220bd3..0b19321510211c642accc2240ef2c5faaa9505e4 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
@@ -79,6 +79,7 @@ public class MigrationStepExecutor extends SimpleJdbcDaoSupport implements IMigr
final ParserUtilities.LineSplitter splitter =
new ParserUtilities.LineSplitter(content, new ILineFilter()
{
+ @Override
public <T> boolean acceptLine(ILine<T> line)
{
String text = line.getText();
@@ -131,6 +132,7 @@ public class MigrationStepExecutor extends SimpleJdbcDaoSupport implements IMigr
// IMigrationStepExecutor
//
+ @Override
public final void init(final Script migrationScript)
{
migrationStep = tryExtractMigrationStep(migrationScript);
@@ -148,6 +150,7 @@ public class MigrationStepExecutor extends SimpleJdbcDaoSupport implements IMigr
inited = true;
}
+ @Override
public final void performPreMigration()
{
assert inited : "Executor not initialized.";
@@ -157,6 +160,7 @@ public class MigrationStepExecutor extends SimpleJdbcDaoSupport implements IMigr
}
}
+ @Override
public final void performPostMigration()
{
assert inited : "Executor not initialized.";
@@ -166,6 +170,7 @@ public class MigrationStepExecutor extends SimpleJdbcDaoSupport implements IMigr
}
}
+ @Override
public final void finish()
{
inited = false;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/DumpPreparator.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/DumpPreparator.java
index bcb150134eef9170df2ad4971cf0339afd813f9e..d96194d166730381df1cd83dc6aa368760df3e40 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/DumpPreparator.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/DumpPreparator.java
@@ -403,6 +403,7 @@ public class DumpPreparator
{
File[] files = folder.listFiles(new FileFilter()
{
+ @Override
public boolean accept(File pathname)
{
if (pathname.isDirectory())
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
index 984763055f4bc93332e750067b069313582955a4..ef643487a2fb2b294bc87f9c0f7efd67a19d226e 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
@@ -84,6 +84,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
databaseName, databaseURL);
}
+ @Override
public void createOwner()
{
try
@@ -109,6 +110,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void createGroups()
{
if (StringUtils.isNotBlank(readOnlyGroupOrNull))
@@ -146,6 +148,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void createDatabase()
{
createEmptyDatabase();
@@ -209,6 +212,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void dropDatabase()
{
try
@@ -223,6 +227,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
}
}
+ @Override
public void restoreDatabaseFromDump(File dumpFolder, String version)
{
createEmptyDatabase();
@@ -265,6 +270,7 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
}
String[] csvFiles = dumpFolder.list(new FilenameFilter()
{
+ @Override
public boolean accept(File dir, String name)
{
return MassUploadFileType.CSV.isOfType(name)
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLDAOFactory.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLDAOFactory.java
index e648aa869e5998810c470fc72548e0ccb0af1882..19e728ba3eda3cf79b3dc54b4b816d541df4776b 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLDAOFactory.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLDAOFactory.java
@@ -78,31 +78,37 @@ public class PostgreSQLDAOFactory implements IDAOFactory
.getDatabaseURL());
}
+ @Override
public IDatabaseAdminDAO getDatabaseDAO()
{
return databaseDAO;
}
+ @Override
public ISqlScriptExecutor getSqlScriptExecutor()
{
return sqlScriptExecutor;
}
+ @Override
public IDatabaseVersionLogDAO getDatabaseVersionLogDAO()
{
return databaseVersionLogDAO;
}
+ @Override
public IMassUploader getMassUploader()
{
return massUploader;
}
+ @Override
public IMigrationStepExecutor getMigrationStepExecutor()
{
return migrationStepExecutor;
}
+ @Override
public IMigrationStepExecutor getMigrationStepExecutorAdmin()
{
return migrationStepExecutorAdmin;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLMassUploader.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLMassUploader.java
index 4709c5b52061824b558c61a815fe182e8a762ba4..89a9aeabe153ecdfb5bc524dc30c0c605a9af250 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLMassUploader.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLMassUploader.java
@@ -104,11 +104,13 @@ public class PostgreSQLMassUploader extends SimpleJdbcDaoSupport implements IMas
return copyManager;
}
+ @Override
public void performMassUpload(String tableName, String data)
{
performMassUpload(tableName, null, data);
}
+ @Override
public void performMassUpload(String tableName, String[] columnNamesOrNull, String data)
{
final StringBuilder copySql = new StringBuilder();
@@ -138,6 +140,7 @@ public class PostgreSQLMassUploader extends SimpleJdbcDaoSupport implements IMas
}
}
+ @Override
public final void performMassUpload(final File[] massUploadFiles)
{
final Set<String> tables = new LinkedHashSet<String>();
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdminFrom001To002.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdminFrom001To002.java
index 729ca81eda8a5eeae0e9a6f219b7255e54194da7..3030e94e4f143ebcb76b34b41301ae58ae7716ad 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdminFrom001To002.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepAdminFrom001To002.java
@@ -52,12 +52,14 @@ public final class MigrationStepAdminFrom001To002 implements IMigrationStep
// IMigrationStep
//
+ @Override
public final void performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
postMigrationPerformed = true;
}
+ @Override
public final void performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom001To002.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom001To002.java
index 439c6a2a5a5623d2eae806c75ba9f4474657d3e1..c645321497cb10230fd479e3fbcb9a0c17be90a3 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom001To002.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom001To002.java
@@ -33,11 +33,13 @@ public final class MigrationStepFrom001To002 implements IMigrationStep
// IMigrationStep
//
+ @Override
public final void performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate, DataSource dataSource)
throws DataAccessException
{
}
+ @Override
public final void performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate, DataSource dataSource)
throws DataAccessException
{
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom002To003.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom002To003.java
index 9b0b8c47d80e3d58bf11bcb3e1651cb9c9b8006f..cfa3e90741a41e5fd5ea016eebb9d3998cbf8597 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom002To003.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepFrom002To003.java
@@ -43,12 +43,14 @@ public final class MigrationStepFrom002To003 implements IMigrationStep
// IMigrationStep
//
+ @Override
public final void performPostMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
throw new EmptyResultDataAccessException(1);
}
+ @Override
public final void performPreMigration(final SimpleJdbcTemplate simpleJdbcTemplate,
DataSource dataSource) throws DataAccessException
{
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSource.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSource.java
index 13bf5bce22d7c33ddab55ca3907d45a2edd8574c..7dec396228c990a7cbf0eeb6ccbaf697cb9e93c0 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSource.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSource.java
@@ -30,6 +30,7 @@ public class SqlMigrationDataSource implements DataSource, DisposableBean
this.password = password;
}
+ @Override
public Connection getConnection() throws SQLException
{
if (connection != null && connection.isClosed() || connection == null)
@@ -47,6 +48,7 @@ public class SqlMigrationDataSource implements DataSource, DisposableBean
return connection;
}
+ @Override
public Connection getConnection(final String username, final String pw) throws SQLException
{
if (owner.equals(username) && password.equals(pw))
@@ -56,26 +58,31 @@ public class SqlMigrationDataSource implements DataSource, DisposableBean
throw new SQLException("Forbidden");
}
+ @Override
public int getLoginTimeout() throws SQLException
{
return 0;
}
+ @Override
public void setLoginTimeout(final int timeout) throws SQLException
{
throw new UnsupportedOperationException("setLoginTimeout");
}
+ @Override
public PrintWriter getLogWriter()
{
throw new UnsupportedOperationException("getLogWriter");
}
+ @Override
public void setLogWriter(final PrintWriter pw) throws SQLException
{
throw new UnsupportedOperationException("setLogWriter");
}
+ @Override
public void destroy() throws SQLException
{
if (connection != null)
@@ -92,11 +99,13 @@ public class SqlMigrationDataSource implements DataSource, DisposableBean
}
// NOTE: the following methods are needed because we compile with JDK 6 on Hudson
+ @Override
public boolean isWrapperFor(Class<?> arg0) throws SQLException
{
return false;
}
+ @Override
public <T> T unwrap(Class<T> arg0) throws SQLException
{
return null;
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSourceFactory.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSourceFactory.java
index d69b0342c83d49dc9fc2758b64ee5d77bdb69851..798540db176b15c99339bfbd4d4c55d9660b65b5 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSourceFactory.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationDataSourceFactory.java
@@ -7,19 +7,23 @@ import ch.systemsx.cisd.dbmigration.IDataSourceFactory;
public class SqlMigrationDataSourceFactory implements IDataSourceFactory
{
+ @Override
public DataSource createDataSource(String driver, String url, String owner, String password)
{
return new SqlMigrationDataSource(driver, url, owner, password);
}
+ @Override
public void setMaxActive(int maxActive)
{
}
+ @Override
public void setMaxIdle(int maxIdle)
{
}
+ @Override
public void setMaxWait(long maxWait)
{
}