This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 19759bab761a11c54c3c51757414d57b144c7dd0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 18:10:46 2016 +0200 Fixes #8089 --- .../echobase/services/service/DbEditorService.java | 22 ++++------- .../services/service/UserDbPersistenceService.java | 43 +++++++++++----------- .../echobase/services/service/UserService.java | 7 ++-- .../service/exportquery/ExportQueryService.java | 6 +-- .../strategy/AbstractRemoveDataStrategy.java | 6 ++- .../workingDb/WorkingDbConfigurationService.java | 2 +- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index 1c13605..7274449 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -102,8 +102,7 @@ public class DbEditorService extends EchoBaseServiceSupport { try { TopiaDao<E> dao = persistenceContext.getDao(entityType); - List<E> result = dao.findAll(); - return result; + return dao.findAll(); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } @@ -111,8 +110,7 @@ public class DbEditorService extends EchoBaseServiceSupport { public TableMeta<EchoBaseUserEntityEnum> getTableMeta(EchoBaseUserEntityEnum tableName) { DbMeta<EchoBaseUserEntityEnum> dbMeta = getDbMeta(); - TableMeta<EchoBaseUserEntityEnum> result = dbMeta.getTable(tableName); - return result; + return dbMeta.getTable(tableName); } public Map<?, ?>[] getData(EchoBaseUserEntityEnum type, TopiaPagerBean pager) { @@ -168,8 +166,7 @@ public class DbEditorService extends EchoBaseServiceSupport { //FIXME echatellier 20160309 use proper paginationparameter everywhere PaginationParameter param = PaginationParameter.of(pager.getPageIndex(), pager.getPageSize()); - List<E> result = dao.find(hql, hqlParameters, param.getStartIndex(), param.getEndIndex()); - return result; + return dao.find(hql, hqlParameters, param.getStartIndex(), param.getEndIndex()); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } @@ -186,8 +183,7 @@ public class DbEditorService extends EchoBaseServiceSupport { hql += " WHERE " + extraWhereQuery; } hql += " ORDER BY e.id"; - Iterable<E> result = dao.forHql(hql, Collections.<String, Object>emptyMap()).findAllLazy(5000); - return result; + return dao.forHql(hql, Collections.<String, Object>emptyMap()).findAllLazy(5000); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } @@ -198,7 +194,7 @@ public class DbEditorService extends EchoBaseServiceSupport { EchoBaseUserEntityEnum entityEnum = tableMeta.getSource(); try { AbstractEchoBaseDao<?> dao = (AbstractEchoBaseDao<?>) persistenceContext.getDao(entityEnum.getContract()); - TopiaEntity entity = dao.findByTopiaId(topiaId); + TopiaEntity entity = dao.forTopiaIdEquals(topiaId).findUnique(); ExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.PROPERTY_TOPIA_ID, true); return loadRow(entity, model); } catch (TopiaException eee) { @@ -210,11 +206,7 @@ public class DbEditorService extends EchoBaseServiceSupport { TopiaDao<E> dao = (TopiaDao<E>) persistenceContext.getDao(entityEnum.getContract()); - E entity = dao.findByTopiaId(topiaId); - if (entity == null) { - throw new EchoBaseTechnicalException("Could not find entity of type " + entityEnum + " with id: " + topiaId); - } - + E entity = dao.forTopiaIdEquals(topiaId).findUnique(); dao.delete(entity); persistenceContext.commit(); @@ -287,7 +279,7 @@ public class DbEditorService extends EchoBaseServiceSupport { } else { - entityToSave = dao.findByTopiaId(id); + entityToSave = dao.forTopiaIdEquals(id).findUniqueOrNull(); if (entityToSave == null) { if (!createIfNotFound) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 63c3cf8..bd06702 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -151,8 +151,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public AreaOfOperation getAreaOfOperation(String id) { - return persistenceContext.getAreaOfOperationDao(). - findByTopiaId(id); + return persistenceContext.getAreaOfOperationDao().forTopiaIdEquals(id).findUnique(); } //------------------------------------------------------------------------// @@ -212,7 +211,10 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Cell getCell(String id) { - return persistenceContext.getCellDao().findByTopiaId(id); + return persistenceContext.getCellDao().forTopiaIdEquals(id).findUnique(); + } + public Optional<Cell >getOptionalCell(String id) { + return persistenceContext.getCellDao().forTopiaIdEquals(id).tryFindUnique(); } public Cell getCellContainsResult(Result result) { @@ -308,7 +310,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public DataAcquisition getDataAcquisition(String id) { - return persistenceContext.getDataAcquisitionDao().findByTopiaId(id); + return persistenceContext.getDataAcquisitionDao().forTopiaIdEquals(id).findUnique(); } public DataAcquisition createDataAcquisition(AcousticInstrument instrument) { @@ -326,8 +328,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public DataMetadata getDataMetadata(String id) { - return persistenceContext.getDataMetadataDao(). - findByTopiaId(id); + return persistenceContext.getDataMetadataDao().forTopiaIdEquals(id).findUnique(); } public DataMetadata getDataMetadataByName(String name) { @@ -430,7 +431,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public DataProcessing getDataProcessing(String id) { - return persistenceContext.getDataProcessingDao().findByTopiaId(id); + return persistenceContext.getDataProcessingDao().forTopiaIdEquals(id).findUnique(); } public DataProcessing getDataProcessingContainsCell(Cell cell) { @@ -489,7 +490,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { // } public Echotype getEchotype(String id) { - return persistenceContext.getEchotypeDao().findByTopiaId(id); + return persistenceContext.getEchotypeDao().forTopiaIdEquals(id).findUnique(); } public Echotype createEchotype(Echotype echotype) { @@ -604,14 +605,14 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public Collection<ImportFile> getImportFiles(String importLogId) { - ImportLog importLog = persistenceContext.getImportLogDao().findByTopiaId(importLogId); + ImportLog importLog = persistenceContext.getImportLogDao().forTopiaIdEquals(importLogId).findUnique(); return importLog.getImportFile(); } public ImportFile getImportFile(String importFileId) { - return persistenceContext.getImportFileDao().findByTopiaId(importFileId); + return persistenceContext.getImportFileDao().forTopiaIdEquals(importFileId).findUnique(); } @@ -636,7 +637,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public LengthAgeKey getLengthAgeKey(String id) { - return persistenceContext.getLengthAgeKeyDao().findByTopiaId(id); + return persistenceContext.getLengthAgeKeyDao().forTopiaIdEquals(id).findUnique(); } public LengthAgeKey createLengthAgeKey(LengthAgeKey lengthAgeKey) { @@ -652,7 +653,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public LengthWeightKey getLengthWeightKey(String id) { - return persistenceContext.getLengthWeightKeyDao().findByTopiaId(id); + return persistenceContext.getLengthWeightKeyDao().forTopiaIdEquals(id).findUnique(); } public LengthWeightKey createLengthWeightKey(LengthWeightKey lengthWeightKey) { @@ -668,7 +669,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Mission getMission(String id) { - return persistenceContext.getMissionDao().findByTopiaId(id); + return persistenceContext.getMissionDao().forTopiaIdEquals(id).findUnique(); } public boolean isMissionExistByName(String missionname) { @@ -684,7 +685,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Operation getOperation(String id) { - return persistenceContext.getOperationDao().findByTopiaId(id); + return persistenceContext.getOperationDao().forTopiaIdEquals(id).findUnique(); } public Operation getOperationContainsSample(Sample sample) { @@ -723,7 +724,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { // } public Result getResult(String id) { - return persistenceContext.getResultDao().findByTopiaId(id); + return persistenceContext.getResultDao().forTopiaIdEquals(id).findUnique(); } public List<Result> getResultsForMissionAndDatametadata(Mission mission, DataMetadata dataMetadata) { @@ -747,7 +748,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Sample getSample(String id) { - return persistenceContext.getSampleDao().findByTopiaId(id); + return persistenceContext.getSampleDao().forTopiaIdEquals(id).findUnique(); } public Sample newSample() { @@ -866,7 +867,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Transect getTransect(String id) { - return persistenceContext.getTransectDao().findByTopiaId(id); + return persistenceContext.getTransectDao().forTopiaIdEquals(id).findUnique(); } public Transect getTransectContainsOperation(Operation operation) { @@ -890,7 +891,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Transit getTransit(String id) { - return persistenceContext.getTransitDao().findByTopiaId(id); + return persistenceContext.getTransitDao().forTopiaIdEquals(id).findUnique(); } public Transit getTransitContainsTransect(Transect transect) { @@ -910,7 +911,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Vessel getVessel(String id) { - return persistenceContext.getVesselDao().findByTopiaId(id); + return persistenceContext.getVesselDao().forTopiaIdEquals(id).findUnique(); } //------------------------------------------------------------------------// @@ -918,7 +919,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Voyage getVoyage(String id) { - return persistenceContext.getVoyageDao().findByTopiaId(id); + return persistenceContext.getVoyageDao().forTopiaIdEquals(id).findUnique(); } public List<Voyage> getVoyagesForMission(Mission mission) { @@ -1009,7 +1010,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Species getSpecies(String speciesId) { - return persistenceContext.getSpeciesDao().findByTopiaId(speciesId); + return persistenceContext.getSpeciesDao().forTopiaIdEquals(speciesId).findUnique(); } public void creteImportFileIds(Collection<ImportFileId> importedFileIdsToPersist) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java index 9832111..216a106 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java @@ -28,7 +28,6 @@ import fr.ifremer.echobase.entities.EchoBaseUserTopiaDao; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.PagerBean; import org.nuiton.util.StringUtil; import org.nuiton.util.pagination.PaginationParameter; @@ -88,7 +87,7 @@ public class UserService extends EchoBaseServiceSupport { public EchoBaseUser getUserById(String userId) { Preconditions.checkNotNull(userId); try { - EchoBaseUser user = getDao().findByTopiaId(userId); + EchoBaseUser user = getDao().forTopiaIdEquals(userId).findUnique();; EchoBaseUser result = newUser(); result.setEmail(user.getEmail()); result.setPassword(user.getPassword()); @@ -112,7 +111,7 @@ public class UserService extends EchoBaseServiceSupport { EchoBaseUser.PROPERTY_PASSWORD, encodePassword(password) ); } else { - userToCreateOrUpdate = getDao().findByTopiaId(id); + userToCreateOrUpdate = getDao().forTopiaIdEquals(id).findUnique();; userToCreateOrUpdate.setEmail(user.getEmail()); if (StringUtils.isNotEmpty(password)) { @@ -128,7 +127,7 @@ public class UserService extends EchoBaseServiceSupport { public void delete(EchoBaseUser user) { try { - EchoBaseUser userToDelete = getDao().findByTopiaId(user.getTopiaId()); + EchoBaseUser userToDelete = getDao().forTopiaIdEquals(user.getTopiaId()).findUnique();; getDao().delete(userToDelete); echoBaseInternalPersistenceContext.commit(); } catch (TopiaException eee) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java index 0f388dc..0b7c016 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java @@ -60,7 +60,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { public ExportQuery getExportQuery(String topiaId) throws ExportQueryNotFoundException { - ExportQuery exportQuery = getDao().findByTopiaId(topiaId); + ExportQuery exportQuery = getDao().forTopiaIdEquals(topiaId).findUnique();; if (exportQuery == null) { throw new ExportQueryNotFoundException(); @@ -126,7 +126,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { if (mustCreate) { entityToSave = getDao().create(exportQuery); } else { - entityToSave = getDao().findByTopiaId(id); + entityToSave = getDao().forTopiaIdEquals(id).findUnique();; entityToSave.setName(queryName); entityToSave.setDescription(exportQuery.getDescription()); entityToSave.setSqlQuery(exportQuery.getSqlQuery()); @@ -143,7 +143,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { public void delete(String topiaId) { try { - ExportQuery entityToDelete = getDao().findByTopiaId(topiaId); + ExportQuery entityToDelete = getDao().forTopiaIdEquals(topiaId).findUnique();; getDao().delete(entityToDelete); echoBaseInternalPersistenceContext.commit(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java index e937318..cee5107 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java @@ -21,6 +21,7 @@ package fr.ifremer.echobase.services.service.removedata.strategy; * #L% */ +import com.google.common.base.Optional; import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.ImportFile; @@ -219,9 +220,10 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport // remove all result of cells for (String cellId : cellIds) { - Cell cell = persistenceService.getCell(cellId); + Optional<Cell> optionalCell = persistenceService.getOptionalCell(cellId); - if (cell != null && !cell.isResultEmpty()) { + if (optionalCell.isPresent() ) { + Cell cell = optionalCell.get(); Collection<Result> cellResult = cell.getResult(); // for (Result result : cellResult) { // cell.removeResult(result); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java index fe0bb6e..63ce218 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java @@ -185,7 +185,7 @@ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { } protected WorkingDbConfiguration getExistingConf(String id) throws WorkingDbConfigurationNotFoundException { - WorkingDbConfiguration entity = getDao().findByTopiaId(id); + WorkingDbConfiguration entity = getDao().forTopiaIdEquals(id).findUnique();; if (entity == null) { throw new WorkingDbConfigurationNotFoundException(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.