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 d7a58f5 EMPIREDB-362 removed generic getters
d7a58f5 is described below
commit d7a58f5dba67dbcec7e097145bf41fc83604ebee
Author: Rainer Döbele <[email protected]>
AuthorDate: Tue Feb 8 17:11:27 2022 +0100
EMPIREDB-362 removed generic getters
---
.../apache/empire/jsf2/websample/db/records/SampleRecord.java | 3 ++-
empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java | 3 ++-
empire-db/src/main/java/org/apache/empire/db/DBColumn.java | 3 ++-
.../src/main/java/org/apache/empire/db/DBCombinedCmd.java | 3 ++-
empire-db/src/main/java/org/apache/empire/db/DBCommand.java | 4 ++--
empire-db/src/main/java/org/apache/empire/db/DBReader.java | 6 +++---
empire-db/src/main/java/org/apache/empire/db/DBRecord.java | 9 ++++-----
.../src/main/java/org/apache/empire/db/DBRecordBase.java | 9 +--------
.../src/main/java/org/apache/empire/db/DBRecordBean.java | 11 +++++------
empire-db/src/main/java/org/apache/empire/db/DBRelation.java | 4 ++--
empire-db/src/main/java/org/apache/empire/db/DBUtils.java | 4 ++--
.../org/apache/empire/db/expr/column/DBAbstractFuncExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBAliasExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBCalcExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBCaseExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBCaseWhenExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBConcatExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBCountExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/column/DBScalarExpr.java | 4 ++--
.../java/org/apache/empire/db/expr/column/DBValueExpr.java | 4 ++--
.../org/apache/empire/db/expr/column/DBVarArgsFuncExpr.java | 4 ++--
.../org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java | 3 ++-
.../org/apache/empire/db/expr/compare/DBCompareColExpr.java | 3 ++-
.../org/apache/empire/db/expr/compare/DBCompareNotExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/compare/DBExistsExpr.java | 3 ++-
.../org/apache/empire/db/expr/compare/DBParenthesisExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java | 3 ++-
.../java/org/apache/empire/db/expr/order/DBOrderByExpr.java | 3 ++-
.../main/java/org/apache/empire/db/expr/set/DBSetExpr.java | 3 ++-
.../src/main/java/org/apache/empire/db/generic/TRecord.java | 1 -
.../java/org/apache/empire/dbms/oracle/OracleRowNumExpr.java | 4 ++--
32 files changed, 67 insertions(+), 57 deletions(-)
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/db/records/SampleRecord.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/db/records/SampleRecord.java
index 9f25a08..00ed964 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/db/records/SampleRecord.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/db/records/SampleRecord.java
@@ -46,7 +46,8 @@ public abstract class SampleRecord<T extends SampleTable>
extends DBRecord
private void readObject(ObjectInputStream strm)
throws IOException, ClassNotFoundException
{ // Restore T
- T table = super.getRowSet();
+ @SuppressWarnings("unchecked")
+ T table = (T)super.getRowSet();
ClassUtils.setPrivateFieldValue(SampleRecord.class, this, "T", table);
// read the rest
strm.defaultReadObject();
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
b/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
index 3405689..c32a6f4 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
@@ -105,8 +105,9 @@ public class DBCmdParam extends DBExpr
// Nothing to add
}
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return cmd.getDatabase();
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
index 53bb88d..728a59b 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
@@ -216,8 +216,9 @@ public abstract class DBColumn extends DBColumnExpr
/**
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return (rowset!=null ? rowset.getDatabase() : null);
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
b/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
index 5a58397..d3ca978 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
@@ -66,8 +66,9 @@ public class DBCombinedCmd extends DBCommandExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return left.getDatabase();
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
index 08e5fa0..d16fd0d 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
@@ -208,9 +208,9 @@ public abstract class DBCommand extends DBCommandExpr
*/
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
@Override
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBReader.java
b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
index 15e506c..dbd5180 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBReader.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBReader.java
@@ -293,9 +293,9 @@ public class DBReader extends DBRecordData implements
Closeable
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
public boolean getScrollable()
@@ -705,7 +705,7 @@ public class DBReader extends DBRecordData implements
Closeable
rownum++;
// post processing
if (bean instanceof DataBean<?>)
- ((DataBean<?>)bean).initialize(getDatabase(), context,
rownum, parent);
+
((DataBean<?>)bean).initialize(((DBObject)this).getDatabase(), context, rownum,
parent);
// Decrease count
if (maxCount > 0)
maxCount--;
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 7f2ba0a..71749fc 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
@@ -166,11 +166,11 @@ public class DBRecord extends DBRecordBase
*/
@Override
@SuppressWarnings("unchecked")
- public <T extends DBContext> T getContext()
+ public DBContext getContext()
{
if (this.context==null)
throw new ObjectNotValidException(this);
- return ((T)context);
+ return context;
}
/**
@@ -179,12 +179,11 @@ public class DBRecord extends DBRecordBase
* @return the DBRowSet object
*/
@Override
- @SuppressWarnings("unchecked")
- public <T extends DBRowSet> T getRowSet()
+ public DBRowSet getRowSet()
{
if (this.rowset==null)
throw new ObjectNotValidException(this);
- return (T)this.rowset;
+ return this.rowset;
}
/**
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
index 17828ea..a453b37 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java
@@ -259,17 +259,10 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
}
/**
- * Returns the current Context
- * @return
- */
- @Override
- public abstract <T extends DBContext> T getContext();
-
- /**
* Returns the DBRowSet object.
* @return the DBRowSet object
*/
- public abstract <T extends DBRowSet> T getRowSet();
+ public abstract DBRowSet getRowSet();
/**
* Returns whether or not RollbackHandling is enabled for this record
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
b/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
index 89a4c6e..3992654 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordBean.java
@@ -87,13 +87,13 @@ public class DBRecordBean extends DBRecordBase
* Returns the current Context
* @return
*/
- @Override
@SuppressWarnings("unchecked")
- public <T extends DBContext> T getContext()
+ @Override
+ public DBContext getContext()
{
if (this.tempContext==null)
throw new ObjectNotValidException(this);
- return ((T)tempContext);
+ return tempContext;
}
/**
@@ -102,12 +102,11 @@ public class DBRecordBean extends DBRecordBase
* @return the DBRowSet object
*/
@Override
- @SuppressWarnings("unchecked")
- public <T extends DBRowSet> T getRowSet()
+ public DBRowSet getRowSet()
{
if (this.rowset==null)
throw new ObjectNotValidException(this);
- return (T)this.rowset;
+ return this.rowset;
}
/**
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
b/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
index 818676f..9fb0ac0 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
@@ -163,9 +163,9 @@ public class DBRelation extends DBObject
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
/**
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBUtils.java
b/empire-db/src/main/java/org/apache/empire/db/DBUtils.java
index cd61d7a..2574fa7 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBUtils.java
@@ -1025,7 +1025,7 @@ public class DBUtils implements DBContextAware
list.add(item);
// post processing
if (item instanceof DataBean<?>)
- ((DataBean<?>)item).initialize(r.getDatabase(), context,
rownum, parent);
+
((DataBean<?>)item).initialize(((DBObject)r).getDatabase(), context, rownum,
parent);
// next
rownum++;
// Decrease count
@@ -1102,7 +1102,7 @@ public class DBUtils implements DBContextAware
T item = factory.newItem(-1, r);
// post processing
if (item instanceof DataBean<?>)
- ((DataBean<?>)item).initialize(r.getDatabase(), context, -1,
null);
+ ((DataBean<?>)item).initialize(((DBObject)r).getDatabase(),
context, -1, null);
// done
return item;
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
index ab02d2a..6bd941c 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
@@ -85,8 +85,9 @@ public abstract class DBAbstractFuncExpr extends DBColumnExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
index d18ea02..6271425 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAliasExpr.java
@@ -65,8 +65,9 @@ public class DBAliasExpr extends DBColumnExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
index b4d2af8..8bc4568 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCalcExpr.java
@@ -66,8 +66,9 @@ public class DBCalcExpr extends DBColumnExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
index ca29473..5f37859 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseExpr.java
@@ -57,8 +57,9 @@ public class DBCaseExpr extends DBColumnExpr
this.elseExpr = elseExpr;
}
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return trueExpr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseWhenExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseWhenExpr.java
index 1105b9f..397ef86 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseWhenExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCaseWhenExpr.java
@@ -59,8 +59,9 @@ public class DBCaseWhenExpr extends DBColumnExpr
this.elseExpr = elseExpr;
}
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return getFirstColumnExpr().getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
index 4ea1db9..b41f8b4 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBConcatExpr.java
@@ -57,8 +57,9 @@ public class DBConcatExpr extends DBColumnExpr
this.right = right;
}
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return left.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
index d9998ab..1b68f57 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBCountExpr.java
@@ -77,8 +77,9 @@ public class DBCountExpr extends DBColumnExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
if (column!=null)
return column.getDatabase();
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBScalarExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBScalarExpr.java
index f273554..05df709 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBScalarExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBScalarExpr.java
@@ -99,9 +99,9 @@ public class DBScalarExpr extends DBColumnExpr
*/
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
/**
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
index 420b9ce..1a1aff4 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBValueExpr.java
@@ -103,9 +103,9 @@ public class DBValueExpr extends DBColumnExpr
*/
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
/**
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBVarArgsFuncExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBVarArgsFuncExpr.java
index 02762f2..a465c21 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/column/DBVarArgsFuncExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/column/DBVarArgsFuncExpr.java
@@ -49,9 +49,9 @@ public class DBVarArgsFuncExpr extends DBColumnExpr
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T) database;
+ return database;
}
@Override
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
index d4f7406..85b7ff7 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
@@ -74,8 +74,9 @@ public class DBCompareAndOrExpr extends DBCompareExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return left.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
index 2e25765..e650598 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
@@ -68,8 +68,9 @@ public class DBCompareColExpr extends DBCompareExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
index 1a65b09..bd280e4 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
@@ -53,8 +53,9 @@ public class DBCompareNotExpr extends DBCompareExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
index 4cc3bc6..a56e399 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
@@ -69,8 +69,9 @@ public class DBExistsExpr extends DBCompareExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return cmd.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBParenthesisExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBParenthesisExpr.java
index 7988835..dab3138 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBParenthesisExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBParenthesisExpr.java
@@ -42,8 +42,9 @@ public class DBParenthesisExpr extends DBCompareExpr
return wrap;
}
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return wrap.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
index 49ef3ec..cc54ed7 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
@@ -60,8 +60,9 @@ public class DBColumnJoinExpr extends DBJoinExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return left.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
index ab5c879..721bce3 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
@@ -62,8 +62,9 @@ public class DBCrossJoinExpr extends DBJoinExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return left.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/order/DBOrderByExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/order/DBOrderByExpr.java
index f1f05c8..b8e3a2e 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/order/DBOrderByExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/order/DBOrderByExpr.java
@@ -68,8 +68,9 @@ public class DBOrderByExpr extends DBExpr
/*
* @see org.apache.empire.db.DBExpr#getDatabase()
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return expr.getDatabase();
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/set/DBSetExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/set/DBSetExpr.java
index 615f460..5ea509a 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/set/DBSetExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/set/DBSetExpr.java
@@ -62,8 +62,9 @@ public class DBSetExpr extends DBExpr
*
* @return the current DBDatabase object
*/
+ @SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
return column.getDatabase();
}
diff --git a/empire-db/src/main/java/org/apache/empire/db/generic/TRecord.java
b/empire-db/src/main/java/org/apache/empire/db/generic/TRecord.java
index 62d7e80..d4bd0b7 100644
--- a/empire-db/src/main/java/org/apache/empire/db/generic/TRecord.java
+++ b/empire-db/src/main/java/org/apache/empire/db/generic/TRecord.java
@@ -55,7 +55,6 @@ public class TRecord<RS extends DBRowSet> extends DBRecord
* finally we know the rowset
*/
@Override
- @SuppressWarnings("unchecked")
public RS getRowSet()
{
return this.RS;
diff --git
a/empire-db/src/main/java/org/apache/empire/dbms/oracle/OracleRowNumExpr.java
b/empire-db/src/main/java/org/apache/empire/dbms/oracle/OracleRowNumExpr.java
index a1bf91c..08b9e27 100644
---
a/empire-db/src/main/java/org/apache/empire/dbms/oracle/OracleRowNumExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/dbms/oracle/OracleRowNumExpr.java
@@ -57,9 +57,9 @@ public class OracleRowNumExpr extends DBColumnExpr
*/
@SuppressWarnings("unchecked")
@Override
- public final <T extends DBDatabase> T getDatabase()
+ public final DBDatabase getDatabase()
{
- return (T)db;
+ return db;
}
/**
