Repository: empire-db Updated Branches: refs/heads/master 12cdd70d5 -> 0bcc7b181
release 2.4.7 remove deprecated features Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/0bcc7b18 Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/0bcc7b18 Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/0bcc7b18 Branch: refs/heads/master Commit: 0bcc7b1818afc3df95d26f17036d69bfe9d202d9 Parents: 12cdd70 Author: Rainer Döbele <[email protected]> Authored: Fri Oct 19 14:05:31 2018 +0200 Committer: Rainer Döbele <[email protected]> Committed: Fri Oct 19 14:05:31 2018 +0200 ---------------------------------------------------------------------- .../org/apache/empire/samples/db/SampleApp.java | 2 +- .../cxf/wssample/client/EmployeeListModel.java | 5 ++-- .../cxf/wssample/server/ServerControl.java | 2 +- .../spring/support/EmpireDaoSupport.java | 2 +- .../websample/web/SampleApplication.java | 2 +- .../java/org/apache/empire/db/DBSQLScript.java | 26 -------------------- .../java/org/apache/empire/db/IntegerTest.java | 4 +-- .../apache/empire/db/PreparedStatementTest.java | 2 +- .../db/hsql/DBDatabaseDriverHSqlTest.java | 8 +++--- .../db/mssql/DBDatabaseDriverMSSqlDateTest.java | 8 +++--- .../db/mssql/DBDatabaseDriverMSSqlTest.java | 4 +-- .../DBDatabaseDriverPostgreSQLTest.java | 2 +- .../db/sqlite/DBDatabaseDriverSQLiteTest.java | 8 +++--- pom.xml | 1 - 14 files changed, 26 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java index 7245448..34769f3 100644 --- a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java +++ b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java @@ -255,7 +255,7 @@ public class SampleApp // Show DDL Statement System.out.println(script.toString()); // Execute Script - script.run(driver, conn, false); + script.executeAll(driver, conn, false); // Commit db.commit(conn); } http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeListModel.java ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeListModel.java b/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeListModel.java index 2d5f1fb..5bd34ec 100644 --- a/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeListModel.java +++ b/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/client/EmployeeListModel.java @@ -26,10 +26,11 @@ import javax.swing.DefaultListModel; import org.apache.empire.samples.cxf.wssample.common.Employee; // A very simple ListModel to display emloyees in a listview. -@SuppressWarnings("serial") public class EmployeeListModel extends DefaultListModel { - public void setListData(List<Employee> data) { + private static final long serialVersionUID = 1L; + + public void setListData(List<Employee> data) { this.removeAllElements(); if (data != null) { http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java b/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java index f55be28..4de5933 100644 --- a/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java +++ b/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/ServerControl.java @@ -229,7 +229,7 @@ public class ServerControl // Show DLL Statements System.out.println(script.toString()); // Execute Script - script.run(driver, conn, false); + script.executeAll(driver, conn, false); db.commit(conn); // Open again if (!db.isOpen()){ http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDaoSupport.java ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDaoSupport.java b/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDaoSupport.java index 965bb5d..3127a50 100644 --- a/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDaoSupport.java +++ b/empire-db-examples/empire-db-example-spring/src/main/java/org/apache/empire/samples/spring/support/EmpireDaoSupport.java @@ -97,7 +97,7 @@ public class EmpireDaoSupport extends JdbcDaoSupport { // Show DLL Statement System.out.println(script.toString()); // Execute Script - script.run(driver, conn, false); + script.executeAll(driver, conn, false); } public void initializeDatabase() { http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java b/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java index 6a5c854..7c59ef0 100644 --- a/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java +++ b/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleApplication.java @@ -232,7 +232,7 @@ public class SampleApplication implements WebApplication { // Show DLL Statements System.out.println(script.toString()); // Execute Script - script.run(driver, conn, false); + script.executeAll(driver, conn, false); db.commit(conn); // Open again if (db.isOpen()==false) http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java b/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java index 0af2f21..248f1bc 100644 --- a/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java +++ b/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java @@ -400,32 +400,6 @@ public class DBSQLScript implements Iterable<String> } /** - * Executes all statements one by one. Replaced by executeAll() - * - * @param driver the driver used for statement execution - * @param conn the connection - * @param ignoreErrors true if errors should be ignored - * @return number of records affected - */ - @Deprecated - public final int run(DBDatabaseDriver driver, Connection conn, boolean ignoreErrors) - { - return executeAll(driver, conn, ignoreErrors); - } - - /** - * Runs all SQL Statements using the supplied driver and connection. - * - * @param driver the driver used for statement execution - * @param conn the connection - */ - @Deprecated - public final void run(DBDatabaseDriver driver, Connection conn) - { - executeAll(driver, conn, false); - } - - /** * Returns an iterator */ @Override http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java b/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java index 4de7a8b..ba8788c 100644 --- a/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java @@ -196,7 +196,7 @@ public class IntegerTest { db.getDriver().getDDLScript(DBCmdType.DROP, table, script2); } } - script2.run(driver, conn, false); + script2.executeAll(driver, conn, false); // Commit db.commit(conn); @@ -207,7 +207,7 @@ public class IntegerTest { // Show DDL Statement LOGGER.info(script.toString()); // Execute Script - script.run(driver, conn, false); + script.executeAll(driver, conn, false); // Commit db.commit(conn); } http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java index c0e5c42..606a8c4 100644 --- a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java @@ -46,7 +46,7 @@ public class PreparedStatementTest{ db.open(driver, conn); DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); - script.run(db.getDriver(), conn, false); + script.executeAll(db.getDriver(), conn, false); DBRecord department = new DBRecord(); department.create(db.DEPARTMENT); http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java b/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java index 0b34156..00b50d1 100644 --- a/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java @@ -56,7 +56,7 @@ public class DBDatabaseDriverHSqlTest{ db.open(driver, dbResource.getConnection()); DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); DBRecord dep = new DBRecord(); dep.create(db.DEPARTMENT); @@ -99,7 +99,7 @@ public class DBDatabaseDriverHSqlTest{ script = new DBSQLScript(); db.getDriver().getDDLScript(DBCmdType.DROP, db.EMPLOYEE, script); db.getDriver().getDDLScript(DBCmdType.DROP, db.DEPARTMENT, script); - script.run(db.getDriver(), conn, true); + script.executeAll(db.getDriver(), conn, true); } @@ -115,7 +115,7 @@ public class DBDatabaseDriverHSqlTest{ db.open(driver, dbResource.getConnection()); DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); DBRecord data = new DBRecord(); data.create(db.DATA); @@ -131,7 +131,7 @@ public class DBDatabaseDriverHSqlTest{ script = new DBSQLScript(); db.getDriver().getDDLScript(DBCmdType.DROP, db.DATA, script); - script.run(db.getDriver(), conn, true); + script.executeAll(db.getDriver(), conn, true); } /** http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlDateTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlDateTest.java b/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlDateTest.java index 3f0c12c..b0afe90 100644 --- a/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlDateTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlDateTest.java @@ -72,7 +72,7 @@ public class DBDatabaseDriverMSSqlDateTest { DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); System.out.println(script.toString()); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); } // STEP 5: Clear Database (Delete all records) @@ -122,7 +122,7 @@ public class DBDatabaseDriverMSSqlDateTest { private static void clearDatabase(Connection conn, DateTimeTestDB db) { DBCommand cmd = db.createCommand(); // Delete all Employees (no constraints) - db.executeSQL(cmd.getDelete(db.USER_INFO), conn); + db.executeDelete(db.USER_INFO, cmd, conn); } /** @@ -155,7 +155,9 @@ public class DBDatabaseDriverMSSqlDateTest { public static class UserInfoTable extends DBTable { - public final DBTableColumn ID; + private static final long serialVersionUID = 1L; + + public final DBTableColumn ID; public final DBTableColumn USER; public final DBTableColumn REG_DATE; public final DBTableColumn LAST_LOGIN; http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlTest.java b/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlTest.java index 8267bd0..a20fa35 100644 --- a/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/mssql/DBDatabaseDriverMSSqlTest.java @@ -57,7 +57,7 @@ public class DBDatabaseDriverMSSqlTest DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); System.out.println(script.toString()); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); } // STEP 5: Clear Database (Delete all records) @@ -89,7 +89,7 @@ public class DBDatabaseDriverMSSqlTest { DBCommand cmd = db.createCommand(); // Delete all Employees (no constraints) - db.executeSQL(cmd.getDelete(db.DEPARTMENT), conn); + db.executeDelete(db.DEPARTMENT, cmd, conn); } /** http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQLTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQLTest.java b/empire-db/src/test/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQLTest.java index 4634ecc..8b78340 100644 --- a/empire-db/src/test/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQLTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQLTest.java @@ -82,7 +82,7 @@ public class DBDatabaseDriverPostgreSQLTest DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); System.out.println(script.toString()); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); } conn.close(); http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/empire-db/src/test/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLiteTest.java ---------------------------------------------------------------------- diff --git a/empire-db/src/test/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLiteTest.java b/empire-db/src/test/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLiteTest.java index 1e2d9be..03e5dbe 100644 --- a/empire-db/src/test/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLiteTest.java +++ b/empire-db/src/test/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLiteTest.java @@ -56,7 +56,7 @@ public class DBDatabaseDriverSQLiteTest{ db.open(driver, dbResource.getConnection()); DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); DBRecord dep = new DBRecord(); dep.create(db.DEPARTMENT); @@ -97,7 +97,7 @@ public class DBDatabaseDriverSQLiteTest{ script = new DBSQLScript(); db.getDriver().getDDLScript(DBCmdType.DROP, db.EMPLOYEE, script); db.getDriver().getDDLScript(DBCmdType.DROP, db.DEPARTMENT, script); - script.run(db.getDriver(), conn, true); + script.executeAll(db.getDriver(), conn, true); } @@ -114,7 +114,7 @@ public class DBDatabaseDriverSQLiteTest{ db.open(driver, dbResource.getConnection()); DBSQLScript script = new DBSQLScript(); db.getCreateDDLScript(db.getDriver(), script); - script.run(db.getDriver(), dbResource.getConnection(), false); + script.executeAll(db.getDriver(), dbResource.getConnection(), false); DBRecord data = new DBRecord(); data.create(db.DATA); @@ -130,7 +130,7 @@ public class DBDatabaseDriverSQLiteTest{ script = new DBSQLScript(); db.getDriver().getDDLScript(DBCmdType.DROP, db.DATA, script); - script.run(db.getDriver(), conn, true); + script.executeAll(db.getDriver(), conn, true); } /** http://git-wip-us.apache.org/repos/asf/empire-db/blob/0bcc7b18/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5d76f7f..15b1925 100644 --- a/pom.xml +++ b/pom.xml @@ -471,7 +471,6 @@ <exclude>**/*.iml</exclude> <exclude>**/*.json</exclude> <!-- specific files --> - <exclude>release.properties</exclude> <exclude>**/META-INF/MANIFEST.MF</exclude> <exclude>**/dependencies.txt</exclude> <exclude>**/.project</exclude>
