This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit f01d75ba154f807d7f113eefd5ee0712b0171850 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 22 16:59:28 2014 +0100 On renomme un modèle CSV (plus de ObsDeb) --- .../ifremer/wao/services/service/SamplingPlanService.java | 6 +++--- ...ExportModel.java => SamplingPlanImportExportModel.java} | 14 +++++++------- ...delTest.java => SamplingPlanImportExportModelTest.java} | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java index 87495c6..ce1e214 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java @@ -64,7 +64,7 @@ import fr.ifremer.wao.entity.TerrestrialLocationTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.administration.UnknownBoatRegistrationCodesException; -import fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModel; +import fr.ifremer.wao.services.service.csv.SamplingPlanImportExportModel; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; @@ -536,7 +536,7 @@ public class SamplingPlanService extends WaoServiceSupport { List<SampleRow> sampleRows = dao.findAll(filter); ExportModel<SampleRow> exportModel = - new ObsMerObsVenteSamplingPlanImportExportModel( + new SamplingPlanImportExportModel( getLocale(), filter.getPeriodFrom(), filter.getPeriodTo(), @@ -670,7 +670,7 @@ public class SamplingPlanService extends WaoServiceSupport { ReferentialService referentialService = getReferentialService(); ImportModel<SampleRow> samplingPlanImportModel = - new ObsMerObsVenteSamplingPlanImportExportModel(getLocale(), + new SamplingPlanImportExportModel(getLocale(), obsProgram, organisations, fishingZones, diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java similarity index 94% rename from wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java rename to wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java index 5723088..0c075e4 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java @@ -69,7 +69,7 @@ import java.util.regex.Pattern; * Modèle d'import et d'export pour ObsMer et Obsvente. Un seul modèle car 80% * des colonnes sont identiques. */ -public class ObsMerObsVenteSamplingPlanImportExportModel implements ImportExportModel<SampleRow> { +public class SamplingPlanImportExportModel implements ImportExportModel<SampleRow> { /** * Pour un ligne du plan, définir l'effort d'observation pour un mois donné. @@ -109,7 +109,7 @@ public class ObsMerObsVenteSamplingPlanImportExportModel implements ImportExport } private static final Logger log = - LoggerFactory.getLogger(ObsMerObsVenteSamplingPlanImportExportModel.class); + LoggerFactory.getLogger(SamplingPlanImportExportModel.class); protected static final SimpleDateFormat MONTH_YEAR_FORMAT = new SimpleDateFormat("MM/yyyy"); @@ -132,17 +132,17 @@ public class ObsMerObsVenteSamplingPlanImportExportModel implements ImportExport protected PeriodDates periodDates; /** Pour l'export */ - public ObsMerObsVenteSamplingPlanImportExportModel(Locale locale, Date fromMonth, Date toMonth, ObsProgram obsProgram) { + public SamplingPlanImportExportModel(Locale locale, Date fromMonth, Date toMonth, ObsProgram obsProgram) { this.locale = locale; this.periodDates = new PeriodDates(fromMonth, toMonth); this.obsProgram = obsProgram; } /** Pour l'import */ - public ObsMerObsVenteSamplingPlanImportExportModel(Locale locale, ObsProgram obsProgram, - Set<Organisation> organisations, List<FishingZone> fishingZones, - List<TerrestrialLocation> terrestrialDistricts, - ReferentialService referentialService) { + public SamplingPlanImportExportModel(Locale locale, ObsProgram obsProgram, + Set<Organisation> organisations, List<FishingZone> fishingZones, + List<TerrestrialLocation> terrestrialDistricts, + ReferentialService referentialService) { this.locale = locale; this.obsProgram = obsProgram; this.organisations = organisations; diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModelTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModelTest.java similarity index 90% rename from wao-services/src/test/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModelTest.java rename to wao-services/src/test/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModelTest.java index 91795da..72e1bdf 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModelTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModelTest.java @@ -32,7 +32,7 @@ import org.nuiton.util.PeriodDates; import java.util.Arrays; import java.util.List; -public class ObsMerObsVenteSamplingPlanImportExportModelTest { +public class SamplingPlanImportExportModelTest { /** * Vérifie la bonne détection de la période de temps (en mois) écrite @@ -44,8 +44,8 @@ public class ObsMerObsVenteSamplingPlanImportExportModelTest { List<String> headers = Arrays.asList("A", "B", "C", "03/2011", "04/2011", "05/2011", "06/2011", "D", "E", "F"); - ObsMerObsVenteSamplingPlanImportExportModel mock = - Mockito.mock(ObsMerObsVenteSamplingPlanImportExportModel.class); + SamplingPlanImportExportModel mock = + Mockito.mock(SamplingPlanImportExportModel.class); Mockito.when(mock.findMinMaxMonth(headers)).thenCallRealMethod(); PeriodDates actualPeriodDates = mock.findMinMaxMonth(headers); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.