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 39bf9f0 EMPIREDB-362 Interface cleanup (1)
39bf9f0 is described below
commit 39bf9f0a8e623f0c2e5287378d9ff2d072bf4ec6
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Feb 13 18:38:23 2022 +0100
EMPIREDB-362 Interface cleanup (1)
---
.../org/apache/empire/samples/db/advanced/SampleAdvApp.java | 4 ++--
empire-db/src/main/java/org/apache/empire/data/Record.java | 5 ++---
empire-db/src/main/java/org/apache/empire/data/RecordData.java | 2 +-
.../main/java/org/apache/empire/data/bean/BeanRecordProxy.java | 6 ------
.../main/java/org/apache/empire/data/list/DataListEntry.java | 4 ++--
empire-db/src/main/java/org/apache/empire/db/DBReader.java | 2 +-
empire-db/src/main/java/org/apache/empire/db/DBRecordBase.java | 10 ----------
empire-db/src/main/java/org/apache/empire/db/DBRecordData.java | 8 ++------
8 files changed, 10 insertions(+), 31 deletions(-)
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 f1a3fe0..58db6f6 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
@@ -635,7 +635,7 @@ public class SampleAdvApp
int count = reader.getFieldCount();
for (int i=0; i<count; i++)
{ // Print all column names
- DBColumnExpr c = reader.getColumnExpr(i);
+ DBColumnExpr c = reader.getColumn(i);
if (i>0)
System.out.print("\t");
System.out.print(c.getName());
@@ -650,7 +650,7 @@ public class SampleAdvApp
if (i>0)
System.out.print("\t");
// Check if conversion is necessary
- DBColumnExpr c = reader.getColumnExpr(i);
+ DBColumnExpr c = reader.getColumn(i);
Options opt = c.getOptions();
if (opt!=null)
{ // Option Lookup
diff --git a/empire-db/src/main/java/org/apache/empire/data/Record.java
b/empire-db/src/main/java/org/apache/empire/data/Record.java
index 0c9b3d0..800b94e 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Record.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Record.java
@@ -72,10 +72,9 @@ public interface Record extends RecordData
boolean isNew();
/**
- * returns the column at the specified index.
- * @param index index of a requested column
- * @return the column on the specified index
+ * Overridden to change return type from ColumnExpr to Column
*/
+ @Override
Column getColumn(int index);
/**
diff --git a/empire-db/src/main/java/org/apache/empire/data/RecordData.java
b/empire-db/src/main/java/org/apache/empire/data/RecordData.java
index 6e37c3e..78d755b 100644
--- a/empire-db/src/main/java/org/apache/empire/data/RecordData.java
+++ b/empire-db/src/main/java/org/apache/empire/data/RecordData.java
@@ -56,7 +56,7 @@ public interface RecordData
* @param i field index of the column expression
* @return the column expression object or null if the index is out of
range
*/
- ColumnExpr getColumnExpr(int i);
+ ColumnExpr getColumn(int i);
/**
* returns the value of the field at the given index position
diff --git
a/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
b/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
index b37b4eb..2ecc987 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
@@ -102,12 +102,6 @@ public class BeanRecordProxy<T> implements Record
}
@Override
- public ColumnExpr getColumnExpr(int index)
- {
- return columns.get(index);
- }
-
- @Override
public Column[] getKeyColumns()
{
return keyColumns;
diff --git
a/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
b/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
index c8cc276..8ddbba6 100644
--- a/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
+++ b/empire-db/src/main/java/org/apache/empire/data/list/DataListEntry.java
@@ -153,7 +153,7 @@ public class DataListEntry implements RecordData,
Serializable
}
@Override
- public ColumnExpr getColumnExpr(int index)
+ public ColumnExpr getColumn(int index)
{
if (index<0 || index>=values.length)
throw new InvalidArgumentException("index", index);
@@ -253,7 +253,7 @@ public class DataListEntry implements RecordData,
Serializable
if (isNull(index))
return null;
// check column data type
- ColumnExpr col = getColumnExpr(index);
+ ColumnExpr col = getColumn(index);
boolean numeric = col.getDataType().isNumeric();
return ObjectUtils.getEnum(enumType, (numeric ? getInt(index) :
getValue(index)));
}
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 407347f..e8ccd5f 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
@@ -333,7 +333,7 @@ public class DBReader extends DBRecordData implements
Closeable
/** Get the column Expression at position */
@Override
- public DBColumnExpr getColumnExpr(int iColumn)
+ public DBColumnExpr getColumn(int iColumn)
{
if (columns == null || iColumn < 0 || iColumn >= columns.length)
return null; // Index out of range
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 3c87984..cae85a5 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
@@ -453,16 +453,6 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
}
/**
- * Returns a DBColumnExpr object by a specified index value.
- * @return the index value
- */
- @Override
- public final ColumnExpr getColumnExpr(int index)
- {
- return getColumn(index);
- }
-
- /**
* Returns true if the field was modified.
*
* @param index the field index
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
b/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
index 6591c03..388df78 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
@@ -71,10 +71,6 @@ public abstract class DBRecordData extends DBObject
@Override
public abstract int getFieldIndex(String column);
- // Column lookup
- @Override
- public abstract ColumnExpr getColumnExpr(int i);
-
// xml
public abstract int addXmlMeta(Element parent);
public abstract int addXmlData(Element parent);
@@ -377,7 +373,7 @@ public abstract class DBRecordData extends DBObject
if (isNull(index))
return null;
// convert
- ColumnExpr col = getColumnExpr(index);
+ ColumnExpr col = getColumn(index);
try {
// Convert to enum, depending on DataType
boolean numeric = col.getDataType().isNumeric();
@@ -518,7 +514,7 @@ public abstract class DBRecordData extends DBObject
int count = 0;
for (int i = 0; i < getFieldCount(); i++)
{ // Check Property
- ColumnExpr column = getColumnExpr(i);
+ ColumnExpr column = getColumn(i);
if (ignoreList != null && ignoreList.contains(column))
continue; // ignore this property
// Get Property Name
