This is an automated email from the git hooks/post-receive script. New commit to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 347a4faabe72a31bde5fa33b67f2b7582036d6a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 03:15:53 2016 +0200 Ne pas utiliser d'optional à tout bout de champ zone --- .../ifremer/tutti/service/PersistenceService.java | 2 +- .../service/sampling/CruiseSamplingCache.java | 61 +++++++++++----------- .../sampling/CruiseSamplingCacheLoader.java | 5 +- .../tutti/service/sampling/SamplingEvent.java | 7 ++- .../frequency/IndividualObservationUICache.java | 4 +- 5 files changed, 38 insertions(+), 41 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 6616593..1aedc60 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -1698,7 +1698,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer FishingOperation fishingOperation = context.getDataContext().getFishingOperation(); Integer fishingOperationId = fishingOperation.getIdAsInt(); - Optional<Zone> optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation); + Zone optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation).orElse(null); Set<Integer> batchIds = new LinkedHashSet<>(); if (addBatchId) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index ba219d5..86fa287 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -188,7 +188,7 @@ public class CruiseSamplingCache implements Closeable { * @param individualObservationBatch l'observation individuelle à ajouter au cache */ public void addIndividualObservation(int fishingOperationId, - Optional<Zone> optionalZone, + Zone optionalZone, IndividualObservationBatch individualObservationBatch) { Objects.requireNonNull(fishingOperationId); @@ -245,7 +245,7 @@ public class CruiseSamplingCache implements Closeable { Optional<Zone> optionalZone = tryFindZone(fishingOperation); - addIndividualObservation(fishingOperation.getIdAsInt(), optionalZone, species, gender, maturity, lengthStep); + addIndividualObservation(fishingOperation.getIdAsInt(), optionalZone.orElse(null), species, gender, maturity, lengthStep); } @@ -253,14 +253,14 @@ public class CruiseSamplingCache implements Closeable { * Ajout d'une observation dans le cache. * * @param fishingOperationId l'identifiant de l'opération de pêche concernée - * @param optionalZone la zone (facultative) de l'opération de pêche concernée + * @param zone la zone (facultative) de l'opération de pêche concernée * @param species l'espèces concernée * @param gender le sexe de l'échantillon (peut-être null) * @param maturity la maturité de l'échantillon (peut-être null) * @param lengthStep la classe de taille de l'échantillon (en mm) */ public void addIndividualObservation(int fishingOperationId, - Optional<Zone> optionalZone, + Zone zone, Species species, CaracteristicQualitativeValue gender, Boolean maturity, @@ -300,8 +300,8 @@ public class CruiseSamplingCache implements Closeable { int zoneValue = 0; int zoneSamplingNb = 0; - if (optionalZone.isPresent()) { - String zoneKey = CruiseSamplingInternalCache.addPrefixKey(optionalZone.get().getId(), samplingKey); + if (zone != null) { + String zoneKey = CruiseSamplingInternalCache.addPrefixKey(zone.getId(), samplingKey); zoneValue = zoneCache.incrementObservationNb(zoneKey); zoneSamplingNb = zoneCache.getSamplingNb(zoneKey); } @@ -314,7 +314,7 @@ public class CruiseSamplingCache implements Closeable { log.info("add Individual Observation " + samplingKey + " => op " + operationValue + " / zone " + zoneValue + " / cruise " + totalValue); } - SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); + SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, zone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); if (!isLoading() && (totalValue == 1 || samplingInterval == 1 || totalValue % samplingInterval == 1)) { if (log.isInfoEnabled()) { @@ -350,14 +350,14 @@ public class CruiseSamplingCache implements Closeable { Optional<Zone> optionalZone = tryFindZone(fishingOperation); - addSampling(fishingOperation.getIdAsInt(), optionalZone, species, gender, maturity, lengthStep, samplingCode); + addSampling(fishingOperation.getIdAsInt(), optionalZone.orElse(null), species, gender, maturity, lengthStep, samplingCode); } /** * Ajout d'un prélèvement dans le cache. * * @param fishingOperationId l'identifiant de l'opération de pêche concernée - * @param optionalZone la zone (facultative) de l'opération de pêche concernée + * @param zone la zone (facultative) de l'opération de pêche concernée * @param species l'espèces concernée * @param gender le sexe de l'échantillon (peut-être null) * @param maturity la maturité de l'échantillon (peut-être null) @@ -365,7 +365,7 @@ public class CruiseSamplingCache implements Closeable { * @param samplingCode le code de prélèvement ajouté */ public void addSampling(int fishingOperationId, - Optional<Zone> optionalZone, + Zone zone, Species species, CaracteristicQualitativeValue gender, Boolean maturity, @@ -385,8 +385,8 @@ public class CruiseSamplingCache implements Closeable { int totalSamplingNb = totalCruiseCache.incrementSamplingNb(samplingKey); int zoneSamplingNb = 0; - if (optionalZone.isPresent()) { - String zoneKey = CruiseSamplingInternalCache.addPrefixKey(optionalZone.get().getId(), samplingKey); + if (zone != null) { + String zoneKey = CruiseSamplingInternalCache.addPrefixKey(zone.getId(), samplingKey); zoneSamplingNb = zoneCache.incrementSamplingNb(zoneKey); } String operationKey = CruiseSamplingInternalCache.addPrefixKey(fishingOperationId, samplingKey); @@ -398,7 +398,7 @@ public class CruiseSamplingCache implements Closeable { } if (cpsDefinitionOpt.isPresent()) { - SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); + SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), zone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); fireSummaryUpdated(event); } @@ -409,15 +409,15 @@ public class CruiseSamplingCache implements Closeable { * Suppression d'un échantillon du cache. * * @param fishingOperationId l'identifiant de l'opération de pêche concernée - * @param optionalZone la zone (facultative) de l'opération de pêche concernée + * @param zone la zone (facultative) de l'opération de pêche concernée * @param individualObservationBatches les observations individuelles à supprimer du cache */ public void removeIndividualObservations(int fishingOperationId, - Optional<Zone> optionalZone, + Zone zone, Collection<IndividualObservationBatch> individualObservationBatches) { Objects.requireNonNull(fishingOperationId); - Objects.requireNonNull(optionalZone); + Objects.requireNonNull(zone); Objects.requireNonNull(individualObservationBatches); individualObservationBatches.forEach(individualObservationBatch -> { @@ -436,11 +436,11 @@ public class CruiseSamplingCache implements Closeable { String samplingCode = individualObservationBatch.getSamplingCode(); if (samplingCode != null) { - removeSampling(fishingOperationId, optionalZone, species, gender, maturity, lengthStepInMm, samplingCode); + removeSampling(fishingOperationId, zone, species, gender, maturity, lengthStepInMm, samplingCode); } - removeIndividualObservation(fishingOperationId, optionalZone, species, gender, maturity, lengthStepInMm); + removeIndividualObservation(fishingOperationId, zone, species, gender, maturity, lengthStepInMm); }); @@ -466,7 +466,7 @@ public class CruiseSamplingCache implements Closeable { Optional<Zone> optionalZone = tryFindZone(fishingOperation); - removeIndividualObservation(fishingOperation.getIdAsInt(), optionalZone, species, gender, maturity, lengthStep); + removeIndividualObservation(fishingOperation.getIdAsInt(), optionalZone.orElse(null), species, gender, maturity, lengthStep); } @@ -474,21 +474,20 @@ public class CruiseSamplingCache implements Closeable { * Suppression d'un échantillon du cache. * * @param fishingOperationId l'identifiant de l'opération de pêche concernée - * @param optionalZone la zone (facultative) de l'opération de pêche concernée + * @param zone la zone (facultative) de l'opération de pêche concernée * @param species l'espèces concernée * @param gender le sexe de l'échantillon (peut-être null) * @param maturity la maturité de l'échantillon (peut-être null) * @param lengthStep la classe de taille de l'échantillon (en mm) */ public void removeIndividualObservation(int fishingOperationId, - Optional<Zone> optionalZone, + Zone zone, Species species, CaracteristicQualitativeValue gender, Boolean maturity, int lengthStep) { Objects.requireNonNull(fishingOperationId); - Objects.requireNonNull(optionalZone); Objects.requireNonNull(species); Optional<CalcifiedPiecesSamplingDefinition> cpsDefinitionOpt = getCalcifiedPiecesSamplingDefinition(species, maturity, lengthStep); @@ -515,8 +514,8 @@ public class CruiseSamplingCache implements Closeable { int totalValue = totalCruiseCache.decrementObservationNb(samplingKey); int zoneValue = 0; - if (optionalZone.isPresent()) { - String zoneKey = CruiseSamplingInternalCache.addPrefixKey(optionalZone.get().getId(), samplingKey); + if (zone != null) { + String zoneKey = CruiseSamplingInternalCache.addPrefixKey(zone.getId(), samplingKey); zoneValue = zoneCache.decrementObservationNb(zoneKey); } String operationKey = CruiseSamplingInternalCache.addPrefixKey(fishingOperationId, samplingKey); @@ -553,14 +552,14 @@ public class CruiseSamplingCache implements Closeable { Optional<Zone> optionalZone = tryFindZone(fishingOperation); - removeSampling(fishingOperation.getIdAsInt(), optionalZone, species, gender, maturity, lengthStep, samplingCode); + removeSampling(fishingOperation.getIdAsInt(), optionalZone.orElse(null), species, gender, maturity, lengthStep, samplingCode); } /** * Suppression d'un prélèvement dans le cache. * * @param fishingOperationId l'identifiant de l'opération de pêche concernée - * @param optionalZone la zone (facultative) de l'opération de pêche concernée + * @param zone la zone (facultative) de l'opération de pêche concernée * @param species l'espèces concernée * @param gender le sexe de l'échantillon (peut-être null) * @param maturity la maturité de l'échantillon (peut-être null) @@ -568,7 +567,7 @@ public class CruiseSamplingCache implements Closeable { * @param samplingCode le code de prélèvement supprimé */ public void removeSampling(int fishingOperationId, - Optional<Zone> optionalZone, + Zone zone, Species species, CaracteristicQualitativeValue gender, Boolean maturity, @@ -588,8 +587,8 @@ public class CruiseSamplingCache implements Closeable { int totalSamplingNb = totalCruiseCache.decrementSamplingNb(samplingKey); int zoneSamplingNb = 0; - if (optionalZone.isPresent()) { - String zoneKey = CruiseSamplingInternalCache.addPrefixKey(optionalZone.get().getId(), samplingKey); + if (zone != null) { + String zoneKey = CruiseSamplingInternalCache.addPrefixKey(zone.getId(), samplingKey); zoneSamplingNb = zoneCache.decrementSamplingNb(zoneKey); } String operationKey = CruiseSamplingInternalCache.addPrefixKey(fishingOperationId, samplingKey); @@ -602,7 +601,7 @@ public class CruiseSamplingCache implements Closeable { if (cpsDefinitionOpt.isPresent()) { - SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); + SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinitionOpt.get(), zone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); fireSummaryUpdated(event); } @@ -710,7 +709,7 @@ public class CruiseSamplingCache implements Closeable { log.info("add Individual Observation " + samplingKey + " => op " + operationValue + " / zone " + zoneValue + " / cruise " + totalValue); } - event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); + event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, optionalZone.orElse(null), totalSamplingNb, zoneSamplingNb, operationSamplingNb); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCacheLoader.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCacheLoader.java index 6406a1a..c9a702e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCacheLoader.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCacheLoader.java @@ -38,7 +38,6 @@ import org.nuiton.decorator.Decorator; import java.util.Collection; import java.util.List; -import java.util.Optional; import static org.nuiton.i18n.I18n.t; @@ -93,7 +92,7 @@ public class CruiseSamplingCacheLoader { List<IndividualObservationBatch> allIndividualObservationBatchsForFishingOperation = persistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); - Optional<Zone> optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation); + Zone optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation).orElse(null); allIndividualObservationBatchsForFishingOperation.stream().filter(obs -> obs.getSize() != null).forEach( individualObservationBatch -> cruiseSamplingCache.addIndividualObservation(fishingOperationId, optionalZone, individualObservationBatch)); @@ -122,7 +121,7 @@ public class CruiseSamplingCacheLoader { Integer fishingOperationId = fishingOperation.getIdAsInt(); - Optional<Zone> optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation); + Zone optionalZone = cruiseSamplingCache.tryFindZone(fishingOperation).orElse(null); if (log.isInfoEnabled()) { log.info("Loading cruise sampling cache for fishing operation: " + fishingOperationId + " - " + cruiseSamplingCache); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java index bc4e570..79f204c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.Zone; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import java.util.EventObject; -import java.util.Optional; /** * @author Kevin Morin (Code Lutin) @@ -45,7 +44,7 @@ public class SamplingEvent extends EventObject { protected final CalcifiedPiecesSamplingDefinition cpsDef; - protected final Optional<Zone> zone; + protected final Zone zone; protected final int nbSamplingForCruise; @@ -54,7 +53,7 @@ public class SamplingEvent extends EventObject { protected final int nbSamplingForOperation; public SamplingEvent(CruiseSamplingCache source, int lengthStep, CaracteristicQualitativeValue gender, Boolean maturity, - CalcifiedPiecesSamplingDefinition cpsDef, Optional<Zone> zone, int nbSamplingForCruise, int nbSamplingForZone, int nbSamplingForOperation) { + CalcifiedPiecesSamplingDefinition cpsDef, Zone zone, int nbSamplingForCruise, int nbSamplingForZone, int nbSamplingForOperation) { super(source); this.lengthStep = lengthStep; this.gender = gender; @@ -82,7 +81,7 @@ public class SamplingEvent extends EventObject { return cpsDef; } - public Optional<Zone> getZone() { + public Zone getZone() { return zone; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java index d05bd2e..b1502cf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java @@ -507,9 +507,9 @@ public class IndividualObservationUICache implements Closeable { key += " " + t("tutti.editSpeciesFrequencies.samplingNeeded.immature"); } } - if (event.getZone().isPresent()) { + if (event.getZone() != null) { Decorator<Zone> zoneDecorator = ui.getHandler().getDecorator(Zone.class, null); - String zone = zoneDecorator.toString(event.getZone().get()); + String zone = zoneDecorator.toString(event.getZone()); summary = t("tutti.editSpeciesFrequencies.samplingNeeded.summary", key, nbForOperationLabel, zone, nbForZoneLabel, nbForCruiseLabel); } else { summary = t("tutti.editSpeciesFrequencies.samplingNeeded.summary.noZone", key, nbForOperationLabel, nbForZoneLabel, nbForCruiseLabel); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.