Author: athimel Date: 2014-05-16 18:09:11 +0200 (Fri, 16 May 2014) New Revision: 3812 Url: http://forge.chorem.org/projects/lima/repository/revisions/3812 Log: refs #934 merge vs saveOrUpdate Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-16 15:58:31 UTC (rev 3811) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-05-16 16:09:11 UTC (rev 3812) @@ -39,13 +39,11 @@ * FIXME echatellier, remove this method when implemented in topia * just overriden to use merge() instead of saveOrUpdate() */ - public ClosedPeriodicEntryBook merge(ClosedPeriodicEntryBook e) throws TopiaException { + public ClosedPeriodicEntryBook merge(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws TopiaException { try { -// e = (ClosedPeriodicEntryBook)getContext().getHibernate().merge(e); -// getContext().getFiresSupport().warnOnUpdateEntity(e); -// return e; - // TODO DCossé 15/05/14 don't know how to get hibernate - return null; + closedPeriodicEntryBook = (ClosedPeriodicEntryBook)topiaHibernateSupport.getHibernateSession().merge(closedPeriodicEntryBook); + topiaFiresSupport.warnOnUpdateEntity(closedPeriodicEntryBook); + return closedPeriodicEntryBook; } catch (HibernateException ex) { throw new TopiaException(ex); } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-16 15:58:31 UTC (rev 3811) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-05-16 16:09:11 UTC (rev 3812) @@ -29,6 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.Filter.Filter; +import org.hibernate.HibernateException; +import org.nuiton.topia.persistence.TopiaException; import java.util.Date; import java.util.List; @@ -52,18 +54,16 @@ * FIXME echatellier, remove this method when implemented in topia * just overriden to use merge() instead of saveOrUpdate() */ - public FinancialTransaction merge(FinancialTransaction e) { -// try { -// e = (FinancialTransaction) getContext().getHibernate().merge(e); -// getContext().getFiresSupport().warnOnUpdateEntity(e); -// return e; -// } catch (HibernateException ex) { -// throw new TopiaException(ex); -// } - // TODO DCossé 15/05/14 find a way to get hibernate - return null; + public FinancialTransaction merge(FinancialTransaction financialTransaction) { + try { + financialTransaction = (FinancialTransaction)topiaHibernateSupport.getHibernateSession().merge(financialTransaction); + topiaFiresSupport.warnOnUpdateEntity(financialTransaction); + return financialTransaction; + } catch (HibernateException ex) { + throw new TopiaException(ex); + } } - + /** * Return how many transaction are found with specified entryBook. * Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-05-16 15:58:31 UTC (rev 3811) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-05-16 16:09:11 UTC (rev 3812) @@ -48,13 +48,11 @@ * just overriden to use merge() instead of saveOrUpdate() */ @Override - public FiscalPeriod update(FiscalPeriod e) throws TopiaException { + public FiscalPeriod update(FiscalPeriod fiscalPeriod) throws TopiaException { try { -// getContext().getHibernate().merge(e); -// getContext().getFiresSupport().warnOnUpdateEntity(e); -// return e; - // TODO DCossé 15/05/14 find a way to do it - return null; + fiscalPeriod = (FiscalPeriod)topiaHibernateSupport.getHibernateSession().merge(fiscalPeriod); + topiaFiresSupport.warnOnUpdateEntity(fiscalPeriod); + return fiscalPeriod; } catch (HibernateException ex) { throw new TopiaException(ex); }