Author: athimel Date: 2014-05-16 16:00:02 +0200 (Fri, 16 May 2014) New Revision: 3802 Url: http://forge.chorem.org/projects/lima/repository/revisions/3802 Log: Remove LimaDaoHelper Removed: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.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/FinancialStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java Deleted: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -1,95 +0,0 @@ -/* - * #%L - * $Id: LimaDaoHelper.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ - * %% - * Copyright (C) 2012 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -import org.chorem.lima.entity.AccountTopiaDao; -import org.chorem.lima.entity.ClosedPeriodicEntryBookTopiaDao; -import org.chorem.lima.entity.EntryBookTopiaDao; -import org.chorem.lima.entity.EntryTopiaDao; -import org.chorem.lima.entity.FinancialPeriodTopiaDao; -import org.chorem.lima.entity.FinancialStatementTopiaDao; -import org.chorem.lima.entity.FinancialTransactionTopiaDao; -import org.chorem.lima.entity.FiscalPeriodTopiaDao; -import org.chorem.lima.entity.IdentityTopiaDao; -import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; -import org.chorem.lima.entity.VatStatementTopiaDao; -import org.nuiton.topia.persistence.TopiaException; - -/** - * DOA helper based on EJB because of context using. - * - * @author chatellier - * @version $Revision: 3585 $ - * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ - */ -public class LimaDaoHelper { - - protected LimaCallaoTopiaDaoSupplier limaCallaoTopiaDaoSupplier; - - public LimaDaoHelper(LimaCallaoTopiaDaoSupplier limaCallaoTopiaDaoSupplier) { - this.limaCallaoTopiaDaoSupplier = limaCallaoTopiaDaoSupplier; - } - - public AccountTopiaDao getAccountTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getAccountDao(); - } - - public EntryTopiaDao getEntryTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getEntryDao(); - } - - public FinancialPeriodTopiaDao getFinancialPeriodTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getFinancialPeriodDao(); - } - - public FinancialTransactionTopiaDao getFinancialTransactionTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getFinancialTransactionDao(); - } - - public FinancialStatementTopiaDao getFinancialStatementTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getFinancialStatementDao(); - } - - public FiscalPeriodTopiaDao getFiscalPeriodTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getFiscalPeriodDao(); - } - - public ClosedPeriodicEntryBookTopiaDao getClosedPeriodicEntryBookTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getClosedPeriodicEntryBookDao(); - } - - public EntryBookTopiaDao getEntryBookTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getEntryBookDao(); - } - - public VatStatementTopiaDao getVatStatementTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getVatStatementDao(); - } - - public IdentityTopiaDao getIdentityTopiaDao() throws TopiaException { - return limaCallaoTopiaDaoSupplier.getIdentityDao(); - } -} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -36,16 +36,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaXAResource; -import org.chorem.lima.entity.AccountImpl; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; +import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaApplicationContextCache; -import org.nuiton.topia.persistence.TopiaException; import com.google.common.base.Function; -import sun.security.krb5.internal.ccache.CCacheInputStream; - /** * Interceptor for topia context transaction. * @@ -62,7 +59,7 @@ private static final Log log = LogFactory.getLog(LimaInterceptor.class); - public static final ThreadLocal<LimaDaoHelper> DAO_HELPER = new ThreadLocal<LimaDaoHelper>(); + public static final ThreadLocal<LimaCallaoTopiaDaoSupplier> DAO_HELPER = new ThreadLocal<LimaCallaoTopiaDaoSupplier>(); protected static final Function<Properties, LimaCallaoTopiaApplicationContext> CREATE_CONTEXT_FUNCTION = new Function<Properties, LimaCallaoTopiaApplicationContext>() { @Override @@ -106,8 +103,7 @@ LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext(); - LimaDaoHelper helper = new LimaDaoHelper(tx); - DAO_HELPER.set(helper); + DAO_HELPER.set(tx); Transaction tr = transactionManager.getTransaction(); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -46,6 +46,7 @@ import org.chorem.lima.entity.FinancialTransactionTopiaDao; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodTopiaDao; +import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; import org.nuiton.topia.persistence.TopiaException; import java.util.ArrayList; @@ -75,7 +76,7 @@ * * @return dao helper */ - protected LimaDaoHelper getDaoHelper() { + protected LimaCallaoTopiaDaoSupplier getDaoHelper() { return LimaInterceptor.DAO_HELPER.get(); } @@ -130,7 +131,7 @@ @Override public void removeAccountRules(Account account) throws LimaException { try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); // Check if account have entries int nbentries = entryTopiaDao.findAllByAccount(account).size(); if (nbentries != 0) { @@ -145,7 +146,7 @@ @Override public void removeEntryBookRules(EntryBook entryBook) throws LimaException { try { - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); // Check if entrybook have entries long nbfinancialtransaction = financialTransactionTopiaDao.getCountByEntryBook(entryBook); @@ -167,7 +168,7 @@ try { //check financial period locked - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); FinancialPeriod financialPeriod = financialPeriodTopiaDao.findByDate(financialTransaction.getTransactionDate()); if (financialPeriod.isLocked()) { throw new LimaBusinessException(t("lima-business.defaultaccountingrules.financialperiodblocked")); @@ -179,8 +180,8 @@ List<EntryBook> entryBooks = new ArrayList<EntryBook>(); List<EntryBook> closedEntryBooks = new ArrayList<EntryBook>(); - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); entryBooks = entryBookTopiaDao.findAll(); for (EntryBook entryBook : entryBooks) { @@ -209,8 +210,8 @@ throws LimaException { try { - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); // reload object in current transaction closedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.findByTopiaId(closedPeriodicEntryBook.getTopiaId()); @@ -260,10 +261,10 @@ try { - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); FinancialPeriod financialPeriod = financialPeriodTopiaDao.findByDate(entry.getFinancialTransaction().getTransactionDate()); - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); if (entryOld != null) { //second case @@ -304,7 +305,7 @@ try { Date financialTransactionDate = financialTransaction.getTransactionDate(); - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); FiscalPeriod lastFiscalPeriod = fiscalPeriodTopiaDao.getLastFiscalPeriod(); FiscalPeriod firstFiscalPeriod = fiscalPeriodTopiaDao.getFirstFiscalPeriod(); Date beginDateFirstFiscalPeriod = firstFiscalPeriod.getBeginDate(); @@ -335,7 +336,7 @@ } }else{ //date on a fiscal period (and consequently on a financial), now test if financial is open - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); FinancialPeriod financialPeriod = financialPeriodTopiaDao.findByDate(financialTransaction.getTransactionDate()); FinancialPeriod financialPeriodOld = financialPeriodTopiaDao.findByDate(financialTransactionOld.getTransactionDate()); 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 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -119,7 +119,7 @@ super.createFiscalPeriodRules(fiscalPeriod); List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); //Checks if is not the first fiscalperiod to create if (fiscalPeriodTopiaDao.count() != 0) { @@ -182,7 +182,7 @@ @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException { try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); FiscalPeriod oldestUnBlockedFiscalPeriod = fiscalPeriodTopiaDao.getLastUnlockedFiscalPeriod(); @@ -206,7 +206,7 @@ try { - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); //Check if the fiscal period to delete is empty if (financialTransactionTopiaDao.findAllByDates(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()).size() != 0) { @@ -246,7 +246,7 @@ // un period peut ne pas durer un mois endDate = DateUtils.addMonths(endDate, -1); - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); //search fiscalperiod have financialperiod FiscalPeriod fiscalPeriod = fiscalPeriodTopiaDao.findByFinancialPeriod(financialPeriod); @@ -255,7 +255,7 @@ // et endDate ? il ne provienent pas du même endroit EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = closedPeriodicEntryBookTopiaDao.findAllByEntryBookAndDates(entryBook, beginDate, endDate); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaDaoHelper; import org.chorem.lima.business.LimaInterceptor; +import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier; /** * Abstract code for all ejb services (get context, catch, finally...). @@ -47,7 +48,7 @@ * * @return dao helper */ - protected LimaDaoHelper getDaoHelper() { + protected LimaCallaoTopiaDaoSupplier getDaoHelper() { return LimaInterceptor.DAO_HELPER.get(); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -62,7 +62,7 @@ long result; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); result = AccountTopiaDao.count(); } catch (TopiaException ex) { throw new LimaException("Can't count", ex); @@ -91,7 +91,7 @@ account.setAccountNumber(account.getAccountNumber().toUpperCase().trim()); // check if account number already exist - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); if (AccountTopiaDao.existByNaturalId(account.getAccountNumber())) { throw new LimaBusinessException( @@ -113,7 +113,7 @@ Account account = null; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); while (account == null && accountNumber.length() > 1) { @@ -133,7 +133,7 @@ Account account; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); account = AccountTopiaDao.findByAccountNumber(number); } catch (Exception ex) { throw new LimaException("Can't get master account", ex); @@ -150,7 +150,7 @@ List<Account> accountsList; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); accountsList = AccountTopiaDao.findAll(); Collections.sort(accountsList, new AccountComparator()); @@ -169,7 +169,7 @@ List<Account> accountsList; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); accountsList = AccountTopiaDao.findAllLeafAccounts(); } catch (Exception ex) { throw new LimaException("Can't get all leaf accounts", ex); @@ -187,7 +187,7 @@ List<Account> accountsList; try { - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); accountsList = AccountTopiaDao.findAllSubAccounts(account); } catch (Exception ex) { throw new LimaException("Can't get all sub accounts", ex); @@ -216,7 +216,7 @@ accountingRules.removeAccountRules(account); // remove account - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); Account accountToDelete = AccountTopiaDao.findByTopiaId(account.getTopiaId()); AccountTopiaDao.delete(accountToDelete); @@ -242,7 +242,7 @@ Account result; try { // DAO - AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); accountingRules.updateAccountRules(account); result = AccountTopiaDao.update(account); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -47,7 +47,7 @@ public ClosedPeriodicEntryBook getByEntryBookAndFinancialPeriod(EntryBook entryBook, FinancialPeriod financialPeriod) { ClosedPeriodicEntryBook result; try { - ClosedPeriodicEntryBookTopiaDao accountTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao accountTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); result = accountTopiaDao.findByEntryBookAndFinancialPeriod(entryBook, financialPeriod); } catch (TopiaException e) { throw new LimaException("Can't find closed period entry book", e); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -398,8 +398,8 @@ if (beginDate != null && endDate != null) { ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); //Split list by financialstatement type List<ClosedPeriodicEntryBook> closedPeriodicEntryBookList = @@ -581,10 +581,10 @@ entryBookReport += constructSubTitleHtml(subTitle); FinancialPeriodTopiaDao financialPeriodTopiaDao = - getDaoHelper().getFinancialPeriodTopiaDao(); + getDaoHelper().getFinancialPeriodDao(); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.findByDates(beginDate, endDate); @@ -796,7 +796,7 @@ try { - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); Account accountFormat = accountTopiaDao.findByTopiaId(account); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy"); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -66,7 +66,7 @@ try { // check if entrybook with is name already exist - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); result = entryBookTopiaDao.findByCode(entryBook.getCode()); if (result != null) { @@ -79,9 +79,9 @@ //create ClosedPeriodicEntryBook for all unblocked financial period ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); FinancialPeriodTopiaDao financialPeriodTopiaDao = - getDaoHelper().getFinancialPeriodTopiaDao(); + getDaoHelper().getFinancialPeriodDao(); // for all unblocked financialperiod for (FinancialPeriod financialPeriod : financialPeriodTopiaDao.findAllByLocked(false)) { @@ -110,7 +110,7 @@ try { // check if entrybook with is name already exist - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); entryBooksList = entryBookTopiaDao.findAll(); } catch (Exception ex) { throw new LimaException("Can't get entry books", ex); @@ -125,7 +125,7 @@ EntryBook result; try { - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); // creation du EntryBook result = entryBookTopiaDao.update(entryBook); @@ -147,12 +147,12 @@ try { // re-attach to current transaction - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); EntryBook localEntryBook = entryBookTopiaDao.findByTopiaId(entryBook.getTopiaId()); // delete all ClosedPeriodicEntryBook from this EntryBook ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = closedPeriodicEntryBookTopiaDao.findAllByEntryBook(localEntryBook); for (ClosedPeriodicEntryBook closedPeriodicEntryBook : closedPeriodicEntryBooks) { @@ -184,7 +184,7 @@ EntryBook entryBook; try { - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); // creation du EntryBook entryBook = entryBookTopiaDao.findByCode(code); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -46,7 +46,7 @@ public Entry createEntry(Entry entry) { try { - EntryTopiaDao entryDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryDao = getDaoHelper().getEntryDao(); entryDao.create(entry); } catch (TopiaException e) { throw new LimaException("Can't create entry", e); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -105,7 +105,7 @@ //export entries FinancialTransactionTopiaDao financialTransactionTopiaDao = - getDaoHelper().getFinancialTransactionTopiaDao(); + getDaoHelper().getFinancialTransactionDao(); List<FinancialTransaction> listFinancialTransaction = financialTransactionTopiaDao.findAll(); @@ -210,7 +210,7 @@ csvWriter.writeNext(nextLine); // Récupère tous les comptes - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); List<Account> listAccount = accountTopiaDao.findAll(); // Pour tous les comptes for (Account account : listAccount) { @@ -363,7 +363,7 @@ String[] nextLine = new String[12]; // Get all Financialstatements FinancialStatementTopiaDao financialStatementTopiaDao = - getDaoHelper().getFinancialStatementTopiaDao(); + getDaoHelper().getFinancialStatementDao(); List<FinancialStatement> listFinancialStatements = financialStatementTopiaDao.findAllOrderedByCreateDate(); @@ -441,7 +441,7 @@ try { String[] nextLine = new String[6]; // Get all Vatstatements - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); List<VatStatement> listVatStatements = vatStatementTopiaDao.findAllOrderedByCreateDate(); @@ -510,7 +510,7 @@ try { String[] nextLine = new String[3]; // Get all entrybook - EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookTopiaDao(); + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); List<EntryBook> listEntryBook = entryBookTopiaDao.findAll(); // For all EntryBook for (EntryBook entryBook : listEntryBook) { @@ -565,7 +565,7 @@ String[] nextLine = new String[6]; // Récupère tous les comptes AccountTopiaDao accountTopiaDao = - getDaoHelper().getAccountTopiaDao(); + getDaoHelper().getAccountDao(); List<Account> listAccount = accountTopiaDao.findAll(); // Pour tous les comptes for (Account account : listAccount) { @@ -596,7 +596,7 @@ // Get all financialtransactions try { FinancialTransactionTopiaDao financialTransactionTopiaDao = - getDaoHelper().getFinancialTransactionTopiaDao(); + getDaoHelper().getFinancialTransactionDao(); List<FinancialTransaction> listFinancialTransaction = financialTransactionTopiaDao.findAll(); // For all financialTransaction @@ -649,7 +649,7 @@ String[] nextLine = new String[4]; // Get all fiscalperiod FiscalPeriodTopiaDao fiscalPeriodTopiaDao = - getDaoHelper().getFiscalPeriodTopiaDao(); + getDaoHelper().getFiscalPeriodDao(); List<FiscalPeriod> listFiscalPeriod = fiscalPeriodTopiaDao.findAll(); // For all Entry @@ -678,7 +678,7 @@ String[] nextLine = new String[5]; // Get all fiscalperiod ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); List<ClosedPeriodicEntryBook> listClosedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.findAll(); // For all Entry @@ -705,7 +705,7 @@ try { String[] nextLine = new String[12]; // Get identity - IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityTopiaDao(); + IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityDao(); List<Identity> identities = identityTopiaDao.findAll(); if (identities.size() != 0) { 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 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -70,11 +70,11 @@ try { FinancialPeriodTopiaDao financialPeriodTopiaDao = - getDaoHelper().getFinancialPeriodTopiaDao(); + getDaoHelper().getFinancialPeriodDao(); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); EntryBookTopiaDao entryBookTopiaDao = - getDaoHelper().getEntryBookTopiaDao(); + getDaoHelper().getEntryBookDao(); //create all financial period for (FinancialPeriod financialPeriod : financialPeriods) { @@ -111,7 +111,7 @@ List<FinancialPeriod> result; try { - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); result = financialPeriodTopiaDao.findAllOrderByBeginDate(); } catch (Exception ex) { throw new LimaException("Can't get periods", ex); @@ -127,7 +127,7 @@ List<FinancialPeriod> result; try { - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); result = financialPeriodTopiaDao.findAllUnlockedOrderByBeginDate(); } catch (Exception ex) { throw new LimaException("Can't create period", ex); @@ -143,7 +143,7 @@ List<FinancialPeriod> result; try { - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); result = financialPeriodTopiaDao.findByDates(beginDate, endDate); } catch (Exception ex) { throw new LimaException("Can't get period", ex); @@ -157,7 +157,7 @@ FinancialPeriod result; try { - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodTopiaDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); result = financialPeriodTopiaDao.findByNaturalId(beginDate, endDate); } catch (Exception ex) { throw new LimaException("Can't get period", ex); @@ -176,7 +176,7 @@ accountingRules.blockClosedPeriodicEntryBookRules(closedPeriodicEntryBook); ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + getDaoHelper().getClosedPeriodicEntryBookDao(); // reload object in current transaction result = closedPeriodicEntryBookTopiaDao.findByTopiaId( @@ -198,7 +198,7 @@ ClosedPeriodicEntryBook closedPeriodicEntryBook; try { - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); closedPeriodicEntryBook = closedPeriodicEntryBookTopiaDao.findByEntryBookAndFinancialPeriod(entryBook, financialPeriod); } catch (Exception ex) { throw new LimaException("Can't get closed periodic", ex); @@ -213,7 +213,7 @@ List<ClosedPeriodicEntryBook> result; try { - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); result = closedPeriodicEntryBookTopiaDao.findAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); } catch (Exception ex) { throw new LimaException("Can't get closed periodics", ex); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -74,7 +74,7 @@ try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); financialStatementTopiaDao.create(financialStatement); @@ -99,7 +99,7 @@ public void removeFinancialStatement(FinancialStatement financialStatement) throws LimaException { try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); // remove financialstatement FinancialStatement financialStatementToDelete = @@ -139,7 +139,7 @@ List<FinancialStatement> financialStatements; try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); financialStatements = financialStatementTopiaDao.findAll(); } catch (Exception ex) { throw new LimaException("Can't get financial statements", ex); @@ -164,7 +164,7 @@ List<FinancialStatement> financialStatements; try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); financialStatements = financialStatementTopiaDao.findChildrenFinancialStatement(masterFinancialStatement); } catch (Exception ex) { throw new LimaException("Can't get childreen statements", ex); @@ -178,7 +178,7 @@ try { // TopiaDao - FinancialStatementTopiaDao financialStatementHeaderTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementHeaderTopiaDao = getDaoHelper().getFinancialStatementDao(); //update financialStatementHeaderTopiaDao.update(financialStatement); @@ -414,7 +414,7 @@ BigDecimal credit = new BigDecimal(0); Boolean substract = false; try { - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); //Remove Spaces String result = StringUtils.deleteWhitespace(accountsNumberList); StringTokenizer stQuote = new StringTokenizer(result, "-"); @@ -459,8 +459,8 @@ try { - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); List<Account> accountsList = accountTopiaDao.findAllLeafAccounts(); @@ -503,7 +503,7 @@ public boolean checkFinancialStatementExist(String label) throws LimaException { boolean result; try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); result = financialStatementTopiaDao.forProperties(FinancialStatement.PROPERTY_LABEL, label).exists(); } catch (TopiaException e) { throw new LimaException("Can't check financial statement", e); @@ -515,7 +515,7 @@ public FinancialStatement getFinancialStatementByLabel(String label) throws LimaException { FinancialStatement result; try { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementTopiaDao(); + FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); result = financialStatementTopiaDao.findByLabel(label); } catch (TopiaException e) { throw new LimaException("Can't find financial statement", e); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -105,7 +105,7 @@ //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialtransaction); - FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); fTransaction = financialtransactionTopiaDao.create(financialtransaction); @@ -124,7 +124,7 @@ List<FinancialTransaction> financialTransactions; try { - FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); financialTransactions = transactionTopiaDao.findAllByDates(beginDate, endDate); } catch (Exception ex) { throw new LimaException("Can't get financial transactions", ex); @@ -140,7 +140,7 @@ String lastActualLetters; String nextLetters; try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<String> letters = new ArrayList<String>(entryTopiaDao.findLetters()); lastActualLetters = findLastLetter(letters); @@ -186,7 +186,7 @@ public List<String> getAllLetters() throws LimaException { List<String> letters; try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); letters = new ArrayList<String>(entryTopiaDao.findLetters()); @@ -348,7 +348,7 @@ List<FinancialTransaction> financialTransactions; try { - FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); financialTransactions = transactionTopiaDao.findAllByDates(period.getBeginDate(), period.getEndDate()); } catch (Exception ex) { throw new LimaException("Can't get financial transactions", ex); @@ -365,7 +365,7 @@ List<FinancialTransaction> financialTransactions; try { - FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); if (entryBook != null) { financialTransactions = transactionTopiaDao.findAllByDates(financialPeriod.getBeginDate(), @@ -391,7 +391,7 @@ //List<FinancialTransaction> checkedResult = new ArrayList<FinancialTransaction>(); try { - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); result = financialTransactionTopiaDao.getAllIncorrectTransaction(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate(), null); @@ -424,7 +424,7 @@ public List<FinancialTransaction> getAllFinancialTransactionsBalanced(FiscalPeriod fiscalPeriod) throws LimaException { List<FinancialTransaction> result; try { - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); result = financialTransactionTopiaDao.getAllBalancedTransaction(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate(), null); @@ -440,7 +440,7 @@ List<Entry> entries; try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); entries = entryTopiaDao.findAllEntryByFilter(filter); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); @@ -458,7 +458,7 @@ Entry lastEntry; try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); lastEntry = entryTopiaDao.getLastEntry(financialTransaction); } catch (Exception ex) { @@ -480,7 +480,7 @@ //FIXME mallon 22/06/2012 : Revoir l'utilisation du rattachement à la session et celle des deux objets 'financialTransactionOld' //et 'financialTransaction' - FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); FinancialTransaction financialTransactionOld = transactionTopiaDao.findByTopiaId(financialTransaction.getTopiaId()); accountingRules.updateFinancialTransactionDateRules(financialTransaction, financialTransactionOld); @@ -507,7 +507,7 @@ try { - FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao transactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); FinancialTransaction financialTransactionOld = transactionTopiaDao.findByTopiaId(financialTransaction.getTopiaId()); transactionTopiaDao.delete(financialTransactionOld); @@ -526,7 +526,7 @@ accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( entry.getFinancialTransaction()); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); newEntry = entryTopiaDao.create(entry); } catch (TopiaException ex) { @@ -544,7 +544,7 @@ AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); Entry entryOld = entryTopiaDao.findByTopiaId(entry.getTopiaId()); @@ -587,7 +587,7 @@ accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( entry.getFinancialTransaction()); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); Entry entryOld = entryTopiaDao.findByTopiaId(entry.getTopiaId()); entryOld.getFinancialTransaction().removeEntry(entryOld); entryTopiaDao.delete(entryOld); @@ -608,7 +608,7 @@ try { // next on financial transaction dao - FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionTopiaDao(); + FinancialTransactionTopiaDao financialTransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); result = financialTransactionTopiaDao.searchFinancialTransaction(filter); 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 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -102,7 +102,7 @@ try { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); // fix begin date at midnight and end date at 23:59:59.999 Date beginDate = fiscalPeriod.getBeginDate(); @@ -147,7 +147,7 @@ try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); result = fiscalPeriodTopiaDao.findAll(); } catch (Exception ex) { throw new LimaException("Can't get periods", ex); @@ -165,7 +165,7 @@ List<FiscalPeriod> result; try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); result = fiscalPeriodTopiaDao.findAllByLocked(true); } catch (Exception ex) { throw new LimaException("Can't create period", ex); @@ -183,7 +183,7 @@ try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); result = fiscalPeriodTopiaDao.findAllByLocked(false); } catch (Exception ex) { throw new LimaException("Can't get periods", ex); @@ -198,7 +198,7 @@ try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); //get the last fiscal period result = fiscalPeriodTopiaDao.getLastFiscalPeriod(); @@ -228,7 +228,7 @@ //check rules accountingRules.blockFiscalPeriodRules(fiscalPeriod); - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); // Get the old fiscal period instance for no object conflict FiscalPeriod oldFiscalPeriod = @@ -281,7 +281,7 @@ FiscalPeriod result; try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); String topiaId = fiscalPeriod.getTopiaId(); FiscalPeriod fiscalPeriodOld = fiscalPeriodTopiaDao.findByTopiaId(topiaId); @@ -307,7 +307,7 @@ // re-attach entities to current session FiscalPeriod localFiscalPeriod; try { - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); localFiscalPeriod = fiscalPeriodTopiaDao.findByTopiaId(fiscalPeriod.getTopiaId()); } catch (TopiaException ex) { throw new LimaException("Can't find fiscal period", ex); @@ -497,7 +497,7 @@ try { try { //get entities with TopiaDao - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodTopiaDao(); + FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); // re-attach entities to current session FiscalPeriod localFiscalPeriod = fiscalPeriodTopiaDao.findByTopiaId(fiscalPeriod.getTopiaId()); @@ -506,7 +506,7 @@ accountingRules.deleteFiscalPeriodRules(localFiscalPeriod); //all "ClosedPeriodicEntryBooks" for the fiscal period - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookTopiaDao(); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); List<ClosedPeriodicEntryBook> closedPeriodicEntryBookTopiaDaoList = closedPeriodicEntryBookTopiaDao.findAllClosedPeriodicEntryBooksFromFiscalPeriod(localFiscalPeriod); //delete closedPeriodicEntryBook before fiscal period Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -48,7 +48,7 @@ Identity identity = null; try { - IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityTopiaDao(); + IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityDao(); List<Identity> identities = identityTopiaDao.findAll(); if (identities.size() != 0) { identity = identities.get(0); @@ -62,7 +62,7 @@ @Override public void updateIdentity(Identity identity) throws LimaException { try { - IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityTopiaDao(); + IdentityTopiaDao identityTopiaDao = getDaoHelper().getIdentityDao(); List<Identity> identities = identityTopiaDao.findAll(); if (identities.size() != 0) { identityTopiaDao.delete(identities.get(0)); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -144,7 +144,7 @@ BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); // trouve les entrees associées à ca compte entre les date données List<Entry> listEntries = entryTopiaDao.findAllEntryOfBalancedTransaction(account, beginDate, endDate); @@ -195,7 +195,7 @@ BigDecimal debit = new BigDecimal(0); BigDecimal solde = new BigDecimal(0); - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); if (getEntries) { List<Entry> listEntries = entryTopiaDao.findAllEntryOfBalancedTransaction(account, beginDate, endDate); @@ -251,7 +251,7 @@ // Get all entries with a topia query try { - EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryTopiaDao(); + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); List<Entry> entries = entryTopiaDao.findAllEntryOfBalancedTransaction(entryBook, beginDate, endDate); reportsDatas.setListEntry(entries); @@ -313,7 +313,7 @@ try { - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); //for each account create a balance sheet with a ReportsDatas List<Account> accounts; @@ -406,7 +406,7 @@ try { //lists all accounts - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); List<Account> accountsList; //gets all financial periods from the fiscal period List<FinancialPeriod> financialPeriod = financialPeriodService.getFinancialPeriods( Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2014-05-16 13:45:06 UTC (rev 3801) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2014-05-16 14:00:02 UTC (rev 3802) @@ -66,7 +66,7 @@ VatStatement vatStatement) throws LimaException { try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); vatStatementTopiaDao.create(vatStatement); @@ -92,7 +92,7 @@ List<VatStatement> vatStatements; try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); vatStatements = vatStatementTopiaDao.findAll(); } catch (Exception ex) { throw new LimaException("Can't get vat statements", ex); @@ -121,7 +121,7 @@ List<VatStatement> vatStatements; try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); vatStatements = vatStatementTopiaDao.getChildrenVatStatement(masterVatStatement); } catch (TopiaException ex) { throw new LimaException("Can't get vat statements", ex); @@ -135,7 +135,7 @@ try { // TopiaDao - VatStatementTopiaDao vatStatementHeaderTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementHeaderTopiaDao = getDaoHelper().getVatStatementDao(); //update vatStatementHeaderTopiaDao.update(vatStatement); } catch (TopiaException ex) { @@ -203,7 +203,7 @@ String accountNumbersList = null; try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); VatStatement vatStatement2 = vatStatementTopiaDao.findVatStatementByLabel(vatStatement.getLabel()); if (vatStatement2 != null) { @@ -228,7 +228,7 @@ String accountNumbersList = findAccountNumberByVatStatement(vatStatement); - AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountTopiaDao(); + AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); List<Account> accountsList = accountTopiaDao.stringToListAccounts(accountNumbersList, false); for (Account account : accountsList) { @@ -257,7 +257,7 @@ try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); vatStatement = vatStatementTopiaDao.findVatStatementByLabel(label); } catch (TopiaException ex) { @@ -349,7 +349,7 @@ public void removeVatStatement(VatStatement vatStatement) throws LimaException { try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); // remove vatstatement VatStatement vatStatementToDelete = @@ -381,7 +381,7 @@ public boolean checkVatStatementExist(String label) throws LimaException { boolean result; try { - VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementTopiaDao(); + VatStatementTopiaDao vatStatementTopiaDao = getDaoHelper().getVatStatementDao(); result = vatStatementTopiaDao.forProperties(VatStatement.PROPERTY_LABEL, label).exists(); } catch (TopiaException e) { throw new LimaException("Can't check VAT statement", e);