Author: tchemit Date: 2014-04-22 22:27:38 +0200 (Tue, 22 Apr 2014) New Revision: 1019 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1019 Log: updates to last topia api Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java trunk/pom.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/AbstractEchoBaseDao.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -21,10 +21,12 @@ * #L% */ +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaNoResultException; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import java.util.List; import java.util.Map; /** @@ -49,4 +51,9 @@ public <K> K findAny(String hql, Map<String, Object> hqlParameters) throws TopiaNoResultException { return super.findAny(hql, hqlParameters); } + + @Override + public <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + return super.find(hql, hqlParameters, pager); + } } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -26,27 +26,11 @@ public class ExportQueryTopiaDao extends AbstractExportQueryTopiaDao<ExportQuery> { public boolean isQueryExists(String queryName) throws TopiaException { - -// String hql = "SELECT COUNT(*)" + -// " FROM " + getTopiaEntityEnum().getImplementationFQN() + -// " WHERE " + ExportQuery.PROPERTY_NAME + " = :name"; -// -// boolean result = existsByQuery(hql, new String[]{"name", queryName}); -// return result; boolean result = forNameEquals(queryName).exists(); return result; } public boolean isQueryExists(String id, String queryName) throws TopiaException { - -// String hql = "SELECT COUNT(*)" + -// " FROM " + getTopiaEntityEnum().getImplementationFQN() + -// " WHERE " + ExportQuery.PROPERTY_NAME + " = :name" + -// " AND " + ExportQuery.PROPERTY_TOPIA_ID + " != :id"; -// -// boolean result = existsByQuery( -// hql, -// new String[]{"name", queryName, "id", id}); boolean result = forNameEquals(queryName). addNotEquals(ExportQuery.PROPERTY_TOPIA_ID, id). exists(); Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -32,7 +32,6 @@ public List<Category> getCategoryUsingEchotype(Voyage voyage) throws TopiaException { String hql = "SELECT DISTINCT c FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; -// List<Category> result = findAllByQuery(hql, "voyage", voyage); List<Category> result = forHql(hql, "voyage", voyage).findAll(); return result; } @@ -41,7 +40,6 @@ String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; try { -// long result = countByQuery(hql, "voyage", voyage); Long result = findUnique(hql, TopiaUtil.convertPropertiesArrayToMap("voyage", voyage)); return result; } catch (TopiaException e) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/EchotypeTopiaDao.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -36,7 +36,6 @@ @Override public Echotype findByIdAndSpecies(Integer id, Species species) throws TopiaException { -// List<E> allById = findAllById(id); List<Echotype> allById = forIdEquals(id).findAll(); Echotype result = null; for (Echotype echotype : allById) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -30,7 +30,6 @@ import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; /** @@ -138,7 +137,7 @@ for (Transit t : transit) { Transect transect = t.getTransect(vessel); - List<Operation> operations = transect.getOperation(); + Collection<Operation> operations = transect.getOperation(); result.addAll(operations); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -25,7 +25,6 @@ import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; @@ -182,7 +181,7 @@ } public Cell getCellContainsResult(Result result) { - return persistenceContext.getCellDao().findContainsResult(result); + return persistenceContext.getCellDao().forResultContains(result).findAnyOrNull(); } public long countVoyageOrphanCells(final Voyage voyage) { @@ -318,7 +317,7 @@ } public DataProcessing getDataProcessingContainsCell(Cell cell) { - DataProcessing dataAcquisition = persistenceContext.getDataProcessingDao().findContainsCell(cell); + DataProcessing dataAcquisition = persistenceContext.getDataProcessingDao().forCellContains(cell).findAnyOrNull(); return dataAcquisition; } @@ -466,7 +465,7 @@ } public Operation getOperationContainsSample(Sample sample) { - Operation dataAcquisition = persistenceContext.getOperationDao().findContainsSample(sample); + Operation dataAcquisition = persistenceContext.getOperationDao().forSampleContains(sample).findAnyOrNull(); return dataAcquisition; } @@ -507,16 +506,10 @@ return persistenceContext.getResultDao().findByTopiaId(id); } - public List<Result> getResultsForMissionAndDatametadata(Mission mission, DataMetadata metas) { - // TODO - return Lists.newArrayList(); + public List<Result> getResultsForMissionAndDatametadata(Mission mission, DataMetadata dataMetadata) { + return persistenceContext.getResultDao().findAllWithMissionAndDatametadata(mission, dataMetadata); } - public Map<String, Result> getResultForCellAndMetadata(Set<String> cellIds, DataMetadata standardDeviationDataMetadata) { - // TODO - return Maps.newTreeMap(); - } - public Result createResult(Result result) { Result resultCreated = persistenceContext.getResultDao().create(result); return resultCreated; @@ -660,11 +653,11 @@ } public Transect getTransectContainsOperation(Operation operation) { - return persistenceContext.getTransectDao().findContainsOperation(operation); + return persistenceContext.getTransectDao().forOperationContains(operation).findAnyOrNull(); } public Transect getTransectContainsDataAcquisition(DataAcquisition dataAcquisition) { - return persistenceContext.getTransectDao().findContainsDataAcquisition(dataAcquisition); + return persistenceContext.getTransectDao().forDataAcquisitionContains(dataAcquisition).findAnyOrNull(); } public Transect createTransect(Transect transect) { @@ -685,7 +678,7 @@ } public Transit getTransitContainsTransect(Transect transect) { - return persistenceContext.getTransitDao().findContainsTransect(transect); + return persistenceContext.getTransitDao().forTransectContains(transect).findAnyOrNull(); } public Transit createTransit(Transit transit) { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseTestServiceSupport.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -54,6 +54,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.zip.GZIPInputStream; @@ -240,8 +241,8 @@ Preconditions.checkNotNull(voyageId); Voyage voyage = serviceContext.getEchoBaseUserPersistenceContext().getVoyageDao().findByTopiaId(voyageId); Preconditions.checkArgument(!voyage.isTransitEmpty()); - List<Transit> transits = voyage.getTransit(); - Transit transit = transits.get(0); + Collection<Transit> transits = voyage.getTransit(); + Transit transit = transits.iterator().next(); return transit.getTopiaId(); } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -94,7 +94,7 @@ Voyage voyage = persistenceService.getVoyage(getVoyageId()); Assert.assertNotNull(voyage); - Transect transect = voyage.getTransit().get(0).getTransect().get(0); + Transect transect = voyage.getTransit().iterator().next().getTransect().iterator().next(); Assert.assertNotNull(transect); List<AcousticInstrument> acousticInstruments = serviceContext.getEchoBaseUserPersistenceContext().getAcousticInstrumentDao().findAll(); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java 2014-04-22 20:27:38 UTC (rev 1019) @@ -165,7 +165,7 @@ transit = serviceContext.getEchoBaseUserPersistenceContext().getTransitDao().create(); voyage.addTransit(transit); } else { - transit = voyage.getTransit().get(0); + transit = voyage.getTransit().iterator().next(); } if (transit.isTransectEmpty()) { @@ -174,7 +174,7 @@ transect = serviceContext.getEchoBaseUserPersistenceContext().getTransectDao().create(); transit.addTransect(transect); } else { - transect = transit.getTransect().get(0); + transect = transit.getTransect().iterator().next(); } if (transect.isDataAcquisitionEmpty()) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-22 20:25:28 UTC (rev 1018) +++ trunk/pom.xml 2014-04-22 20:27:38 UTC (rev 1019) @@ -138,7 +138,7 @@ <!-- libraries version --> - <topiaVersion>3.0-beta-2</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> @@ -405,7 +405,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.7.4</version> + <version>2.8</version> <dependencies> <dependency> <groupId>org.nuiton.topia</groupId>