This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 82b701f6b21e574cec0c06bd9e015985b6c7429a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 25 10:33:34 2016 +0100 Suppression d'une api obsolète --- .../topia/entity/BasketEntitiesExtractor.java | 59 ---- .../topia/entity/BranchlineEntitiesExtractor.java | 66 ----- .../services/topia/entity/EntitiesExtractor.java | 76 ----- .../services/topia/entity/EntitiesSetFactory.java | 310 --------------------- .../topia/entity/SectionEntitiesExtractor.java | 47 ---- .../topia/entity/SpeciesListEntitiesExtractor.java | 59 ---- .../entity/SpeciesListOceanEntitiesExtractor.java | 58 ---- .../data}/TripMapDtoFactory.java | 24 +- .../data/longline/TripLonglineServiceTopia.java | 4 +- .../service/data/seine/TripSeineServiceTopia.java | 4 +- 10 files changed, 15 insertions(+), 692 deletions(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java deleted file mode 100644 index 0823988..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BasketEntitiesExtractor.java +++ /dev/null @@ -1,59 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Sets; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; - -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class BasketEntitiesExtractor extends EntitiesExtractor<Basket> { - - protected BasketEntitiesExtractor() { - super(Basket.class, null); - } - - @Override - protected Collection<Basket> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - - SetLongline setLongline = (SetLongline) requestContext.get(Section.PROPERTY_SET_LONGLINE); - - LinkedHashSet<Basket> baskets = Sets.newLinkedHashSet(); - - for (Section section : setLongline.getSection()) { - - baskets.addAll(section.getBasket()); - - } - - return baskets; - } -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java deleted file mode 100644 index 966a5e6..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/BranchlineEntitiesExtractor.java +++ /dev/null @@ -1,66 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Sets; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; - -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Map; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class BranchlineEntitiesExtractor extends EntitiesExtractor<Branchline> { - - protected BranchlineEntitiesExtractor() { - super(Branchline.class, null); - } - - @Override - protected Collection<Branchline> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - - SetLongline setLongline = (SetLongline) requestContext.get(Section.PROPERTY_SET_LONGLINE); - - LinkedHashSet<Branchline> branchlines = Sets.newLinkedHashSet(); - - for (Section section : setLongline.getSection()) { - - for (Basket basket : section.getBasket()) { - - branchlines.addAll(basket.getBranchline()); - - } - - } - - return branchlines; - } - - -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java deleted file mode 100644 index b403b56..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesExtractor.java +++ /dev/null @@ -1,76 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.ObserveEntity; -import org.nuiton.topia.persistence.TopiaDao; - -import java.util.Collection; -import java.util.Map; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * Cette classe permet d'extraire dynamiquement un ensemble d'entitiées de la base de données. - * cet emsenble est definit par un ensemble extrait de la base, definit dans getEntitiesSetBase - * Sur cet ensemble on applique le filtre definit l'attribut optionalFilter - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class EntitiesExtractor<E extends ObserveEntity> { - - /** - * Le type de l'entité dont on cherche des éléments. - */ - protected final Class<E> entityType; - - /** - * Un prédicat de filtrage optionnel. - */ - protected final Predicate<E> optionalFilter; - - protected EntitiesExtractor(Class<E> entityType, Predicate<E> optionalFilter) { - this.entityType = entityType; - this.optionalFilter = optionalFilter; - } - - public Iterable<E> getEntities(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - Collection<E> result = getEntitiesSetBase(persistenceContext, requestContext); - Predicate<E> filter = getFilter(requestContext); - if (filter != null) { - result = result.stream().filter(filter).collect(Collectors.toSet()); - } - return result; - } - - protected Collection<E> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - TopiaDao<E> dao = persistenceContext.getDao(entityType); - return dao.findAll(); - } - - protected Predicate<E> getFilter(Map<String, Object> requestContext) { - return optionalFilter == null ? null : optionalFilter; - } - -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java deleted file mode 100644 index fcac8f2..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/EntitiesSetFactory.java +++ /dev/null @@ -1,310 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.ImmutableMap; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.ObserveEntity; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.Encounter; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; -import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.entities.referentiel.Person; -import fr.ird.observe.entities.referentiel.Persons; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Vessel; -import fr.ird.observe.entities.referentiel.Vessels; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.TargetCatch; -import fr.ird.observe.entities.seine.TargetCatchImpl; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; - -import java.util.Objects; -import java.util.function.Predicate; - -/** - * Une usine de {@link EntitiesExtractor}. - * - * Created on 18/10/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class EntitiesSetFactory { - - protected final ImmutableMap<String, EntitiesExtractor> cache; - - public EntitiesSetFactory(ObserveSpeciesListConfiguration speciesListConfiguration) { - - ImmutableMap.Builder<String, EntitiesExtractor> builder = ImmutableMap.builder(); - - // TripSeine - registerReferentialEntitiesExtractor(builder, - TripSeine.class, - TripSeine.PROPERTY_CAPTAIN, - Person.class, - Persons.CAPTAIN_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripSeine.class, - TripSeine.PROPERTY_OBSERVER, - Person.class, - Persons.OBSERVER_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripSeine.class, - TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, - Person.class, - Persons.DATA_ENTRY_OPERATOR_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripSeine.class, - TripSeine.PROPERTY_VESSEL, - Vessel.class, - Vessels.newVesselSeinePredicate()); - - // TripLongLine - registerReferentialEntitiesExtractor(builder, - TripLongline.class, - TripLongline.PROPERTY_CAPTAIN, - Person.class, - Persons.CAPTAIN_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripLongline.class, - TripLongline.PROPERTY_OBSERVER, - Person.class, - Persons.OBSERVER_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripLongline.class, - TripLongline.PROPERTY_DATA_ENTRY_OPERATOR, - Person.class, - Persons.DATA_ENTRY_OPERATOR_PREDICATE); - registerReferentialEntitiesExtractor(builder, - TripLongline.class, - TripLongline.PROPERTY_VESSEL, - Vessel.class, - Vessels.newVesselLonglinePredicate()); - - // ObjectSchoolEstimate - registerSpeciesListEntitiesExtractor(builder, - ObjectSchoolEstimate.class, - ObjectSchoolEstimate.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListSeineObjectSchoolEstimateId()); - - // ObjectObservedSpecies - registerSpeciesListEntitiesExtractor(builder, - ObjectObservedSpecies.class, - ObjectObservedSpecies.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListSeineObjectObservedSpeciesId()); - - // SchoolEstimate - registerSpeciesListEntitiesExtractor(builder, - SchoolEstimate.class, - SchoolEstimate.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListSeineSchoolEstimateId()); - - // TargetCatch - registerSpeciesListOceanEntitiesExtractor(builder, - TargetCatch.class, - TargetCatchImpl.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListSeineTargetCatchId()); - - // NonTargetCatch - registerSpeciesListEntitiesExtractor(builder, - NonTargetCatch.class, - NonTargetCatch.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListSeineNonTargetCatchId()); - - // Encounter - registerSpeciesListEntitiesExtractor(builder, - Encounter.class, - Encounter.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListLonglineEncounterId()); - - // CatchLongline - registerSpeciesListEntitiesExtractor(builder, - CatchLongline.class, - CatchLongline.PROPERTY_SPECIES_CATCH, - speciesListConfiguration.getSpeciesListLonglineCatchId()); - - registerSpeciesListEntitiesExtractor(builder, - CatchLongline.class, - CatchLongline.PROPERTY_PREDATOR, - speciesListConfiguration.getSpeciesListLonglineDepredatorId()); - - registerSectionEntitiesExtractor(builder, - CatchLongline.class, - CatchLongline.PROPERTY_SECTION); - - registerBasketEntitiesExtractor(builder, - CatchLongline.class, - CatchLongline.PROPERTY_BASKET); - - registerBranchlineEntitiesExtractor(builder, - CatchLongline.class, - CatchLongline.PROPERTY_BRANCHLINE); - - // CatchLongline - registerSpeciesListEntitiesExtractor(builder, - Tdr.class, - Tdr.PROPERTY_SPECIES, - speciesListConfiguration.getSpeciesListLonglineCatchId()); - - registerSectionEntitiesExtractor(builder, - Tdr.class, - Tdr.PROPERTY_SECTION); - - registerBasketEntitiesExtractor(builder, - Tdr.class, - Tdr.PROPERTY_BASKET); - - registerBranchlineEntitiesExtractor(builder, - Tdr.class, - Tdr.PROPERTY_BRANCHLINE); - - - this.cache = builder.build(); - - } - - public <P extends ObserveEntity, C extends ObserveEntity> EntitiesExtractor<C> newEntitiesSet(Class<P> parentType, - Class<C> propertyType, - String propertyName) { - - Objects.requireNonNull(parentType, "Parent type is required"); - Objects.requireNonNull(propertyName, "Property name is required"); - Objects.requireNonNull(propertyType, "Property type is required"); - - String key = buildKey(parentType, propertyName); - EntitiesExtractor<C> entitiesExtractor = cache.get(key); - - if (entitiesExtractor == null) { - - // Pas de filtre spécifique trouvé, on en construit un générique - - if (Entities.isReferentielClass(propertyType)) { - - // On veut tous les référentiels sauf ceux qui sont désactivés - entitiesExtractor = new EntitiesExtractor<>(propertyType, (Predicate) ObserveReferentialEntities.IS_ACTIF_PREDICATE); - - } else { - - // On veut toutes les entités - entitiesExtractor = new EntitiesExtractor<>(propertyType, null); - - } - - } - - return entitiesExtractor; - - } - - protected <P extends ObserveEntity> String buildKey(Class<P> parentType, String propertyName) { - return parentType.getName() + "#" + propertyName; - } - - protected <P extends ObserveEntity, C extends ObserveReferentialEntity> void registerReferentialEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName, - Class<C> propertyType, - Predicate<C> filter) { - - Predicate<C> predicate = (Predicate) ObserveReferentialEntities.IS_ACTIF_PREDICATE; - Predicate<C> newFilter = f -> filter.test(f) && predicate.test(f); - - EntitiesExtractor<C> entitiesExtractor = new EntitiesExtractor<>(propertyType, newFilter); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity> void registerSpeciesListEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName, - String speciesListId) { - - EntitiesExtractor<Species> entitiesExtractor = new SpeciesListEntitiesExtractor(speciesListId); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity> void registerSpeciesListOceanEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName, - String speciesListId) { - - EntitiesExtractor<Species> entitiesExtractor = new SpeciesListOceanEntitiesExtractor(speciesListId); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity> void registerSectionEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName) { - - EntitiesExtractor<Section> entitiesExtractor = new SectionEntitiesExtractor(); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity> void registerBasketEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName) { - - EntitiesExtractor<Basket> entitiesExtractor = new BasketEntitiesExtractor(); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity> void registerBranchlineEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName) { - - EntitiesExtractor<Branchline> entitiesExtractor = new BranchlineEntitiesExtractor(); - registerEntitiesExtractor(builder, parentType, propertyName, entitiesExtractor); - - } - - protected <P extends ObserveEntity, C extends ObserveEntity> void registerEntitiesExtractor( - ImmutableMap.Builder<String, EntitiesExtractor> builder, - Class<P> parentType, - String propertyName, - EntitiesExtractor<C> entitiesExtractor) { - - String key = buildKey(parentType, propertyName); - builder.put(key, entitiesExtractor); - - } - -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java deleted file mode 100644 index 1c5db10..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SectionEntitiesExtractor.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; - -import java.util.Collection; -import java.util.Map; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class SectionEntitiesExtractor extends EntitiesExtractor<Section> { - - protected SectionEntitiesExtractor() { - super(Section.class, null); - } - - @Override - protected Collection<Section> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - SetLongline setLongline = (SetLongline) requestContext.get(Section.PROPERTY_SET_LONGLINE); - - return setLongline.getSection(); - } -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java deleted file mode 100644 index 1ddef0b..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListEntitiesExtractor.java +++ /dev/null @@ -1,59 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.referentiel.ObserveReferentialEntities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.entities.referentiel.SpeciesListTopiaDao; - -import java.util.Collection; -import java.util.Map; -import java.util.function.Predicate; - -/** - * Extraction des list d'espèces definit dans le référentiel "liste d'èspéce" - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class SpeciesListEntitiesExtractor extends EntitiesExtractor<Species> { - - /** - * L'id de la liste d'espèces à utiliser. - */ - protected final String speciesListId; - - public SpeciesListEntitiesExtractor(String speciesListId) { - super(Species.class, (Predicate) ObserveReferentialEntities.IS_ACTIF_PREDICATE); - this.speciesListId = speciesListId; - } - - @Override - protected Collection<Species> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { - SpeciesListTopiaDao speciesListDao = persistenceContext.getSpeciesListDao(); - SpeciesList speciesList = speciesListDao.forTopiaIdEquals(speciesListId).findUnique(); - return speciesList.getSpecies(); - } - -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java b/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java deleted file mode 100644 index 23a8a29..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/SpeciesListOceanEntitiesExtractor.java +++ /dev/null @@ -1,58 +0,0 @@ -package fr.ird.observe.services.topia.entity; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; - -import java.util.Map; -import java.util.function.Predicate; - -/** - * Extraction des list d'espèces definit dans le référentiel "liste d'èspéce" et présent dans un océan - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class SpeciesListOceanEntitiesExtractor extends SpeciesListEntitiesExtractor { - - public SpeciesListOceanEntitiesExtractor(String speciesListId) { - super(speciesListId); - } - - @Override - protected Predicate<Species> getFilter(Map<String, Object> requestContext) { - - Predicate<Species> filter = super.getFilter(requestContext); - - Ocean ocean = (Ocean) requestContext.get(Species.PROPERTY_OCEAN); - - if (ocean != null) { - - filter = filter.and(Species2.newSpeciesByOceanPredicate(ocean)); - - } - - return filter; - } -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java similarity index 75% rename from services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java rename to services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java index 4d9c7bb..ba2cde5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/entity/TripMapDtoFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.entity; +package fr.ird.observe.services.topia.service.data; /*- * #%L @@ -22,8 +22,6 @@ package fr.ird.observe.services.topia.entity; * #L% */ -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; @@ -31,7 +29,7 @@ import fr.ird.observe.services.dto.constants.TripMapPointType; import java.util.LinkedHashSet; import java.util.Set; -import java.util.function.Function; +import java.util.stream.Collectors; /** * Created on 09/01/16. @@ -40,20 +38,20 @@ import java.util.function.Function; */ public class TripMapDtoFactory { - protected static final Function<TripMapPoint, TripMapPointDto> TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION = tripMapPoint -> { + public static TripMapDto of(String tripId, Set<TripMapPoint> points) { + TripMapDto tripMapDto = new TripMapDto(); + tripMapDto.setId(tripId); + LinkedHashSet<TripMapPointDto> pointDtos = points.stream().map(TripMapDtoFactory::of).collect(Collectors.toCollection(LinkedHashSet::new)); + tripMapDto.setPoints(pointDtos); + return tripMapDto; + } + + private static TripMapPointDto of(TripMapPoint tripMapPoint) { TripMapPointDto result = new TripMapPointDto(); result.setLatitude(tripMapPoint.getLatitude()); result.setLongitude(tripMapPoint.getLongitude()); result.setTime(tripMapPoint.getTime()); result.setType(TripMapPointType.valueOf(tripMapPoint.getType().name())); return result; - }; - - public static TripMapDto newTripMapDto(String tripId, Set<TripMapPoint> points) { - TripMapDto tripMapDto = new TripMapDto(); - tripMapDto.setId(tripId); - LinkedHashSet<TripMapPointDto> pointDtos = Sets.newLinkedHashSet(Iterables.transform(points, TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION::apply)); - tripMapDto.setPoints(pointDtos); - return tripMapDto; } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java index 18455ad..09dbd0e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java @@ -48,7 +48,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.topia.entity.TripMapDtoFactory; +import fr.ird.observe.services.topia.service.data.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -118,7 +118,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripLonglineId); - return TripMapDtoFactory.newTripMapDto(tripLonglineId, points); + return TripMapDtoFactory.of(tripLonglineId, points); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java index ebe73f1..8ba2d61 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java @@ -47,7 +47,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; -import fr.ird.observe.services.topia.entity.TripMapDtoFactory; +import fr.ird.observe.services.topia.service.data.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -147,7 +147,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripSeineId); - return TripMapDtoFactory.newTripMapDto(tripSeineId, points); + return TripMapDtoFactory.of(tripSeineId, points); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.