Author: sbavencoff Date: 2014-06-06 10:41:08 +0200 (Fri, 06 Jun 2014) New Revision: 707 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/707 Log: fixes #5190 : Erreur ?\195?\160 l'import des fichiers .sammoa Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/FlightService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -169,7 +169,7 @@ long start = TimeLog.getTime(); FlightTopiaDao dao = transaction.getFlightDao(); - Flight result = (Flight) dao.forTopiaIdEquals(flightId).findUniqueOrNull(); + Flight result = dao.forTopiaIdEquals(flightId).findUniqueOrNull(); Preconditions.checkNotNull( result, String.format("%s doesn't exist", flightId)); @@ -341,7 +341,7 @@ try { FlightTopiaDao dao = tx.getFlightDao(); - Flight flight = (Flight) dao.forTopiaIdEquals(flightId).findUnique(); + Flight flight = dao.forTopiaIdEquals(flightId).findUnique(); // delete geoPoints List<GeoPoint> geoPoints = getFlightGeoPoints(tx, flight); @@ -1141,7 +1141,7 @@ SammoaTopiaPersistenceContext tx = beginTransaction(); try { FlightTopiaDao dao = tx.getFlightDao(); - Flight result = (Flight)dao.forProperties(naturalId).findAnyOrNull(); + Flight result = dao.forProperties(naturalId).findAnyOrNull(); return result; } catch (TopiaException e) { throw new SammoaTechnicalException(e); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/ReferentialService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -105,8 +105,7 @@ String result; if (region.getTopiaId() == null) { - Region existRegion = dao.findByNaturalId(region.getCode()); - Preconditions.checkArgument(existRegion == null); + Preconditions.checkArgument(!dao.existByNaturalId(region.getCode())); Region newRegion = dao.createByNaturalId(region.getCode()); newRegion.setName(region.getName()); @@ -202,8 +201,6 @@ CampaignTopiaDao dao = transaction.getCampaignDao(); Campaign result = dao.findByTopiaId(topiaId); return result; - } catch (TopiaException e) { - throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -229,9 +226,7 @@ if (createCampaign) { - Campaign existCampaign = dao.findByNaturalId( - campaign.getCode(), campaign.getRegion()); - Preconditions.checkArgument(existCampaign == null); + Preconditions.checkArgument(!dao.existByNaturalId(campaign.getCode(), campaign.getRegion())); Campaign newCampaign = dao.createByNaturalId( campaign.getCode(), campaign.getRegion()); @@ -266,8 +261,6 @@ } return result; - } catch (TopiaException e) { - throw new TopiaException(e); } finally { endTransaction(transaction); } @@ -394,9 +387,7 @@ TransectTopiaDao dao = transaction.getTransectDao(); - Transect existTransect = dao.findByNaturalId(transect.getName(), - transect.getStrate()); - Preconditions.checkArgument(existTransect == null); + Preconditions.checkArgument(! dao.existByNaturalId(transect.getName(),transect.getStrate())); Transect newTransect = dao.createByNaturalId(transect.getName(), transect.getStrate()); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/csv/ImportCsvService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.io.Files; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; @@ -68,7 +67,6 @@ RegionTopiaDao regionDAO = transaction.getRegionDao(); Region region = regionDAO.findByTopiaId(regionId); - Preconditions.checkNotNull(region); String regionCode = region.getCode(); SpeciesTopiaDao dao = transaction.getSpeciesDao(); @@ -112,7 +110,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkNotNull(campaign); String campaignCode = campaign.getCode(); ObserverTopiaDao dao = transaction.getObserverDao(); @@ -148,12 +145,8 @@ // while importing a species, it does become valid species.setLocalCreation(false); - Species speciesExists = - dao.findByNaturalId(species.getCode(), - species.getRegion()); - boolean newSpecies = false; - if (speciesExists == null) { + if (dao.existByNaturalId(species.getCode(), species.getRegion())) { dao.create(species); @@ -167,6 +160,10 @@ } else { + Species speciesExists = + dao.findByNaturalId(species.getCode(), + species.getRegion()); + speciesExists.setCommonName(species.getCommonName()); speciesExists.setLatinName(species.getLatinName()); speciesExists.setGroupName(species.getGroupName()); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-06-05 08:52:41 UTC (rev 706) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/map/ImportMapService.java 2014-06-06 08:41:08 UTC (rev 707) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ulr.sammoa.application.SammoaServiceSupport; import fr.ulr.sammoa.persistence.Campaign; @@ -66,9 +65,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkArgument(campaign != null, - "The topiaId : " + campaignId + - " doesn't match any existing campaign"); StrateTopiaDao strateDAO = transaction.getStrateDao(); TransectTopiaDao transectDAO = transaction.getTransectDao(); @@ -110,9 +106,6 @@ CampaignTopiaDao campaignDAO = transaction.getCampaignDao(); Campaign campaign = campaignDAO.findByTopiaId(campaignId); - Preconditions.checkArgument(campaign != null, - "The topiaId : " + campaignId + - " doesn't match any existing campaign"); StrateTopiaDao strateDAO = transaction.getStrateDao(); SectorTopiaDao sectorDAO = transaction.getSectorDao(); @@ -169,10 +162,10 @@ ); } - Transect existTransect = dao.findByNaturalId(transect.getName(), existStrate); + // If the existing strate is null, create it otherwise ignore - if (existTransect == null) { + if (!dao.existByNaturalId(transect.getName(), existStrate)) { Transect newTransect = dao.createByNaturalId(transect.getName(), existStrate); newTransect.setLength(transect.getLength()); @@ -195,6 +188,8 @@ } else { + Transect existTransect = dao.findByNaturalId(transect.getName(), existStrate); + existTransect.setGraphicIndex(graphicIndex); if (logger.isWarnEnabled()) { @@ -221,7 +216,7 @@ Sector sector = strate.getSector(); int sectorNumber = sector.getSectorNumber(); - Strate existStrate; + boolean existStrate; // Create sector if necessary Sector existSector = sectors.get(sectorNumber); @@ -231,16 +226,16 @@ existSector.setName(sector.getName()); sectors.put(sectorNumber, existSector); - existStrate = null; + existStrate = false; } else { // Find existing strate only if sector is not created - existStrate = strateDAO.findByNaturalId(strateType, existSector); + existStrate = strateDAO.existByNaturalId(strateType, existSector); } // If the existing strate is null, create it otherwise ignore - if (existStrate == null) { + if (!existStrate) { Strate newStrate = strateDAO.createByNaturalId(strateType, existSector); newStrate.setCode(Strates.getCode(newStrate)); @@ -259,7 +254,7 @@ if (logger.isWarnEnabled()) { logger.warn("The strate {} already " + "exists and will be ignored", - existStrate.getCode()); + "" + strateType.getCode() + existSector.getSectorNumber()); } } return result;