September 2014 - Wao-commits - mailman.cloud.codelutin.com

r2237 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com Sept. 5, 2014

Sept. 5, 2014

Author: bleny Date: 2014-09-05 15:24:14 +0200 (Fri, 05 Sep 2014) New Revision: 2237 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2237 Log: Suppression du champs nbObservants de la table Contact et suppression et du champs color des motifs de refus (fixes #4481) Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/resources/motifs.csv trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -67,46 +67,34 @@ return getSampleRow().getObsProgram(); } - /** Value is still used but it's no longer written, it's now computed - * from the size of observers. */ - protected void updateNbObservers() { - setNbObservants(getAllObservers().size()); - } - @Override public void addSecondaryObservers(WaoUser secondaryObservers) { super.addSecondaryObservers(secondaryObservers); - updateNbObservers(); } @Override public void addAllSecondaryObservers(Set<WaoUser> secondaryObservers) { super.addAllSecondaryObservers(secondaryObservers); - updateNbObservers(); } @Override public void setSecondaryObservers(Set<WaoUser> secondaryObservers) { super.setSecondaryObservers(secondaryObservers); - updateNbObservers(); } @Override public void removeSecondaryObservers(WaoUser secondaryObservers) { super.removeSecondaryObservers(secondaryObservers); - updateNbObservers(); } @Override public void clearSecondaryObservers() { super.clearSecondaryObservers(); - updateNbObservers(); } @Override public void setMainObserver(WaoUser mainObserver) { super.setMainObserver(mainObserver); - updateNbObservers(); } @Override Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -326,7 +326,9 @@ Map<String, Long> countContactsByCompany = countByCompany(hqlAndParametersBuilder); - hqlAndParametersBuilder.addWhereClause("c." + Contact.PROPERTY_NB_OBSERVANTS + " >= c.sampleRow." + SampleRow.PROPERTY_NB_OBSERVANTS); + hqlAndParametersBuilder.addWhereClause( + "(c." + Contact.PROPERTY_MAIN_OBSERVER + " is null and size(c." + Contact.PROPERTY_SECONDARY_OBSERVERS + ") >= c.sampleRow." + SampleRow.PROPERTY_NB_OBSERVANTS + ")" + + " or (c." + Contact.PROPERTY_MAIN_OBSERVER + " is not null and 1 + size(c." + Contact.PROPERTY_SECONDARY_OBSERVERS + ") >= c.sampleRow." + SampleRow.PROPERTY_NB_OBSERVANTS + ")"); Map<String, Long> countContactsWithComplianceByCompany = countByCompany(hqlAndParametersBuilder); @@ -354,7 +356,7 @@ String hql = hqlAndParametersBuilder.getHql(); - hql = "select c.sampleRow.company.topiaId, c.state, count(c.topiaId) " + hql + " group by c.sampleRow.company.topiaId, c.state"; + hql = "select c.sampleRow.company.topiaId, c.contactState, count(c.topiaId) " + hql + " group by c.sampleRow.company.topiaId, c.contactState"; List<Object[]> rows = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); @@ -363,7 +365,7 @@ for (Object[] row : rows) { String companyId = (String) row[0]; - int contactStateOrdinal = (int) row[1]; + ContactState contactState = (ContactState) row[1]; Long count = (Long) row[2]; Map<ContactState, Long> companyStatistics = contactStatesStatistics.get(companyId); @@ -375,7 +377,6 @@ contactStatesStatistics.put(companyId, companyStatistics); } - ContactState contactState = ContactState.valueOf(contactStateOrdinal); companyStatistics.put(contactState, count); } Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-09-05 13:24:14 UTC (rev 2237) @@ -47,11 +47,13 @@ DROP TABLE fleet; ALTER TABLE boat DROP COLUMN boatgroup; DROP TABLE boatgroup; +ALTER TABLE contactstatemotif DROP COLUMN color; -- Suppression de quelques dénormalisations ALTER TABLE contact DROP COLUMN tidenbdays; ALTER TABLE contact DROP COLUMN obsprogramordinal; +ALTER TABLE contact DROP COLUMN nbobservants; -- Suppresion de tout ce qui concerne les indicateurs Modified: trunk/wao-persistence/src/main/resources/motifs.csv =================================================================== --- trunk/wao-persistence/src/main/resources/motifs.csv 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-persistence/src/main/resources/motifs.csv 2014-09-05 13:24:14 UTC (rev 2237) @@ -1,6 +1,5 @@ -MOTIF_CODE;MOTIF_NOM;MOTIF_COULEUR -REFUS_ADMINISTRATIF;Administratif;00FFFF -REFUS_PROGRAMME;Rejet du programme;FF0000 -REFUS_PROFESSION;Blocage de la profession;0000FF -REFUS_AUTRE;Autre;DDDDDD - +MOTIF_CODE;MOTIF_NOM +REFUS_ADMINISTRATIF;Administratif +REFUS_PROGRAMME;Rejet du programme +REFUS_PROFESSION;Blocage de la profession +REFUS_AUTRE;Autre Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -398,10 +398,6 @@ } catch (UnwantedContactContactStateMotifException e) { String message = l(l, "wao.import.contact.failure.unwantedContactStateMotif", lineNumber); throw new ImportErrorException(message); - } catch (MissingContactNbObservantsException e) { - String state = WaoUtils.l(l, e.getContact().getContactState()); - String message = l(l, "wao.import.contact.failure.missingObserver", lineNumber, state); - throw new ImportErrorException(message); } catch (MissingContactObservationEndDateException e) { String state = WaoUtils.l(l, e.getContact().getContactState()); String message = l(l, "wao.import.contact.failure.missingObservationEndDate", lineNumber, state); @@ -536,7 +532,6 @@ MissingContactCommentException, MissingContactObservationBeginDateException, MissingContactObservationEndDateException, - MissingContactNbObservantsException, MissingContactStateMotifException, UnwantedContactContactStateMotifException, MissingContactObservedDataControlException, @@ -686,9 +681,6 @@ if (observationEndDate == null) { throw new MissingContactObservationEndDateException(contact); } - if (contact.getNbObservants() == 0) { - throw new MissingContactNbObservantsException(contact); - } if (contact.getObsProgram().isObsVente() && contact.getTerrestrialLocation() == null) { throw new MissingContactTerrestrialLocationException(contact); } Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -1,40 +0,0 @@ -package fr.ifremer.wao.services.service; - -/* - * #%L - * Wao :: Services - * %% - * Copyright (C) 2009 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import fr.ifremer.wao.entity.Contact; - -/** - * Created on 4/4/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -public class MissingContactNbObservantsException extends ContactValidationException { - - private static final long serialVersionUID = 1L; - - public MissingContactNbObservantsException(Contact contact) { - super(contact); - } - -} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -442,7 +442,6 @@ } else { existingMotif.setName(motif.getName()); existingMotif.setContactState(motif.getContactState()); - existingMotif.setColor(motif.getColor()); dao.update(existingMotif); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -29,10 +29,7 @@ import org.nuiton.csv.ImportModel; import org.nuiton.csv.ImportableColumn; import org.nuiton.csv.ModelBuilder; -import org.nuiton.csv.ValueParser; -import org.nuiton.i18n.I18n; -import java.text.ParseException; import java.util.List; import java.util.Locale; @@ -69,17 +66,6 @@ "MOTIF_CODE", ContactStateMotif.PROPERTY_CODE); modelBuilder.newMandatoryColumn( "MOTIF_NOM", ContactStateMotif.PROPERTY_NAME); - modelBuilder.newMandatoryColumn( - "MOTIF_COULEUR", ContactStateMotif.PROPERTY_COLOR, new ValueParser<String>() { - @Override - public String parse(String value) throws ParseException { - if (value.length() != 6) { - //FIXME Not correct i18n key - throw new IllegalArgumentException(I18n.l(locale, "wao.import.contact.failure.wrongColor", value)); - } - return value.trim(); - } - }); } @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -55,7 +55,6 @@ import fr.ifremer.wao.services.service.MissingContactDataReliabilityException; import fr.ifremer.wao.services.service.MissingContactMainObserverException; import fr.ifremer.wao.services.service.MissingContactMammalsInfoException; -import fr.ifremer.wao.services.service.MissingContactNbObservantsException; import fr.ifremer.wao.services.service.MissingContactObservationBeginDateException; import fr.ifremer.wao.services.service.MissingContactObservationEndDateException; import fr.ifremer.wao.services.service.MissingContactObservedDataControlException; @@ -250,10 +249,6 @@ } catch (UnwantedContactContactStateMotifException e) { addFieldError("updateContactCommand.contact.contactStateMotif", t("wao.ui.form.Contact.error.unwantedContactStateMotif")); - } catch (MissingContactNbObservantsException e) { - String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); - addFieldError("updateContactCommand.contact.nbObservants", t("wao.ui.form.Contact.error.missingObserver", state)); - } catch (MissingContactObservationEndDateException e) { String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); addFieldError("updateContactCommand.contact.observationEndDate", t("wao.ui.form.Contact.error.missingObservationEndDate", state)); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-09-05 10:19:33 UTC (rev 2236) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-09-05 13:24:14 UTC (rev 2237) @@ -46,7 +46,6 @@ import fr.ifremer.wao.services.service.MissingContactDataReliabilityException; import fr.ifremer.wao.services.service.MissingContactMainObserverException; import fr.ifremer.wao.services.service.MissingContactMammalsInfoException; -import fr.ifremer.wao.services.service.MissingContactNbObservantsException; import fr.ifremer.wao.services.service.MissingContactObservationBeginDateException; import fr.ifremer.wao.services.service.MissingContactObservationEndDateException; import fr.ifremer.wao.services.service.MissingContactObservedDataControlException; @@ -173,10 +172,6 @@ } catch (UnwantedContactContactStateMotifException e) { errorMessage = t("wao.ui.form.Contact.error.unwantedContactStateMotif"); - } catch (MissingContactNbObservantsException e) { - String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); - errorMessage = t("wao.ui.form.Contact.error.missingObserver", state); - } catch (MissingContactObservationEndDateException e) { String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); errorMessage = t("wao.ui.form.Contact.error.missingObservationEndDate", state);

1 0

r2236 - in branches/wao-4.0.x: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com Sept. 5, 2014

Sept. 5, 2014

Author: bleny Date: 2014-09-05 12:19:33 +0200 (Fri, 05 Sep 2014) New Revision: 2236 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2236 Log: Introduction d'un cache optimiste sur les contacts et les navires (refs #5288, refs #5392) Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheLoader.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheLoader.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-09-04 08:05:26 UTC (rev 2235) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -63,4 +63,19 @@ return Objects.hashCode(locale, optionalCompanyId, obsProgram, boatsFilter); } + public Locale getLocale() { + return locale; + } + + public ObsProgram getObsProgram() { + return obsProgram; + } + + public Optional<String> getOptionalCompanyId() { + return optionalCompanyId; + } + + public BoatsFilter getBoatsFilter() { + return boatsFilter; + } } Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheLoader.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheLoader.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheLoader.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -0,0 +1,61 @@ +package fr.ifremer.wao.services.service; + +import com.google.common.cache.CacheLoader; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.WaoApplicationContext; +import fr.ifremer.wao.services.WaoServiceContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Locale; + +public class BoatsFilterValuesCacheLoader extends CacheLoader<BoatsFilterValuesCacheKey, BoatsFilterValues> { + + private static final Log log = LogFactory.getLog(BoatsFilterValuesCacheLoader.class); + + protected WaoApplicationContext waoApplicationContext; + + public BoatsFilterValuesCacheLoader(WaoApplicationContext waoApplicationContext) { + this.waoApplicationContext = waoApplicationContext; + } + + @Override + public BoatsFilterValues load(BoatsFilterValuesCacheKey key) { + + if (log.isTraceEnabled()) { + log.trace("start refreshing boatFilterValuesCache for key " + key); + } + + Locale locale = key.getLocale(); + + WaoTopiaPersistenceContext persistenceContext = null; + + try { + + persistenceContext = waoApplicationContext.newPersistenceContext(); + + WaoServiceContext waoServiceContext = waoApplicationContext.newServiceContext(persistenceContext, locale); + + BoatsService service = waoServiceContext.newService(BoatsService.class); + + BoatsFilterValues boatsFilterValues = service.getBoatsFilterValues(key); + + if (log.isTraceEnabled()) { + log.trace("will return from refreshing boatFilterValuesCache"); + } + + return boatsFilterValues; + + } catch (Exception e) { + if (persistenceContext != null) { + persistenceContext.rollback(); + } + throw e; + } finally { + if (persistenceContext != null) { + persistenceContext.close(); + } + } + + } +} Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-09-04 08:05:26 UTC (rev 2235) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -90,21 +90,37 @@ if (boatsFilterValues == null) { - BoatTopiaDao dao = getBoatDao(); + if (log.isTraceEnabled()) { + log.trace("cache fail, will compute filter values for key " + boatsFilterValuesCacheKey); + } - List<Boat> boats = dao.findAll(filter); + boatsFilterValues = getBoatsFilterValues(boatsFilterValuesCacheKey); - boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), optionalCompanyId); + cache.put(boatsFilterValuesCacheKey, boatsFilterValues); - for (Boat boat : boats) { - boatsFilterValues.addBoat(boat); - } + } - cache.put(boatsFilterValuesCacheKey, boatsFilterValues); + return boatsFilterValues; + } + public BoatsFilterValues getBoatsFilterValues(BoatsFilterValuesCacheKey boatsFilterValuesCacheKey) { + + BoatTopiaDao dao = getBoatDao(); + + List<Boat> boats = dao.findAll(boatsFilterValuesCacheKey.getBoatsFilter()); + + BoatsFilterValues boatsFilterValues = + new BoatsFilterValues( + boatsFilterValuesCacheKey.getLocale(), + boatsFilterValuesCacheKey.getObsProgram(), + boatsFilterValuesCacheKey.getOptionalCompanyId()); + + for (Boat boat : boats) { + boatsFilterValues.addBoat(boat); } return boatsFilterValues; + } public BoatsList getBoatsList(AuthenticatedWaoUser authenticatedWaoUser, Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java 2014-09-04 08:05:26 UTC (rev 2235) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheKey.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -63,4 +63,19 @@ return Objects.hashCode(locale, optionalCompanyId, obsProgram, contactsFilter); } + public Locale getLocale() { + return locale; + } + + public ObsProgram getObsProgram() { + return obsProgram; + } + + public Optional<String> getOptionalCompanyId() { + return optionalCompanyId; + } + + public ContactsFilter getContactsFilter() { + return contactsFilter; + } } Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheLoader.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheLoader.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValuesCacheLoader.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -0,0 +1,61 @@ +package fr.ifremer.wao.services.service; + +import com.google.common.cache.CacheLoader; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.WaoApplicationContext; +import fr.ifremer.wao.services.WaoServiceContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Locale; + +public class ContactsFilterValuesCacheLoader extends CacheLoader<ContactsFilterValuesCacheKey, ContactsFilterValues> { + + private static final Log log = LogFactory.getLog(BoatsFilterValuesCacheLoader.class); + + protected WaoApplicationContext waoApplicationContext; + + public ContactsFilterValuesCacheLoader(WaoApplicationContext waoApplicationContext) { + this.waoApplicationContext = waoApplicationContext; + } + + @Override + public ContactsFilterValues load(ContactsFilterValuesCacheKey key) { + + if (log.isTraceEnabled()) { + log.trace("start refreshing boatFilterValuesCache for key " + key); + } + + Locale locale = key.getLocale(); + + WaoTopiaPersistenceContext persistenceContext = null; + + try { + + persistenceContext = waoApplicationContext.newPersistenceContext(); + + WaoServiceContext waoServiceContext = waoApplicationContext.newServiceContext(persistenceContext, locale); + + ContactsService service = waoServiceContext.newService(ContactsService.class); + + ContactsFilterValues boatsFilterValues = service.getContactsFilterValues(key); + + if (log.isTraceEnabled()) { + log.trace("will return from refreshing boatFilterValuesCache"); + } + + return boatsFilterValues; + + } catch (Exception e) { + if (persistenceContext != null) { + persistenceContext.rollback(); + } + throw e; + } finally { + if (persistenceContext != null) { + persistenceContext.close(); + } + } + + } +} Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-09-04 08:05:26 UTC (rev 2235) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -153,19 +153,31 @@ ContactsFilterValues contactsFilterValues = cache.getIfPresent(cacheKey); if (contactsFilterValues == null) { + contactsFilterValues = getContactsFilterValues(cacheKey); + cache.put(cacheKey, contactsFilterValues); + } - ContactTopiaDao dao = getContactDao(); - List<Contact> contacts = dao.findAllForFilterValues(filter); + return contactsFilterValues; + } - contactsFilterValues = new ContactsFilterValues(locale, obsProgram, optionalCompanyId); - for (Contact contact : contacts) { - contactsFilterValues.addContact(contact); - } + public ContactsFilterValues getContactsFilterValues(ContactsFilterValuesCacheKey cacheKey) { - cache.put(cacheKey, contactsFilterValues); + ContactTopiaDao dao = getContactDao(); + + List<Contact> contacts = dao.findAllForFilterValues(cacheKey.getContactsFilter()); + + ContactsFilterValues contactsFilterValues = + new ContactsFilterValues( + cacheKey.getLocale(), + cacheKey.getObsProgram(), + cacheKey.getOptionalCompanyId()); + + for (Contact contact : contacts) { + contactsFilterValues.addContact(contact); } return contactsFilterValues; + } public ObsMerContactsList getContactsList(AuthenticatedWaoUser authenticatedWaoUser, Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-04 08:05:26 UTC (rev 2235) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-05 10:19:33 UTC (rev 2236) @@ -34,8 +34,10 @@ import fr.ifremer.wao.services.WaoWebApplicationContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheLoader; import fr.ifremer.wao.services.service.ContactsFilterValues; import fr.ifremer.wao.services.service.ContactsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ContactsFilterValuesCacheLoader; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; @@ -130,7 +132,11 @@ @Override public Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache() { if (boatsFilterValuesCache == null) { - boatsFilterValuesCache = newCacheBuilder(100).expireAfterWrite(18, TimeUnit.HOURS).build(); + BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); + boatsFilterValuesCache = newCacheBuilder(100) + . expireAfterAccess(20, TimeUnit.DAYS) + . refreshAfterWrite(20, TimeUnit.MINUTES) + . build(loader); } return boatsFilterValuesCache; } @@ -146,7 +152,11 @@ @Override public Cache<ContactsFilterValuesCacheKey, ContactsFilterValues> getContactsFilterValuesCache() { if (contactsFilterValuesCache == null) { - contactsFilterValuesCache = newCacheBuilder(100).expireAfterWrite(18, TimeUnit.HOURS).build(); + ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); + contactsFilterValuesCache = newCacheBuilder(100) + . expireAfterAccess(20, TimeUnit.DAYS) + . refreshAfterWrite(20, TimeUnit.MINUTES) + . build(loader); } return contactsFilterValuesCache; } @@ -178,6 +188,8 @@ } + logCacheStats(); + return persistenceContext; } @@ -195,12 +207,7 @@ @Override public void close() { - if (log.isInfoEnabled()) { - log.info("samplingPlansCache stats: " + getSamplingPlansCache().stats().toString()); - log.info("boatsFilterValuesCache stats: " + getBoatsFilterValuesCache().stats().toString()); - log.info("contactsFilterValuesCache stats: " + getContactsFilterValuesCache().stats().toString()); - log.info("synthesesCache stats: " + getSynthesesCache().stats().toString()); - } + logCacheStats(); if (topiaApplicationContext != null) { @@ -210,6 +217,17 @@ } + protected void logCacheStats() { + + if (log.isInfoEnabled()) { + log.info("samplingPlansCache stats: " + getSamplingPlansCache().stats().toString()); + log.info("boatsFilterValuesCache stats: " + getBoatsFilterValuesCache().stats().toString()); + log.info("contactsFilterValuesCache stats: " + getContactsFilterValuesCache().stats().toString()); + log.info("synthesesCache stats: " + getSynthesesCache().stats().toString()); + } + + } + public void init() { if (getApplicationConfig().isLogConfigurationProvided()) {

1 0

r2235 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com Sept. 4, 2014

Sept. 4, 2014

Author: bleny Date: 2014-09-04 10:05:26 +0200 (Thu, 04 Sep 2014) New Revision: 2235 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2235 Log: Suppression de code mort Removed: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthTopiaDao.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java Deleted: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthTopiaDao.java 2014-09-03 16:01:17 UTC (rev 2234) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthTopiaDao.java 2014-09-04 08:05:26 UTC (rev 2235) @@ -1,48 +0,0 @@ -package fr.ifremer.wao.entity; - -/* - * #%L - * Wao :: Persistence - * %% - * Copyright (C) 2009 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.google.common.collect.ImmutableMap; -import org.nuiton.topia.persistence.HqlAndParametersBuilder; -import org.nuiton.topia.persistence.TopiaNoResultException; -import org.nuiton.util.PeriodDates; - -import java.util.Date; - -public class SampleMonthTopiaDao extends AbstractSampleMonthTopiaDao<SampleMonth> { - - public SampleMonth getExistingSampleMonth(SampleRow sampleRow, Date tideBeginDate) throws TopiaNoResultException { - - PeriodDates period = new PeriodDates(tideBeginDate, tideBeginDate); - period.initDayOfMonthExtremities(); - - HqlAndParametersBuilder<SampleMonth> query = newHqlAndParametersBuilder(); - query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow); - query.addWhereClause(SampleMonth.PROPERTY_PERIOD_DATE + " >= :beforeDate", ImmutableMap.of("beforeDate", (Object) period.getFromDate())); - query.addWhereClause(SampleMonth.PROPERTY_PERIOD_DATE + " <= :endDate", ImmutableMap.of("endDate", (Object) period.getThruDate())); - - - SampleMonth result = findUnique(query.getHql(), query.getHqlParameters()); - return result; - } - -} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-09-03 16:01:17 UTC (rev 2234) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-09-04 08:05:26 UTC (rev 2235) @@ -259,16 +259,6 @@ } - public Collection<Boat> getBoats(BoatsFilter boatsFilter, int pageSize) { - - PaginationParameter pager = newBoatsPaginationParameter(0, pageSize); - - PaginationResult<Boat> boats = getBoatDao().find(boatsFilter, pager); - - return boats.getElements(); - - } - public void changeBoatElligibility(AuthenticatedWaoUser authenticatedWaoUser, String boatId, String sampleRowId, boolean active) { ElligibleBoatTopiaDao dao = getElligibleBoatDao();

1 0

r2234 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com Sept. 3, 2014

Sept. 3, 2014

Author: bleny Date: 2014-09-03 18:01:17 +0200 (Wed, 03 Sep 2014) New Revision: 2234 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2234 Log: Utilisation de l'API de Topia pour <= et >= Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-02 14:11:49 UTC (rev 2233) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-03 16:01:17 UTC (rev 2234) @@ -120,12 +120,12 @@ } if (filter.getPeriodFrom() != null) { - query.addWhereClause("c." + periodProperty + " >= :periodFrom", ImmutableMap.of("periodFrom", (Object) filter.getPeriodFrom())); + query.addGreaterOrEquals(periodProperty, filter.getPeriodFrom()); } if (filter.getPeriodTo() != null) { Date periodTo = DateUtil.setMaxTimeOfDay(filter.getPeriodTo()); - query.addWhereClause("c." + periodProperty + " <= :periodTo", ImmutableMap.of("periodTo", (Object) periodTo)); + query.addLowerOrEquals(periodProperty, periodTo); } if (CollectionUtils.isNotEmpty(filter.getContactIds())) {

1 0

r2233 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com Sept. 2, 2014

Sept. 2, 2014

Author: bleny Date: 2014-09-02 16:11:49 +0200 (Tue, 02 Sep 2014) New Revision: 2233 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2233 Log: On ?\195?\169vite d'instancier deux fois UpdateContactCommand pour d?\195?\169corer la m?\195?\170me entit?\195?\169 sinon, on perd des informations qui ont r?\195?\169cup?\195?\169r?\195?\169es sur la premi?\195?\168re instance et pas la deux?\195?\168me (texte de capture de mammif?\195?\168res) (fixes #5653) Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 14:09:57 UTC (rev 2232) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 14:11:49 UTC (rev 2233) @@ -144,7 +144,8 @@ public UpdateContactCommand getUpdateContactCommand() { if (updateContactCommand == null) { - prepare(); + // XXX brendan 02/09/14 avant le prepare, on ne sait pas si contactId a été injecté donc on ne l'utilise pas. Par ailleurs, même s'il avait été injecté, on se retrouverait avec une première instance de updateContactCommand qui sera perdue et l'entité sera décorée par une autre commande et on aura perdu des infos entre temps (notamment le flag qui vérifie si on a modifié les informations de capture accidentelle) + updateContactCommand = service.newUpdateContactCommandForCreation(getAuthenticatedWaoUser()); } return updateContactCommand; }

1 0

r2232 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail
by bleny＠users.forge.codelutin.com Sept. 2, 2014

Sept. 2, 2014

Author: bleny Date: 2014-09-02 16:09:57 +0200 (Tue, 02 Sep 2014) New Revision: 2232 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2232 Log: Documentation d'une classe d'un mail Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-09-02 14:08:50 UTC (rev 2231) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-09-02 14:09:57 UTC (rev 2232) @@ -33,7 +33,8 @@ import java.util.Locale; /** - * Created on 4/5/14. + * Courriel de notification qui est envoyé lorsqu'un utilisateur rapporte, à la saisie d'un + * contact, qu'une capture accidentelle d'un mammifère est survenue pendant la marée. * * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0

1 0

r2231 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com Sept. 2, 2014

Sept. 2, 2014

Author: bleny Date: 2014-09-02 16:08:50 +0200 (Tue, 02 Sep 2014) New Revision: 2231 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2231 Log: La valeur du champs saisie en cas capture accidentelle n'?\195?\169tait pas affich?\195?\169e dans le formulaire Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-09-02 13:04:51 UTC (rev 2230) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-09-02 14:08:50 UTC (rev 2231) @@ -120,6 +120,10 @@ contact.setMammalsInfo(mammalsInfo); } + public String getMammalsInfo() { + return contact.getMammalsInfo(); + } + /** * Check if mammals informations has changed. *

1 0

r2230 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-services/src/test/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com Sept. 2, 2014

Sept. 2, 2014

Author: bleny Date: 2014-09-02 15:04:51 +0200 (Tue, 02 Sep 2014) New Revision: 2230 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2230 Log: Retrait des clauses 'throws Exception' Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -104,34 +104,34 @@ // ship owner modelBuilder.newColumnForImportExport("ARMATEUR_CODE", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getCode(); } @Override - public void set(Boat boat, String code) throws Exception { + public void set(Boat boat, String code) { boat.getShipOwner().setCode(code); } }); modelBuilder.newColumnForImportExport("ARMATEUR_NOM", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getLastName(); } @Override - public void set(Boat boat, String lastName) throws Exception { + public void set(Boat boat, String lastName) { boat.getShipOwner().setLastName(lastName); } }); modelBuilder.newColumnForImportExport("ARMATEUR_PRENOM", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getFirstName(); } @Override - public void set(Boat boat, String firstName) throws Exception { + public void set(Boat boat, String firstName) { boat.getShipOwner().setFirstName(firstName); } }); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -183,7 +183,7 @@ modelBuilder.newIgnoredColumn("NAVIRE_NOM"); modelBuilder.newColumnForExport("NAVIRE_NOM", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { return contact.getBoat().getName(); } }); @@ -204,7 +204,7 @@ modelBuilder.newColumnForExport("CONTACT_ETAT_MOTIF_NOM", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { String name = ""; if (contact.getContactStateMotif() != null) { name = contact.getContactStateMotif().getName(); @@ -245,7 +245,7 @@ "CONTACT_LIEU_TYPE", new ValueGetter<Contact, LocationType>() { @Override - public LocationType get(Contact contact) throws Exception { + public LocationType get(Contact contact) { LocationType locationType = null; if (contact.getTerrestrialLocation() != null) { locationType = contact.getTerrestrialLocation() @@ -263,7 +263,7 @@ modelBuilder.newIgnoredColumn("CONTACT_LIEU_DESCRIPTION"); modelBuilder.newColumnForExport("CONTACT_LIEU_DESCRIPTION", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { String description = ""; if (contact.getTerrestrialLocation() != null) { description = contact.getTerrestrialLocation() Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -79,7 +79,7 @@ } @Override - public Integer get(SampleRow sampleRow) throws Exception { + public Integer get(SampleRow sampleRow) { SampleMonth sampleMonth = sampleRow.getSampleMonth(month); Integer value = null; if (sampleMonth != null) { @@ -89,7 +89,7 @@ } @Override - public void set(SampleRow sampleRow, Integer expectedTidesValue) throws Exception { + public void set(SampleRow sampleRow, Integer expectedTidesValue) { SampleMonth sampleMonth = sampleRow.getSampleMonth(month); if (sampleMonth == null) { sampleMonth = new SampleMonthImpl(); Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -157,7 +157,7 @@ } @Test - public void testRecomputeSampleRowEstimatedAndRealTides() throws Exception { + public void testRecomputeSampleRowEstimatedAndRealTides() { FakeWaoServiceContext serviceContext = newServiceContext(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -25,7 +25,6 @@ import fr.ifremer.wao.WaoEntityEnum; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.impl.StrutsObjectFactory; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -37,7 +36,7 @@ private static final Log log = LogFactory.getLog(WaoStrutsObjectFactory.class); @Override - public Object buildBean(Class clazz, Map<String, Object> extraContext) throws Exception { + public Object buildBean(Class clazz, Map<String, Object> extraContext) throws IllegalAccessException, InstantiationException { Object instance; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -333,14 +333,20 @@ } @Override - public String execute() throws Exception { + public String execute() { - service.save(updateContactCommand); + try { + service.save(updateContactCommand); + } catch (ContactNotUpdatableException e) { + throw new IllegalStateException("should never occur", e); + } session.addMessage(t("wao.ui.form.updateContactCommand.success")); session.setContactToHighlightId(updateContactCommand.getContact().getTopiaId()); + return SUCCESS; + } } \ No newline at end of file

1 0

r2229 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com Sept. 2, 2014

Sept. 2, 2014

Author: bleny Date: 2014-09-02 11:38:14 +0200 (Tue, 02 Sep 2014) New Revision: 2229 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2229 Log: Mont?\195?\169e de version de ToPIA et utilisation de l'API fetch plut?\195?\180t que de modifier le HQL en manipulation de cha?\195?\174ne Modified: trunk/pom.xml trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-27 15:46:57 UTC (rev 2228) +++ trunk/pom.xml 2014-09-02 09:38:14 UTC (rev 2229) @@ -121,8 +121,8 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> - <eugeneVersion>2.12</eugeneVersion> - <topiaVersion>3.0-beta-8</topiaVersion> + <eugeneVersion>2.13</eugeneVersion> + <topiaVersion>3.0-beta-12</topiaVersion>  <locales>fr</locales> Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-08-27 15:46:57 UTC (rev 2228) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-09-02 09:38:14 UTC (rev 2229) @@ -44,16 +44,21 @@ HqlAndParametersBuilder<Boat> query = toBoatHqlAndParametersBuilder(filter); - String hql = query.getHql(); + query.addAllFetches( + Boat.PROPERTY_DISTRICT, + Boat.PROPERTY_PORT_OF_REGISTRY, + Boat.PROPERTY_SHIP_OWNER, + Boat.PROPERTY_ELLIGIBLE_BOAT + '.' + ElligibleBoat.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_FISHING_ZONE + ); - hql = StringUtils.replace( - hql, - "from fr.ifremer.wao.entity.Boat b", - "from fr.ifremer.wao.entity.BoatImpl b left outer join fetch b." + Boat.PROPERTY_DISTRICT + " left outer join fetch b." + Boat.PROPERTY_PORT_OF_REGISTRY + " left outer join fetch b." + Boat.PROPERTY_SHIP_OWNER + " so left outer join fetch b." + Boat.PROPERTY_ELLIGIBLE_BOAT + " eb left join fetch eb." + ElligibleBoat.PROPERTY_SAMPLE_ROW + " sr left join fetch sr." + SampleRow.PROPERTY_FISHING_ZONE); + if (log.isTraceEnabled()) { + log.trace("query to fetch data from boats is " + query.getHql()); + } - List<Boat> boats = findAll(hql, query.getHqlParameters()); + List<Boat> boats = findAll(query.getHql(), query.getHqlParameters()); return boats; + } public PaginationResult<Boat> find(BoatsFilter filter, PaginationParameter pager) { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-08-27 15:46:57 UTC (rev 2228) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-02 09:38:14 UTC (rev 2229) @@ -29,7 +29,6 @@ import fr.ifremer.wao.ContactsFilter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -436,27 +435,19 @@ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); - String hql = query.getHql(); - - hql = StringUtils.replace( - hql, - "from fr.ifremer.wao.entity.Contact " + ALIAS, - "from fr.ifremer.wao.entity.ContactImpl " + ALIAS - + " left join fetch " + ALIAS + "." + Contact.PROPERTY_SAMPLE_ROW + " sr" - + " left join fetch sr." + SampleRow.PROPERTY_COMPANY - + " left join fetch sr." + SampleRow.PROPERTY_FISHING_ZONE - + " left join fetch sr." + SampleRow.PROPERTY_PROFESSION - + " left join fetch sr." + SampleRow.PROPERTY_DCF5_CODE + " dcf" - + " left outer join fetch dcf." + Dcf5Code.PROPERTY_FISHING_GEAR_DCF - + " left outer join fetch dcf." + Dcf5Code.PROPERTY_TARGET_SPECIES_DCF - + " left join fetch " + ALIAS + "." + Contact.PROPERTY_BOAT + " b" - + " left join fetch b." + Boat.PROPERTY_DISTRICT - + " left join fetch " + ALIAS + "." + Contact.PROPERTY_MAIN_OBSERVER - + " left join fetch " + ALIAS + "." + Contact.PROPERTY_SECONDARY_OBSERVERS - + " left outer join fetch " + ALIAS + "." + Contact.PROPERTY_CONTACT_STATE_MOTIF + query.addAllFetches( + Contact.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_COMPANY, + Contact.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_FISHING_ZONE, + Contact.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_PROFESSION, + Contact.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_DCF5_CODE + '.' + Dcf5Code.PROPERTY_FISHING_GEAR_DCF, + Contact.PROPERTY_SAMPLE_ROW + '.' + SampleRow.PROPERTY_DCF5_CODE + '.' + Dcf5Code.PROPERTY_TARGET_SPECIES_DCF, + Contact.PROPERTY_BOAT + '.' + Boat.PROPERTY_DISTRICT, + Contact.PROPERTY_MAIN_OBSERVER, + Contact.PROPERTY_SECONDARY_OBSERVERS, + Contact.PROPERTY_CONTACT_STATE_MOTIF ); - List<Contact> contacts = findAll(hql, query.getHqlParameters()); + List<Contact> contacts = findAll(query.getHql(), query.getHqlParameters()); return contacts; Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java 2014-08-27 15:46:57 UTC (rev 2228) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java 2014-09-02 09:38:14 UTC (rev 2229) @@ -26,15 +26,15 @@ public class WaoUserTopiaDao extends AbstractWaoUserTopiaDao<WaoUser> { public Optional<WaoUser> tryFindByEmailAndFetchCollections(String email) { - Optional<WaoUser> waoUserOptional = forLoginEquals(email).tryFindUnique(); - if (waoUserOptional.isPresent()) { - WaoUser waoUser = waoUserOptional.get(); - // fetch the lazy collections to avoid lazy initialisation exception - waoUser.sizeAllegroWallet(); - waoUser.sizeCanReadBoats(); - waoUser.sizeUserProfile(); - } + Optional<WaoUser> waoUserOptional + = forLoginEquals(email) + . addFetch(WaoUser.PROPERTY_COMPANY) + . addFetch(WaoUser.PROPERTY_CAN_READ_BOATS) + . addFetch(WaoUser.PROPERTY_USER_PROFILE) + . addFetch(WaoUser.PROPERTY_ALLEGRO_WALLET) + . tryFindUnique() + ; return waoUserOptional; } -} //WaoUserTopiaDao +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-08-27 15:46:57 UTC (rev 2228) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-09-02 09:38:14 UTC (rev 2229) @@ -270,7 +270,7 @@ WaoUserTopiaDao dao = getWaoUserDao(); - Optional<WaoUser> optionalWaoUser = dao.forLoginEquals(login).tryFindUnique(); + Optional<WaoUser> optionalWaoUser = dao.tryFindByEmailAndFetchCollections(login); WaoUser waoUser; @@ -299,10 +299,6 @@ throw new NoRoleAttributedException(waoUser); } - waoUser.sizeUserProfile(); - waoUser.sizeCanReadBoats(); - waoUser.getCompany().getTopiaId(); - return waoUser; }

1 0