Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3655d085 by tchemit at 2019-01-02T14:37:30Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - 2 changed files: - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/java/fr/ird/observe/dto/data/seine/TripSeineHelper.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java ===================================== @@ -22,19 +22,18 @@ package fr.ird.observe.dto.data.longline; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.stream.Collectors; public class TripLonglineHelper extends GeneratedTripLonglineHelper { public static List<TripLonglineReference> sort(List<TripLonglineReference> data) { - Map<Object, TripLonglineReference> map = new TreeMap<>(); - for (TripLonglineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripLonglineReference::getStartDate) + .thenComparing(TripLonglineReference::getEndDate) + .thenComparing(TripLonglineReference::getVesselLabel)) + .collect(Collectors.toList()); } - } ===================================== dto/src/main/java/fr/ird/observe/dto/data/seine/TripSeineHelper.java ===================================== @@ -22,18 +22,18 @@ package fr.ird.observe.dto.data.seine; * #L% */ -import java.util.ArrayList; +import java.util.Comparator; import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.stream.Collectors; public class TripSeineHelper extends GeneratedTripSeineHelper { public static List<TripSeineReference> sort(List<TripSeineReference> data) { - Map<Object, TripSeineReference> map = new TreeMap<>(); - for (TripSeineReference datum : data) { - map.put(datum.getStartDate(), datum); - } - return new ArrayList<>(map.values()); + return data + .stream() + .sorted(Comparator.comparing(TripSeineReference::getStartDate) + .thenComparing(TripSeineReference::getEndDate) + .thenComparing(TripSeineReference::getVesselLabel)) + .collect(Collectors.toList()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3655d08559f1fdb6b84d102b1bf4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3655d08559f1fdb6b84d102b1bf4... You're receiving this email because of your account on gitlab.com.