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 1358550770aed1c5e1add7ecc855b01092ca8854 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:28:38 2016 +0100 on utilise le code pas le label --- .../services/dto/referential/SizeMeasureTypeHelper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java index d955fee..d31236d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { - public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL","LD1"); - public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("LF", "FL"); + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL", "LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("FL", "LF"); public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() @@ -42,7 +42,7 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { } public static ReferentialReference<SizeMeasureTypeDto> filterForSeine(ReferentialReference<SizeMeasureTypeDto> incoming) { - int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_LABEL); + int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_CODE); String value; if (isLd1(incoming)) { value = "LD1"; @@ -57,24 +57,24 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); } public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); } public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() .filter(SizeMeasureTypeHelper::isLd1) - .findAny().get(); + .findAny().orElse(null); } public static ReferentialReference<SizeMeasureTypeDto> getLf(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() .filter(SizeMeasureTypeHelper::isLf) - .findAny().get(); + .findAny().orElse(null); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.