[Tutti-commits] 01/01: optimize imports

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8e7c2bf263be924782b51efab36cbb8f55cf85bd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 13:01:42 2015 +0100 optimize imports --- .../tutti/service/AbstractTuttiService.java | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 5 ++-- .../ifremer/tutti/service/PdfGeneratorService.java | 2 -- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 7 ++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- .../tutti/service/bigfin/BigfinDataRow.java | 17 ++++++++++- .../tutti/service/bigfin/BigfinDataRowModel.java | 34 ++++++---------------- .../tutti/service/bigfin/BigfinImportResult.java | 2 -- .../tutti/service/bigfin/BigfinImportService.java | 33 ++++++++++++--------- .../fr/ifremer/tutti/service/bigfin/Signs.java | 13 ++++----- .../service/catches/WeightCleaningService.java | 2 +- .../service/catches/WeightComputingService.java | 4 +-- .../catches/multipost/FishingOperationRow.java | 2 -- .../multipost/FishingOperationRowModel.java | 2 -- .../service/export/generic/CatchExportRow.java | 1 - .../tutti/service/protocol/CaracteristicRow.java | 2 +- .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 29 +++++++++--------- .../service/psionimport/PsionImportModel.java | 2 +- .../service/psionimport/PsionImportService.java | 1 - .../tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../pupitri/report/PupitriImportReportRow.java | 4 +-- .../referential/ReferentialImportResult.java | 3 +- .../referential/ReferentialImportService.java | 12 -------- .../tutti/service/report/ReportService.java | 2 +- 25 files changed, 85 insertions(+), 102 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java index b51e0a1..de0e9b4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.service; * #L% */ -import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.ZipUtil; import java.io.File; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java index fa07772..1c3f83f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java @@ -45,8 +45,8 @@ import org.nuiton.decorator.DecoratorProvider; import java.io.File; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Tutti decorator service. @@ -63,6 +63,7 @@ public class DecoratorService extends AbstractTuttiService { public static final String CARACTERISTIC_PARAMETER_ONLY = "parameterOnly"; public static final String WITH_SURVEY_CODE = "withSurveyCode"; + public static final String FROM_PROTOCOL = "fromProtocol"; public static final String GEAR_WITH_RANK_ORDER = "gearWithrankOrder"; @@ -244,7 +245,7 @@ public class DecoratorService extends AbstractTuttiService { // try with refTaxCode result = bean.getRefTaxCode(); - if (result ==null) { + if (result == null) { result = t("tutti.propety.no.species.speciesCode"); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java index 67e6207..9881944 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java @@ -24,14 +24,12 @@ package fr.ifremer.tutti.service; * #L% */ -import com.itextpdf.text.PageSize; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; import freemarker.template.Template; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.eclipse.birt.report.engine.emitter.excel.layout.Page; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.xhtmlrenderer.pdf.ITextRenderer; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java index d36a45b..d93c9d1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java @@ -26,7 +26,6 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -36,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.NestedNullException; import org.apache.commons.beanutils.PropertyUtils; @@ -532,8 +532,8 @@ public class TuttiCsvUtil extends Common { protected final Map<String, E> universe; public ForeignKeyListValue(Class<E> entityType, - String propertyName, - Map<String, E> universe) { + String propertyName, + Map<String, E> universe) { this.entityType = entityType; this.propertyName = propertyName; this.universe = universe; @@ -929,7 +929,6 @@ public class TuttiCsvUtil extends Common { } /** - * * @param <M> */ public static abstract class ImportModelWithHeader<M> extends AbstractTuttiImportModel<M> { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index 4d5ef04..5f96e87 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiConfiguration; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -39,6 +38,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java index 2d94226..a6cfed0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.bigfin; * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import java.io.Serializable; @@ -37,23 +36,39 @@ import java.util.Date; public class BigfinDataRow implements Serializable { public static final String PROPERTY_RECORD_ID = "recordId"; + public static final String PROPERTY_LENGTH = "length"; + public static final String PROPERTY_WEIGHT = "weight"; + public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_STATION = "station"; + public static final String PROPERTY_DT = "dt"; + public static final String PROPERTY_SZ_CLASS = "szClass"; + public static final String PROPERTY_GENDER = "gender"; + public static final String PROPERTY_VRAC_HORS_VRAC = "vracHorsVrac"; protected String recordId; + protected float length; + protected Float weight; + protected Species species; + protected String station; + protected Date dt; + protected Signs szClass; + protected Signs gender; + protected Signs vracHorsVrac; public String getRecordId() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java index d3527a4..4f2b8c1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java @@ -24,33 +24,17 @@ package fr.ifremer.tutti.service.bigfin; * #L% */ -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.Common; -import org.nuiton.csv.ImportRuntimeException; import org.nuiton.csv.ValueParser; import java.text.ParseException; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; /** * @author Kevin Morin (Code Lutin) @@ -119,15 +103,15 @@ public class BigfinDataRowModel extends TuttiCsvUtil.AbstractTuttiImportModel<Bi newMandatoryColumn("gender", BigfinDataRow.PROPERTY_GENDER, new ValueParser<Signs>() { - @Override - public Signs parse(String value) throws ParseException { - Signs result = Signs.getSign(value.toUpperCase(), PmfmId.SEX.getValue()); - if (result == null) { - throw new ParseException("Could not parse Sign value: " + value, 0); - } - return result; - } - }); + @Override + public Signs parse(String value) throws ParseException { + Signs result = Signs.getSign(value.toUpperCase(), PmfmId.SEX.getValue()); + if (result == null) { + throw new ParseException("Could not parse Sign value: " + value, 0); + } + return result; + } + }); newMandatoryColumn("text", BigfinDataRow.PROPERTY_VRAC_HORS_VRAC, new ValueParser<Signs>() { @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportResult.java index 7f4d1da..5761081 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportResult.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.bigfin; * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.Species; - import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 6921500..eb2e061 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -90,6 +90,7 @@ public class BigfinImportService extends AbstractTuttiService { protected PersistenceService persistenceService; protected Caracteristic sizeCaracteristic; + protected Caracteristic genderCaracteristic; protected Map<Signs, CaracteristicQualitativeValue> signsToCaracteristicValue; @@ -190,7 +191,7 @@ public class BigfinImportService extends AbstractTuttiService { String station = bean.getStation(); Date dt = bean.getDt(); if (station != null && station.equals(operation.getStationNumber()) - && dt != null && DateUtils.isSameDay(dt, operation.getGearShootingStartDate())) { + && dt != null && DateUtils.isSameDay(dt, operation.getGearShootingStartDate())) { if (bean.getSzClass() == null) { String error = t("tutti.service.bigfinImport.error.szClass.unknwon", bean.getRecordId()); @@ -288,7 +289,7 @@ public class BigfinImportService extends AbstractTuttiService { List<Function<BigfinDataRow, Signs>> functions = new ArrayList<>(); // put the size and order in the right order - for (Integer categoryId: samplingOrder) { + for (Integer categoryId : samplingOrder) { if (PmfmId.SIZE_CATEGORY.getValue().equals(categoryId)) { pmfmIds.add(categoryId); functions.add(new Function<BigfinDataRow, Signs>() { @@ -312,7 +313,7 @@ public class BigfinImportService extends AbstractTuttiService { } List<Category> categories = new ArrayList<>(); - for (int i = 0 ; i < pmfmIds.size() ; i++) { + for (int i = 0; i < pmfmIds.size(); i++) { Category category = new Category(pmfmIds.get(i), i < functions.size() ? functions.get(i) : null); categories.add(category); } @@ -356,17 +357,17 @@ public class BigfinImportService extends AbstractTuttiService { /** * Go deeper in the batches until it finds the last of gender or size class, then add the frequencies * - * @param commonParameter The parameter containing the parameters which do not change while browsing - * @param parentBatch The parent batch (null if root) - * @param depth The depth in the batch children + * @param commonParameter The parameter containing the parameters which do not change while browsing + * @param parentBatch The parent batch (null if root) + * @param depth The depth in the batch children * @param batchesByCaracteristic a map containing the batches by caracteristic value - * @param rowsByCaracteristic a multimap containing the rows to import by caracteristic value + * @param rowsByCaracteristic a multimap containing the rows to import by caracteristic value */ protected void browseBatchesToAddFrequencies(BrowseBatchesParameter commonParameter, - SpeciesBatch parentBatch, - int depth, - Map<Serializable, SpeciesBatch> batchesByCaracteristic, - Multimap<Signs, BigfinDataRow> rowsByCaracteristic) { + SpeciesBatch parentBatch, + int depth, + Map<Serializable, SpeciesBatch> batchesByCaracteristic, + Multimap<Signs, BigfinDataRow> rowsByCaracteristic) { Category category = commonParameter.getCategories().get(depth++); @@ -524,7 +525,7 @@ public class BigfinImportService extends AbstractTuttiService { weightsByLengthStep.put(lengthStep, weight); } - List<SpeciesBatchFrequency> frequencies = new ArrayList<>(); + List<SpeciesBatchFrequency> frequencies = new ArrayList<>(); for (Float lengthStep : weightsByLengthStep.keySet()) { SpeciesBatchFrequency frequency = SpeciesBatchFrequencys.newSpeciesBatchFrequency(); frequencies.add(frequency); @@ -568,6 +569,7 @@ public class BigfinImportService extends AbstractTuttiService { private class Category { private Integer pmfmId; + /** function to get the value of the caracteristic we want to group the batches by (eg size or gender) */ private Function<BigfinDataRow, Signs> categoryValueGetter; @@ -592,19 +594,24 @@ public class BigfinImportService extends AbstractTuttiService { private class BrowseBatchesParameter { /** the current fishing operation */ private FishingOperation operation; + /** the current species */ private Species species; + /** the lengthstep caracteristic found in the protocol */ private Caracteristic lengthStepPmfm; + /** the ordered categories */ private List<Category> categories; + /** the result of the import (to add the errors) */ private BigfinImportResult result; + /** label for the species in the errors */ private String speciesLabel; public BrowseBatchesParameter(FishingOperation operation, Species species, Caracteristic lengthStepPmfm, - List<Category> categories, BigfinImportResult result) { + List<Category> categories, BigfinImportResult result) { this.operation = operation; this.species = species; this.lengthStepPmfm = lengthStepPmfm; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java index 0e0cec8..babbe08 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java @@ -23,9 +23,7 @@ package fr.ifremer.tutti.service.bigfin; */ import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId2; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; @@ -90,7 +88,7 @@ public enum Signs { } }, -// classe de taille, 1 = petit ; 2 = gros ; 0 = pas de classe de taille (saisie libre donc risque fort de mauvaise saisie) + // classe de taille, 1 = petit ; 2 = gros ; 0 = pas de classe de taille (saisie libre donc risque fort de mauvaise saisie) NOT_SIZED("0") { @Override public Integer getCategory() { @@ -120,7 +118,7 @@ public enum Signs { } @Override - public boolean isNullEquivalent() { + public boolean isNullEquivalent() { return false; } }, @@ -136,7 +134,7 @@ public enum Signs { } @Override - public boolean isNullEquivalent() { + public boolean isNullEquivalent() { return false; } }, @@ -154,7 +152,7 @@ public enum Signs { } @Override - public boolean isNullEquivalent() { + public boolean isNullEquivalent() { return false; } }, @@ -189,11 +187,12 @@ public enum Signs { Signs result = getSign(sign, null); return result; } + public static Signs getSign(String sign, Integer categoryId) { Signs result = null; for (Signs s : values()) { if (s.sign.equals(sign) && - (categoryId == null || s.getCategory().equals(categoryId))) { + (categoryId == null || s.getCategory().equals(categoryId))) { result = s; break; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java index 8bc4b33..ef8be8c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -45,6 +44,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index 34e9d91..b5fcc14 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -24,8 +24,6 @@ package fr.ifremer.tutti.service.catches; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.tutti.util.Numbers; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -41,6 +39,8 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.util.Numbers; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java index b5db4d9..72d11bf 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.catches.multipost; * #L% */ -import java.util.Date; - /** * @author kmorin <kmorin@codelutin.com> * @since 2.3.1 diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java index eedfefd..ab7eccd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.catches.multipost; * #L% */ -import fr.ifremer.tutti.service.TuttiCsvUtil; - /** * @author kmorin <kmorin@codelutin.com> * @since 2.3.1 diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java index 3e1b725..60143d2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.export.generic; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java index a4ac8de..d19001c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java @@ -21,8 +21,8 @@ */ package fr.ifremer.tutti.service.protocol; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java index 5a6b244..febdde8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti.service.protocol; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.TuttiCsvUtil; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import java.util.Map; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index 72832eb..73486af 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -32,6 +32,7 @@ import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRowBean; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -39,7 +40,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -141,12 +141,12 @@ public class ProtocolImportExportService extends AbstractTuttiService { } Map<String, CaracteristicMappingRow> rowsByCaracteristicId = Maps.uniqueIndex(caracteristicMapping, - new Function<CaracteristicMappingRow, String>() { - @Override - public String apply(CaracteristicMappingRow caracteristicMappingRow) { - return caracteristicMappingRow.getPmfmId(); - } - }); + new Function<CaracteristicMappingRow, String>() { + @Override + public String apply(CaracteristicMappingRow caracteristicMappingRow) { + return caracteristicMappingRow.getPmfmId(); + } + }); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.GEAR_USE_FEATURE); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.VESSEL_USE_FEATURE); @@ -203,7 +203,7 @@ public class ProtocolImportExportService extends AbstractTuttiService { } if (!protocol.isCaracteristicMappingEmpty()) { - for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { + for (CaracteristicMappingRow mappingRow : protocol.getCaracteristicMapping()) { function.setType(CaracteristicType.valueOf(mappingRow.getTab())); rows.add(function.apply(mappingRow.getPmfmId())); } @@ -232,9 +232,9 @@ public class ProtocolImportExportService extends AbstractTuttiService { } public List<Species> importProtocolSpecies(File file, - TuttiProtocol protocol, - Map<String, Caracteristic> caracteristicMap, - Map<String, Species> speciesMap) { + TuttiProtocol protocol, + Map<String, Caracteristic> caracteristicMap, + Map<String, Species> speciesMap) { if (log.isInfoEnabled()) { log.info("Will import protocol [" + protocol.getName() + @@ -328,7 +328,6 @@ public class ProtocolImportExportService extends AbstractTuttiService { } /** - * * @param file * @param protocol * @param caracteristicMap @@ -336,9 +335,9 @@ public class ProtocolImportExportService extends AbstractTuttiService { * @return The list of the species not imported because they are already in the species */ public List<Species> importProtocolBenthos(File file, - TuttiProtocol protocol, - Map<String, Caracteristic> caracteristicMap, - Map<String, Species> speciesMap) { + TuttiProtocol protocol, + Map<String, Caracteristic> caracteristicMap, + Map<String, Species> speciesMap) { if (log.isInfoEnabled()) { log.info("Will import protocol [" + protocol.getName() + 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 3f3cbe5..a43f8c5 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 @@ -321,7 +321,7 @@ public class PsionImportModel { PsionImportBatchModel.SampleCategory nextCat = categoryIterator.next(); SampleCategoryModelEntry actualCategory = categoriesById.get(nextCat.getCategoryId()); - if (lastSampleCategory!=null) { + if (lastSampleCategory != null) { if (actualCategory.getOrder() < lastSampleCategory.getOrder()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java index 1814b86..a786fa5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java @@ -32,7 +32,6 @@ import com.google.common.collect.Sets; import com.google.common.io.Files; import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java index e2de313..40b8b0a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java @@ -79,7 +79,7 @@ public class CarrouselRow implements Serializable { public boolean acceptOperation(FishingOperation operation) { return operationCode.equals(operation.getStationNumber()) - && DateUtils.isSameDay(date, operation.getGearShootingStartDate()); + && DateUtils.isSameDay(date, operation.getGearShootingStartDate()); } public String getOperationCode() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java index 6bc8a79..8aaf0c9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java @@ -62,8 +62,8 @@ public class PupitriImportReportRow { result.speciesName = name; result.speciesVernucalCode = vernacularCode; result.sorted = sorted; - result.sign= signContext.getSigns().getSign(); - result.sortedWeight= signContext.getWeight(); + result.sign = signContext.getSigns().getSign(); + result.sortedWeight = signContext.getWeight(); result.nbBox = signContext.getNbBox(); result.nbSmallBox = signContext.getNbSmallBox(); result.nbBigBox = signContext.getNbBigBox(); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java index 0414bc6..81bb617 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential; * #L% */ -import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import java.util.ArrayList; @@ -38,7 +37,9 @@ import java.util.List; public class ReferentialImportResult<E extends TuttiReferentialEntity> { protected List<E> refAdded = new ArrayList<>(); + protected List<E> refUpdated = new ArrayList<>(); + protected int nbRefDeleted = 0; public List<E> getRefAdded() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java index ea953fb..eca768f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java @@ -24,11 +24,8 @@ package fr.ifremer.tutti.service.referential; import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -41,24 +38,15 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Export; -import org.nuiton.csv.Import; -import org.nuiton.csv.ImportRuntimeException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; -import java.io.Reader; -import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; import static org.nuiton.i18n.I18n.t; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java index 9ec96f3..b4a3c49 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.report; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.AbstractTuttiService; @@ -44,6 +43,7 @@ import org.eclipse.birt.report.engine.api.IReportEngineFactory; import org.eclipse.birt.report.engine.api.IReportRunnable; import org.eclipse.birt.report.engine.api.IRunAndRenderTask; import org.eclipse.birt.report.engine.api.RenderOption; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.File; import java.io.FileFilter; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.