This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7d9a05a2653d4521115710c9ef4edc14df41b67c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 16 09:48:25 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) --- .../tutti/service/csv/CaracteristicParserFormatter.java | 5 +++++ .../tutti/service/csv/EntityParserFormatterSupport.java | 15 ++++++++++++++- .../csv/FishingOperationLocationParserFormatter.java | 5 +++++ .../csv/FishingOperationStrataParserFormatter.java | 5 +++++ .../csv/FishingOperationSubStrataParserFormatter.java | 5 +++++ .../ifremer/tutti/service/csv/GearParserFormatter.java | 5 +++++ .../tutti/service/csv/HarbourParserFormatter.java | 5 +++++ .../tutti/service/csv/PersonParserFormatter.java | 5 +++++ .../tutti/service/csv/ProgramParserFormatter.java | 5 +++++ .../tutti/service/csv/SpeciesParserFormatter.java | 5 +++++ .../tutti/service/csv/VesselParserFormatter.java | 5 +++++ .../genericformat/GenericFormatImportConfiguration.java | 10 ++++++++++ .../GenericFormatImportEntityParserFactory.java | 17 ++++++++++++++++- .../genericformat/GenericFormatImportRequest.java | 4 ++++ 14 files changed, 94 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicParserFormatter.java index 12dc8e8..51f1da2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicParserFormatter.java @@ -61,6 +61,11 @@ public class CaracteristicParserFormatter extends EntityParserFormatterSupport<C } @Override + protected List<Caracteristic> getEntitiesWithObsoletes() { + return entities; + } + + @Override protected String formatBusiness(Caracteristic caracteristic) { return caracteristic.getParameterName() + " - " + caracteristic.getMatrixName() diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityParserFormatterSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityParserFormatterSupport.java index 9649876..edb15b5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityParserFormatterSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/EntityParserFormatterSupport.java @@ -49,12 +49,16 @@ public abstract class EntityParserFormatterSupport<E extends TuttiEntity> implem protected Map<String, E> entitiesById; + protected boolean authorizeObsoleteReferentials; + protected EntityParserFormatterSupport(String formatNullValue, boolean technical, Class<E> entityType) { this.formatNullValue = formatNullValue; this.technical = technical; this.entityType = entityType; } + protected abstract List<E> getEntitiesWithObsoletes(); + protected abstract List<E> getEntities(); protected abstract String formatBusiness(E e); @@ -63,7 +67,7 @@ public abstract class EntityParserFormatterSupport<E extends TuttiEntity> implem if (entitiesById == null) { - List<E> entities = getEntities(); + List<E> entities = isAuthorizeObsoleteReferentials() ? getEntitiesWithObsoletes() : getEntities(); entitiesById = TuttiEntities.splitById(entities); } @@ -128,4 +132,13 @@ public abstract class EntityParserFormatterSupport<E extends TuttiEntity> implem value = e.getId(); return value; } + + public boolean isAuthorizeObsoleteReferentials() { + return authorizeObsoleteReferentials; + } + + public void setAuthorizeObsoleteReferentials(boolean authorizeObsoleteReferentials) { + this.authorizeObsoleteReferentials = authorizeObsoleteReferentials; + } + } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationLocationParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationLocationParserFormatter.java index 80d802c..ee3f61f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationLocationParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationLocationParserFormatter.java @@ -66,6 +66,11 @@ public class FishingOperationLocationParserFormatter extends EntityParserFormatt } @Override + protected List<TuttiLocation> getEntitiesWithObsoletes() { + return persistenceService.getAllFishingOperationLocationWithObsoletes(zoneId, null, null); + } + + @Override protected String formatBusiness(TuttiLocation value) { return TuttiLocations.GET_NAME.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationStrataParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationStrataParserFormatter.java index 4b70eef..830d274 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationStrataParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationStrataParserFormatter.java @@ -66,6 +66,11 @@ public class FishingOperationStrataParserFormatter extends EntityParserFormatter } @Override + protected List<TuttiLocation> getEntitiesWithObsoletes() { + return persistenceService.getAllFishingOperationStrataWithObsoletes(zoneId); + } + + @Override protected String formatBusiness(TuttiLocation value) { return TuttiLocations.GET_NAME.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationSubStrataParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationSubStrataParserFormatter.java index 96efc77..b3a6828 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationSubStrataParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/FishingOperationSubStrataParserFormatter.java @@ -66,6 +66,11 @@ public class FishingOperationSubStrataParserFormatter extends EntityParserFormat } @Override + protected List<TuttiLocation> getEntitiesWithObsoletes() { + return persistenceService.getAllFishingOperationSubStrataWithObsoletes(zoneId, null); + } + + @Override protected String formatBusiness(TuttiLocation value) { return TuttiLocations.GET_NAME.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java index 503e391..d31ebb5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java @@ -67,6 +67,11 @@ public class GearParserFormatter extends EntityParserFormatterSupport<Gear> { } @Override + protected List<Gear> getEntitiesWithObsoletes() { + return persistenceService.getAllGearWithObsoletes(); + } + + @Override protected String formatBusiness(Gear value) { String result = Gears.GET_NAME.apply(value); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java index 1d2a17c..d0a6646 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java @@ -63,6 +63,11 @@ public class HarbourParserFormatter extends EntityParserFormatterSupport<TuttiLo } @Override + protected List<TuttiLocation> getEntitiesWithObsoletes() { + return persistenceService.getAllHarbourWithObsoletes(); + } + + @Override public String formatBusiness(TuttiLocation value) { String result = TuttiLocations.GET_NAME.apply(value); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonParserFormatter.java index c3b94ed..b5d85b0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/PersonParserFormatter.java @@ -67,6 +67,11 @@ public class PersonParserFormatter extends EntityParserFormatterSupport<Person> } @Override + protected List<Person> getEntitiesWithObsoletes() { + return persistenceService.getAllPersonWithObsoletes(); + } + + @Override protected String formatBusiness(Person person) { return Persons.GET_FULL_NAME.apply(person); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramParserFormatter.java index 6ab66d4..72f3b6d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramParserFormatter.java @@ -63,6 +63,11 @@ public class ProgramParserFormatter extends EntityParserFormatterSupport<Program } @Override + protected List<Program> getEntitiesWithObsoletes() { + return getEntities(); + } + + @Override protected String formatBusiness(Program value) { return Programs.GET_NAME.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java index 3224d4d..b052ba1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesParserFormatter.java @@ -67,6 +67,11 @@ public class SpeciesParserFormatter extends EntityParserFormatterSupport<Species return persistenceService.getAllReferentSpecies(); } + @Override + protected List<Species> getEntitiesWithObsoletes() { + return persistenceService.getAllReferentSpeciesWithObsoletes(); + } + protected Map<String, Species> getEntitiesById() { if (entitiesById == null) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java index f5cf12b..bad8e8a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java @@ -67,6 +67,11 @@ public class VesselParserFormatter extends EntityParserFormatterSupport<Vessel> } @Override + protected List<Vessel> getEntitiesWithObsoletes() { + return persistenceService.getAllVesselWithObsoletes(); + } + + @Override public String formatBusiness(Vessel value) { String result = Vessels.GET_REGISTRATION_CODE_OR_INTERNATIONAL_REGISTRATION_CODE.apply(value); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java index 9e2caf6..5f4832f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java @@ -114,6 +114,8 @@ public class GenericFormatImportConfiguration implements Serializable { */ private int maximumRowsInErrorPerFile; + private boolean authorizeObsoleteReferentials; + public ProgramDataModel getDataToExport() { return dataToExport; } @@ -233,4 +235,12 @@ public class GenericFormatImportConfiguration implements Serializable { public void setMaximumRowsInErrorPerFile(int maximumRowsInErrorPerFile) { this.maximumRowsInErrorPerFile = maximumRowsInErrorPerFile; } + + public boolean isAuthorizeObsoleteReferentials() { + return authorizeObsoleteReferentials; + } + + public void setAuthorizeObsoleteReferentials(boolean authorizeObsoleteReferentials) { + this.authorizeObsoleteReferentials = authorizeObsoleteReferentials; + } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportEntityParserFactory.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportEntityParserFactory.java index f798dda..5d01551 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportEntityParserFactory.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportEntityParserFactory.java @@ -94,9 +94,14 @@ public class GenericFormatImportEntityParserFactory { this.importContext = importContext; } + protected boolean isAuthorizeObsoleteReferentials() { + return importContext.getImportRequest().isAuthorizeObsoleteReferentials(); + } + public VesselParserFormatter getVesselParser() { if (vesselParser == null) { vesselParser = VesselParserFormatter.newParser(persistenceService, importContext.getReferentialTemporaryVesselFileResult().getIdTranslationMap()); + vesselParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return vesselParser; } @@ -104,6 +109,7 @@ public class GenericFormatImportEntityParserFactory { public HarbourParserFormatter getHarbourParser() { if (harbourParser == null) { harbourParser = HarbourParserFormatter.newParser(persistenceService); + harbourParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return harbourParser; } @@ -111,6 +117,7 @@ public class GenericFormatImportEntityParserFactory { public GearParserFormatter getGearParser() { if (gearParser == null) { gearParser = GearParserFormatter.newParser(persistenceService, importContext.getReferentialTemporaryGearFileResult().getIdTranslationMap()); + gearParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return gearParser; } @@ -126,6 +133,7 @@ public class GenericFormatImportEntityParserFactory { public PersonListParserFormatter getPersonListParser() { if (personListParser == null) { PersonParserFormatter delegateParserFormatter = PersonParserFormatter.newParser(persistenceService, importContext.getReferentialTemporaryPersonFileResult().getIdTranslationMap()); + delegateParserFormatter.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); personListParser = PersonListParserFormatter.newParser(delegateParserFormatter); } return personListParser; @@ -134,6 +142,7 @@ public class GenericFormatImportEntityParserFactory { public ProgramParserFormatter getProgramParser() { if (programParser == null) { programParser = ProgramParserFormatter.newParser(persistenceService); + programParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return programParser; } @@ -142,6 +151,7 @@ public class GenericFormatImportEntityParserFactory { if (caracteristicParser == null) { List<Caracteristic> caracteristics = persistenceService.getAllCaracteristic(); caracteristicParser = CaracteristicParserFormatter.newParser(caracteristics); + caracteristicParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return caracteristicParser; } @@ -150,6 +160,7 @@ public class GenericFormatImportEntityParserFactory { if (caracteristicWithProtectedParser == null) { List<Caracteristic> caracteristics = persistenceService.getAllCaracteristicWithProtected(); caracteristicWithProtectedParser = CaracteristicParserFormatter.newParser(caracteristics); + caracteristicWithProtectedParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return caracteristicWithProtectedParser; } @@ -158,7 +169,7 @@ public class GenericFormatImportEntityParserFactory { if (caracteristicForSampleCategoryParser == null) { List<Caracteristic> caracteristics = persistenceService.getAllCaracteristicForSampleCategory(); caracteristicForSampleCategoryParser = CaracteristicParserFormatter.newParser(caracteristics); - + caracteristicForSampleCategoryParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return caracteristicForSampleCategoryParser; } @@ -167,6 +178,7 @@ public class GenericFormatImportEntityParserFactory { if (fishingOperationStrataParser == null) { Program program = importContext.getImportRequest().getProgram(); fishingOperationStrataParser = FishingOperationStrataParserFormatter.newParser(persistenceService, program.getZone().getId()); + fishingOperationStrataParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return fishingOperationStrataParser; } @@ -175,6 +187,7 @@ public class GenericFormatImportEntityParserFactory { if (fishingOperationSubStrataParser == null) { Program program = importContext.getImportRequest().getProgram(); fishingOperationSubStrataParser = FishingOperationSubStrataParserFormatter.newParser(persistenceService, program.getZone().getId()); + fishingOperationSubStrataParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return fishingOperationSubStrataParser; } @@ -183,6 +196,7 @@ public class GenericFormatImportEntityParserFactory { if (fishingOperationLocationParser == null) { Program program = importContext.getImportRequest().getProgram(); fishingOperationLocationParser = FishingOperationLocationParserFormatter.newParser(persistenceService, program.getZone().getId()); + fishingOperationLocationParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return fishingOperationLocationParser; } @@ -197,6 +211,7 @@ public class GenericFormatImportEntityParserFactory { public SpeciesParserFormatter getSpeciesParser() { if (speciesParser == null) { speciesParser = SpeciesParserFormatter.newParser(persistenceService, importContext.getReferentialTemporarySpeciesFileResult().getReferenceTaxonIdTranslationMap()); + speciesParser.setAuthorizeObsoleteReferentials(isAuthorizeObsoleteReferentials()); } return speciesParser; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java index c1a8419..7154f2a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java @@ -183,6 +183,10 @@ public class GenericFormatImportRequest implements Serializable { return importConfiguration.getMaximumRowsInErrorPerFile(); } + public boolean isAuthorizeObsoleteReferentials() { + return importConfiguration.isAuthorizeObsoleteReferentials(); + } + protected String getExistingCruiseId(Cruise importRowCruise) { String result = null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.