branch feature/2246 updated (8690ac9 -> 42d9dbb)
This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 8690ac9 Meilleure gestion de la suppression d'un ImportLog new 91a2107 Ajout toString new 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... new 42d9dbb Tester avant de supprimer lors de la suppression d'un import The 3 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 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:55:34 2016 +0200 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:54:44 2016 +0200 Ajout toString Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 2 +- .../main/java/fr/ifremer/echobase/io/InputFile.java | 20 ++++++++++++++++++++ .../strategy/AbstractRemoveDataStrategy.java | 15 +++++++++------ 3 files changed, 30 insertions(+), 7 deletions(-) -- 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/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:54:44 2016 +0200 Ajout toString --- .../main/java/fr/ifremer/echobase/io/InputFile.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java index 4ec8668..c762d5c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/InputFile.java @@ -20,6 +20,8 @@ */ package fr.ifremer.echobase.io; +import com.google.common.base.MoreObjects; + import java.io.File; import java.io.Serializable; @@ -88,4 +90,22 @@ public class InputFile implements Serializable { public boolean hasFile() { return file != null; } + + @Override + public String toString() { + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + if (fileName != null) { + toStringHelper.add("fileName", fileName); + } + if (file != null) { + toStringHelper.add("file", file); + } + if (contentType != null) { + toStringHelper.add("contentType", contentType); + } + if (label != null) { + toStringHelper.add("label", label); + } + return toStringHelper.toString(); + } } -- 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/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:55:34 2016 +0200 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... --- .../main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java index 12e998e..07bc6c2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java @@ -60,7 +60,7 @@ public class ImportFileIdTopiaDao extends AbstractImportFileIdTopiaDao<ImportFil String hql = " Select " + constructor + " From " + entityType.getName() + " As e, " + ImportFileId.class.getName() + " As i" - + " Where e.id = i." + ImportFileId.PROPERTY_ENTITY_ID + + " Where e.topiaId = i." + ImportFileId.PROPERTY_ENTITY_ID + " And i." + ImportFileId.PROPERTY_IMPORT_FILE + " = :" + ImportFileId.PROPERTY_IMPORT_FILE + " And i." + ImportFileId.PROPERTY_ENTITY_ID + " Like :" + ImportFileId.PROPERTY_ENTITY_ID + " Order By i." + ImportFileId.PROPERTY_IMPORT_ORDER; -- 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/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import --- .../removedata/strategy/AbstractRemoveDataStrategy.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 cee5107..45b9896 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 @@ -108,13 +108,16 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport String importId = importFileId.getEntityId(); - try { - removeImportData(voyage, importId); - } catch (TopiaException e) { - throw new EchoBaseTechnicalException(e); + boolean exists = persistenceService.isIdExists(importId); + if (exists) { + try { + removeImportData(voyage, importId); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } - incrementOp("ImportLog " + importId + "Removed"); + incrementOp("Import file id:" + importId + " removed."); } @@ -222,7 +225,7 @@ public abstract class AbstractRemoveDataStrategy extends EchoBaseServiceSupport for (String cellId : cellIds) { Optional<Cell> optionalCell = persistenceService.getOptionalCell(cellId); - if (optionalCell.isPresent() ) { + if (optionalCell.isPresent()) { Cell cell = optionalCell.get(); Collection<Result> cellResult = cell.getResult(); // for (Result result : cellResult) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm