Author: echatellier Date: 2012-05-14 12:38:31 +0200 (Mon, 14 May 2012) New Revision: 3412 Url: http://chorem.org/repositories/revision/lima/3412 Log: Redefine DAO to use merge instead of saveOrUpdate Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-05-11 15:23:45 UTC (rev 3411) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-05-14 10:38:31 UTC (rev 3412) @@ -36,7 +36,6 @@ import org.chorem.lima.entity.ClosedPeriodicEntryBookDAO; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FinancialPeriodDAO; import org.chorem.lima.entity.FinancialPeriodImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; @@ -118,7 +117,7 @@ FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); //Checks if is not the first fiscalperiod to create - if (fiscalPeriodDAO.findAll().size() != 0) { + if (fiscalPeriodDAO.count() != 0) { TopiaQuery query = fiscalPeriodDAO.createQuery(); query.addOrderDesc(FiscalPeriod.PROPERTY_END_DATE); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-05-11 15:23:45 UTC (rev 3411) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-05-14 10:38:31 UTC (rev 3412) @@ -83,7 +83,7 @@ //create financial period financialPeriod = financialPeriodDAO.create(financialPeriod); - + //create ClosedPeriodicEntryBook for all entrybook for (EntryBook entryBook : entryBookDAO.findAll()) { //new closed periodic entrybook Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-05-11 15:23:45 UTC (rev 3411) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-05-14 10:38:31 UTC (rev 3412) @@ -67,7 +67,6 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.topia.framework.TopiaQuery; /** @@ -98,21 +97,21 @@ @Override public FiscalPeriod createFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - - AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + FiscalPeriod result = null; try { + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); + // fix begin date at midnight and end date at 23:59:59.999 Date beginDate = fiscalPeriod.getBeginDate(); beginDate = DateUtils.truncate(beginDate, Calendar.DATE); Date endDate = fiscalPeriod.getEndDate(); endDate = DateUtils.addDays(endDate, 1); endDate = DateUtils.truncate(endDate, Calendar.DATE); endDate = DateUtils.addMilliseconds(endDate, -1); - fiscalPeriod.setBeginDate(beginDate); fiscalPeriod.setEndDate(endDate); Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java 2012-05-11 15:23:45 UTC (rev 3411) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java 2012-05-14 10:38:31 UTC (rev 3412) @@ -30,9 +30,7 @@ import org.chorem.lima.entity.FinancialPeriodImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodDAO; -import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.junit.Ignore; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -73,7 +71,7 @@ FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); //Checks if is not the first fiscalperiod to create - if (fiscalPeriodDAO.findAll().size() != 0) { + if (fiscalPeriodDAO.count() != 0) { TopiaQuery query = fiscalPeriodDAO.createQuery(); query.addOrderDesc(FiscalPeriod.PROPERTY_END_DATE); Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-05-11 15:23:45 UTC (rev 3411) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-05-14 10:38:31 UTC (rev 3412) @@ -27,6 +27,7 @@ import java.util.List; +import org.hibernate.HibernateException; import org.nuiton.topia.TopiaException; /** @@ -41,6 +42,21 @@ public class FiscalPeriodDAOImpl <E extends FiscalPeriod> extends FiscalPeriodDAOAbstract<FiscalPeriod> { /** + * FIXME echatellier, remove this method when implemented in topia + * just overriden to use merge() instead of saveOrUpdate() + */ + @Override + public FiscalPeriod update(FiscalPeriod e) throws TopiaException { + try { + getContext().getHibernate().merge(e); + getContext().getFiresSupport().warnOnUpdateEntity(e); + return e; + } catch (HibernateException ex) { + throw new TopiaException(ex); + } + } + + /** * Find fiscal period by financial period. * * @param financialPeriod financial period @@ -49,7 +65,7 @@ */ public FiscalPeriod findByFinancialPeriod(FinancialPeriod financialPeriod) throws TopiaException { String query = "FROM " + FiscalPeriod.class.getName() + - "WHERE :financialPeriod in elements(financialPeriod)"; + " WHERE :financialPeriod in elements(financialPeriod)"; List<FiscalPeriod> fiscalPeriods = context.find(query, "financialPeriod", financialPeriod); FiscalPeriod result = null;