branch feature/8180 updated (612b6a3 -> 33247f7)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 612b6a3 Refactoring on echotype import to make place for mooring new 33247f7 Add DataAcousticProvider in the model to avoid cast 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 33247f7015982298a038eadbc5337d4fd40a1fa1 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast Summary of changes: .../entities/{ => data}/DataAcousticProvider.java | 2 +- .../ifremer/echobase/entities/data/MooringImpl.java | 3 +-- .../echobase/entities/data/TransectImpl.java | 3 +-- .../ifremer/echobase/entities/data/VoyageImpl.java | 3 +-- echobase-domain/src/main/xmi/echobase.zargo | Bin 98213 -> 99350 bytes .../fr/ifremer/echobase/services/csv/CellAble.java | 4 ++-- .../ifremer/echobase/services/csv/ProviderAble.java | 2 +- .../DuplicatedElementaryCellException.java | 5 +++-- .../importdata/DuplicatedEsduCellException.java | 2 +- .../importdata/EsduCellNotFoundException.java | 2 +- ...xception.java => MismatchProviderException.java} | 6 +++--- .../actions/ImportAcousticsActionSupport.java | 2 +- .../actions/ImportResultsCellDataActionSupport.java | 2 +- .../actions/ImportResultsEchotypeActionSupport.java | 6 +++--- .../actions/MooringAcousticsImportAction.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 4 ++-- .../VoyageResultsCellImportDataActionSupport.java | 4 ++-- ...AndSpeciesCategoryAndLengthCellImportAction.java | 4 ++-- ...yEchotypeAndSpeciesCategoryCellImportAction.java | 5 ++--- ...VoyageResultsEsduByEchotypeCellImportAction.java | 4 ++-- ...tsEsduSpeciesAndAgeCategoryCellImportAction.java | 5 ++--- .../VoyageResultsMapFishCellImportAction.java | 4 ++-- .../VoyageResultsMapOtherCellImportAction.java | 4 ++-- .../actions/VoyageResultsRegionImportAction.java | 4 ++-- .../VoyageResultsRegionResultsImportAction.java | 4 ++-- .../VoyageResultsVoyageEchotypeImportAction.java | 6 +++--- ...VoyageResultsVoyageLengthAgeKeyImportAction.java | 4 ++-- ...ageResultsVoyageLengthWeightKeyImportAction.java | 4 ++-- ...chotypeAndSpeciesCategoryAndLengthImportRow.java | 16 ++++++++-------- ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 16 ++++++++-------- ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsRegionCellResultImportRow.java | 18 +++++++++--------- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 6 +++--- .../importdb/strategy/AbstractImportDbStrategy.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../strategy/ReferentialImportDbStrategy.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/DummyMooringRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/MooringAcousticRemoveDataStrategy.java | 2 +- .../strategy/MooringRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../i18n/echobase-services_en_GB.properties | 5 +++-- .../i18n/echobase-services_fr_FR.properties | 5 +++-- .../importdata/AbstractImportDataServiceIT.java | 3 --- pom.xml | 2 +- 59 files changed, 120 insertions(+), 125 deletions(-) rename echobase-domain/src/main/java/fr/ifremer/echobase/entities/{ => data}/DataAcousticProvider.java (97%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchVoyageException.java => MismatchProviderException.java} (80%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 33247f7015982298a038eadbc5337d4fd40a1fa1 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast --- .../entities/{ => data}/DataAcousticProvider.java | 2 +- .../ifremer/echobase/entities/data/MooringImpl.java | 3 +-- .../echobase/entities/data/TransectImpl.java | 3 +-- .../ifremer/echobase/entities/data/VoyageImpl.java | 3 +-- echobase-domain/src/main/xmi/echobase.zargo | Bin 98213 -> 99350 bytes .../fr/ifremer/echobase/services/csv/CellAble.java | 4 ++-- .../ifremer/echobase/services/csv/ProviderAble.java | 2 +- .../DuplicatedElementaryCellException.java | 5 +++-- .../importdata/DuplicatedEsduCellException.java | 2 +- .../importdata/EsduCellNotFoundException.java | 2 +- ...xception.java => MismatchProviderException.java} | 6 +++--- .../actions/ImportAcousticsActionSupport.java | 2 +- .../actions/ImportResultsCellDataActionSupport.java | 2 +- .../actions/ImportResultsEchotypeActionSupport.java | 6 +++--- .../actions/MooringAcousticsImportAction.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 4 ++-- .../VoyageResultsCellImportDataActionSupport.java | 4 ++-- ...AndSpeciesCategoryAndLengthCellImportAction.java | 4 ++-- ...yEchotypeAndSpeciesCategoryCellImportAction.java | 5 ++--- ...VoyageResultsEsduByEchotypeCellImportAction.java | 4 ++-- ...tsEsduSpeciesAndAgeCategoryCellImportAction.java | 5 ++--- .../VoyageResultsMapFishCellImportAction.java | 4 ++-- .../VoyageResultsMapOtherCellImportAction.java | 4 ++-- .../actions/VoyageResultsRegionImportAction.java | 4 ++-- .../VoyageResultsRegionResultsImportAction.java | 4 ++-- .../VoyageResultsVoyageEchotypeImportAction.java | 6 +++--- ...VoyageResultsVoyageLengthAgeKeyImportAction.java | 4 ++-- ...ageResultsVoyageLengthWeightKeyImportAction.java | 4 ++-- ...chotypeAndSpeciesCategoryAndLengthImportRow.java | 16 ++++++++-------- ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 16 ++++++++-------- ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsRegionCellResultImportRow.java | 18 +++++++++--------- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 6 +++--- .../importdb/strategy/AbstractImportDbStrategy.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../strategy/ReferentialImportDbStrategy.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/DummyMooringRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/MooringAcousticRemoveDataStrategy.java | 2 +- .../strategy/MooringRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../i18n/echobase-services_en_GB.properties | 5 +++-- .../i18n/echobase-services_fr_FR.properties | 5 +++-- .../importdata/AbstractImportDataServiceIT.java | 3 --- pom.xml | 2 +- 59 files changed, 120 insertions(+), 125 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DataAcousticProvider.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataAcousticProvider.java similarity index 97% rename from echobase-domain/src/main/java/fr/ifremer/echobase/entities/DataAcousticProvider.java rename to echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataAcousticProvider.java index 450b9f1..bb35e6a 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DataAcousticProvider.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataAcousticProvider.java @@ -1,4 +1,4 @@ -package fr.ifremer.echobase.entities; +package fr.ifremer.echobase.entities.data; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.Echotype; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java index 1a8cd77..d355396 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/MooringImpl.java @@ -1,6 +1,5 @@ package fr.ifremer.echobase.entities.data; -import fr.ifremer.echobase.entities.DataAcousticProvider; import java.util.Collection; /** @@ -9,7 +8,7 @@ import java.util.Collection; * @author Julien Ruchaud - ruchaud@codelutin.com * @since 4.0 */ -public class MooringImpl extends MooringAbstract implements DataAcousticProvider<Mooring> { +public class MooringImpl extends MooringAbstract { private static final long serialVersionUID = 4049916052281439032L; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java index 0162a71..da48043 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java @@ -1,6 +1,5 @@ package fr.ifremer.echobase.entities.data; -import fr.ifremer.echobase.entities.DataAcousticProvider; import java.util.Collection; /** @@ -9,7 +8,7 @@ import java.util.Collection; * @author Julien Ruchaud - ruchaud@codelutin.com * @since 4.0 */ -public class TransectImpl extends TransectAbstract implements DataAcousticProvider<Transect> { +public class TransectImpl extends TransectAbstract { private static final long serialVersionUID = 7016949489850474806L; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java index 7e2e655..3488b9a 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java @@ -30,7 +30,6 @@ import fr.ifremer.echobase.entities.references.Vessel; import java.util.Collection; import java.util.Date; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; /** * Default implementation of {@link Voyage}. @@ -38,7 +37,7 @@ import fr.ifremer.echobase.entities.DataAcousticProvider; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageImpl extends VoyageAbstract implements DataAcousticProvider<Voyage> { +public class VoyageImpl extends VoyageAbstract { private static final long serialVersionUID = 1L; diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index 33aa4f5..b7abef0 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java index 55ea14e..2893789 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java @@ -22,6 +22,7 @@ package fr.ifremer.echobase.services.csv; */ import fr.ifremer.echobase.entities.data.Cell; +import org.nuiton.topia.persistence.TopiaEntity; /** * Created on 05/04/16. @@ -29,10 +30,9 @@ import fr.ifremer.echobase.entities.data.Cell; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public interface CellAble extends ProviderAble { +public interface CellAble<E extends TopiaEntity> extends ProviderAble<E> { Cell getCell(); void setCell(Cell cell); - } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ProviderAble.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ProviderAble.java index 64a0363..13a1846 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ProviderAble.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ProviderAble.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.csv; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import org.nuiton.topia.persistence.TopiaEntity; /** diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedElementaryCellException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedElementaryCellException.java index 8f2a1ac..e488369 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedElementaryCellException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedElementaryCellException.java @@ -21,6 +21,7 @@ package fr.ifremer.echobase.services.service.importdata; * #L% */ +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import org.nuiton.csv.ImportRuntimeException; import java.util.Locale; @@ -37,7 +38,7 @@ public class DuplicatedElementaryCellException extends ImportRuntimeException { private static final long serialVersionUID = 1L; - public DuplicatedElementaryCellException(Locale locale, int rowNumber, String cellName,String voyageName) { - super(l(locale, "echobase.importError.duplicate.elementaryCell", rowNumber, cellName, voyageName)); + public DuplicatedElementaryCellException(Locale locale, int rowNumber, String cellName, DataAcousticProvider provider) { + super(l(locale, "echobase.importError.duplicate.elementaryCell", rowNumber, cellName, provider.getName())); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEsduCellException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEsduCellException.java index 2e43f8b..1fef87c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEsduCellException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEsduCellException.java @@ -26,7 +26,7 @@ import org.nuiton.csv.ImportRuntimeException; import java.util.Locale; import static org.nuiton.i18n.I18n.l; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Created on 1/21/15. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EsduCellNotFoundException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EsduCellNotFoundException.java index 5f9542f..4888a5d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EsduCellNotFoundException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EsduCellNotFoundException.java @@ -27,7 +27,7 @@ import org.nuiton.csv.ImportRuntimeException; import java.util.Locale; import static org.nuiton.i18n.I18n.l; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Created on 1/21/15. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchProviderException.java similarity index 80% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchProviderException.java index 5e59f55..814f254 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchProviderException.java @@ -33,10 +33,10 @@ import static org.nuiton.i18n.I18n.l; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class MismatchVoyageException extends ImportRuntimeException { +public class MismatchProviderException extends ImportRuntimeException { - public MismatchVoyageException(Locale locale, int rowNumber, String voyageName) { - super(l(locale, "echobase.importError.mismatch.voyage", rowNumber, voyageName)); + public MismatchProviderException(Locale locale, int rowNumber, String voyageName) { + super(l(locale, "echobase.importError.mismatch.provider", rowNumber, voyageName)); } } \ No newline at end of file diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java index 85877d9..e8e714d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAcousticsActionSupport.java @@ -63,7 +63,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import java.util.Collection; /** diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsCellDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsCellDataActionSupport.java index 3acef6c..4657d22 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsCellDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsCellDataActionSupport.java @@ -22,7 +22,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; */ import com.google.common.base.Preconditions; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.ImportedCellResult; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java index c50ef55..db14842 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportResultsEchotypeActionSupport.java @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Echotypes; @@ -32,7 +32,7 @@ import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedEchotypeAssociationException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.configurations.ImportDataConfigurationSupport; import fr.ifremer.echobase.services.service.importdata.contexts.ImportDataContextSupport; import fr.ifremer.echobase.services.service.importdata.csv.ResultsEchotypeImportRow; @@ -82,7 +82,7 @@ public abstract class ImportResultsEchotypeActionSupport<M extends ImportDataCon DataAcousticProvider provider = row.getProvider(); if (!expectedProvider.equals(provider)) { - throw new MismatchVoyageException(getLocale(), rowNumber, provider.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, provider.getName()); } Echotype rowEchotype = row.getEchotype(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.java index 4aff897..6b494e9 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.services.service.importdata.configurations.MooringAcousticsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.contexts.MooringAcousticsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.AcousticImportExportModel; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java index 6a82c50..1a470a7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; @@ -83,7 +83,7 @@ public class VoyageAcousticsImportAction extends ImportAcousticsActionSupport<Vo // can not find correct transect throw new TransectNotFoundException(locale, voyage, vessel, startDate, rowNumber); } - return (DataAcousticProvider) transect; + return transect; } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java index f1f9cd9..cabfee3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.csv.CellAble; import fr.ifremer.echobase.services.csv.ResultAble; @@ -47,7 +47,7 @@ public abstract class VoyageResultsCellImportDataActionSupport<E extends ResultA @Override protected DataAcousticProvider getDataProvider(VoyageResultsImportDataContext importDataContext) { - return (DataAcousticProvider) importDataContext.getVoyage(); + return importDataContext.getVoyage(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java index 2cc2ad5..7ac6e19 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -88,7 +88,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAct @Override protected VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.of((Voyage) voyage, cell, category, cellResults); + return VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.of(voyage, cell, category, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java index b965d5f..2bd57ad 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java @@ -21,14 +21,13 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.ResultCategoryCache; -import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsEsduByEchotypeAndSpeciesCategoryImportExportModel; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow; @@ -69,7 +68,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction exten @Override protected VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.of((Voyage) voyage, cell, category, cellResults); + return VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.of(voyage, cell, category, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java index b591598..9d3c7b1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -63,7 +63,7 @@ public class VoyageResultsEsduByEchotypeCellImportAction extends VoyageResultsCe @Override protected VoyageResultsEsduByEchotypeImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsEsduByEchotypeImportRow.of((Voyage) voyage, cell, category, cellResults); + return VoyageResultsEsduByEchotypeImportRow.of(voyage, cell, category, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java index 761806a..c5e19c2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java @@ -22,7 +22,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; */ import com.google.common.base.Preconditions; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -32,7 +32,6 @@ import fr.ifremer.echobase.services.service.importdata.AgeCategoryCache; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.MismatchAgeCategoryMeaningException; import fr.ifremer.echobase.services.service.importdata.ResultCategoryCache; -import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsEsduBySpeciesAndAgeCategoryImportExportModel; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsEsduBySpeciesAndAgeCategoryImportRow; @@ -76,7 +75,7 @@ public class VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction extends Voya @Override protected VoyageResultsEsduBySpeciesAndAgeCategoryImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.of((Voyage) voyage, cell, category, cellResults); + return VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.of(voyage, cell, category, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java index 1d715c3..d2fab8a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java @@ -34,7 +34,7 @@ import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedMapCellException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.ResultCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsMapFishCellImportExportModel; @@ -111,7 +111,7 @@ public class VoyageResultsMapFishCellImportAction extends VoyageResultsImportDat Voyage voyage = row.getVoyage(); if (!expectedVoyage.equals(voyage)) { - throw new MismatchVoyageException(getLocale(), rowNumber, voyage.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, voyage.getName()); } String cellName = row.getCell().getName(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java index 1467c1e..8ec06e9 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java @@ -32,7 +32,7 @@ import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedMapCellException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsMapOtherCellImportExportModel; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsMapOtherCellImportRow; @@ -104,7 +104,7 @@ public class VoyageResultsMapOtherCellImportAction extends VoyageResultsImportDa Voyage voyage = row.getVoyage(); if (!expectedVoyage.equals(voyage)) { - throw new MismatchVoyageException(getLocale(), rowNumber, voyage.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, voyage.getName()); } String cellName = row.getCell().getName(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java index a14047f..1381354 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java @@ -36,7 +36,7 @@ import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedRegionCellException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellImportExportModel; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellImportRow; @@ -93,7 +93,7 @@ public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActi Voyage voyage = row.getVoyage(); if (!expectedVoyage.equals(voyage)) { - throw new MismatchVoyageException(getLocale(), rowNumber, voyage.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, voyage.getName()); } DataQuality dataQuality = row.getDataQuality(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java index 92852e4..30656c8 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -69,6 +69,6 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsCellImp @Override protected VoyageResultsRegionCellResultImportRow newImportedRow(DataAcousticProvider voyage, Cell cell, Category category, List<Result> cellResults) { - return VoyageResultsRegionCellResultImportRow.of((Voyage) voyage, cell, category, cellResults); + return VoyageResultsRegionCellResultImportRow.of(voyage, cell, category, cellResults); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java index d539412..d890141 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.actions; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; @@ -62,8 +62,8 @@ public class VoyageResultsVoyageEchotypeImportAction extends ImportResultsEchoty } @Override - protected VoyageResultsVoyageEchotypeImportRow newImportedRow(DataAcousticProvider provider, Echotype echotype, Species species) { - return VoyageResultsVoyageEchotypeImportRow.of(provider, echotype, species); + protected VoyageResultsVoyageEchotypeImportRow newImportedRow(DataAcousticProvider voyage, Echotype echotype, Species species) { + return VoyageResultsVoyageEchotypeImportRow.of(voyage, echotype, species); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java index 7107453..e251812 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java @@ -27,7 +27,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedResultsVoyageLengthAgeKeyException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsVoyageLengthAgeKeyImportExportModel; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsVoyageLengthAgeKeyImportRow; @@ -90,7 +90,7 @@ public class VoyageResultsVoyageLengthAgeKeyImportAction extends VoyageResultsIm Voyage voyage = row.getVoyage(); if (!expectedVoyage.equals(voyage)) { - throw new MismatchVoyageException(getLocale(), rowNumber, voyage.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, voyage.getName()); } LengthAgeKey lengthAgeKeyToCreate = row.getLengthAgeKey(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java index 1446112..77c7c41 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java @@ -28,7 +28,7 @@ import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.DuplicatedResultsVoyageLengthWeightKeyException; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; -import fr.ifremer.echobase.services.service.importdata.MismatchVoyageException; +import fr.ifremer.echobase.services.service.importdata.MismatchProviderException; import fr.ifremer.echobase.services.service.importdata.SpeciesCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsVoyageLengthWeightKeyImportExportModel; @@ -93,7 +93,7 @@ public class VoyageResultsVoyageLengthWeightKeyImportAction extends VoyageResult Voyage voyage = row.getVoyage(); if (!expectedVoyage.equals(voyage)) { - throw new MismatchVoyageException(getLocale(), rowNumber, voyage.getName()); + throw new MismatchProviderException(getLocale(), rowNumber, voyage.getName()); } // find speciesCategory diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java index 4945c15..4aa8b82 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java @@ -20,7 +20,7 @@ */ package fr.ifremer.echobase.services.service.importdata.csv; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Echotype; @@ -42,7 +42,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow implements ResultAble, CellAble { +public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow implements ResultAble, CellAble<Voyage> { public static final String PROPERTY_VOYAGE = "voyage"; public static final String PROPERTY_CELL = "cell"; @@ -63,9 +63,9 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp protected String sizeCategoryMeaning; protected Echotype echotype; - public static VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow of(Voyage voyage, Cell cell, Category category, List<Result> results) { + public static VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> results) { VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow row = new VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow(); - row.setVoyage(voyage); + row.setProvider(provider); row.setCell(cell); row.setSpecies(category.getSpeciesCategory().getSpecies()); row.setLengthClass(category.getSpeciesCategory().getLengthClass()); @@ -89,12 +89,12 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } - + @Override - public void setProvider(DataAcousticProvider provider) { - setVoyage((Voyage) provider); + public void setProvider(DataAcousticProvider<Voyage> provider) { + this.voyage = provider.getEntity(); } public Species getSpecies() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java index 4acdedd..260fd08 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java @@ -20,7 +20,7 @@ */ package fr.ifremer.echobase.services.service.importdata.csv; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Echotype; @@ -42,7 +42,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements ResultAble, CellAble { +public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements ResultAble, CellAble<Voyage> { public static final String PROPERTY_VOYAGE = "voyage"; @@ -64,9 +64,9 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements R protected DataQuality dataQuality; protected SizeCategory sizeCategory; - public static VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow of(Voyage voyage, Cell cell, Category category, List<Result> cellResults) { + public static VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> cellResults) { VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow row = new VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow(); - row.setVoyage(voyage); + row.setProvider(provider); row.setCell(cell); row.setSpecies(category.getSpeciesCategory().getSpecies()); row.setEchotype(category.getEchotype()); @@ -85,12 +85,12 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow implements R @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } - + @Override - public void setProvider(DataAcousticProvider provider) { - setVoyage((Voyage) provider); + public void setProvider(DataAcousticProvider<Voyage> provider) { + this.voyage = provider.getEntity(); } public Echotype getEchotype() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java index 1087aad..632226b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportRow.java @@ -20,7 +20,7 @@ */ package fr.ifremer.echobase.services.service.importdata.csv; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Echotype; @@ -39,7 +39,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAble { +public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAble<Voyage> { public static final String PROPERTY_VOYAGE = "voyage"; public static final String PROPERTY_ECHOTYPE = "echotype"; @@ -52,9 +52,9 @@ public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAbl protected final List<Result> result = new LinkedList<>(); protected DataQuality dataQuality; - public static VoyageResultsEsduByEchotypeImportRow of(Voyage voyage, Cell cell, Category category, List<Result> cellResults) { + public static VoyageResultsEsduByEchotypeImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> cellResults) { VoyageResultsEsduByEchotypeImportRow row = new VoyageResultsEsduByEchotypeImportRow(); - row.setVoyage(voyage); + row.setProvider(provider); row.setCell(cell); row.setEchotype(category.getEchotype()); row.result.addAll(cellResults); @@ -71,12 +71,12 @@ public class VoyageResultsEsduByEchotypeImportRow implements ResultAble, CellAbl @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } - + @Override - public void setProvider(DataAcousticProvider provider) { - setVoyage((Voyage) provider); + public void setProvider(DataAcousticProvider<Voyage> provider) { + this.voyage = provider.getEntity(); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java index f466978..0c0a5aa 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java @@ -20,7 +20,7 @@ */ package fr.ifremer.echobase.services.service.importdata.csv; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; @@ -40,7 +40,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements ResultAble, CellAble { +public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements ResultAble, CellAble<Voyage> { public static final String PROPERTY_VOYAGE = "voyage"; public static final String PROPERTY_CELL = "cell"; @@ -57,9 +57,9 @@ public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements Result protected String ageCategory; protected String ageCategoryMeaning; - public static VoyageResultsEsduBySpeciesAndAgeCategoryImportRow of(Voyage voyage, Cell cell, Category category, List<Result> cellResults) { + public static VoyageResultsEsduBySpeciesAndAgeCategoryImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> cellResults) { VoyageResultsEsduBySpeciesAndAgeCategoryImportRow row = new VoyageResultsEsduBySpeciesAndAgeCategoryImportRow(); - row.setVoyage(voyage); + row.setProvider(provider); row.setCell(cell); row.setSpecies(category.getSpeciesCategory().getSpecies()); row.setAgeCategory(category.getSpeciesCategory().getAgeCategory().getName()); @@ -78,12 +78,12 @@ public class VoyageResultsEsduBySpeciesAndAgeCategoryImportRow implements Result @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } - + @Override - public void setProvider(DataAcousticProvider provider) { - setVoyage((Voyage) provider); + public void setProvider(DataAcousticProvider<Voyage> provider) { + this.voyage = provider.getEntity(); } public Species getSpecies() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java index 855d4fc..89fb78b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdata.csv; import com.google.common.base.Preconditions; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Echotype; @@ -42,7 +42,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class VoyageResultsRegionCellResultImportRow implements ResultAble, CellAble { +public class VoyageResultsRegionCellResultImportRow implements ResultAble, CellAble<Voyage> { public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_VOYAGE = "voyage"; @@ -60,15 +60,15 @@ public class VoyageResultsRegionCellResultImportRow implements ResultAble, CellA protected SizeCategory sizeCategory; protected DataQuality dataQuality; - public static VoyageResultsRegionCellResultImportRow of(Voyage voyage, Cell cell, Category category, List<Result> result) { - Preconditions.checkNotNull(voyage); + public static VoyageResultsRegionCellResultImportRow of(DataAcousticProvider provider, Cell cell, Category category, List<Result> result) { + Preconditions.checkNotNull(provider); Preconditions.checkNotNull(cell); Preconditions.checkNotNull(category); Preconditions.checkNotNull(result); Preconditions.checkArgument(!result.isEmpty()); VoyageResultsRegionCellResultImportRow row = new VoyageResultsRegionCellResultImportRow(); - row.setVoyage(voyage); + row.setProvider(provider); row.setCell(cell); row.result.clear(); row.result.addAll(result); @@ -97,12 +97,12 @@ public class VoyageResultsRegionCellResultImportRow implements ResultAble, CellA @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } - + @Override - public void setProvider(DataAcousticProvider provider) { - setVoyage((Voyage) provider); + public void setProvider(DataAcousticProvider<Voyage> provider) { + this.voyage = provider.getEntity(); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportRow.java index 1d26403..67120df 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportRow.java @@ -20,7 +20,7 @@ */ package fr.ifremer.echobase.services.service.importdata.csv; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Species; @@ -63,11 +63,11 @@ public class VoyageResultsVoyageEchotypeImportRow extends ResultsEchotypeImportR @Override public DataAcousticProvider<Voyage> getProvider() { - return (DataAcousticProvider) voyage; + return voyage; } @Override public void setProvider(DataAcousticProvider<Voyage> provider) { - setVoyage(provider.getEntity()); + this.voyage = provider.getEntity(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java index ab1c28c..9fccdde 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/AbstractImportDbStrategy.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.services.service.importdb.strategy; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java index 0070c1c..3b075e2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.services.service.importdb.strategy; * #L% */ -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.ImportLog; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java index e1d3fa6..8adf23b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/ReferentialImportDbStrategy.java @@ -22,7 +22,7 @@ package fr.ifremer.echobase.services.service.importdb.strategy; */ import com.google.common.collect.Lists; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.persistence.EchoBaseDbMeta; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java index 63c16da..ebf8ee6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java @@ -63,7 +63,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Service to remove an import data. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java index 01f47dc..3c62d9d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AbstractRemoveDataStrategy.java @@ -45,7 +45,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Abstract service to remove import data. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java index 98710e2..5bdc925 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#ACOUSTIC} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java index 9cba239..b09697d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java @@ -32,7 +32,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.Collections; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#CATCHES} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java index 0215b56..cda8611 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#COMMON_ALL} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java index d9a45b7..9e9a0cf 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#COMMON_TRANSECT} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java index 16ff621..3b09dc2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#COMMON_TRANSIT} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java index 74b396c..5f0624b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#COMMON_VOYAGE} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java index cfd3412..f437124 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * @author Julien Ruchaud - ruchaud@codelutin.com diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java index da0086e..146d3ad 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#VOYAGE} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java index 155f0b4..d1b7248 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#MOORING_ACOUSTIC} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java index 19f8591..ee3f24f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#MOORING_COMMONS} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java index 6b86b21..9a0c690 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#OPERATION} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java index 787b01e..704789d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java @@ -32,7 +32,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.Collections; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#RESULT_ESDU} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java index d8658fe..db8484d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.Collections; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#RESULT_MAP_FISH} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java index dd6e56a..5d38559 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.Collections; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#RESULT_MAP_OTHER} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java index fe58a94..c8ddf4f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java @@ -31,7 +31,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.Collections; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#RESULT_REGION} import. diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java index 2ef51a9..26baa2d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java @@ -35,7 +35,7 @@ import org.nuiton.topia.persistence.TopiaException; import java.util.List; import java.util.Set; -import fr.ifremer.echobase.entities.DataAcousticProvider; +import fr.ifremer.echobase.entities.data.DataAcousticProvider; /** * Remove a {@link ImportType#OPERATION} import. diff --git a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties index 9e67117..f458efc 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties @@ -34,8 +34,8 @@ echobase.exportError.toFile=An error occured while exporting file %s \:%s echobase.importError.can.only.import.one.voyage.atime=Impossible to import more that one voyage at a time echobase.importError.dataMetadata.notFound=Metadata column %s missing (existing values \:%s) echobase.importError.duplicate.echotypeSpeciesAssociation=Line %s - Echotype «%s» on voyage named «%s» already contains the species «%s». -echobase.importError.duplicate.elementaryCell=Line %s - Elementary cell named «%s» on voyage «%s» already exists in database. -echobase.importError.duplicate.esduCell=Line %s - ESDU cell named «%s» on voyage «%s» already exists in database. +echobase.importError.duplicate.elementaryCell=Line %s - Elementary cell named «%s» on «%s» already exists in database. +echobase.importError.duplicate.esduCell=Line %s - ESDU cell named «%s» on «%s» already exists in database. echobase.importError.duplicate.gearMetataValue=Line %s - A gear meta data (type «%s») value on engin «%s» for operation with id «%s», on startum «%s» - vessel «%s» on voyage «%s» already exists in database. echobase.importError.duplicate.mapCell=Line %s - Map cell named «%s» on voyage «%s» already exists in database. echobase.importError.duplicate.mooring=Line %s - A mooring named «%s» already exists in database. @@ -55,6 +55,7 @@ echobase.importError.esduCell.withDepthEndFilled=ESDU Cell (id\: %s - name %s) c echobase.importError.esduCellMooring.notfound=A new « dataAquisition» entry must be created for mooring %s, instrument %s, whereas some elementary cells are not associated to an ESDU cell (line %s) echobase.importError.fromFile=An error occured while importing file %s \:%s echobase.importError.mismatch.ageCategoryMeaning=Imported age category meaning (%s) does not match the one persisted ine database (%s) +echobase.importError.mismatch.provider=Line %s - Used «%s» does not match with the configuration. echobase.importError.mismatch.sizeCategoryMeaning=Imported size category meaning (%s) does not match the one persisted ine database (%s) echobase.importError.mismatch.voyage=Line %s - Used voyage «%s» does not match with the voyage configured. echobase.importError.no.transit.between.date=No transit associated to voyage %s between dates %s and %s diff --git a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties index b1c1c08..49f2286 100644 --- a/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties +++ b/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties @@ -34,8 +34,8 @@ echobase.exportError.toFile=Erreur lors de l'extraction du fichier %s \: %s echobase.importError.can.only.import.one.voyage.atime=Vous ne pouvez pas importer plus d'un voyage à la fois echobase.importError.dataMetadata.notFound=Colonne de métadonnées nommée %s non trouvée (valeurs existantes \: %s) echobase.importError.duplicate.echotypeSpeciesAssociation=Ligne %s - L'échotype «%s» sur la marée nommée «%s» contient déjà l'espèce «%s». -echobase.importError.duplicate.elementaryCell=Ligne %s - La cellule élémentaire d'identifiant «%s» sur la marée nommée «%s» existe déjà en base. -echobase.importError.duplicate.esduCell=Ligne %s - La cellule ESDU d'identifiant «%s» sur la marée nommée «%s» existe déjà en base. +echobase.importError.duplicate.elementaryCell=Ligne %s - La cellule élémentaire d'identifiant «%s» sur «%s» existe déjà en base. +echobase.importError.duplicate.esduCell=Ligne %s - La cellule ESDU d'identifiant «%s» sur «%s» existe déjà en base. echobase.importError.duplicate.gearMetataValue=Ligne %s - La mise en œuvre (type %s) de l'engin «%s» (opération d'identifiant «%s» sur la strate «%s» - navire «%s» et sur la marée nommée «%s») existe déjà dans la base. echobase.importError.duplicate.mapCell=Ligne %s - La cellule de type Carte d'identifiant «%s» sur la marée nommée «%s» existe déjà en base. echobase.importError.duplicate.mooring=Ligne %s - La bouée nommée «%s» existe déjà dans la base. @@ -55,6 +55,7 @@ echobase.importError.esduCell.withDepthEndFilled=La cellule de type ESDU (id\: % echobase.importError.esduCellMooring.notfound=Un nouvelle entrée « dataAquisition »doit être créée pour la bouée %s, instrument %s, mais il reste des cellules élémentaires non rattachées à une cellule ESDU (ligne %s) echobase.importError.fromFile=Erreur lors de l'importation du fichier %s \: %s echobase.importError.mismatch.ageCategoryMeaning=Le label de la catégorie d'age (%s) ne correspond pas à celui enregistré en base (%s) +echobase.importError.mismatch.provider=Ligne %s - «%s» ne correspond pas à celle configurée. echobase.importError.mismatch.sizeCategoryMeaning=Le label de la catégorie de taille (%s) ne correspond pas à celui enregistré en base (%s) echobase.importError.mismatch.voyage=Ligne %s - La marée «%s» ne correspond pas à celle configurée. echobase.importError.no.transit.between.date=Pas de transit attribué au voyage %s entre les dates %s et %s diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java index ed84605..f9cecfd 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java @@ -140,12 +140,9 @@ public abstract class AbstractImportDataServiceIT<C extends ImportDataConfigurat } assertAfertImport(importDataResult); - } protected void addMissingEsduCells(String esduColumnName, String voyageId, InputFile inputFile) throws TopiaException, IOException { - - UserDbPersistenceService persistenceService = serviceContext.newService(UserDbPersistenceService.class); Voyage voyage = persistenceService.getVoyage(voyageId); diff --git a/pom.xml b/pom.xml index a09976c..af4f84e 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <!-- libraries version --> - <topiaVersion>3.2-SNAPSHOT</topiaVersion> + <topiaVersion>3.1.1</topiaVersion> <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm