Repository: empire-db Updated Branches: refs/heads/master af4a98c7f -> 1e83799fa
EMPIREDB-240 Updated Spring dependencies to latest versions. Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/1e83799f Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/1e83799f Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/1e83799f Branch: refs/heads/master Commit: 1e83799fa0d0623e81eb52a005d1b11f0ae3625d Parents: af4a98c Author: Rainer Döbele <[email protected]> Authored: Fri Mar 25 19:39:33 2016 +0100 Committer: Rainer Döbele <[email protected]> Committed: Fri Mar 25 19:39:33 2016 +0100 ---------------------------------------------------------------------- empire-db-examples/empire-db-example-spring/pom.xml | 2 +- empire-db-spring/pom.xml | 2 +- .../src/main/java/org/apache/empire/spring/EmpireReader.java | 3 ++- .../src/main/java/org/apache/empire/spring/EmpireRecord.java | 2 +- .../org/apache/empire/spring/example2/EmployeeDaoImpl.java | 8 ++++---- 5 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/1e83799f/empire-db-examples/empire-db-example-spring/pom.xml ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-spring/pom.xml b/empire-db-examples/empire-db-example-spring/pom.xml index a58e6e1..0eba0e9 100644 --- a/empire-db-examples/empire-db-example-spring/pom.xml +++ b/empire-db-examples/empire-db-example-spring/pom.xml @@ -29,7 +29,7 @@ <description>Examples showing the use of empire-db with Spring.</description> <properties> - <spring.version>3.0.5.RELEASE</spring.version> + <spring.version>3.2.16.RELEASE</spring.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/empire-db/blob/1e83799f/empire-db-spring/pom.xml ---------------------------------------------------------------------- diff --git a/empire-db-spring/pom.xml b/empire-db-spring/pom.xml index 845ec36..0cdbad1 100644 --- a/empire-db-spring/pom.xml +++ b/empire-db-spring/pom.xml @@ -28,7 +28,7 @@ <description>Implementation of Spring JDBC Template with Empire-db.</description> <properties> - <spring.version>4.2.1.RELEASE</spring.version> + <spring.version>4.2.5.RELEASE</spring.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/empire-db/blob/1e83799f/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireReader.java ---------------------------------------------------------------------- diff --git a/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireReader.java b/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireReader.java index cfac81a..8cc2f54 100644 --- a/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireReader.java +++ b/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireReader.java @@ -26,6 +26,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.PropertyUtils; import org.apache.empire.commons.ObjectUtils; import org.apache.empire.commons.StringUtils; +import org.apache.empire.data.ColumnExpr; import org.apache.empire.db.DBReader; import org.apache.empire.exceptions.BeanPropertySetException; import org.apache.empire.exceptions.InvalidArgumentException; @@ -36,7 +37,7 @@ public class EmpireReader extends DBReader private static final long serialVersionUID = 1L; @Override - protected void getBeanProperty(Object bean, String property, Object value) + protected void setBeanProperty(ColumnExpr column, Object bean, String property, Object value) { try { http://git-wip-us.apache.org/repos/asf/empire-db/blob/1e83799f/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireRecord.java ---------------------------------------------------------------------- diff --git a/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireRecord.java b/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireRecord.java index e3efca1..aef674c 100644 --- a/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireRecord.java +++ b/empire-db-spring/src/main/java/org/apache/empire/spring/EmpireRecord.java @@ -32,7 +32,7 @@ public class EmpireRecord extends DBRecord private static final long serialVersionUID = 1L; @Override - protected void setBeanValue(Object bean, String property, Column column) + protected void setRecordValue(Column column, Object bean, String property) { try { http://git-wip-us.apache.org/repos/asf/empire-db/blob/1e83799f/empire-db-spring/src/main/java/org/apache/empire/spring/example2/EmployeeDaoImpl.java ---------------------------------------------------------------------- diff --git a/empire-db-spring/src/main/java/org/apache/empire/spring/example2/EmployeeDaoImpl.java b/empire-db-spring/src/main/java/org/apache/empire/spring/example2/EmployeeDaoImpl.java index b454ef2..d605feb 100644 --- a/empire-db-spring/src/main/java/org/apache/empire/spring/example2/EmployeeDaoImpl.java +++ b/empire-db-spring/src/main/java/org/apache/empire/spring/example2/EmployeeDaoImpl.java @@ -152,7 +152,7 @@ public class EmployeeDaoImpl extends EmpireDaoSupport implements EmployeeDao { public Employee mapRecord(DBRecordData record, int rowNum) { Employee result = new Employee(); // Auto-copy all properties - record.getBeanProperties(result); + record.setBeanProperties(result); /* result.setEmployeeId(record.getInt(EMPLOYEES.EMPLOYEE_ID)); result.setFirstName(record.getString(EMPLOYEES.FIRSTNAME)); @@ -171,7 +171,7 @@ public class EmployeeDaoImpl extends EmpireDaoSupport implements EmployeeDao { @Override public void write(DBRecord record, Employee entity) { // Auto-copy all properties - record.setBeanValues(entity); + record.setRecordValues(entity); /* record.setValue(EMPLOYEES.EMPLOYEE_ID, entity.getEmployeeId()); record.setValue(EMPLOYEES.FIRSTNAME, entity.getFirstName()); @@ -199,7 +199,7 @@ public class EmployeeDaoImpl extends EmpireDaoSupport implements EmployeeDao { if (department == null) { department = new Department(); // Auto-copy all properties - record.getBeanProperties(department); + record.setBeanProperties(department); /* department.setDepartmentId(id); department.setName(record.getString(DEPARTMENTS.NAME)); @@ -218,7 +218,7 @@ public class EmployeeDaoImpl extends EmpireDaoSupport implements EmployeeDao { @Override public void write(DBRecord record, Department entity) { // Auto-copy all properties - record.setBeanValues(entity); + record.setRecordValues(entity); /* record.setValue(DEPARTMENTS.DEPARTMENT_ID, entity.getDepartmentId()); record.setValue(DEPARTMENTS.NAME, entity.getName());
