Author: tchemit Date: 2014-03-25 12:39:50 +0100 (Tue, 25 Mar 2014) New Revision: 1743 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1743 Log: - fix test config - use diamonds Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -40,7 +40,7 @@ protected ModelBuilder<Boat> modelBuilder; protected void buildModel() { - modelBuilder = new ModelBuilder<Boat>(); + modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport( "NAVIRE_IMMATRICULATION", Boat.PROPERTY_IMMATRICULATION, Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -68,7 +68,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<Boat>(); + modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport( "NAVIRE_IMMATRICULATION", Boat.PROPERTY_IMMATRICULATION, Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -93,12 +93,12 @@ @Override public TerrestrialLocation parse(String code) throws ParseException { if (indexedLocations == null) { - indexedLocations = new HashMap<LocationType, Map<String, TerrestrialLocation>>(); + indexedLocations = new HashMap<>(); for (TerrestrialLocation terrestrialLocation : terrestrialLocations) { LocationType locationType = terrestrialLocation.getLocationType(); Map<String, TerrestrialLocation> locationsForType = indexedLocations.get(locationType); if (locationsForType == null) { - locationsForType = new HashMap<String, TerrestrialLocation>(); + locationsForType = new HashMap<>(); } locationsForType.put(terrestrialLocation.getCode(), terrestrialLocation); indexedLocations.put(locationType, locationsForType); @@ -176,7 +176,7 @@ } protected ModelBuilder<Contact> getModel() { - ModelBuilder<Contact> modelBuilder = new ModelBuilder<Contact>(); + ModelBuilder<Contact> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport("CONTACT_ID", Contact.TOPIA_ID); modelBuilder.newColumnForImportExport("CONTACT_DATE_CREATION", Contact.PROPERTY_CREATION_DATE, Common.DAY_TIME); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEUR_PRINCIPAL", Contact.PROPERTY_MAIN_OBSERVER, new UserParserFormatter(waoUsers)); @@ -188,7 +188,7 @@ new ValueFormatter<List<WaoUser>>() { @Override public String format(List<WaoUser> value) { - List<String> fullNames = new LinkedList<String>(); + List<String> fullNames = new LinkedList<>(); for (WaoUser waoUser : value) { fullNames.add(waoUser.getFullName()); } @@ -228,7 +228,7 @@ if (obsProgram == ObsProgram.OBSMER) { modelBuilder.newColumnForImportExport("CONTACT_QUALITE_DONNEE", "dataReliability", - new Common.ToStringParserFormatter<DataReliability>(DataReliability.values())); + new Common.ToStringParserFormatter<>(DataReliability.values())); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATION_MAMMIFERE", Contact.PROPERTY_MAMMALS_OBSERVATION, Common.BOOLEAN); modelBuilder.newColumnForImportExport("CONTACT_CAPTURE_ACCIDENTELLE", Contact.PROPERTY_MAMMALS_CAPTURE, Common.BOOLEAN); modelBuilder.newIgnoredColumn("CONTACT_CAPTURE_ACCIDENTELLE_DETAILS"); @@ -251,7 +251,7 @@ // FIXME 20110606 bleny contact.getTerrestrialLocation() may be null, export will fail // terrestrial location for both ObsVente and ObsDeb - ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<Contact, LocationType>(); + ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<>(); LocationTypeParserFormatter locationTypeParserFormatter = new LocationTypeParserFormatter(); modelBuilder.newMandatoryColumn( "CONTACT_LIEU_TYPE", Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -57,7 +57,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<ContactStateMotif>(); + modelBuilder = new ModelBuilder<>(); modelBuilder.newMandatoryColumn( "MOTIF_CODE", ContactStateMotif.PROPERTY_CODE); modelBuilder.newMandatoryColumn( Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -57,7 +57,7 @@ @Override public Iterable<ImportableColumn<FishingZone, Object>> getColumnsForImport() { - ModelBuilder<FishingZone> modelBuilder = new ModelBuilder<FishingZone>(); + ModelBuilder<FishingZone> modelBuilder = new ModelBuilder<>(); modelBuilder.newMandatoryColumn("PECHE_DIVISION", FishingZone.PROPERTY_DISTRICT_CODE); modelBuilder.newMandatoryColumn("PECHE_ZONE", FishingZone.PROPERTY_SECTOR_NAME); modelBuilder.newMandatoryColumn("PECHE_FACADE", FishingZone.PROPERTY_FACADE_NAME); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -128,7 +128,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<SampleRow>(); + modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport( "PLAN_CODE", SampleRow.PROPERTY_CODE, @@ -215,12 +215,12 @@ } protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { - indexedObservationUnits = new HashMap<String, Map<String, TerrestrialDivision>>(); + indexedObservationUnits = new HashMap<>(); for (TerrestrialDivision terrestrialDivision : observationUnits) { String regionCode = terrestrialDivision.getRegionIfremer().getRegionIfremerCode(); Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); if (unitCodesToDivision == null) { - unitCodesToDivision = new HashMap<String, TerrestrialDivision>(); + unitCodesToDivision = new HashMap<>(); } unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); indexedObservationUnits.put(regionCode, unitCodesToDivision); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -59,7 +59,7 @@ } protected void buildModel() { - modelBuilder = new ModelBuilder<RawObsDebCode>(); + modelBuilder = new ModelBuilder<>(); modelBuilder.newMandatoryColumn("CODE", RawObsDebCode.PROPERTY_CODE); modelBuilder.newMandatoryColumn("NOM", RawObsDebCode.PROPERTY_LABEL); modelBuilder.newMandatoryColumn("REGION_IFREMER", Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -69,7 +69,7 @@ @Override public Iterable<ImportableColumn<TerrestrialDivision, Object>> getColumnsForImport() { - ModelBuilder<TerrestrialDivision> modelBuilder = new ModelBuilder<TerrestrialDivision>(); + ModelBuilder<TerrestrialDivision> modelBuilder = new ModelBuilder<>(); modelBuilder.newMandatoryColumn( "ID_STRATE", Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -73,7 +73,7 @@ @Override public Iterable<ImportableColumn<TerrestrialLocation, Object>> getColumnsForImport() { - ModelBuilder<TerrestrialLocation> modelBuilder = new ModelBuilder<TerrestrialLocation>(); + ModelBuilder<TerrestrialLocation> modelBuilder = new ModelBuilder<>(); modelBuilder.newMandatoryColumn("TLIEU_COD", new ValueParser<LocationType>() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -35,7 +35,7 @@ @Override public String format(Collection<TerrestrialLocation> terrestrialLocations) { - List<String> districtNames = new LinkedList<String>(); + List<String> districtNames = new LinkedList<>(); if (terrestrialLocations != null) { for (TerrestrialLocation terrestrialLocation : terrestrialLocations) { districtNames.add(terrestrialLocation.getDistrictName()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -52,7 +52,7 @@ @Override public String format(Collection<TerrestrialLocation> districts) { - List<String> districtCodes = new LinkedList<String>(); + List<String> districtCodes = new LinkedList<>(); if (districts != null) { for (TerrestrialLocation district : districts) { districtCodes.add(district.getDistrictCode()); @@ -68,7 +68,7 @@ throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.districtMissing")); } String[] districtCodes = StringUtils.split(value, ','); - Collection<TerrestrialLocation> districts = new LinkedList<TerrestrialLocation>(); + Collection<TerrestrialLocation> districts = new LinkedList<>(); for (String districtCode : districtCodes) { TerrestrialLocation district = indexedDistricts.get(districtCode.trim()); if (district == null) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -50,7 +50,7 @@ @Override public String format(List<FishingZone> fishingZones) { - List<String> districtCodes = new LinkedList<String>(); + List<String> districtCodes = new LinkedList<>(); for (FishingZone fishingZone : fishingZones) { districtCodes.add(fishingZone.getDistrictCode()); } @@ -62,7 +62,7 @@ if (indexedFishingZones == null) { indexedFishingZones = Maps.uniqueIndex(fishingZones, FishingZones.getDistrictCode()); } - List<FishingZone> fishingZones = new LinkedList<FishingZone>(); + List<FishingZone> fishingZones = new LinkedList<>(); if (StringUtils.isBlank(districtCodes)) { throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.fishingZoneMissing")); } else { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -49,7 +49,7 @@ @Override public LocationType parse(String value) throws ParseException { if (fromStrings == null) { - fromStrings = new HashMap<String, LocationType>(); + fromStrings = new HashMap<>(); fromStrings.put(LocationType.PORT.toString(), LocationType.PORT); fromStrings.put(LocationType.AUCTION.toString(), LocationType.AUCTION); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -43,7 +43,7 @@ ValueParserFormatter<ObservedDataControl> nonNullObservedDataControlParserFormatter; public ObservedDataControlParserFormatter() { - List<ObservedDataControl> observedDataControlsValues = new LinkedList<ObservedDataControl>(); + List<ObservedDataControl> observedDataControlsValues = new LinkedList<>(); Collections.addAll(observedDataControlsValues, ObservedDataControl.values()); observedDataControlsValues.add(null); StringUtil.ToString<ObservedDataControl> nullableObservedDataControlToString = new StringUtil.ToString<ObservedDataControl>() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -51,7 +51,7 @@ } String[] regionCodes = value.split(","); - List<TerrestrialLocation> regions = new LinkedList<TerrestrialLocation>(); + List<TerrestrialLocation> regions = new LinkedList<>(); for (String regionCode : regionCodes) { if ( ! regionCode.isEmpty()) { TerrestrialLocation region = Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -57,7 +57,7 @@ @Override public List<WaoUser> parse(String value) throws ParseException { String[] logins = StringUtils.split(value, SEPARATOR); - List<WaoUser> users = new LinkedList<WaoUser>(); + List<WaoUser> users = new LinkedList<>(); for (String login : logins) { String trimmedLogin = login.trim(); WaoUser user = indexedWaoUsers.get(trimmedLogin); Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-03-25 10:57:36 UTC (rev 1742) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-03-25 11:39:50 UTC (rev 1743) @@ -56,15 +56,16 @@ protected WaoTopiaApplicationContext applicationContext; - protected List<WaoTopiaPersistenceContext> openedTransactions = new LinkedList<WaoTopiaPersistenceContext>(); + protected List<WaoTopiaPersistenceContext> openedTransactions = new LinkedList<>(); protected WaoTopiaApplicationContext newApplicationContext(String dataBase) { - Map<String, String> hibernateH2Config = new HashMap<String, String>(); + Map<String, String> hibernateH2Config = new HashMap<>(); hibernateH2Config.putAll(getApplicationConfig().getTopiaProperties()); hibernateH2Config.put(Environment.DRIVER, org.h2.Driver.class.getName()); + hibernateH2Config.put(Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName()); hibernateH2Config.put(Environment.USER, "sa"); hibernateH2Config.put(Environment.PASS, "");