[empire-db] branch version3 updated: EMPIREDB-362 small fix

[doebele]

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 e62c5a8  EMPIREDB-362 small fix
e62c5a8 is described below

commit e62c5a8c08ac243f37c6f9190719166eea09f0c7
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Fri Feb 4 16:01:03 2022 +0100

    EMPIREDB-362 small fix
---
 .../src/main/java/org/apache/empire/samples/db/SampleApp.java          | 3 ++-
 empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java         | 3 ++-
 empire-db/src/main/java/org/apache/empire/db/DBRecord.java             | 2 +-
 .../src/main/java/org/apache/empire/db/list/DBBeanFactoryCache.java    | 1 -
 4 files changed, 5 insertions(+), 4 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 522ea3c..fe0905a 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
@@ -645,8 +645,9 @@ public class SampleApp
         cmd.join(EMP.DEPARTMENT_ID, DEP.ID);
         cmd.joinLeft(EMP.ID, PAY.EMPLOYEE_ID).where(PAY.YEAR.is(lastYear));
         // Where constraints
-        cmd.where(EMP.RETIRED.is(false));
         cmd.where(EMP.LASTNAME.length().isGreaterThan(0));
+        cmd.where(EMP.GENDER.in(Gender.M, Gender.F));
+        cmd.where(EMP.RETIRED.is(false));
         // Order by
         cmd.orderBy(EMPLOYEE_FULLNAME);
 
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java 
b/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
index 903f771..5c5c693 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
@@ -452,7 +452,8 @@ public abstract class DBColumnExpr extends DBExpr
      * @param values the values to compare this column with
      * @return a DBCompareColExpr for the "in" operator
      */
-    public final DBCompareColExpr in(Object... values)
+    @SafeVarargs
+    public final <T> DBCompareColExpr in(T... values)
     {
         if (values==null || values.length==0)
             return cmp(DBCmpType.EQUAL, null);
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 25e7810..d522bed 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
@@ -404,7 +404,7 @@ public class DBRecord extends DBRecordData implements 
Record, Cloneable, Seriali
      * @return the current DBDatabase object
      */
     @Override
-    public final <T extends DBDatabase> T getDatabase()
+    public <T extends DBDatabase> T getDatabase()
     {
         return getRowSet().getDatabase();
     }
diff --git 
a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanFactoryCache.java 
b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanFactoryCache.java
index 16f605f..5273742 100644
--- a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanFactoryCache.java
+++ b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanFactoryCache.java
@@ -21,7 +21,6 @@ package org.apache.empire.db.list;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.empire.db.exceptions.UnknownBeanTypeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;