This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b1782dbb4283ce9b18e8a3974e2581598856969a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 22 18:13:35 2016 +0100 meilleure remontée de données --- .../main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java | 4 ++-- .../src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java | 4 ++-- .../services/topia/service/data/seine/TripSeineServiceTopia.java | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java index b19940d..f95201c 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java @@ -32,7 +32,7 @@ public class TripLonglineImpl extends TripLonglineAbstract { private static final long serialVersionUID = 1L; - private int activityCount; + private Integer activityCount; @Override public String getObserverLabel() { @@ -51,7 +51,7 @@ public class TripLonglineImpl extends TripLonglineAbstract { @Override public int getActivityCount() { - return activityCount; + return activityCount == null ? sizeActivityLongline() : activityCount; } @Override diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java index d261a6f..9a46055 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java @@ -28,7 +28,7 @@ package fr.ird.observe.entities.seine; public class TripSeineImpl extends TripSeineAbstract { private static final long serialVersionUID = 1L; - private int routeCount; + private Integer routeCount; @Override public String getObserverLabel() { @@ -37,7 +37,7 @@ public class TripSeineImpl extends TripSeineAbstract { @Override public int getRouteCount() { - return routeCount; + return routeCount == null ? sizeRoute() : routeCount; } @Override 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 8ba2d61..e5c5791 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 @@ -77,7 +77,6 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = loadEntities(TripSeine.class); - tripSeines.forEach(t -> t.setRouteCount(t.sizeRoute())); return toDataReferenceSet(TripSeineDto.class, tripSeines); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.