This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit aabaad218482d762456aeb508ff60b3aeddc39ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:41:21 2016 +0200 Utilisation nouvelle API des poids --- .../tutti/service/TuttiValidationDataContextSupport.java | 6 ++++-- .../main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 3 +-- .../service/export/toconfirmreport/ToConfirmReportService.java | 5 ++--- .../service/genericformat/consumer/CsvConsumerForCatch.java | 4 ++-- .../service/genericformat/producer/CsvProducerForCatch.java | 5 +++-- .../fr/ifremer/tutti/service/psionimport/PsionImportModel.java | 10 +++++----- .../fr/ifremer/tutti/service/pupitri/PupitriImportResult.java | 2 +- .../fr/ifremer/tutti/service/pupitri/PupitriImportService.java | 4 ++-- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContextSupport.java index a5b2b9f..35eb29a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiValidationDataContextSupport.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.util.Weights; +import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -43,6 +43,8 @@ import java.util.List; /** * Data to shared by validators. * + * <strong>Be ware some of this methods are used in validation files, so do NOT remove them, even if your IDE tells you they are not used, they are!</strong> + * * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ @@ -134,7 +136,7 @@ public abstract class TuttiValidationDataContextSupport { } public final boolean isNotWeightZeroValue(Float weight) { - return Weights.isNotEqualWeight(weight, 0f); + return WeightUnit.KG.isNotNullNorZero(weight); } public final boolean isMutiRegNumberValid(String numberAsString) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java index c4365db..4e906e6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java @@ -31,7 +31,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.util.Weights; import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ValueParserFormatter; @@ -62,7 +61,7 @@ public class TuttiCsvUtil extends Common { // if value is null then use the default value value = defaultValue; } - return Weights.getWeightStringValue(value); + return WeightUnit.KG.renderWeight(value); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java index 401519e..88c5d27 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java @@ -38,7 +38,6 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.catches.WeightComputingService; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.util.Weights; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -182,10 +181,10 @@ public class ToConfirmReportService extends AbstractTuttiService { Species species = batch.getSpecies(); Float sampleCategoryWeightValue = weightUnit.fromEntity(batch.getSampleCategoryWeight()); - String sampleCategoryWeight = Weights.getWeightStringValue(sampleCategoryWeightValue); + String sampleCategoryWeight = weightUnit.renderWeight(sampleCategoryWeightValue); Float weightValue = weightUnit.fromEntity(batch.getWeight()); - String weight = Weights.getWeightStringValue(weightValue); + String weight = weightUnit.renderWeight(weightValue); String comment = batch.getComment(); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index 52a04e3..5edbf93 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -40,7 +40,7 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatImportOperationContex import fr.ifremer.tutti.service.genericformat.csv.CatchModel; import fr.ifremer.tutti.service.genericformat.csv.CatchRow; import fr.ifremer.tutti.service.genericformat.csv.ExportSampleCategory; -import fr.ifremer.tutti.util.Weights; +import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.ImportRow; @@ -100,7 +100,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { } - if (bean.getFrequencyWeight() != null && Weights.isEqualWeight(bean.getFrequencyWeight(), 0f)) { + if (bean.getFrequencyWeight() != null && WeightUnit.KG.isZero(bean.getFrequencyWeight())) { // Cant have a Weight 0.0 addCheckError(row, new FrequencyWeigthNullValueException(operationContext.getFishingOperation())); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index dba9f60..579aba7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -35,6 +35,7 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatExportOperationContex import fr.ifremer.tutti.service.genericformat.csv.CatchModel; import fr.ifremer.tutti.service.genericformat.csv.CatchRow; import fr.ifremer.tutti.service.genericformat.csv.ExportSampleCategory; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Numbers; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; @@ -529,7 +530,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { float currentRate = totalWeight / sampleWeight; - if (Weights.isNotEqualWeight(1.0f, currentRate)) { + if (WeightUnit.KG.isNotEquals(1.0f, currentRate)) { // the only case which can change the final rate finalRaisingFactor *= currentRate; @@ -543,7 +544,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { Float frequencyWeight = row.getFrequencyWeight(); Float computedFrequencyTotalWeight = row.getComputedFrequencyTotalWeight(); float currentRate = computedFrequencyTotalWeight / frequencyWeight; - if (Weights.isNotEqualWeight(1.0f, currentRate)) { + if (WeightUnit.KG.isNotEquals(1.0f, currentRate)) { // the only case which can change the final rate finalRaisingFactor *= currentRate; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java index 2c7ae1d..1c6874d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java @@ -31,7 +31,7 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.util.Weights; +import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -156,7 +156,7 @@ public class PsionImportModel { Multimap<Species, PsionImportBatchModel> store; // --- Guess if sorted or unsorted batch --- // - if (Weights.isGreaterWeight(weight, 0) && Weights.isEqualWeight(weight, sampleWeight)) { + if (WeightUnit.KG.isGreaterThanZero(weight) && WeightUnit.KG.isEquals(weight, sampleWeight)) { store = unsortedBatchsBySpecies; if (log.isInfoEnabled()) { @@ -218,7 +218,7 @@ public class PsionImportModel { Float weight = batchModel.getWeight(); Float sampleWeight = batchModel.getSampleWeight(); - if (Weights.isEqualWeight(weight, 0) && Weights.isGreaterWeight(sampleWeight, 0)) { + if (WeightUnit.KG.isZero(weight) && WeightUnit.KG.isGreaterThanZero(sampleWeight)) { // POID = 0 et TAIL != POID : un seul poids à positionner batchModel.setWeight(sampleWeight); @@ -262,13 +262,13 @@ public class PsionImportModel { Float weight = batchModel.getWeight(); Float sampleWeight = batchModel.getSampleWeight(); - if (Weights.isEqualWeight(weight, 0) && Weights.isGreaterWeight(sampleWeight, 0)) { + if (WeightUnit.KG.isZero(weight) && WeightUnit.KG.isGreaterThanZero(sampleWeight)) { // POID = 0 et TAIL != POID : un seul poids à positionner continue; } - if (Weights.isGreaterWeight(weight, 0) && Weights.isGreaterWeight(weight, sampleWeight)) { + if (WeightUnit.KG.isGreaterThanZero(weight) && WeightUnit.KG.isGreaterThan(weight, sampleWeight)) { // POID > 0 et POID > TAIL : deux poids à positionner speciesBatchesWithDoubleWeight.add(batchModel); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java index e71f539..a302425 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java @@ -364,7 +364,7 @@ public class PupitriImportResult { melagCommentBuilder.append(t("tutti.service.pupitri.import.createMelag.comment.part3", editedMelagTotalWeight, unitLabel)).append("\n"); - if (Weights.isNotEqualWeight(editedMelagTotalWeight, melagTotalWeight.floatValue())) { + if (WeightUnit.KG.isNotEquals(editedMelagTotalWeight, melagTotalWeight.floatValue())) { melagCommentBuilder.append(t("tutti.service.pupitri.import.createMelag.comment.part4", melagTotalWeight.floatValue(), unitLabel, editedMelagTotalWeight, unitLabel)).append("\n"); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index 396af5e..28b0e9f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -286,7 +286,7 @@ public class PupitriImportService extends AbstractTuttiService { PupitriSignContext signContext = aCatch.getSignContext(signs); - if (!Weights.isNullOrZero(signContext.getWeight())) { + if (!WeightUnit.KG.isNullOrZero(signContext.getWeight())) { PupitriImportReportRow reportCatch = PupitriImportReportRow.newRow(code, name, @@ -569,7 +569,7 @@ public class PupitriImportService extends AbstractTuttiService { SpeciesBatch childBatch = createSpeciesBatch( operation, species, - Weights.isNullOrZero(catchWeight) ? null : catchWeight, + WeightUnit.KG.isNullOrZero(catchWeight) ? null : catchWeight, categoryId, splitCqv); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.