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 dff04e67512eeace72e35c697df41db387a3cfeb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 8 16:10:52 2015 +0100 revert Speciess modification (see commit 9b885ba813850b9fc816e604210b8ee1ccbf2e5d) --- .../tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../persistence/entities/referential/Speciess.java | 7 +++- .../SpeciesPersistenceServiceReadTest.java | 2 +- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../csv/AbstractTuttiImportExportModel.java | 2 +- .../service/csv/ProgramTechnicalFormatter.java | 23 ------------ .../tutti/service/csv/ProgramTechnicalParser.java | 43 ---------------------- .../tutti/service/csv/SpeciesTechnicalParser.java | 16 +++----- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 2 - .../ui/swing/action/ImportProtocolAction.java | 2 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- ...SpeciesForIndividualObservationBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 2 +- .../content/protocol/EditProtocolUIModel.java | 10 ++--- 15 files changed, 26 insertions(+), 95 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index f45dd85..0a96870 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -817,7 +817,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { // see http://forge.codelutin.com/issues/4154 List<Species> allReferentSpecies = getAllReferentSpecies(); - Map<String, Species> map = Speciess.splitByReferenceTaxonId(allReferentSpecies); + Map<String, Species> map = Speciess.splitByTaxonId(allReferentSpecies); if (!protocol.isSpeciesEmpty()) { Iterator<SpeciesProtocol> iterator = protocol.getSpecies().iterator(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index fddb39f..ab869e1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -106,10 +106,14 @@ public class Speciess extends AbstractSpeciess { } }; - public static Map<String, Species> splitByReferenceTaxonId(Iterable<Species> list) { + public static Map<String, Species> splitByTaxonId(Iterable<Species> list) { return Maps.uniqueIndex(list, GET_REFERECE_TAXON_ID); } + public static Multimap<String, Species> splitByReferenceTaxonId(Iterable<Species> list) { + return Multimaps.index(list, GET_REFERECE_TAXON_ID); + } + public static Multimap<String, Species> splitByRefTaxCode(Iterable<Species> list) { return Multimaps.index(list, GET_REF_TAX_CODE); } @@ -124,5 +128,4 @@ public class Speciess extends AbstractSpeciess { Sets.newHashSet(Lists.transform(list, GET_REFERECE_TAXON_ID)); return result; } - } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java index 1be7bf9..bf2f0e8 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java @@ -57,7 +57,7 @@ public class SpeciesPersistenceServiceReadTest extends ReferentialPersistenceSer TuttiEntities.splitById(result); assertResultList(result, fixtures.refNbReferentSpecies()); - Speciess.splitByReferenceTaxonId(result); + Speciess.splitByTaxonId(result); } @Test diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 5c72706..59e208d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -540,7 +540,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer if (!protocol.isSpeciesEmpty()) { // split by taxonId - Map<String, Species> map = Speciess.splitByReferenceTaxonId(referentSpecies); + Map<String, Species> map = Speciess.splitByTaxonId(referentSpecies); for (SpeciesProtocol protocolSpecy : protocol.getSpecies()) { String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); @@ -574,7 +574,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer if (!protocol.isBenthosEmpty()) { // split by taxonId - Map<String, Species> map = Speciess.splitByReferenceTaxonId(referentSpecies); + Map<String, Species> map = Speciess.splitByTaxonId(referentSpecies); for (SpeciesProtocol protocolSpecy : protocol.getBenthos()) { String taxonId = String.valueOf(protocolSpecy.getSpeciesReferenceTaxonId()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java index 6601161..22a5cd3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java @@ -51,7 +51,7 @@ public abstract class AbstractTuttiImportExportModel<M> extends AbstractImportEx if (species == null) { species = Lists.newArrayList(); } - Map<String, Species> universe = Speciess.splitByReferenceTaxonId(species); + Map<String, Species> universe = Speciess.splitByTaxonId(species); newMandatoryColumn(propertyName, propertyName, new ForeignKeyParserFormatter<>(Species.class, Species.PROPERTY_REFERENCE_TAXON_ID, universe)); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalFormatter.java deleted file mode 100644 index b2fee74..0000000 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalFormatter.java +++ /dev/null @@ -1,23 +0,0 @@ -package fr.ifremer.tutti.service.csv; - -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.Program; -import org.nuiton.csv.ValueFormatter; - -/** - * Created on 2/8/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.13 - */ -public class ProgramTechnicalFormatter implements ValueFormatter<Program> { - - @Override - public String format(Program value) { - String result = ""; - if (value != null) { - result = TuttiEntities.GET_ID.apply(value); - } - return result; - } -} diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalParser.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalParser.java deleted file mode 100644 index b9cbd10..0000000 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/ProgramTechnicalParser.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.ifremer.tutti.service.csv; - -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.service.PersistenceService; -import org.nuiton.csv.ValueParser; - -import java.text.ParseException; -import java.util.List; -import java.util.Map; - -/** - * Created on 2/5/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.13 - */ -public class ProgramTechnicalParser implements ValueParser<Program> { - - private final PersistenceService persistenceService; - - private Map<String, Program> programsById; - - public ProgramTechnicalParser(PersistenceService persistenceService) { - this.persistenceService = persistenceService; - } - - @Override - public Program parse(String value) throws ParseException { - - if (programsById == null) { - List<Program> allProgram = persistenceService.getAllProgram(); - programsById = TuttiEntities.splitById(allProgram); - } - Program program = programsById.get(value); - - if (program == null) { - throw new ParseException("Could not found a program with name " + value, 0); - } - return program; - - } -} diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesTechnicalParser.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesTechnicalParser.java index c1a69c1..ea93f81 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesTechnicalParser.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/SpeciesTechnicalParser.java @@ -1,16 +1,13 @@ package fr.ifremer.tutti.service.csv; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.service.PersistenceService; -import org.apache.commons.collections4.CollectionUtils; import org.nuiton.csv.ValueParser; import java.text.ParseException; -import java.util.Collection; import java.util.List; +import java.util.Map; /** * Created on 2/5/15. @@ -22,7 +19,7 @@ public class SpeciesTechnicalParser implements ValueParser<Species> { private final PersistenceService persistenceService; - private Multimap<String, Species> speciesByReferenceTaxonId; + private Map<String, Species> speciesByReferenceTaxonId; public SpeciesTechnicalParser(PersistenceService persistenceService) { this.persistenceService = persistenceService; @@ -33,14 +30,13 @@ public class SpeciesTechnicalParser implements ValueParser<Species> { if (speciesByReferenceTaxonId == null) { List<Species> gears = persistenceService.getAllReferentSpecies(); - speciesByReferenceTaxonId = Speciess.splitByReferenceTaxonId(gears); + speciesByReferenceTaxonId = Speciess.splitByTaxonId(gears); } - Collection<Species> specieses = speciesByReferenceTaxonId.get(value); + Species species = speciesByReferenceTaxonId.get(value); - if (CollectionUtils.isEmpty(specieses)) { - throw new ParseException("Could not found a species with referenceTaxonId " + value, 0); + if (species == null) { + throw new ParseException("Could not found a referent species with referenceTaxonId " + value, 0); } - Species species = Iterables.get(specieses, 0); return species; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java index d3c219a..de1565f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java @@ -199,8 +199,6 @@ public class TuttiCsvUtil extends Common { public static final ValueFormatter<Program> PROGRAM_FORMATTER = new ProgramFormatter(); - public static final ValueFormatter<Program> PROGRAM_TECHNICAL_FORMATTER = new ProgramTechnicalFormatter(); - public static final ValueFormatter<Gear> GEAR_FORMATTER = new GearFormatter(); public static final ValueFormatter<Gear> GEAR_TECHNICAL_FORMATTER = new GearTechnicalFormatter(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java index d4c8c26..189adc5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java @@ -117,7 +117,7 @@ public class ImportProtocolAction extends AbstractChangeScreenAction { if (doAction) { - Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByReferenceTaxonId( + Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByTaxonId( getDataContext().getReferentSpecies()); // clean species diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java index 48b8e24..8d8cab8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java @@ -82,7 +82,7 @@ public class SelectSpeciesForBenthosBatchAction extends AbstractTuttiAction<Crea if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java index 0ca62ca..e5795d6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java @@ -84,7 +84,7 @@ public class SelectSpeciesForIndividualObservationBatchAction extends AbstractTu if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java index 0d341e3..174b73a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java @@ -82,7 +82,7 @@ public class SelectSpeciesForSpeciesBatchAction extends AbstractTuttiAction<Crea if (!selectedSpecies.isReferenceTaxon()) { String decoratedSynonym = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); List<Species> referents = referentSpecies; - Map<String, Species> referentsById = Speciess.splitByReferenceTaxonId(referents); + Map<String, Species> referentsById = Speciess.splitByTaxonId(referents); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 44e9159..9f4f872 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -185,7 +185,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Speciess.splitByReferenceTaxonId(allSpecies); model.setAllSpeciesByTaxonId(allSpeciesByTaxonId); - Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByReferenceTaxonId( + Map<String, Species> allReferentSpeciesByTaxonId = Speciess.splitByTaxonId( getDataContext().getReferentSpecies()); model.setAllReferentSpeciesByTaxonId(allReferentSpeciesByTaxonId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 0ef2903..11d4055 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -193,11 +193,11 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, this.caracteristicMappingRows = new HashMap<Caracteristic, EditProtocolCaracteristicsRowModel>( Maps.uniqueIndex(caracteristicMappingRows, new Function<EditProtocolCaracteristicsRowModel, Caracteristic>() { - @Override - public Caracteristic apply(EditProtocolCaracteristicsRowModel editProtocolCaracteristicsRowModel) { - return editProtocolCaracteristicsRowModel.getPsfm(); - } - }) + @Override + public Caracteristic apply(EditProtocolCaracteristicsRowModel editProtocolCaracteristicsRowModel) { + return editProtocolCaracteristicsRowModel.getPsfm(); + } + }) ); firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.