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 fc9244a EMPIREDB-364 fix
fc9244a is described below
commit fc9244a93ef0e68cbb1acd6f141a721c07b386ea
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Jan 23 00:39:52 2022 +0100
EMPIREDB-364 fix
---
.../org/apache/empire/db/codegen/CodeGenTest.java | 1 -
.../empire/samples/db/advanced/SampleAdvApp.java | 2 ++
.../websample/web/pages/EmployeeDetailPage.java | 3 ++-
.../jsf2/websample/web/pages/EmployeeListPage.java | 6 ++---
.../main/java/org/apache/empire/db/DBRecord.java | 31 +++++++++++++++++-----
5 files changed, 32 insertions(+), 11 deletions(-)
diff --git
a/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
b/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
index fdacb8c..804964a 100644
---
a/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
+++
b/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/CodeGenTest.java
@@ -37,7 +37,6 @@ public class CodeGenTest
}
@Test
- @SuppressWarnings("serial")
public void testCodeGen()
{
CodeGenConfig config = new CodeGenConfig();
diff --git
a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
index fdfa595..bf241e2 100644
---
a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
+++
b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
@@ -470,6 +470,8 @@ public class SampleAdvApp
reader.open(cmd);
// Print output
DBRecord record = new DBRecord(context, EMP);
+ // Disable rollback handling to improve performance
+ record.setRollbackHandlingEnabled(false);
while (reader.moveNext())
{
// Calculate sum
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
index a6682db..716e714 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
@@ -28,8 +28,9 @@ import org.slf4j.LoggerFactory;
public class EmployeeDetailPage extends SamplePage
{
+ // *Deprecated* private static final long serialVersionUID = 1L;
+
private static final Logger log =
LoggerFactory.getLogger(EmployeeDetailPage.class);
- private static final long serialVersionUID = 1L;
private String idParam;
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
index aae67e9..8e1ea9f 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
@@ -42,10 +42,10 @@ import org.slf4j.LoggerFactory;
public class EmployeeListPage extends SamplePage
{
- private static final long serialVersionUID = 1L;
- private static final Logger log =
LoggerFactory.getLogger(EmployeeListPage.class);
+ // *Deprecated* private static final long serialVersionUID = 1L;
+
+ private static final Logger log =
LoggerFactory.getLogger(EmployeeListPage.class);
-
private BeanListPageElement<EmployeeListEntry> employees;
public static class EmployeeListEntry extends
ListPageElement.SelectableItem implements ParameterizedItem
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
index 687699d..6e0d6b8 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
@@ -732,24 +732,43 @@ public class DBRecord extends DBRecordData implements
DBContextAware, Record, Cl
}
/**
+ * Returns whether or not RollbackHandling is enabled for this record
+ */
+ public boolean isRollbackHandlingEnabled()
+ {
+ return this.enableRollbackHandling;
+ }
+
+ /**
+ * Set whether or not RollbackHandling will be performed for this record
+ * Since Rollback handling requires additional resources it should only be
used if necessary
+ * Especially for bulk operations it should be disabled
+ * @param enabled flag whether to enable or disable RollbackHandling
+ */
+ public void setRollbackHandlingEnabled(boolean enabled)
+ {
+ this.enableRollbackHandling = enabled;
+ }
+
+ /**
* Returns whether or not values are checked for validity when calling
setValue().
* If set to true validateValue() is called to check validity
* @return true if the validity of values is checked or false otherwise
*/
public boolean isValidateFieldValues()
{
- return validateFieldValues;
- }
+ return validateFieldValues;
+ }
/**
* Set whether or not values are checked for validity when calling
setValue().
* If set to true validateValue() is called to check validity, otherwise
not.
* @param validateFieldValues flag whether to check validity
*/
- public void setValidateFieldValues(boolean validateFieldValues)
- {
- this.validateFieldValues = validateFieldValues;
- }
+ public void setValidateFieldValues(boolean validateFieldValues)
+ {
+ this.validateFieldValues = validateFieldValues;
+ }
/**
* returns whether a field is visible to the client or not
