This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3225ca9b1088e0a526d914ed76b10dbfe5efe31c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:19:29 2016 +0200 Use java 8 --- .../echobase/entities/references/Gears.java | 41 ---------------------- .../contexts/ImportDataContextSupport.java | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java deleted file mode 100644 index 52a60df..0000000 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.ifremer.echobase.entities.references; - -/* - * #%L - * EchoBase :: Domain - * %% - * Copyright (C) 2011 - 2015 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.google.common.base.Function; - -/** - * Created on 1/21/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since XXX - */ -public class Gears { - public static final Function<Gear, String> GEAR_CASINO_GEAR_NAME = new Function<Gear, String>() { - @Override - public String apply(Gear input) { - //FIXME : Remove the dummy test when all gear in db have a casino name - // return StringUtils.isEmpty(casinoGearName) ? input.getName() : casinoGearName; - return input.getCasinoGearName(); - } - }; -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java index ddac448..a24b12e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java @@ -39,7 +39,6 @@ import fr.ifremer.echobase.entities.references.DepthStratums; import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.GearMetadatas; -import fr.ifremer.echobase.entities.references.Gears; import fr.ifremer.echobase.entities.references.OperationMetadata; import fr.ifremer.echobase.entities.references.OperationMetadatas; import fr.ifremer.echobase.entities.references.Port; @@ -223,7 +222,7 @@ public abstract class ImportDataContextSupport<C extends ImportDataConfiguration public final Map<String, Gear> getGearsByCasinoGearName() { if (gearsByCasinoGearName == null) { - gearsByCasinoGearName = persistenceService.getEntitiesMap(Gear.class, Gears.GEAR_CASINO_GEAR_NAME); + gearsByCasinoGearName = persistenceService.getEntitiesMap(Gear.class, Gear::getCasinoGearName); } return gearsByCasinoGearName; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.