This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/version3 by this push:
new 4b34d34 EMPIREDB-362 Removed unnecessary imports
4b34d34 is described below
commit 4b34d34101643dcdf7b3a19d8d896d9f519c266a
Author: Rainer Döbele <[email protected]>
AuthorDate: Mon Feb 7 21:12:24 2022 +0100
EMPIREDB-362 Removed unnecessary imports
---
.../org/apache/empire/samples/db/SampleApp.java | 45 +++++++++++-----------
.../jsf2/websample/web/pages/SamplePage.java | 4 +-
empire-db-examples/empire-db-example-vue/pom.xml | 1 -
.../org/apache/empire/jsf2/app/WebDBContext.java | 1 -
empire-db-maven-plugin/pom.xml | 5 ---
.../main/java/org/apache/empire/db/DBQuery.java | 2 -
6 files changed, 25 insertions(+), 33 deletions(-)
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 ddfb2ff..778a0fc 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
@@ -469,8 +469,8 @@ public class SampleApp
* testTransactionCreate
* @param context
* @param idDep
- */
- private static int testTransactionCreate(int idDep)
+ *
+ private static int testTransactionCreate(long idDep)
{
// Shortcut for convenience
SampleDB.Employees EMP = db.EMPLOYEES;
@@ -509,11 +509,13 @@ public class SampleApp
return rec.getInt(EMP.ID);
}
+ */
+
/**
* @param context
* @param idDep
- */
- private static void testTransactionUpdate(int idEmp)
+ *
+ private static void testTransactionUpdate(long idEmp)
{
// Shortcut for convenience
SampleDB.Employees EMP = db.EMPLOYEES;
@@ -539,42 +541,41 @@ public class SampleApp
log.info("Timestamp {}", rec.getString(EMP.UPDATE_TIMESTAMP));
log.info("testTransactionUpdate performed OK");
- context.commit();
-
+ context.commit();
}
+ */
+
/**
* @param context
* @param idDep
- */
- private static void testTransactionDelete(int idEmp)
+ *
+ private static void testTransactionDelete(long idEmp)
{
// Shortcut for convenience
SampleDB.Employees T = db.EMPLOYEES;
DBRecord rec = new DBRecord(context, T);
rec.read(idEmp);
- /*
- log.info("Timestamp {}", rec.getString(T.UPDATE_TIMESTAMP));
- rec.setValue(T.SALARY, "100.001");
- rec.update();
- log.info("Timestamp {}", rec.getString(T.UPDATE_TIMESTAMP));
- */
+
+ // log.info("Timestamp {}", rec.getString(T.UPDATE_TIMESTAMP));
+ // rec.setValue(T.SALARY, "100.001");
+ // rec.update();
+ // log.info("Timestamp {}", rec.getString(T.UPDATE_TIMESTAMP));
+
rec.delete();
context.rollback();
- /*
- DBCommand cmd = db.createCommand();
- cmd.select(T.UPDATE_TIMESTAMP);
- cmd.where (T.EMPLOYEE_ID.is(idEmp));
- log.info("Timestamp {}", db.querySingleString(cmd,
context.getConnection()));
- */
+ // DBCommand cmd = db.createCommand();
+ // cmd.select(T.UPDATE_TIMESTAMP);
+ // cmd.where (T.EMPLOYEE_ID.is(idEmp));
+ // log.info("Timestamp {}", db.querySingleString(cmd,
context.getConnection()));
rec.update();
- log.info("Transaction performed OK");
-
+ log.info("Transaction performed OK");
}
+ */
/**
* <PRE>
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
index 87805e0..dc53bf8 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/SamplePage.java
@@ -19,7 +19,6 @@
package org.apache.empire.jsf2.websample.web.pages;
import org.apache.empire.db.DBCommand;
-import org.apache.empire.db.DBContext;
import org.apache.empire.db.DBDatabase;
import org.apache.empire.jsf2.pages.Page;
import org.apache.empire.jsf2.websample.db.SampleDB;
@@ -46,8 +45,9 @@ public class SamplePage extends Page
return this.sampleContext;
}
+ @SuppressWarnings("unchecked")
@Override
- public DBContext getDBContext(DBDatabase db)
+ public SampleContext getDBContext(DBDatabase db)
{
return getSampleContext();
}
diff --git a/empire-db-examples/empire-db-example-vue/pom.xml
b/empire-db-examples/empire-db-example-vue/pom.xml
index 3357549..5015784 100644
--- a/empire-db-examples/empire-db-example-vue/pom.xml
+++ b/empire-db-examples/empire-db-example-vue/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
</dependency>
<!-- Logging -->
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebDBContext.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebDBContext.java
index 8013ebc..4f30ad6 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebDBContext.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/WebDBContext.java
@@ -15,7 +15,6 @@ import org.apache.empire.db.context.DBContextBase;
import org.apache.empire.db.context.DBRollbackManager;
import org.apache.empire.dbms.DBMSHandler;
import org.apache.empire.exceptions.ItemNotFoundException;
-import org.apache.empire.exceptions.NotSupportedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/empire-db-maven-plugin/pom.xml b/empire-db-maven-plugin/pom.xml
index ff19b2a..ff7f999 100644
--- a/empire-db-maven-plugin/pom.xml
+++ b/empire-db-maven-plugin/pom.xml
@@ -67,11 +67,6 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
b/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
index e63af44..adcb882 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
@@ -29,8 +29,6 @@ import org.apache.empire.commons.StringUtils;
import org.apache.empire.data.ColumnExpr;
import org.apache.empire.db.exceptions.InvalidKeyException;
import org.apache.empire.db.exceptions.NoPrimaryKeyException;
-import org.apache.empire.db.exceptions.QueryNoResultException;
-import org.apache.empire.db.exceptions.RecordNotFoundException;
import org.apache.empire.db.exceptions.RecordUpdateAmbiguousException;
import org.apache.empire.db.exceptions.RecordUpdateFailedException;
import org.apache.empire.db.expr.column.DBAliasExpr;
