branch feature/7488 updated (89f9a9a -> 8740cfe)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git from 89f9a9a Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 new 8740cfe Sérialiser les objets + quelques améliorations de code The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8740cfebce6fb7fd7930bdeb2589bbe18d576b4b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code Summary of changes: .../ConsolidateActivitySeineDataResult.java | 5 +- .../ConsolidateTripSeineDataRequest.java | 8 +++- .../ConsolidateTripSeineDataResult.java | 13 ++--- .../service/ConsolidationDataServiceTopia.java | 56 ++++++++++++---------- 4 files changed, 45 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git commit 8740cfebce6fb7fd7930bdeb2589bbe18d576b4b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code --- .../ConsolidateActivitySeineDataResult.java | 5 +- .../ConsolidateTripSeineDataRequest.java | 8 +++- .../ConsolidateTripSeineDataResult.java | 13 ++--- .../service/ConsolidationDataServiceTopia.java | 56 ++++++++++++---------- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java index 0298edd..8cc778f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.actions.consolidate; +import java.io.Serializable; import java.util.Date; /** @@ -9,7 +10,9 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -public class ConsolidateActivitySeineDataResult { +public class ConsolidateActivitySeineDataResult implements Serializable { + + private static final long serialVersionUID = 1L; protected String schoolTypeChanged; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java index 5205e33..a43081f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java @@ -2,15 +2,19 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import java.io.Serializable; + /** * Pour configurer l'opération de consolidation. * * Created on 28/08/15. * * @author Tony Chemit - chemit@codelutin.com - * @see ConsolidationDataService#consolidateTripSeine(String) + * @see ConsolidationDataService#consolidateTripSeines(ConsolidateTripSeineDataRequest) */ -public class ConsolidateTripSeineDataRequest { +public class ConsolidateTripSeineDataRequest implements Serializable { + + private static final long serialVersionUID = 1L; protected ImmutableSet<String> tripSeineIds; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java index ff9c6a1..7da61b1 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.actions.consolidate; +import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; @@ -9,22 +10,18 @@ import java.util.Set; * Created on 28/08/15. * * @author Tony Chemit - chemit@codelutin.com - * @see ConsolidationDataService#consolidateTripSeine(String) + * @see ConsolidationDataService#consolidateTripSeines(ConsolidateTripSeineDataRequest) */ -public class ConsolidateTripSeineDataResult { +public class ConsolidateTripSeineDataResult implements Serializable{ - protected boolean noActivityFound; + private static final long serialVersionUID = 1L; protected boolean tripWasModified; protected final Set<ConsolidateActivitySeineDataResult> activitySeineDataResults = new LinkedHashSet<>(); public boolean isNoActivityFound() { - return noActivityFound; - } - - public void setNoActivityFound(boolean noActivityFound) { - this.noActivityFound = noActivityFound; + return activitySeineDataResults.isEmpty(); } public boolean isTripWasModified() { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java index 13ef1a9..4f033a4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import fr.ird.observe.entities.LengthWeightComputable; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.entities.constants.seine.SchoolType; @@ -35,7 +34,6 @@ import org.nuiton.util.beans.BeanMonitor; import java.util.Collection; import java.util.Date; -import java.util.Set; /** * Created on 28/08/15. @@ -107,12 +105,14 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushTargetLength() { if (targetLengthMonitor.wasModified()) { TargetLength targetLength = (TargetLength) targetLengthMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(targetLengthMonitor.getModifiedProperties()); - if (modifiedProperties.contains(TargetLength.PROPERTY_LENGTH)) { - consolidateActivitySeineDataResult.registerTargetLengthLengthWasComputed(targetLength.getTopiaId(), targetLength.getLength()); - } - if (modifiedProperties.contains(TargetLength.PROPERTY_WEIGHT)) { - consolidateActivitySeineDataResult.registerTargetLengthWeightWasComputed(targetLength.getTopiaId(), targetLength.getWeight()); + Species species = targetLength.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : targetLengthMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(TargetLength.PROPERTY_LENGTH)) { + consolidateActivitySeineDataResult.registerTargetLengthLengthWasComputed(targetLength.getTopiaId(), targetLength.getLength()); + } else if (modifiedProperty.equals(TargetLength.PROPERTY_WEIGHT)) { + consolidateActivitySeineDataResult.registerTargetLengthWeightWasComputed(targetLength.getTopiaId(), targetLength.getWeight()); + } } } targetLengthMonitor.setBean(null); @@ -121,13 +121,16 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushNonTargetLength() { if (nonTargetLengthMonitor.wasModified()) { NonTargetLength nonTargetLength = (NonTargetLength) nonTargetLengthMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(nonTargetLengthMonitor.getModifiedProperties()); - if (modifiedProperties.contains(NonTargetLength.PROPERTY_LENGTH)) { - consolidateActivitySeineDataResult.registerNonTargetLengthLengthWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getLength()); - } - if (modifiedProperties.contains(NonTargetLength.PROPERTY_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetLengthWeightWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getWeight()); + Species species = nonTargetLength.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : nonTargetLengthMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(NonTargetLength.PROPERTY_LENGTH)) { + consolidateActivitySeineDataResult.registerNonTargetLengthLengthWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getLength()); + } else if (modifiedProperty.equals(NonTargetLength.PROPERTY_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetLengthWeightWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getWeight()); + } } + } nonTargetLengthMonitor.setBean(null); } @@ -139,19 +142,20 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushNonTargetCatch() { if (nonTargetCatchMonitor.wasModified()) { NonTargetCatch nonTargetCatch = (NonTargetCatch) nonTargetCatchMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(nonTargetCatchMonitor.getModifiedProperties()); - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_MEAN_LENGTH)) { - consolidateActivitySeineDataResult.registerNonTargetCatchMeanLengthWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanLength(), nonTargetCatch.getMeanLengthComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_MEAN_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchMeanWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanWeight(), nonTargetCatch.getMeanWeightComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_CATCH_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchCatchWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getCatchWeight(), nonTargetCatch.getCatchWeightComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_TOTAL_COUNT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchTotalCountWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getTotalCount(), nonTargetCatch.getTotalCountComputedSource().name()); + Species species = nonTargetCatch.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : nonTargetCatchMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(NonTargetCatch.PROPERTY_MEAN_LENGTH)) { + consolidateActivitySeineDataResult.registerNonTargetCatchMeanLengthWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanLength(), nonTargetCatch.getMeanLengthComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_MEAN_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchMeanWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanWeight(), nonTargetCatch.getMeanWeightComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_CATCH_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchCatchWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getCatchWeight(), nonTargetCatch.getCatchWeightComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_TOTAL_COUNT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchTotalCountWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getTotalCount(), nonTargetCatch.getTotalCountComputedSource().name()); + } } + } nonTargetCatchMonitor.setBean(null); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm