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 95e590a EMPIREDB-362 Interface cleanup (2) Record.getValue() ->
Record.get(); Record.setValue() -> Record.set()
95e590a is described below
commit 95e590a1eaca01dd0055390ba6ebce385725b7d5
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Feb 13 19:49:51 2022 +0100
EMPIREDB-362 Interface cleanup (2) Record.getValue() -> Record.get();
Record.setValue() -> Record.set()
---
.../empire/samples/db/advanced/SampleAdvApp.java | 22 +++++-----
.../jsf2/websample/web/SampleApplication.java | 14 +++---
.../org/apache/empire/rest/json/JsoRecordData.java | 2 +-
.../jsf2/pageelements/BeanListPageElement.java | 2 +-
.../empire/jsf2/utils/TagEncodingHelper.java | 10 ++---
.../main/java/org/apache/empire/data/Record.java | 2 +-
.../java/org/apache/empire/data/RecordData.java | 2 +-
.../apache/empire/data/bean/BeanRecordProxy.java | 19 ++++----
.../org/apache/empire/data/list/DataListEntry.java | 30 ++++++++++---
.../main/java/org/apache/empire/db/DBQuery.java | 2 +-
.../main/java/org/apache/empire/db/DBRecord.java | 16 +++----
.../java/org/apache/empire/db/DBRecordBase.java | 20 ++++++---
.../java/org/apache/empire/db/DBRecordBean.java | 26 +++--------
.../java/org/apache/empire/db/DBRecordData.java | 51 ++++++++++++++--------
.../main/java/org/apache/empire/db/DBTable.java | 2 +-
.../empire/db/list/DBBeanListFactoryImpl.java | 2 +-
.../java/org/apache/empire/db/IntegerTest.java | 12 ++---
.../apache/empire/db/PreparedStatementTest.java | 4 +-
.../empire/dbms/hsql/DBMSHandlerHSqlTest.java | 28 ++++++------
.../dbms/mssql/DBMSHandlerMSSqlDateTest.java | 6 +--
.../empire/dbms/mssql/DBMSHandlerMSSqlTest.java | 4 +-
.../dbms/postgresql/DBMSHandlerPostgreSQLTest.java | 4 +-
.../empire/dbms/sqlite/DBMSHandlerSQLiteTest.java | 16 +++----
23 files changed, 158 insertions(+), 138 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 58db6f6..c5a1484 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
@@ -167,7 +167,7 @@ public class SampleAdvApp
System.out.println("*** bulkReadRecords: reads employee records into a
hashmap, reads employee from hashmap and updates employee ***");
HashMap<Integer, DBRecord> employeeMap = bulkReadRecords(conn);
DBRecord rec = employeeMap.get(idEmp2);
- rec.setValue(db.T_EMPLOYEES.C_SALUTATION, "Mr.");
+ rec.set(db.T_EMPLOYEES.C_SALUTATION, "Mr.");
rec.update();
// STEP 10: bulkProcessRecords
@@ -297,8 +297,8 @@ public class SampleAdvApp
// Insert a Department
DBRecord rec = new DBRecord(context, T_DEP);
rec.create();
- rec.setValue(T_DEP.C_NAME, departmentName);
- rec.setValue(T_DEP.C_BUSINESS_UNIT, businessUnit);
+ rec.set(T_DEP.C_NAME, departmentName);
+ rec.set(T_DEP.C_BUSINESS_UNIT, businessUnit);
rec.update();
// Return Department ID
return rec.getInt(T_DEP.C_DEPARTMENT_ID);
@@ -314,9 +314,9 @@ public class SampleAdvApp
// Insert an Employee
DBRecord rec = new DBRecord(context, T_EMP);
rec.create();
- rec.setValue(T_EMP.C_FIRSTNAME, firstName);
- rec.setValue(T_EMP.C_LASTNAME, lastName);
- rec.setValue(T_EMP.C_GENDER, gender);
+ rec.set(T_EMP.C_FIRSTNAME, firstName);
+ rec.set(T_EMP.C_LASTNAME, lastName);
+ rec.set(T_EMP.C_GENDER, gender);
rec.update();
// Return Employee ID
return rec.getInt(T_EMP.C_EMPLOYEE_ID);
@@ -435,7 +435,7 @@ public class SampleAdvApp
// Init updateable record
reader.initRecord(record);
// reader
- record.setValue(T_EMP.C_CHECKSUM, sum);
+ record.set(T_EMP.C_CHECKSUM, sum);
record.update();
}
// Done
@@ -512,7 +512,7 @@ public class SampleAdvApp
System.out.println("Changing the value for the FOO field of a
particular employee:");
DBRecord rec = new DBRecord(context, db.T_EMPLOYEES);
rec.read(idTestPerson);
- rec.setValue(C_FOO, "Hello World");
+ rec.set(C_FOO, "Hello World");
rec.update();
// Now extend the size of the field from 20 to 40 characters
@@ -524,7 +524,7 @@ public class SampleAdvApp
// Now set a longer value for the record
System.out.println("Changing the value for the FOO field for the above
employee to a longer string:");
- rec.setValue(C_FOO, "This is a very long field value!");
+ rec.set(C_FOO, "This is a very long field value!");
rec.update();
// Finally, drop the column again
@@ -581,8 +581,8 @@ public class SampleAdvApp
DBRecord rec = new DBRecord(context, Q_EMP_DEP);
rec.read(employeeId);
// Modify and Update fields from both Employee and Department
- rec.setValue(T_EMP.C_PHONE_NUMBER, "0815-4711");
- rec.setValue(T_DEP.C_BUSINESS_UNIT, "AUTO");
+ rec.set(T_EMP.C_PHONE_NUMBER, "0815-4711");
+ rec.set(T_DEP.C_BUSINESS_UNIT, "AUTO");
rec.update();
// Successfully updated
System.out.println("The employee has been sucessfully updated");
diff --git
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
index 25e3921..c2b12c2 100644
---
a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
+++
b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
@@ -239,8 +239,8 @@ public class SampleApplication extends WebApplication {
// Insert a Department
DBRecord rec = new DBRecord(context, sampleDB.T_DEPARTMENTS);
rec.create();
- rec.setValue(sampleDB.T_DEPARTMENTS.NAME, department_name);
- rec.setValue(sampleDB.T_DEPARTMENTS.BUSINESS_UNIT,
businessUnit);
+ rec.set(sampleDB.T_DEPARTMENTS.NAME, department_name);
+ rec.set(sampleDB.T_DEPARTMENTS.BUSINESS_UNIT, businessUnit);
try {
rec.update();
} catch (Exception e) {
@@ -258,11 +258,11 @@ public class SampleApplication extends WebApplication {
// Insert an Employee
DBRecord rec = new DBRecord(context, sampleDB.T_EMPLOYEES);
rec.create();
- rec.setValue(sampleDB.T_EMPLOYEES.SALUTATION, salutation);
- rec.setValue(sampleDB.T_EMPLOYEES.FIRST_NAME, firstName);
- rec.setValue(sampleDB.T_EMPLOYEES.LAST_NAME, lastName);
- rec.setValue(sampleDB.T_EMPLOYEES.GENDER, gender);
- rec.setValue(sampleDB.T_EMPLOYEES.DEPARTMENT_ID, depID);
+ rec.set(sampleDB.T_EMPLOYEES.SALUTATION, salutation);
+ rec.set(sampleDB.T_EMPLOYEES.FIRST_NAME, firstName);
+ rec.set(sampleDB.T_EMPLOYEES.LAST_NAME, lastName);
+ rec.set(sampleDB.T_EMPLOYEES.GENDER, gender);
+ rec.set(sampleDB.T_EMPLOYEES.DEPARTMENT_ID, depID);
try {
rec.update();
} catch (Exception e) {
diff --git
a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/json/JsoRecordData.java
b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/json/JsoRecordData.java
index 10f24c1..0f4bc02 100644
---
a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/json/JsoRecordData.java
+++
b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/json/JsoRecordData.java
@@ -85,7 +85,7 @@ public class JsoRecordData extends LinkedHashMap<String,
Object>
super(rec.getFieldCount());
for (int i=0; i<rec.getFieldCount(); i++)
{
- String prop = rec.getColumnExpr(i).getBeanPropertyName();
+ String prop = rec.getColumn(i).getBeanPropertyName();
if (prop==null)
continue;
put(prop, rec.getValue(i));
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
index 6bac121..e1e60b7 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
@@ -598,7 +598,7 @@ public class BeanListPageElement<T> extends
ListPageElement<T> implements ListIt
{
if (item instanceof DBRecordData)
{
- key[i] = ((DBRecordData) item).getValue(cols[i]);
+ key[i] = ((DBRecordData) item).get(cols[i]);
}
else
{ // Bean Property Name
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index 808b26a..e756e31 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -709,7 +709,7 @@ public class TagEncodingHelper implements NamingContainer
if (record instanceof RecordData)
{ // a record
ColumnExpr col = unwrapColumnExpr(getColumn());
- mostRecentValue = ((RecordData) record).getValue(col);
+ mostRecentValue = ((RecordData) record).get(col);
return mostRecentValue;
}
else
@@ -751,7 +751,7 @@ public class TagEncodingHelper implements NamingContainer
*/
if (mostRecentValue!=null && isDetectFieldChange())
{ // DetectFieldChange by comparing current and most recent
value
- Object currentValue = ((Record) record).getValue(column);
+ Object currentValue = ((Record) record).get(column);
if (!ObjectUtils.compareEqual(currentValue,
mostRecentValue))
{ // Value has been changed by someone else!
log.info("Concurrent data change for
"+column.getName()+". Current Value is {}. Ignoring new value {}",
currentValue, value);
@@ -777,7 +777,7 @@ public class TagEncodingHelper implements NamingContainer
}
// Now, set the value
try {
- ((Record) record).setValue(column, value);
+ ((Record) record).set(column, value);
mostRecentValue = value;
} finally {
// re-enable validation
@@ -1251,7 +1251,7 @@ public class TagEncodingHelper implements NamingContainer
{ // value
if (record instanceof RecordData)
{ // a record
- value = ((RecordData) record).getValue(ttc);
+ value = ((RecordData) record).get(ttc);
}
else
{ // a normal bean
@@ -1370,7 +1370,7 @@ public class TagEncodingHelper implements NamingContainer
Column col = ((Column)value);
Object rec = getRecord();
if (rec instanceof Record)
- return ((Record)rec).getValue(col);
+ return ((Record)rec).get(col);
else if (rec!=null)
{ // Get Value from a bean
String property = col.getBeanPropertyName();
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 800b94e..4efeca1 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
@@ -136,7 +136,7 @@ public interface Record extends RecordData
* @param column the requested column
* @param value the new record value for the given column
*/
- void setValue(Column column, Object value);
+ Record set(Column column, Object value);
/**
* Validates a value before it is set in the record.
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 78d755b..13b1278 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
@@ -71,7 +71,7 @@ public interface RecordData
* @param column the column for which to return the value
* @return the record value for the given column
*/
- Object getValue(ColumnExpr column);
+ Object get(ColumnExpr column);
/**
* checks if the field at the given index position contains no value
(null)
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 2ecc987..513218c 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
@@ -119,7 +119,7 @@ public class BeanRecordProxy<T> implements Record
// Get key values
Object[] key = new Object[keyColumns.length];
for (int i=0; i<keyColumns.length; i++)
- key[i] = this.getValue(keyColumns[i]);
+ key[i] = this.get(keyColumns[i]);
// the key
return key;
}
@@ -196,7 +196,7 @@ public class BeanRecordProxy<T> implements Record
{ // Check all Key Columns
for (int i=0; i<keyColumns.length; i++)
{
- Object value = getValue(keyColumns[i]);
+ Object value = get(keyColumns[i]);
if ((value instanceof Number) &&
((Number)value).longValue()==0)
return true;
if (ObjectUtils.isEmpty(value))
@@ -226,7 +226,7 @@ public class BeanRecordProxy<T> implements Record
}
@Override
- public Object getValue(ColumnExpr column)
+ public Object get(ColumnExpr column)
{
if (!isValid())
throw new ObjectNotValidException(this);
@@ -237,13 +237,13 @@ public class BeanRecordProxy<T> implements Record
@Override
public Object getValue(int index)
{
- return getValue(getColumn(index));
+ return get(getColumn(index));
}
@Override
public boolean isNull(ColumnExpr column)
{
- return ObjectUtils.isEmpty(getValue(column));
+ return ObjectUtils.isEmpty(get(column));
}
@Override
@@ -265,12 +265,12 @@ public class BeanRecordProxy<T> implements Record
* sets the value of a field.
*/
@Override
- public void setValue(Column column, Object value)
+ public BeanRecordProxy<T> set(Column column, Object value)
{
if (!isValid())
throw new ObjectNotValidException(this);
// Track modification status
- if (ObjectUtils.compareEqual(getValue(column), value)==false)
+ if (ObjectUtils.compareEqual(get(column), value)==false)
{
if (modified== null)
modified = new boolean[columns.size()];
@@ -280,6 +280,7 @@ public class BeanRecordProxy<T> implements Record
value = validateValue(column, value);
// Set Value
setBeanPropertyValue(data, column, value);
+ return this;
}
/**
@@ -288,7 +289,7 @@ public class BeanRecordProxy<T> implements Record
@Override
public final void setValue(int i, Object value)
{
- setValue(getColumn(i), value);
+ set(getColumn(i), value);
}
/**
@@ -353,7 +354,7 @@ public class BeanRecordProxy<T> implements Record
// Get Property Name
String property = column.getBeanPropertyName();
Object value = getBeanPropertyValue(bean, property);
- setValue(column, value);
+ set(column, value);
count++;
}
return count;
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 8ddbba6..cc21c4f 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
@@ -63,7 +63,7 @@ public class DataListEntry implements RecordData, Serializable
Column[] keyColumns = entity.getKeyColumns();
Object[] key = new Object[keyColumns.length];
for (int i=0; i<key.length; i++)
- key[i] = this.getValue(keyColumns[i]);
+ key[i] = this.get(keyColumns[i]);
return key;
}
@@ -73,7 +73,7 @@ public class DataListEntry implements RecordData, Serializable
if (keyColumns.length!=1)
throw new InvalidArgumentException("entity", entity.getName());
// return id
- return ObjectUtils.getLong(getValue(keyColumns[0]));
+ return ObjectUtils.getLong(get(keyColumns[0]));
}
public boolean compareKey(Column[] keyColumns, Object[] key)
@@ -169,21 +169,37 @@ public class DataListEntry implements RecordData,
Serializable
}
@Override
- public Object getValue(ColumnExpr column)
+ public final Object get(ColumnExpr column)
{
return getValue(indexOf(column));
}
+
+ public final <T> T get(Column column, Class<T> returnType)
+ {
+ return ObjectUtils.convert(returnType, get(column));
+ }
+
+ public final Object[] get(ColumnExpr... columns)
+ {
+ Object[] values = new Object[columns.length];
+ for (int i=0; i<columns.length; i++)
+ {
+ int index = getFieldIndex(columns[i]);
+ if (index<0)
+ throw new ItemNotFoundException(columns[i].getName());
+ values[i] = getValue(index);
+ }
+ return values;
+ }
@Override
public boolean isNull(int index)
{
- if (index<0 || index>=values.length)
- throw new InvalidArgumentException("index", index);
- return ObjectUtils.isEmpty(values[index]);
+ return ObjectUtils.isEmpty(getValue(index));
}
@Override
- public boolean isNull(ColumnExpr column)
+ public final boolean isNull(ColumnExpr column)
{
return isNull(indexOf(column));
}
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 c6bf2e4..aa12f7e 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
@@ -362,7 +362,7 @@ public class DBQuery extends DBRowSet
{ // create key
Object[] recordKey = new Object[keyColumns.length];
for (int i=0; i<recordKey.length; i++)
- recordKey[i]=recData.getValue(keyColumns[i]);
+ recordKey[i]=recData.get(keyColumns[i]);
rowsetData = recordKey;
setRowsetData(record, rowsetData);
}
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 eeff855..ad72b02 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
@@ -300,23 +300,19 @@ public class DBRecord extends DBRecordBase
* @param column a DBColumn object
* @param value the value
- */
public final Object get(Column column)
{
return getValue(column);
}
+ */
/**
- * Sets the value of a column in the record.
- * Same as setValue but allows chaining as it returns itself
-
- * @param column a DBColumn object
- * @param value the value
+ * Overridden to change return type from DBCommandExpr to DBCommand
*/
- public final DBRecord set(Column column, Object value)
- {
- setValue(getFieldIndex(column), value);
- return this;
+ @Override
+ public DBRecord set(Column column, Object value)
+ {
+ return (DBRecord)super.set(column, value);
}
/**
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 cae85a5..ee610a6 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
@@ -541,7 +541,7 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
Object[] key = new Object[keyColumns.length];
for (int i = 0; i < keyColumns.length; i++)
{
- key[i] = getValue(keyColumns[i]);
+ key[i] = get(keyColumns[i]);
if (key[i] == null)
{ // Primary Key not set
log.warn("DBRecord.getKey() failed: " + getRowSet().getName()
+ " primary key value is null!");
@@ -690,6 +690,15 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
}
/**
+ * @Deprecated Renamed to set(...)
+ */
+ @Deprecated
+ public DBRecordBase setValue(Column column, Object value)
+ {
+ return set(column, value);
+ }
+
+ /**
* Sets the value of a column in the record.
* The functions checks if the column and the value are valid and whether
the
* value has changed.
@@ -698,9 +707,10 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
* @param value the value
*/
@Override
- public final void setValue(Column column, Object value)
+ public DBRecordBase set(Column column, Object value)
{
setValue(getFieldIndex(column), value);
+ return this;
}
/**
@@ -823,7 +833,7 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
{ // clear parent
if (parentRecordMap!=null)
parentRecordMap.remove(parentIdColumn);
- setValue(parentIdColumn, null);
+ set(parentIdColumn, null);
return;
}
// set key or record
@@ -1125,7 +1135,7 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
PropertyUtilsBean pub =
BeanUtilsBean.getInstance().getPropertyUtils();
Object value = pub.getSimpleProperty(bean, property);
// Now, set the record value
- setValue( column, value );
+ set( column, value );
// done
} catch (IllegalAccessException e)
{ log.error(bean.getClass().getName() + ": unable to get property '"
+ property + "'");
@@ -1157,7 +1167,7 @@ public abstract class DBRecordBase extends DBRecordData
implements Record, Clone
throw new ObjectNotValidException(e.getValue());
// Set key
log.info("Deffered setting of {} to {}!",
parentIdColumn.getName(), keyValue);
- setValue(parentIdColumn, keyValue);
+ set(parentIdColumn, keyValue);
}
parentRecordMap.clear();
}
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 ac91cfe..f0f5bad 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
@@ -248,28 +248,12 @@ public class DBRecordBean extends DBRecordBase
}
/**
- * Sets the value of a column in the record.
- * Same as getValue but provided in conjunction with set(...)
-
- * @param column a DBColumn object
- * @param value the value
- */
- public final Object get(Column column)
- {
- return getValue(column);
- }
-
- /**
- * Sets the value of a column in the record.
- * Same as setValue but allows chaining as it returns itself
-
- * @param column a DBColumn object
- * @param value the value
+ * Overridden to change return type from DBCommandExpr to DBCommand
*/
- public final DBRecordBean set(Column column, Object value)
- {
- setValue(getFieldIndex(column), value);
- return this;
+ @Override
+ public DBRecordBean set(Column column, Object value)
+ {
+ return (DBRecordBean)super.set(column, value);
}
/**
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 388df78..c14ebc8 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
@@ -86,13 +86,40 @@ public abstract class DBRecordData extends DBObject
public abstract Object getValue(int index);
/**
+ * @Deprecated Renamed to get(...)
+ */
+ @Deprecated
+ public Object getValue(ColumnExpr column)
+ {
+ return get(column);
+ }
+
+ /**
+ * @Deprecated Renamed to get(...)
+ */
+ @Deprecated
+ public final <T> T getValue(Column column, Class<T> returnType)
+ {
+ return get(column, returnType);
+ }
+
+ /**
+ * @Deprecated Renamed to get(...)
+ */
+ @Deprecated
+ public final Object[] getValue(ColumnExpr... columns)
+ {
+ return get(columns);
+ }
+
+ /**
* Returns a data value for the desired column .
*
* @param column the column for which to obtain the value
* @return the record value
*/
@Override
- public final Object getValue(ColumnExpr column)
+ public final Object get(ColumnExpr column)
{
int index = getFieldIndex(column);
if (index<0)
@@ -102,27 +129,13 @@ public abstract class DBRecordData extends DBObject
/**
* Returns the value of a field as an object of a given (wrapper)type
- * @param index index of the field
- * @param returnType the type of the returned value
- * @return the value
- */
- public <T> T getValue(int index, Class<T> returnType)
- {
- return ObjectUtils.convert(returnType, getValue(index));
- }
-
- /**
- * Returns the value of a field as an object of a given (wrapper)type
* @param column the column for which to retrieve the value
* @param returnType the type of the returned value
* @return the value
*/
- public final <T> T getValue(Column column, Class<T> returnType)
+ public final <T> T get(Column column, Class<T> returnType)
{
- int index = getFieldIndex(column);
- if (index<0)
- throw new ItemNotFoundException(column.getName());
- return getValue(index, returnType);
+ return ObjectUtils.convert(returnType, get(column));
}
/**
@@ -131,7 +144,7 @@ public abstract class DBRecordData extends DBObject
* @param column the column expressions
* @return the corresponding record values
*/
- public final Object[] getValues(ColumnExpr... columns)
+ public final Object[] get(ColumnExpr... columns)
{
Object[] values = new Object[columns.length];
for (int i=0; i<columns.length; i++)
@@ -427,7 +440,7 @@ public abstract class DBRecordData extends DBObject
@Override
public boolean isNull(int index)
{
- return (getValue(index) == null);
+ return ObjectUtils.isEmpty(getValue(index));
}
/**
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBTable.java
b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
index 1dc70f2..47df45f 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBTable.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
@@ -613,7 +613,7 @@ public class DBTable extends DBRowSet implements Cloneable
cmd.select(count());
for (DBColumn c : idx.getColumns())
{
- Object value = rec.getValue(c);
+ Object value = rec.get(c);
cmd.where(c.is(value));
}
DBUtils utils = rec.getContext().getUtils();
diff --git
a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
index e0d3116..8676cef 100644
---
a/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
+++
b/empire-db/src/main/java/org/apache/empire/db/list/DBBeanListFactoryImpl.java
@@ -227,7 +227,7 @@ public class DBBeanListFactoryImpl<T> implements
DBBeanListFactory<T>
if (enumType!=null)
params[i++] = recData.getEnum(expr, enumType);
else
- params[i++] = recData.getValue(expr);
+ params[i++] = recData.get(expr);
// log
if (log.isTraceEnabled())
log.trace("{}: constructor param '{}' is {}",
constructor.getDeclaringClass().getName(), StringUtils.coalesce(expr.getName(),
String.valueOf(i-1)), params[i-1]);
diff --git a/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java
b/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java
index da6d72f..5544114 100644
--- a/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java
+++ b/empire-db/src/test/java/org/apache/empire/db/IntegerTest.java
@@ -115,16 +115,16 @@ public class IntegerTest {
DBRecord maxRec = new DBRecord(context, database.SAMPLE);
maxRec.create();
- maxRec.setValue(database.SAMPLE.MY_INTEGER, Integer.MAX_VALUE);
- maxRec.setValue(database.SAMPLE.MY_LONG, Long.MAX_VALUE);
- maxRec.setValue(database.SAMPLE.MY_SHORT, Short.MAX_VALUE);
+ maxRec.set(database.SAMPLE.MY_INTEGER, Integer.MAX_VALUE);
+ maxRec.set(database.SAMPLE.MY_LONG, Long.MAX_VALUE);
+ maxRec.set(database.SAMPLE.MY_SHORT, Short.MAX_VALUE);
maxRec.update();
DBRecord minRec = new DBRecord(context, database.SAMPLE);
minRec.create();
- minRec.setValue(database.SAMPLE.MY_INTEGER, Integer.MIN_VALUE);
- minRec.setValue(database.SAMPLE.MY_LONG, Long.MIN_VALUE);
- minRec.setValue(database.SAMPLE.MY_SHORT, Short.MIN_VALUE);
+ minRec.set(database.SAMPLE.MY_INTEGER, Integer.MIN_VALUE);
+ minRec.set(database.SAMPLE.MY_LONG, Long.MIN_VALUE);
+ minRec.set(database.SAMPLE.MY_SHORT, Short.MIN_VALUE);
minRec.update();
}
diff --git
a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
index c9a3434..6cd0075 100644
--- a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
+++ b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
@@ -54,8 +54,8 @@ public class PreparedStatementTest{
DBRecord department = new DBRecord(context, db.DEPARTMENT);
department.create();
- department.setValue(db.DEPARTMENT.NAME, "junit");
- department.setValue(db.DEPARTMENT.BUSINESS_UNIT, "test");
+ department.set(db.DEPARTMENT.NAME, "junit");
+ department.set(db.DEPARTMENT.BUSINESS_UNIT, "test");
department.update();
int id = department.getInt(db.DEPARTMENT.ID);
diff --git
a/empire-db/src/test/java/org/apache/empire/dbms/hsql/DBMSHandlerHSqlTest.java
b/empire-db/src/test/java/org/apache/empire/dbms/hsql/DBMSHandlerHSqlTest.java
index 9398c04..05504d8 100644
---
a/empire-db/src/test/java/org/apache/empire/dbms/hsql/DBMSHandlerHSqlTest.java
+++
b/empire-db/src/test/java/org/apache/empire/dbms/hsql/DBMSHandlerHSqlTest.java
@@ -64,8 +64,8 @@ public class DBMSHandlerHSqlTest{
DBRecord dep = new DBRecord(context, db.DEPARTMENT);
dep.create();
- dep.setValue(db.DEPARTMENT.NAME, "junit");
- dep.setValue(db.DEPARTMENT.BUSINESS_UNIT, "test");
+ dep.set(db.DEPARTMENT.NAME, "junit");
+ dep.set(db.DEPARTMENT.BUSINESS_UNIT, "test");
dep.update();
Date date = dep.getDateTime(db.DEPARTMENT.UPDATE_TIMESTAMP);
@@ -74,20 +74,20 @@ public class DBMSHandlerHSqlTest{
DBRecord emp = new DBRecord(context, db.EMPLOYEE);
emp.create();
- assertNotNull("Employee-ID is null", emp.getValue(db.EMPLOYEE.ID));
- emp.setValue(db.EMPLOYEE.FIRSTNAME, "junit");
- emp.setValue(db.EMPLOYEE.LASTNAME, "test");
- emp.setValue(db.EMPLOYEE.GENDER, "m");
- emp.setValue(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
+ assertNotNull("Employee-ID is null", emp.get(db.EMPLOYEE.ID));
+ emp.set(db.EMPLOYEE.FIRSTNAME, "junit");
+ emp.set(db.EMPLOYEE.LASTNAME, "test");
+ emp.set(db.EMPLOYEE.GENDER, "m");
+ emp.set(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
emp.update();
DBRecord emp2 = new DBRecord(context, db.EMPLOYEE);
emp2.create(null);
- assertNull("Employee-ID is NOT null", emp2.getValue(db.EMPLOYEE.ID));
- emp2.setValue(db.EMPLOYEE.FIRSTNAME, "junit2");
- emp2.setValue(db.EMPLOYEE.LASTNAME, "test2");
- emp2.setValue(db.EMPLOYEE.GENDER, "m");
- emp2.setValue(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
+ assertNull("Employee-ID is NOT null", emp2.get(db.EMPLOYEE.ID));
+ emp2.set(db.EMPLOYEE.FIRSTNAME, "junit2");
+ emp2.set(db.EMPLOYEE.LASTNAME, "test2");
+ emp2.set(db.EMPLOYEE.GENDER, "m");
+ emp2.set(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
emp2.update();
date = emp.getDateTime(db.EMPLOYEE.UPDATE_TIMESTAMP);
@@ -100,7 +100,7 @@ public class DBMSHandlerHSqlTest{
emp = new DBRecord(context, db.EMPLOYEE);
emp.read(id);
// Set
- emp.setValue(db.EMPLOYEE.PHONE_NUMBER, "123456");
+ emp.set(db.EMPLOYEE.PHONE_NUMBER, "123456");
emp.update();
emp = new DBRecord(context, db.EMPLOYEE);
@@ -132,7 +132,7 @@ public class DBMSHandlerHSqlTest{
DBRecord data = new DBRecord(context, db.DATA);
data.create();
- data.setValue(db.DATA.VALUE, "test");
+ data.set(db.DATA.VALUE, "test");
data.update();
final long id = data.getLong(db.DATA.ID);
diff --git
a/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlDateTest.java
b/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlDateTest.java
index 16ed60c..fe021a0 100644
---
a/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlDateTest.java
+++
b/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlDateTest.java
@@ -94,9 +94,9 @@ public class DBMSHandlerMSSqlDateTest {
dbms.executeSQL("SET DATEFORMAT " + dbDateFormat, null,
conn, null);
DBRecord rec = new DBRecord(context, db.USER_INFO);
rec.create();
- rec.setValue(db.USER_INFO.USER, "john.doe");
- rec.setValue(db.USER_INFO.REG_DATE, regDate);
- rec.setValue(db.USER_INFO.LAST_LOGIN, lastLoginTs);
+ rec.set(db.USER_INFO.USER, "john.doe");
+ rec.set(db.USER_INFO.REG_DATE, regDate);
+ rec.set(db.USER_INFO.LAST_LOGIN, lastLoginTs);
rec.update();
int id = rec.getInt(db.USER_INFO.ID);
diff --git
a/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlTest.java
b/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlTest.java
index dfc0e5e..ff56c08 100644
---
a/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlTest.java
+++
b/empire-db/src/test/java/org/apache/empire/dbms/mssql/DBMSHandlerMSSqlTest.java
@@ -68,8 +68,8 @@ public class DBMSHandlerMSSqlTest
clearDatabase(context, db);
DBRecord dep = new DBRecord(context, db.DEPARTMENT);
- dep.setValue(db.DEPARTMENT.NAME, "junit");
- dep.setValue(db.DEPARTMENT.BUSINESS_UNIT, "中文");
+ dep.set(db.DEPARTMENT.NAME, "junit");
+ dep.set(db.DEPARTMENT.BUSINESS_UNIT, "中文");
dep.update();
int id = dep.getInt(db.DEPARTMENT.ID);
diff --git
a/empire-db/src/test/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQLTest.java
b/empire-db/src/test/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQLTest.java
index 5a21442..fb3ab9b 100644
---
a/empire-db/src/test/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQLTest.java
+++
b/empire-db/src/test/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQLTest.java
@@ -109,7 +109,7 @@ public class DBMSHandlerPostgreSQLTest
DBRecord emp = new DBRecord(context, db.DATA);
emp.create();
- emp.setValue(db.DATA.DATA, new byte[]{1,2,3});
+ emp.set(db.DATA.DATA, new byte[]{1,2,3});
emp.update();
// read a value
@@ -119,7 +119,7 @@ public class DBMSHandlerPostgreSQLTest
try {
reader.open(cmd);
while(reader.moveNext()){
- byte[] value = (byte[]) reader.getValue(db.DATA.DATA);
+ byte[] value = (byte[]) reader.get(db.DATA.DATA);
Assert.assertArrayEquals(new byte[]{1,2,3}, value);
}
} finally {
diff --git
a/empire-db/src/test/java/org/apache/empire/dbms/sqlite/DBMSHandlerSQLiteTest.java
b/empire-db/src/test/java/org/apache/empire/dbms/sqlite/DBMSHandlerSQLiteTest.java
index 6ae903c..c5dfc84 100644
---
a/empire-db/src/test/java/org/apache/empire/dbms/sqlite/DBMSHandlerSQLiteTest.java
+++
b/empire-db/src/test/java/org/apache/empire/dbms/sqlite/DBMSHandlerSQLiteTest.java
@@ -62,8 +62,8 @@ public class DBMSHandlerSQLiteTest{
DBRecord dep = new DBRecord(context, db.DEPARTMENT);
dep.create();
- dep.setValue(db.DEPARTMENT.NAME, "junit");
- dep.setValue(db.DEPARTMENT.BUSINESS_UNIT, "test");
+ dep.set(db.DEPARTMENT.NAME, "junit");
+ dep.set(db.DEPARTMENT.BUSINESS_UNIT, "test");
dep.update();
Date date = dep.getDateTime(db.DEPARTMENT.UPDATE_TIMESTAMP);
@@ -72,10 +72,10 @@ public class DBMSHandlerSQLiteTest{
DBRecord emp = new DBRecord(context, db.EMPLOYEE);
emp.create();
- emp.setValue(db.EMPLOYEE.FIRSTNAME, "junit");
- emp.setValue(db.EMPLOYEE.LASTNAME, "test");
- emp.setValue(db.EMPLOYEE.GENDER, "m");
- emp.setValue(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
+ emp.set(db.EMPLOYEE.FIRSTNAME, "junit");
+ emp.set(db.EMPLOYEE.LASTNAME, "test");
+ emp.set(db.EMPLOYEE.GENDER, "m");
+ emp.set(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
emp.update();
date = emp.getDateTime(db.EMPLOYEE.UPDATE_TIMESTAMP);
@@ -88,7 +88,7 @@ public class DBMSHandlerSQLiteTest{
emp = new DBRecord(context, db.EMPLOYEE);
emp.read(id);
// Set
- emp.setValue(db.EMPLOYEE.PHONE_NUMBER, "123456");
+ emp.set(db.EMPLOYEE.PHONE_NUMBER, "123456");
emp.update();
emp = new DBRecord(context, db.EMPLOYEE);
@@ -121,7 +121,7 @@ public class DBMSHandlerSQLiteTest{
DBRecord data = new DBRecord(context, db.DATA);
data.create();
- data.setValue(db.DATA.VALUE, "test");
+ data.set(db.DATA.VALUE, "test");
data.update();
final long id = data.getLong(db.DATA.ID);
