Author: bleny Date: 2014-10-07 18:11:42 +0200 (Tue, 07 Oct 2014) New Revision: 2287 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2287 Log: Suppression de code mort Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 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-10-07 15:46:37 UTC (rev 2286) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-07 16:11:42 UTC (rev 2287) @@ -29,8 +29,8 @@ import com.google.common.base.Splitter; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; @@ -77,7 +77,6 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaNoResultException; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -364,49 +363,6 @@ } - /** Find ports and auctions in a given district */ - public List<TerrestrialLocation> getAllPortsAndAuctions(TerrestrialLocation district) { - - Preconditions.checkArgument(district.isDistrict(), "terrestrial location " + district + " is not district"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> query = dao.newQueryBuilder(); - - query.addIn(TerrestrialLocation.PROPERTY_LOCATION_TYPE, ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)); - - query.addEquals(TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode()); - - List<TerrestrialLocation> result = query.findAll(); - - return result; - - } - - public List<TerrestrialLocation> executeGetAllRegionIfremers() { - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - List<TerrestrialLocation> allRegionIfremers = dao.forLocationTypeEquals(LocationType.REGION).findAll(); - - return allRegionIfremers; - - } - - public TerrestrialLocation getTerrestrialDistrict(String districtCode) { - - Preconditions.checkArgument(StringUtils.isNotBlank(districtCode)); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TerrestrialLocation terrestrialDistrict = dao.forProperties( - TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.DISTRICT, - TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCode).findUnique(); - - return terrestrialDistrict; - - } - /** * @param contactState if null, return motifs for all contact states */ @@ -458,31 +414,6 @@ } - /** - * @param region may be null, and all ports will be returned - * @return all the ports that are in a region - */ - public List<TerrestrialLocation> getAllPorts(TerrestrialLocation region) { - - Preconditions.checkArgument(region == null || region.isRegion(), region + " is not a region"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - Map<String, Object> properties = new HashMap<>(); - - // we are looking for ports only - properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.PORT); - - // ports in a specific region - properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode()); - - // run query - List<TerrestrialLocation> ports = dao.forProperties(properties).findAll(); - - return ports; - - } - protected void initialDcf5CodesImport() { FishingGearDcfTopiaDao fishingGearDcfDao = getPersistenceContext().getFishingGearDcfDao(); @@ -882,9 +813,9 @@ public List<TerrestrialLocation> getAllTerrestrialDistricts() { - List<TerrestrialLocation> allTerrestialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); + List<TerrestrialLocation> allTerrestrialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); - return allTerrestialDistricts; + return allTerrestrialDistricts; } }