Author: tchemit Date: 2012-09-22 17:25:32 +0200 (Sat, 22 Sep 2012) New Revision: 691 Url: http://forge.codelutin.com/repositories/revision/echobase/691 Log: fixes #1521: Change Echotype relation type (no more *-*) (impact sur les suppression d'import et mise ?\195?\160 jour des tests) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-22 15:25:32 UTC (rev 691) @@ -138,7 +138,7 @@ StringBuilder buffer = new StringBuilder(); if (StringUtils.isNotEmpty(configuration.getImportNotes())) { - buffer.append("Notes :").append(configuration.getImportNotes()); + buffer.append("Notes :").append(configuration.getImportNotes()).append('\n'); } List<String> importIds = Lists.newArrayList(); @@ -165,7 +165,7 @@ description.append("]"); } } - buffer.append('\n').append(description.toString()); + buffer.append(description.toString()); } String importText = buffer.toString(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; @@ -58,7 +57,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -197,6 +195,12 @@ List<Category> allByEchotype = categoryDAO.findAllByEchotype(echotype); categoryDAO.deleteAll(allByEchotype); + if (entity != null) { + + // remove it from the voyage + entity.removeEchotype(echotype); + } + // delete echotype echotypeDAO.delete(echotype); @@ -217,26 +221,6 @@ incrementOp("Remove postCell " + cell.getTopiaId()); } - protected void removeVoyage(Voyage entity) throws TopiaException { - - Set<Echotype> echotypes = CollectionUtils.isEmpty(entity.getEchotype()) ? - Collections.<Echotype>emptySet() : - Sets.newHashSet(entity.getEchotype()); - - // clean this data - entity.clearEchotype(); - - // delete voyage - delete(voyageDao, entity); - - flushTransaction("Could not flush voyage deletion"); - - // delete all echotypes - for (Echotype echotype : echotypes) { - removeEchotype(null, echotype); - } - } - protected void removeVoyagePostCell(Voyage entity) throws TopiaException { if (CollectionUtils.isNotEmpty(entity.getPostCell())) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -59,9 +59,6 @@ long result = importLog.sizeImportId(); - // add all echotype - result += voyage.sizeEchotype(); - // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -76,7 +73,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - removeVoyage(entity); + delete(voyageDao, entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-22 15:25:32 UTC (rev 691) @@ -59,12 +59,6 @@ long result = importLog.sizeImportId(); - // add all cell results - result += countVoyageCellResults(voyage); - - // add all postCell - result += voyage.sizePostCell(); - // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -79,7 +73,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - removeVoyage(entity); + delete(voyageDao, entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EchoBaseServiceFixtures.java 2012-09-22 15:25:32 UTC (rev 691) @@ -32,28 +32,28 @@ public class EchoBaseServiceFixtures { public String IMPORT_DATA_ECHOBASE_NO_DATA() { - return "/import-data/echobase-" + dbVersion() + "-nodata.h2.db.gz"; + return "/import-data/echobase-nodata.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_COMMON_DATA() { - return "/import-data/echobase-" + dbVersion() + "-commonData.h2.db.gz"; + return "/import-data/echobase-commonData.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_OPERATION() { - return "/import-data/echobase-" + dbVersion() + "-operation.h2.db.gz"; + return "/import-data/echobase-operation.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_CATCHES() { - return "/import-data/echobase-" + dbVersion() + "-catches.h2.db.gz"; + return "/import-data/echobase-catches.h2.db.gz"; } public String IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT() { - return "/import-data/echobase-" + dbVersion() + "-catches-and-voyage-result.h2.db.gz"; + return "/import-data/echobase-catches-and-voyage-result.h2.db.gz"; } -// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-" + dbVersion()+ "-catches-and-acoustic.h2.db.gz"; +// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-catches-and-acoustic.h2.db.gz"; -// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-" + dbVersion()+ "-catches-and-acoustic-and-voyage-result.h2.db.gz"; +// public String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-catches-and-acoustic-and-voyage-result.h2.db.gz"; public String VESSEL_ID() { return "fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855"; @@ -67,13 +67,8 @@ return "fr.ifremer.echobase.entities.references.AreaOfOperation#1323128474277#0.011341599655098622"; } - - public String dbVersion() { - return "1.2"; - } - public String importDbReferentialPath() { - return "/echobase-" + dbVersion() + "-importDb-referentiel.zip"; + return "/echobase-importDb-referentiel.zip"; } public int NB_VOYAGE() { Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-09-22 14:59:11 UTC (rev 690) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-09-22 15:25:32 UTC (rev 691) @@ -396,13 +396,13 @@ Voyage voyage = create(voyageDao, TopiaEntity.TOPIA_ID, voyage2Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), - Voyage.PROPERTY_NAME, "voyage1", + Voyage.PROPERTY_NAME, "voyage2", Voyage.PROPERTY_START_DATE, newDate(), Voyage.PROPERTY_END_DATE, newDate(), - Voyage.PROPERTY_START_PORT, "voyage1StartPort", - Voyage.PROPERTY_END_PORT, "voyage1EndPort", - Voyage.PROPERTY_DESCRIPTION, "voyage1Description", - Voyage.PROPERTY_DATUM, "voyage1Datum" + Voyage.PROPERTY_START_PORT, "voyage2StartPort", + Voyage.PROPERTY_END_PORT, "voyage2EndPort", + Voyage.PROPERTY_DESCRIPTION, "voyage2Description", + Voyage.PROPERTY_DATUM, "voyage2Datum" ); // create transit @@ -410,19 +410,19 @@ TopiaEntity.TOPIA_ID, transit2Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), - Transit.PROPERTY_START_LOCALITY, "transit1tartLocality", - Transit.PROPERTY_END_LOCALITY, "transit1EndLocality", - Transit.PROPERTY_DESCRIPTION, "transit1Description", - Transit.PROPERTY_RELATED_ACTIVITY, "transit1RelatedActivity" + Transit.PROPERTY_START_LOCALITY, "transit2StartLocality", + Transit.PROPERTY_END_LOCALITY, "transit2EndLocality", + Transit.PROPERTY_DESCRIPTION, "transit2Description", + Transit.PROPERTY_RELATED_ACTIVITY, "transit2RelatedActivity" ); voyage.addTransit(transit); // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect2Id, - Transect.PROPERTY_TITLE, "transect1Title", + Transect.PROPERTY_TITLE, "transect2Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect1Stratum" + Transect.PROPERTY_STRATUM, "transect2Stratum" ); transit.addTransect(transect); @@ -444,9 +444,9 @@ // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect1_2Id, - Transect.PROPERTY_TITLE, "transect2Title", + Transect.PROPERTY_TITLE, "transect12Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect2Stratum" + Transect.PROPERTY_STRATUM, "transect12Stratum" ); voyage.getTransit().get(0).addTransect(transect); @@ -468,9 +468,9 @@ // create transect Transect transect = create(transectDAO, TopiaEntity.TOPIA_ID, transect2_2Id, - Transect.PROPERTY_TITLE, "transect2Title", + Transect.PROPERTY_TITLE, "transect22Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), - Transect.PROPERTY_STRATUM, "transect2Stratum" + Transect.PROPERTY_STRATUM, "transect22Stratum" ); voyage.getTransit().get(0).addTransect(transect); Modified: trunk/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz =================================================================== (Binary files differ)
participants (1)
-
tchemit＠users.forge.codelutin.com