This is an automated email from the git hooks/post-receive script. New commit to branch feature/8302 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 9d494d93f8758b71067dd50d3bc0b34c6e2d08ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:54:28 2016 +0200 On arrête d'utiliser guava en faveur de java 8 --- .../protocol/CaracteristicMappingRows.java | 7 +-- .../entities/protocol/SpeciesProtocols.java | 20 ++++---- .../entities/protocol/TuttiProtocols.java | 58 ++++++++-------------- 3 files changed, 31 insertions(+), 54 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java index 78f6f1d..20523a0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java @@ -29,12 +29,7 @@ import com.google.common.base.Predicate; public class CaracteristicMappingRows extends AbstractCaracteristicMappingRows { - public static final Function<CaracteristicMappingRow, String> GET_PMFM_ID = new Function<CaracteristicMappingRow, String>() { - @Override - public String apply(CaracteristicMappingRow caracteristicMappingRow) { - return caracteristicMappingRow.getPmfmId(); - } - }; + public static final Function<CaracteristicMappingRow, String> GET_PMFM_ID = CaracteristicMappingRow::getPmfmId; public static class TabPredicate implements Predicate<CaracteristicMappingRow> { private final CaracteristicType type; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java index a1ddd0e..04abd54 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java @@ -24,29 +24,29 @@ package fr.ifremer.tutti.persistence.entities.protocol; * #L% */ -import com.google.common.base.Function; -import com.google.common.base.Predicate; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import java.util.List; +import java.util.function.Predicate; public class SpeciesProtocols extends AbstractSpeciesProtocols { - public static Function<SpeciesProtocol, String> GET_SURVEY_CODE = SpeciesProtocol::getSpeciesSurveyCode; + public static Predicate<SpeciesProtocol> speciesProtocolWhoseCategoryIsMandatoryPredicate(Caracteristic caracteristic) { + return new SpeciesProtocolWhoseCategoryIsMandatoryPredicate(caracteristic); + } - public static class SpeciesProtocolWhoseCategoryIsMandatoryPredicate implements Predicate<SpeciesProtocol> { + private static class SpeciesProtocolWhoseCategoryIsMandatoryPredicate implements Predicate<SpeciesProtocol> { - private final Caracteristic caracteristic; + private final Integer caracteristicId; - public SpeciesProtocolWhoseCategoryIsMandatoryPredicate(Caracteristic caracteristic) { - this.caracteristic = caracteristic; + SpeciesProtocolWhoseCategoryIsMandatoryPredicate(Caracteristic caracteristic) { + this.caracteristicId = caracteristic.getIdAsInt(); } @Override - public boolean apply(SpeciesProtocol input) { + public boolean test(SpeciesProtocol input) { List<Integer> mandatorySampleCategoryId = input.getMandatorySampleCategoryId(); - return mandatorySampleCategoryId != null - && mandatorySampleCategoryId.contains(caracteristic.getIdAsInt()); + return mandatorySampleCategoryId != null && mandatorySampleCategoryId.contains(caracteristicId); } } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index 80c3a2e..085f320 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -25,11 +25,9 @@ package fr.ifremer.tutti.persistence.entities.protocol; import com.esotericsoftware.yamlbeans.YamlConfig; import com.esotericsoftware.yamlbeans.YamlReader; import com.esotericsoftware.yamlbeans.YamlWriter; -import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.io.Files; @@ -61,10 +59,10 @@ import org.nuiton.util.beans.BinderFactory; import java.io.BufferedWriter; import java.io.File; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -93,7 +91,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { BufferedWriter fileWriter = null; try { - fileWriter = Files.newWriter(file, Charsets.UTF_8); + fileWriter = Files.newWriter(file, StandardCharsets.UTF_8); YamlWriter writer = new YamlWriter(fileWriter, createConfig()); writer.write(protocol); writer.close(); @@ -109,7 +107,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { TuttiProtocol result; Reader fileReader = null; try { - fileReader = Files.newReader(file, Charsets.UTF_8); + fileReader = Files.newReader(file, StandardCharsets.UTF_8); YamlReader reader = new YamlReader(fileReader, createConfig()); result = reader.read(typeOfTuttiProtocol()); fileReader.close(); @@ -133,7 +131,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { if (!result.isBenthosEmpty()) { for (SpeciesProtocol speciesProtocol : result.getBenthos()) { List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); - List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); + List<Integer> mandatorySampleCategoryIdInteger = new ArrayList<>(); for (Object o : mandatorySampleCategoryId) { mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); } @@ -145,7 +143,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { if (!result.isSpeciesEmpty()) { for (SpeciesProtocol speciesProtocol : result.getSpecies()) { List mandatorySampleCategoryId = speciesProtocol.getMandatorySampleCategoryId(); - List<Integer> mandatorySampleCategoryIdInteger = Lists.newArrayList(); + List<Integer> mandatorySampleCategoryIdInteger = new ArrayList<>(); for (Object o : mandatorySampleCategoryId) { mandatorySampleCategoryIdInteger.add(Integer.valueOf(o.toString())); } @@ -224,7 +222,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { Reader fileReader = null; try { - fileReader = Files.newReader(file, Charsets.UTF_8); + fileReader = Files.newReader(file, StandardCharsets.UTF_8); YamlReader reader = new YamlReader(fileReader, createConfigV1()); TuttiProtocol1 result = reader.read(TuttiProtocolBean1.class); fileReader.close(); @@ -240,7 +238,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { Reader fileReader = null; try { - fileReader = Files.newReader(file, Charsets.UTF_8); + fileReader = Files.newReader(file, StandardCharsets.UTF_8); YamlReader reader = new YamlReader(fileReader, createConfigV2()); TuttiProtocol2 result = reader.read(TuttiProtocolBean2.class); fileReader.close(); @@ -256,7 +254,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { Reader fileReader = null; try { - fileReader = Files.newReader(file, Charsets.UTF_8); + fileReader = Files.newReader(file, StandardCharsets.UTF_8); YamlReader reader = new YamlReader(fileReader, createConfigV3()); TuttiProtocol3 result = reader.read(TuttiProtocolBean3.class); fileReader.close(); @@ -314,7 +312,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { public static String getBadCategoriesMessage(Set<Integer> badCategories, Decorator<Caracteristic> decorator, TuttiPersistence persistenceService) { - List<String> badCategoriesStr = Lists.newArrayList(); + List<String> badCategoriesStr = new ArrayList<>(); for (Integer id : badCategories) { String caracteristicStr; @@ -337,11 +335,11 @@ public class TuttiProtocols extends AbstractTuttiProtocols { Binder<TuttiProtocol1, TuttiProtocol2> binder = BinderFactory.newBinder(TuttiProtocol1.class, TuttiProtocol2.class); binder.copy(tuttiProtocol1, result); if (!tuttiProtocol1.isSpeciesEmpty()) { - result.setSpecies(Lists.<SpeciesProtocol>newArrayList()); + result.setSpecies(new ArrayList<>()); Binder<SpeciesProtocol1, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol1.class, SpeciesProtocol.class); for (SpeciesProtocol1 speciesProtocol1 : tuttiProtocol1.getSpecies()) { SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); - row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + row.setMandatorySampleCategoryId(new ArrayList<>()); binderSpecies.copy(speciesProtocol1, row); if (speciesProtocol1.isAgeEnabled()) { row.addMandatorySampleCategoryId(PmfmId.AGE.getValue()); @@ -359,11 +357,11 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } } if (!tuttiProtocol1.isBenthosEmpty()) { - result.setBenthos(Lists.<SpeciesProtocol>newArrayList()); + result.setBenthos(new ArrayList<>()); Binder<SpeciesProtocol1, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol1.class, SpeciesProtocol.class); for (SpeciesProtocol1 speciesProtocol1 : tuttiProtocol1.getBenthos()) { SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); - row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + row.setMandatorySampleCategoryId(new ArrayList<>()); binderSpecies.copy(speciesProtocol1, row); if (speciesProtocol1.isAgeEnabled()) { row.addMandatorySampleCategoryId(PmfmId.AGE.getValue()); @@ -414,21 +412,21 @@ public class TuttiProtocols extends AbstractTuttiProtocols { binder.copy(tuttiProtocol3, result); if (!tuttiProtocol3.isSpeciesEmpty()) { - result.setSpecies(Lists.<SpeciesProtocol>newArrayList()); + result.setSpecies(new ArrayList<>()); Binder<SpeciesProtocol3, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol3.class, SpeciesProtocol.class); for (SpeciesProtocol3 speciesProtocol3 : tuttiProtocol3.getSpecies()) { SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); - row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + row.setMandatorySampleCategoryId(new ArrayList<>()); binderSpecies.copy(speciesProtocol3, row); result.addSpecies(row); } } if (!tuttiProtocol3.isBenthosEmpty()) { - result.setBenthos(Lists.<SpeciesProtocol>newArrayList()); + result.setBenthos(new ArrayList<>()); Binder<SpeciesProtocol3, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol3.class, SpeciesProtocol.class); for (SpeciesProtocol3 speciesProtocol3 : tuttiProtocol3.getBenthos()) { SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); - row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + row.setMandatorySampleCategoryId(new ArrayList<>()); binderSpecies.copy(speciesProtocol3, row); result.addBenthos(row); } @@ -710,7 +708,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { public static String getBadSpeciesMessage(Map<Integer, String> speciesProtocolNotFound) { - List<String> badCategoriesStr = Lists.newArrayList(); + List<String> badCategoriesStr = new ArrayList<>(); for (Map.Entry<Integer, String> id : speciesProtocolNotFound.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } @@ -720,7 +718,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { public static String getBadBenthosMessage(Map<Integer, String> benthosProtocolNotFound) { - List<String> badCategoriesStr = Lists.newArrayList(); + List<String> badCategoriesStr = new ArrayList<>(); for (Map.Entry<Integer, String> id : benthosProtocolNotFound.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } @@ -728,25 +726,9 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } - public static Collection<String> getSurveyCodeWhoseCategoryIsMandatory(TuttiProtocol protocol, - final Caracteristic caracteristic) { - - Preconditions.checkNotNull(caracteristic); - - Collection<String> surveyCodes = new HashSet<>(); - - if (protocol != null) { - Collection<SpeciesProtocol> speciesProtocols = Collections2.filter(protocol.getSpecies(), - new SpeciesProtocols.SpeciesProtocolWhoseCategoryIsMandatoryPredicate(caracteristic)); - - surveyCodes.addAll(Collections2.transform(speciesProtocols, SpeciesProtocols.GET_SURVEY_CODE)); - } - - return surveyCodes; - } - public static boolean matchProgramId(TuttiProtocol protocol, String programId) { Preconditions.checkNotNull(protocol, "Protocol can't be null."); return Objects.equals(programId, protocol.getProgramId()); } + } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.